Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add change_level() native. #104

Merged
merged 4 commits into from
Aug 6, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions amxmodx/amxmodx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2574,6 +2574,18 @@ 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)
{
int length;
const char* new_map = get_amxstring(amx, params[1], 0, length);

// Same as calling "changelevel" command but will trigger "server_changelevel" AMXX forward as well.
// Filling second param will call "changelevel2" command, but this is not usable in multiplayer game.
g_pEngTable->pfnChangeLevel(new_map, NULL);

return 1;
}

static cell AMX_NATIVE_CALL task_exists(AMX *amx, cell *params) /* 1 param */
{
return g_tasksMngr.taskExists(params[1], params[2] ? 0 : amx);
Expand Down Expand Up @@ -4838,6 +4850,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},
{"client_cmd", client_cmd},
{"client_print", client_print},
{"client_print_color", client_print_color},
Expand Down
2 changes: 1 addition & 1 deletion plugins/admincmd.sma
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public cmdSlap(id, level, cid)

public chMap(map[])
{
server_cmd("changelevel %s", map)
change_level(map);
}

public cmdMap(id, level, cid)
Expand Down
14 changes: 14 additions & 0 deletions plugins/include/amxmodx.inc
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,20 @@ native precache_sound(const name[]);
/* Precaches any file. */
native precache_generic(const szFile[]);

/**
* Changes map.
*
* @note This calls the pfnChangelLevel engine function.
* @note This has the same behavior as calling the "changelevel" server command,
* but this will also trigger the server_changelevel() forward in AMXX plugins.
* It will also notify any Metamod plugins that are hooking pfnChangeLevel.
*
* @param map The map name to change.
*
* @noreturn
*/
native change_level(const map[]);

/* Sets info for player. */
native set_user_info(index,const info[],const value[]);

Expand Down
2 changes: 1 addition & 1 deletion plugins/mapsmenu.sma
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ public cmdMapsMenu(id, level, cid)
}

public delayedChange(mapname[])
server_cmd("changelevel %s", mapname)
change_level(mapname)

public actionVoteMapMenu(id, key)
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/nextmap.sma
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public delayedChange(param[])
if (g_mp_chattime) {
set_pcvar_float(g_mp_chattime, get_pcvar_float(g_mp_chattime) - 2.0)
}
server_cmd("changelevel %s", param)
change_level(param)
}

public changeMap()
Expand Down