Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a missing include/export, and typos in the previous revision.

Browse Source 
Corrected wrong length values in one charserver packet.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11714 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-11 10:56:39 +00:00
parent a65db8120c
commit 95f651807d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/char/char.c
View File

@ -3101,7 +3101,7 @@ int parse_frommap(int fd)
break; break;
case 0x2b19: // Character set online [Wizputer] case 0x2b19: // Character set online [Wizputer]
if (RFIFOREST(fd) < 6) if (RFIFOREST(fd) < 10)
return 0; return 0;
set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6)); set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
RFIFOSKIP(fd,10); RFIFOSKIP(fd,10);

2
src/char_sql/char.c
View File

@ -2608,7 +2608,7 @@ int parse_frommap(int fd)
break; break;
case 0x2b19: // Character set online [Wizputer] case 0x2b19: // Character set online [Wizputer]
if (RFIFOREST(fd) < 6) if (RFIFOREST(fd) < 10)
return 0; return 0;
set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6)); set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
RFIFOSKIP(fd,10); RFIFOSKIP(fd,10);

5
src/map/map.c
View File

@ -21,6 +21,7 @@
#include "pc.h" #include "pc.h"
#include "status.h" #include "status.h"
#include "mob.h" #include "mob.h"
#include "npc.h" // npc_setcells(), npc_unsetcells()
#include "chat.h" #include "chat.h"
#include "itemdb.h" #include "itemdb.h"
#include "storage.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); status_change_end(bl, SC_MAGICROD, -1);
} }
} else } 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); if (moveblock) map_delblock_sub(bl,0);
#ifdef CELL_NOSTACK #ifdef CELL_NOSTACK
@ -491,7 +492,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick)
} }
} }
} else } else
if (bl->type == BL_NPC) npc_setcells((BL_NPC*)bl); if (bl->type == BL_NPC) npc_setcells((TBL_NPC*)bl);
return 0; return 0;
} }

1
src/map/npc.h
View File

@ -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); int npc_globalmessage(const char* name,const char* mes);
void npc_setcells(struct npc_data* nd); 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); void npc_movenpc(struct npc_data* nd, int x, int y);
int npc_enable(const char* name, int flag); int npc_enable(const char* name, int flag);
int npc_changename(const char* name, const char* newname, short look); // [Lance] int npc_changename(const char* name, const char* newname, short look); // [Lance]