summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/script_commands.txt2
-rw-r--r--src/map/script.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index b53dda2f6..8f114fbac 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6502,7 +6502,7 @@ This command will kill all monsters that were spawned with monster() or
areamonster() and have a specified event label attached to them. Commonly
used to get rid of remaining quest monsters once the quest is complete.
-If the label is given as "All", all monsters which have their respawn
+If the label is given as "all", all monsters which have their respawn
times set to -1 (like all the monsters summoned with 'monster' or
'areamonster' script command, and all monsters summoned with GM commands,
but no other ones - that is, all non-permanent monsters) on the specified
diff --git a/src/map/script.c b/src/map/script.c
index fe8638ac3..01245a617 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11043,10 +11043,16 @@ static BUILDIN(killmonster)
int16 m,allflag=0;
mapname=script_getstr(st,2);
event=script_getstr(st,3);
- if(strcmp(event,"All")==0)
+
+ if (strcmpi(event, "all") == 0) {
+ if (strcmp(event, "all") != 0) {
+ ShowWarning("buildin_killmonster: \"%s\" deprecated! Please use \"all\" instead.\n", event);
+ script->reportsrc(st);
+ }
allflag = 1;
- else
+ } else {
script->check_event(st, event);
+ }
if( (m=map->mapname2mapid(mapname))<0 )
return true;