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

Added error messages when trying to place objects on invalid map coordinates (quick patch for bugreport:419)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11737 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-15 03:42:10 +00:00
parent 6debac1c6e
commit 7b0200e6dc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/16 2007/11/16
* Added error messages when trying to place objects on invalid map coords
* Fixed Divine Protection working against players (bugreport:410) * Fixed Divine Protection working against players (bugreport:410)
2007/11/15 2007/11/15
* Fixed some homunculus skill offset calculation mistakes (bugreport:363) * Fixed some homunculus skill offset calculation mistakes (bugreport:363)

14
src/map/map.c
View File

@ -333,17 +333,23 @@ int map_addblock_sub (struct block_list *bl, int flag)
if (bl->prev != NULL) { if (bl->prev != NULL) {
if(battle_config.error_log) if(battle_config.error_log)
ShowError("map_addblock error : bl->prev != NULL\n"); ShowError("map_addblock: bl->prev != NULL\n");
return 0; return 0;
} }
m = bl->m; m = bl->m;
x = bl->x; x = bl->x;
y = bl->y; y = bl->y;
if (m < 0 || m >= map_num || if( m < 0 || m >= map_num )
x < 0 || x >= map[m].xs || {
y < 0 || y >= map[m].ys) ShowError("map_addblock: invalid map id (%d), only %d are loaded.\n", m, map_num);
return 1; return 1;
}
if( x < 0 || x >= map[m].xs || y < 0 || y >= map[m].ys )
{
ShowError("map_addblock: out-of-bounds coordinates (\"%s\",%d,%d), map is %dx%d\n", map[m].name, x, y, map[m].xs, map[m].ys);
return 1;
}
#ifdef CELL_NOSTACK #ifdef CELL_NOSTACK
map_addblcell(bl); map_addblcell(bl);