summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d6ce9905d..8a410a697 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ 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.
+2007/12/28
+ * Reverted a bad modification in clif_produceeffect from r11290. [FlavioJS]
2007/12/27
* Removed an incorrect range check and fixed a copypaste typo which
caused script engine errors / crashes (see r11984)
diff --git a/src/map/clif.c b/src/map/clif.c
index d176a9415..d2044a77e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5653,7 +5653,7 @@ int clif_movetoattack(struct map_session_data *sd,struct block_list *bl)
*------------------------------------------*/
int clif_produceeffect(struct map_session_data* sd,int flag,int nameid)
{
- int fd;
+ int view,fd;
nullpo_retr(0, sd);
@@ -5662,7 +5662,10 @@ int clif_produceeffect(struct map_session_data* sd,int flag,int nameid)
WFIFOHEAD(fd,packet_len(0x18f));
WFIFOW(fd, 0)=0x18f;
WFIFOW(fd, 2)=flag;
- WFIFOW(fd, 4)=(itemdb_viewid(nameid)||nameid);
+ if((view = itemdb_viewid(nameid)) > 0)
+ WFIFOW(fd, 4)=view;
+ else
+ WFIFOW(fd, 4)=nameid;
WFIFOSET(fd,packet_len(0x18f));
return 0;
}