diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-11 10:56:39 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-11 10:56:39 +0000 |
| commit | a2af1f425fb90746191f5ae8ae1ee8624739c441 (patch) | |
| tree | f6fd4534f507544682a2a3b67915f3be288f57e8 | |
| parent | 0f94f735f50a320d97c0dacb806de2a65662cc3c (diff) | |
| download | hercules-a2af1f425fb90746191f5ae8ae1ee8624739c441.tar.gz hercules-a2af1f425fb90746191f5ae8ae1ee8624739c441.tar.bz2 hercules-a2af1f425fb90746191f5ae8ae1ee8624739c441.tar.xz hercules-a2af1f425fb90746191f5ae8ae1ee8624739c441.zip | |
Fixed a missing include/export, and typos in the previous revision.
Corrected wrong length values in one charserver packet.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11714 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 5 | ||||
| -rw-r--r-- | src/map/npc.h | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/char/char.c b/src/char/char.c index b1e49442b..2df5a7318 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3101,7 +3101,7 @@ int parse_frommap(int fd) break; case 0x2b19: // Character set online [Wizputer] - if (RFIFOREST(fd) < 6) + if (RFIFOREST(fd) < 10) return 0; set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6)); RFIFOSKIP(fd,10); diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 3838d0c1f..4e3d7382e 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -2608,7 +2608,7 @@ int parse_frommap(int fd) break; case 0x2b19: // Character set online [Wizputer] - if (RFIFOREST(fd) < 6) + if (RFIFOREST(fd) < 10) return 0; set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6)); RFIFOSKIP(fd,10); diff --git a/src/map/map.c b/src/map/map.c index 19006cf35..526c24394 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -21,6 +21,7 @@ #include "pc.h" #include "status.h" #include "mob.h" +#include "npc.h" // npc_setcells(), npc_unsetcells() #include "chat.h" #include "itemdb.h" #include "storage.h" @@ -466,7 +467,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) status_change_end(bl, SC_MAGICROD, -1); } } else - if (bl->type == BL_NPC) npc_unsetcells((BL_NPC*)bl); + if (bl->type == BL_NPC) npc_unsetcells((TBL_NPC*)bl); if (moveblock) map_delblock_sub(bl,0); #ifdef CELL_NOSTACK @@ -491,7 +492,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) } } } else - if (bl->type == BL_NPC) npc_setcells((BL_NPC*)bl); + if (bl->type == BL_NPC) npc_setcells((TBL_NPC*)bl); return 0; } diff --git a/src/map/npc.h b/src/map/npc.h index 908ca3382..07658d654 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -57,6 +57,7 @@ const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const char* s int npc_globalmessage(const char* name,const char* mes); void npc_setcells(struct npc_data* nd); +void npc_unsetcells(struct npc_data* nd); void npc_movenpc(struct npc_data* nd, int x, int y); int npc_enable(const char* name, int flag); int npc_changename(const char* name, const char* newname, short look); // [Lance] |