summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-07 11:08:06 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-07 11:08:06 +0000
commit18abe06fb8028743881c54a3092ab24458cd2fdc (patch)
tree117c3b0c3dc45a9a9cfbaf1206c7fb76742af7cc
parentb6dbb89d9149f4da36c861eb5b74b136aebe3864 (diff)
downloadhercules-18abe06fb8028743881c54a3092ab24458cd2fdc.tar.gz
hercules-18abe06fb8028743881c54a3092ab24458cd2fdc.tar.bz2
hercules-18abe06fb8028743881c54a3092ab24458cd2fdc.tar.xz
hercules-18abe06fb8028743881c54a3092ab24458cd2fdc.zip
'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14450 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pc.c13
2 files changed, 7 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c5f2cc069..162598540 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/11/07
+ * 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard]
* Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard]
2010/11/02
* Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X]
diff --git a/src/map/pc.c b/src/map/pc.c
index 72fc4da90..834a7f871 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4899,18 +4899,17 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int
clif_updatestatus(sd,SP_JOBEXP);
}
- if(sd->state.showexp){
#if PACKETVER >= 20091027
- if(base_exp)
- clif_displayexp(sd, base_exp, 1, quest);
- if(job_exp)
- clif_displayexp(sd, job_exp, 2, quest);
-#else
+ if(base_exp)
+ clif_displayexp(sd, base_exp, 1, quest);
+ if(job_exp)
+ clif_displayexp(sd, job_exp, 2, quest);
+#endif
+ if(sd->state.showexp) {
char output[256];
sprintf(output,
"Experience Gained Base:%u (%.2f%%) Job:%u (%.2f%%)",base_exp,nextbp*(float)100,job_exp,nextjp*(float)100);
clif_disp_onlyself(sd,output,strlen(output));
-#endif
}
return 1;