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

gvg warning (#3919)

Browse Source 
* pvpon, pvpoff, gvgon, gvgoff, gvgon3, gvgoff3 now display a message when the map doesn't exist
* The command don't return SCRIPT_CMD_FAILURE anymore when the mapflag is already in the state
This commit is contained in:
Atemo 2019-02-06 15:27:04 +01:00 committed by GitHub
parent 42b71e6f6e
commit 92de3065e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/map/script.cpp
View File

@ -12501,10 +12501,12 @@ BUILDIN_FUNC(pvpon)
m = map_mapname2mapid(str);
if (m < 0 || map_getmapflag(m, MF_PVP))
if (m < 0) {
ShowWarning("buildin_pvpon: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
map_setmapflag(m, MF_PVP, true);
}
if (!map_getmapflag(m, MF_PVP))
map_setmapflag(m, MF_PVP, true);
return SCRIPT_CMD_SUCCESS;
}
@ -12516,10 +12518,12 @@ BUILDIN_FUNC(pvpoff)
m = map_mapname2mapid(str);
if(m < 0 || !map_getmapflag(m, MF_PVP))
if (m < 0) {
ShowWarning("buildin_pvpoff: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
map_setmapflag(m, MF_PVP, false);
}
if (map_getmapflag(m, MF_PVP))
map_setmapflag(m, MF_PVP, false);
return SCRIPT_CMD_SUCCESS;
}
@ -12531,10 +12535,12 @@ BUILDIN_FUNC(gvgon)
m = map_mapname2mapid(str);
if (m < 0 || map_getmapflag(m, MF_GVG))
if (m < 0) {
ShowWarning("buildin_gvgon: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
map_setmapflag(m, MF_GVG, true);
}
if (!map_getmapflag(m, MF_GVG))
map_setmapflag(m, MF_GVG, true);
return SCRIPT_CMD_SUCCESS;
}
@ -12546,8 +12552,11 @@ BUILDIN_FUNC(gvgoff)
m = map_mapname2mapid(str);
if (m < 0 || !map_getmapflag(m, MF_GVG))
if (m < 0) {
ShowWarning("buildin_gvgoff: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
}
if (map_getmapflag(m, MF_GVG))
map_setmapflag(m, MF_GVG, false);
return SCRIPT_CMD_SUCCESS;
@ -12560,10 +12569,12 @@ BUILDIN_FUNC(gvgon3)
m = map_mapname2mapid(str);
if (m < 0 || map_getmapflag(m, MF_GVG_TE))
if (m < 0) {
ShowWarning("buildin_gvgon3: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
map_setmapflag(m, MF_GVG_TE, true);
}
if (!map_getmapflag(m, MF_GVG_TE))
map_setmapflag(m, MF_GVG_TE, true);
return SCRIPT_CMD_SUCCESS;
}
@ -12575,10 +12586,12 @@ BUILDIN_FUNC(gvgoff3)
m = map_mapname2mapid(str);
if (m < 0 || !map_getmapflag(m, MF_GVG_TE))
if (m < 0) {
ShowWarning("buildin_gvgoff3: Unknown map '%s'.\n", str);
return SCRIPT_CMD_FAILURE;
map_setmapflag(m, MF_GVG_TE, false);
}
if (map_getmapflag(m, MF_GVG_TE))
map_setmapflag(m, MF_GVG_TE, false);
return SCRIPT_CMD_SUCCESS;
}