summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-28 14:43:15 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-28 14:43:15 +0000
commit29b8d9d94f79154c992a65ea05a7a2f550fe91f8 (patch)
tree7620009ae0339fc3865beaa0799da77d04977266 /src/map/clif.c
parentf5d5ec4f9f07273fa788653ad8622d22242ee2d7 (diff)
downloadhercules-29b8d9d94f79154c992a65ea05a7a2f550fe91f8.tar.gz
hercules-29b8d9d94f79154c992a65ea05a7a2f550fe91f8.tar.bz2
hercules-29b8d9d94f79154c992a65ea05a7a2f550fe91f8.tar.xz
hercules-29b8d9d94f79154c992a65ea05a7a2f550fe91f8.zip
* Reverted a bad modification in clif_produceeffect from r11290.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11988 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c7
1 files changed, 5 insertions, 2 deletions
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;
}