summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/script_commands.txt5
-rw-r--r--src/map/script.c7
2 files changed, 3 insertions, 9 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 471f98d03..ccb45e5e1 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6417,14 +6417,11 @@ may be a number or a string depending on the mapflag in question.
---------------------------------------
-*removemapflag "<map name>",<flag>{,<zone>};
+*removemapflag "<map name>",<flag>;
This command removes a mapflag from a specified map.
See 'setmapflag' for a list of mapflags.
-The zone optional parameter is used to remove the zone from restricted
-mapflags.
-
---------------------------------------
*getmapflag("<map name>",<flag>)
diff --git a/src/map/script.c b/src/map/script.c
index 3cb31b726..c48610d3c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10486,13 +10486,10 @@ BUILDIN(removemapflag)
{
int16 m,i;
const char *str;
- //int val=0;//warning: variable ‘val’ set but not used" - deprecated?
str=script_getstr(st,2);
i=script_getnum(st,3);
- //if(script_hasdata(st,4)){
- // val=script_getnum(st,4);
- //}
+
m = iMap->mapname2mapid(str);
if(m >= 0) {
switch(i) {
@@ -17768,7 +17765,7 @@ void script_parse_builtin(void) {
BUILDIN_DEF(setmapflagnosave,"ssii"),
BUILDIN_DEF(getmapflag,"si"),
BUILDIN_DEF(setmapflag,"si?"),
- BUILDIN_DEF(removemapflag,"si?"),
+ BUILDIN_DEF(removemapflag,"si"),
BUILDIN_DEF(pvpon,"s"),
BUILDIN_DEF(pvpoff,"s"),
BUILDIN_DEF(gvgon,"s"),