summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-02 16:28:45 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-02 16:28:45 +0000
commitc70ac34152d41e9af4de8d3c2ac0f62506187dad (patch)
tree2a989c45c8bab972a4b3f21373fd1edd97dc89a2
parentd899792c127313aafdd1d694b257a59f98a75891 (diff)
downloadhercules-c70ac34152d41e9af4de8d3c2ac0f62506187dad.tar.gz
hercules-c70ac34152d41e9af4de8d3c2ac0f62506187dad.tar.bz2
hercules-c70ac34152d41e9af4de8d3c2ac0f62506187dad.tar.xz
hercules-c70ac34152d41e9af4de8d3c2ac0f62506187dad.zip
Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14443 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char_sql/char.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6a0422f8c..649ea12d5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/11/02
+ * Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X]
* Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X]
* Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X]
* Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 1a81b5d85..f27395a80 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -459,7 +459,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
(p->base_exp != cp->base_exp) || (p->base_level != cp->base_level) ||
(p->job_level != cp->job_level) || (p->job_exp != cp->job_exp) ||
(p->zeny != cp->zeny) ||
- strcmp(p->last_point.map, cp->last_point.map)
+ (p->last_point.map != cp->last_point.map) ||
(p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) ||
(p->max_hp != cp->max_hp) || (p->hp != cp->hp) ||
(p->max_sp != cp->max_sp) || (p->sp != cp->sp) ||