diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-05 21:41:22 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-05 21:41:22 +0000 |
| commit | e6b60185ffc87bc9d701fd5852bb492bf64e5c97 (patch) | |
| tree | 59bb1826afd7c441af0219a6acfc437dc479bcba | |
| parent | aeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2 (diff) | |
| download | hercules-e6b60185ffc87bc9d701fd5852bb492bf64e5c97.tar.gz hercules-e6b60185ffc87bc9d701fd5852bb492bf64e5c97.tar.bz2 hercules-e6b60185ffc87bc9d701fd5852bb492bf64e5c97.tar.xz hercules-e6b60185ffc87bc9d701fd5852bb492bf64e5c97.zip | |
Corrected one place belonging to the no-stacking mod that I missed when doing the mapcell update (followup to r12003).
Added info from newest clients to packet db.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12015 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/packet_db.txt | 19 | ||||
| -rw-r--r-- | src/map/map.c | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/db/packet_db.txt b/db/packet_db.txt index e640c022c..d8c8f076d 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1055,18 +1055,29 @@ packet_ver: 22 0x029b,80 //2007-11-13aSakexe -//0x015b,-1 0x02e1,33 //2007-11-20aSakexe -//0x015b,54,guildexpulsion,2:6:10:14 -//0x01df,10,gmreqnochatcount,2 <- TODO -//0x01f3,0 +//0x01df,10 <- ??? 0x02e2,14 0x02e3,25 0x02e4,8 0x02e5,8 0x02e6,6 +//2007-11-27aSakexe +0x02e7,-1 + +//2008-01-02aSakexe +0x01df,6,gmreqnochatcount,2 +0x02e8,-1 +0x02e9,-1 +0x02ea,-1 +0x02eb,13 +0x02ec,67 +0x02ed,59 +0x02ee,60 +0x02ef,8 + //Add new packets here //packet_ver: 23 diff --git a/src/map/map.c b/src/map/map.c index bc5235192..b26af3f36 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -265,7 +265,7 @@ void map_addblcell(struct block_list *bl) { if( bl->m<0 || bl->x<0 || bl->x>=map[bl->m].xs || bl->y<0 || bl->y>=map[bl->m].ys || !(bl->type&BL_CHAR) ) return; - map[bl->m].cell_bl[bl->x+bl->y*map[bl->m].xs]++; + map[bl->m].cell[bl->x+bl->y*map[bl->m].xs].cell_bl++; return; } @@ -273,7 +273,7 @@ void map_delblcell(struct block_list *bl) { if( bl->m <0 || bl->x<0 || bl->x>=map[bl->m].xs || bl->y<0 || bl->y>=map[bl->m].ys || !(bl->type&BL_CHAR) ) return; - map[bl->m].cell_bl[bl->x+bl->y*map[bl->m].xs]--; + map[bl->m].cell[bl->x+bl->y*map[bl->m].xs].cell_bl--; } #endif |