From cdfd789f56c4c301f8f56f0349465facf9b7da6e Mon Sep 17 00:00:00 2001 From: Arkshine Date: Fri, 23 Jan 2015 16:52:58 +0100 Subject: [PATCH] Rename change_level to engine_changelevel --- amxmodx/amxmodx.cpp | 4 ++-- plugins/admincmd.sma | 2 +- plugins/include/amxmodx.inc | 4 ++-- plugins/mapsmenu.sma | 4 +++- plugins/nextmap.sma | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index 10c8ab9c..7535a93d 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -2578,7 +2578,7 @@ static cell AMX_NATIVE_CALL change_task(AMX *amx, cell *params) return g_tasksMngr.changeTasks(params[1], params[3] ? 0 : amx, flNewTime); } -static cell AMX_NATIVE_CALL change_level(AMX *amx, cell *params) +static cell AMX_NATIVE_CALL engine_changelevel(AMX *amx, cell *params) { int length; const char* new_map = get_amxstring(amx, params[1], 0, length); @@ -4854,7 +4854,7 @@ AMX_NATIVE_INFO amxmodx_Natives[] = {"callfunc_push_str", callfunc_push_str}, {"callfunc_push_array", callfunc_push_array}, {"change_task", change_task}, - {"change_level", change_level}, + {"engine_changelevel", engine_changelevel}, {"client_cmd", client_cmd}, {"client_print", client_print}, {"client_print_color", client_print_color}, diff --git a/plugins/admincmd.sma b/plugins/admincmd.sma index a36f5b0c..33c5cab8 100755 --- a/plugins/admincmd.sma +++ b/plugins/admincmd.sma @@ -633,7 +633,7 @@ public cmdSlap(id, level, cid) public chMap(map[]) { - change_level(map); + engine_changelevel(map); } public cmdMap(id, level, cid) diff --git a/plugins/include/amxmodx.inc b/plugins/include/amxmodx.inc index e778a381..7fe66ee7 100755 --- a/plugins/include/amxmodx.inc +++ b/plugins/include/amxmodx.inc @@ -63,7 +63,7 @@ forward plugin_unpause(); * server command "changelevel" which is used by many plugins will not * trigger this forward. Unfortunately this means that in practice this * forward is very unreliable, and will not be called in many situations. - * @note AMXX 1.8.3 has added the change_level() function which will utilize + * @note AMXX 1.8.3 has added the engine_changelevel() function which will utilize * the correct engine function to change the map and therefore trigger * this forward. * @@ -262,7 +262,7 @@ native precache_generic(const szFile[]); * * @noreturn */ -native change_level(const map[]); +native engine_changelevel(const map[]); /** * Sets info on the client. diff --git a/plugins/mapsmenu.sma b/plugins/mapsmenu.sma index ac7a6f74..15d49ccd 100755 --- a/plugins/mapsmenu.sma +++ b/plugins/mapsmenu.sma @@ -300,7 +300,9 @@ public cmdMapsMenu(id, level, cid) } public delayedChange(mapname[]) - change_level(mapname) +{ + engine_changelevel(mapname) +} public actionVoteMapMenu(id, key) { diff --git a/plugins/nextmap.sma b/plugins/nextmap.sma index ff73fe58..bdb318ea 100755 --- a/plugins/nextmap.sma +++ b/plugins/nextmap.sma @@ -97,7 +97,7 @@ public delayedChange(param[]) if (g_mp_chattime) { set_pcvar_float(g_mp_chattime, get_pcvar_float(g_mp_chattime) - 2.0) } - change_level(param) + engine_changelevel(param) } public changeMap()