summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-09-24 23:18:43 +0200
committerHaruna <haru@dotalux.com>2015-09-24 23:18:43 +0200
commit8b14ab29582cc0adb97a545ce03a827ad93ff34f (patch)
tree7ae91df92cda84c6cc0eec8f79f855dbfd07b7e0
parentfd1125553f27fbeb8a1e1846eb2b6c95fa62b80b (diff)
parente8bcb1e0e42a522936b35ff8cb316a446e49b6f6 (diff)
downloadhercules-8b14ab29582cc0adb97a545ce03a827ad93ff34f.tar.gz
hercules-8b14ab29582cc0adb97a545ce03a827ad93ff34f.tar.bz2
hercules-8b14ab29582cc0adb97a545ce03a827ad93ff34f.tar.xz
hercules-8b14ab29582cc0adb97a545ce03a827ad93ff34f.zip
Merge pull request #741 from 4144/fix
Fix script command checkcell without player attached.
-rw-r--r--src/map/script.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 4e5ed7fdd..c59a4db45 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -16841,14 +16841,13 @@ BUILDIN(checkcell) {
int16 x = script_getnum(st,3);
int16 y = script_getnum(st,4);
cell_chk type = (cell_chk)script_getnum(st,5);
- TBL_PC* sd = script->rid2sd(st);
if ( m == -1 ) {
ShowWarning("checkcell: Attempted to run on unexsitent map '%s', type %d, x/y %d,%d\n",script_getstr(st,2),type,x,y);
return true;
}
- script_pushint(st, map->getcell(m, &sd->bl, x, y, type));
+ script_pushint(st, map->getcell(m, NULL, x, y, type));
return true;
}