diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-13 06:15:35 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-13 06:15:35 +0000 |
| commit | 03c45b1b06a788b6688601a1d1633c43795631c9 (patch) | |
| tree | c27e1de66f4600b29b152679cfb35e8cfd792af7 | |
| parent | 9babdbcbb4209a6ae861550eb662ac810d7ad886 (diff) | |
| download | hercules-03c45b1b06a788b6688601a1d1633c43795631c9.tar.gz hercules-03c45b1b06a788b6688601a1d1633c43795631c9.tar.bz2 hercules-03c45b1b06a788b6688601a1d1633c43795631c9.tar.xz hercules-03c45b1b06a788b6688601a1d1633c43795631c9.zip | |
Fixed a mistake in r11344 that caused the 'my shop' window to display info about cards slotted in items incorrectly (bugreport:1502).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12704 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3953b7591..887f724df 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/05/13 + * Fixed a mistake in r11344 that caused the 'my shop' window to display + info about cards slotted in items incorrectly (bugreport:1502) 2008/05/12 * Fixed a script engine problem where warping away while having a menu window open and talking to an another npc with a menu would produce diff --git a/src/map/clif.c b/src/map/clif.c index bac29ef47..7275ede90 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5230,7 +5230,7 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven WFIFOB(fd,19+i*22) = sd->status.cart[index].identify; WFIFOB(fd,20+i*22) = sd->status.cart[index].attribute; WFIFOB(fd,21+i*22) = sd->status.cart[index].refine; - clif_addcards(WFIFOP(fd,22+count*22), &sd->status.cart[index]); + clif_addcards(WFIFOP(fd,22+i*22), &sd->status.cart[index]); } WFIFOSET(fd,WFIFOW(fd,2)); } |