From 489a6826d74a84ae8e65f9b92d17b3f4aba1f984 Mon Sep 17 00:00:00 2001 From: Shavitush Date: Mon, 21 Sep 2015 15:12:31 +0300 Subject: [PATCH] Fix compilation for the 1.7.3 SM compiler --- scripting/shavit-core.sp | 6 +++--- scripting/shavit-misc.sp | 2 +- scripting/shavit-replay.sp | 2 +- scripting/shavit-wr.sp | 4 ++-- scripting/shavit-zones.sp | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripting/shavit-core.sp b/scripting/shavit-core.sp index 07275cf13..44dec39ee 100644 --- a/scripting/shavit-core.sp +++ b/scripting/shavit-core.sp @@ -467,7 +467,7 @@ public void Player_Death(Handle event, const char[] name, bool dontBroadcast) public int Native_GetGameType(Handle handler, int numParams) { - return view_asgSG_Type; + return view_as(gSG_Type); } public int Native_GetDB(Handle handler, int numParams) @@ -526,7 +526,7 @@ public int Native_FinishMap(Handle handler, int numParams) Call_StartForward(gH_Forwards_Finish); Call_PushCell(client); - Call_PushCell(view_asgBS_Style[client]); + Call_PushCell(view_as(gBS_Style[client])); Call_PushCell(CalculateTime(client)); Call_PushCell(gI_Jumps[client]); Call_Finish(); @@ -762,7 +762,7 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3 { bEdit = true; - vel = view_as{0.0, 0.0, 0.0}; + vel = view_as({0.0, 0.0, 0.0}); } return bEdit? Plugin_Changed:Plugin_Continue; diff --git a/scripting/shavit-misc.sp b/scripting/shavit-misc.sp index 56e3a09e4..e9f0fe0b0 100644 --- a/scripting/shavit-misc.sp +++ b/scripting/shavit-misc.sp @@ -194,7 +194,7 @@ public Action OnPlayerRunCmd(int client, int &buttons) { if((gI_PreSpeed == 2 || gI_PreSpeed == 3) && !(gF_LastFlags[client] & FL_ONGROUND) && (GetEntityFlags(client) & FL_ONGROUND) && buttons & IN_JUMP) { - TeleportEntity(client, NULL_VECTOR, NULL_VECTOR, view_as{0.0, 0.0, 0.0}); + TeleportEntity(client, NULL_VECTOR, NULL_VECTOR, view_as({0.0, 0.0, 0.0})); PrintToChat(client, "%s Bhopping in the start zone is not allowed.", PREFIX); gF_LastFlags[client] = GetEntityFlags(client); diff --git a/scripting/shavit-replay.sp b/scripting/shavit-replay.sp index 0f370f6a0..79da9320c 100644 --- a/scripting/shavit-replay.sp +++ b/scripting/shavit-replay.sp @@ -179,7 +179,7 @@ public void OnMapStart() CreateDirectory(sPath, 511); } - LoadReplay(view_asi); + LoadReplay(view_as(i)); } } diff --git a/scripting/shavit-wr.sp b/scripting/shavit-wr.sp index 5996b9013..1e660fb79 100644 --- a/scripting/shavit-wr.sp +++ b/scripting/shavit-wr.sp @@ -775,7 +775,7 @@ public void SQL_SubMenu_Callback(Handle owner, Handle hndl, const char[] error, // 3 - style int iStyle = SQL_FetchInt(hndl, 3); char sStyle[16]; - FormatEx(sStyle, 16, "%s", iStyle == view_asStyle_Forwards? "Forwards":"Sideways"); + FormatEx(sStyle, 16, "%s", iStyle == view_as(Style_Forwards)? "Forwards":"Sideways"); FormatEx(sDisplay, 128, "Style: %s", sStyle); AddMenuItem(menu, "-1", sDisplay); @@ -875,7 +875,7 @@ public any abs(any thing) public void Shavit_OnFinish(int client, BhopStyle style, float time, int jumps) { - BhopStyle bsStyle = view_asstyle; + BhopStyle bsStyle = view_as(style); char sTime[32]; FormatSeconds(time, sTime, 32); diff --git a/scripting/shavit-zones.sp b/scripting/shavit-zones.sp index 87f8a8a5c..7710b4b7f 100644 --- a/scripting/shavit-zones.sp +++ b/scripting/shavit-zones.sp @@ -145,7 +145,7 @@ public void OnConVarChanged(ConVar cvar, const char[] sOld, const char[] sNew) // using an if() statement just incase I'll add more cvars. if(cvar == gCV_ZoneStyle) { - gB_ZoneStyle = view_asStringToInt(sNew); + gB_ZoneStyle = view_as(StringToInt(sNew)); } } @@ -296,7 +296,7 @@ public void UnloadZones(int zone) return; } - if(zone != view_asZone_Freestyle) + if(zone != view_as(Zone_Freestyle)) { for(int i = 0; i < 3; i++) { @@ -339,7 +339,7 @@ public void SQL_RefreshZones_Callback(Handle owner, Handle hndl, const char[] er while(SQL_FetchRow(hndl)) { - MapZones type = view_asSQL_FetchInt(hndl, 0); + MapZones type = view_as(SQL_FetchInt(hndl, 0)); if(type == Zone_Freestyle) { @@ -444,7 +444,7 @@ public Action Command_DeleteZone(int client, int args) for (int i = 0; i < MAX_ZONES; i++) { - if(i == view_asZone_Freestyle) + if(i == view_as(Zone_Freestyle)) { if(!EmptyZone(gV_FreestyleZones[0][0]) && !EmptyZone(gV_FreestyleZones[0][1])) { @@ -614,7 +614,7 @@ public int Select_Type_MenuHandler(Handle menu, MenuAction action, int param1, i char info[8]; GetMenuItem(menu, param2, info, 8); - gMZ_Type[param1] = view_asStringToInt(info); + gMZ_Type[param1] = view_as(StringToInt(info)); ShowPanel(param1, 1); } @@ -1025,7 +1025,7 @@ public Action Timer_DrawEverything(Handle Timer, any data) float vPoints[8][3]; - if(i == view_asZone_Freestyle) + if(i == view_as(Zone_Freestyle)) { for(int j = 0; j < MULTIPLEZONES_LIMIT; j++) { @@ -1058,12 +1058,12 @@ public Action Timer_DrawEverything(Handle Timer, any data) continue; }*/ - if(i == view_asZone_Respawn) + if(i == view_as(Zone_Respawn)) { continue; } - if(i == view_asZone_Stop) + if(i == view_as(Zone_Stop)) { continue; } @@ -1229,6 +1229,6 @@ public void Shavit_OnRestart(int client) AddVectors(gV_MapZones[0][0], vCenter, vCenter); - TeleportEntity(client, vCenter, NULL_VECTOR, view_as{0.0, 0.0, 0.0}); + TeleportEntity(client, vCenter, NULL_VECTOR, view_as({0.0, 0.0, 0.0})); } }