sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-07 02:18:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trim whitespace & add licenses

Browse Source
This commit is contained in:
rtldg 2022-01-01 09:53:34 +00:00
parent 168968800d
commit 0c91c19ba6
26 changed files with 261 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/sourcemod/scripting/include/convar_class.inc
View File

@ -1,3 +1,27 @@
/*
MIT License
Copyright (c) 2019 KiD Fearless
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#if defined _convar_class_included
#endinput
#endif

20
addons/sourcemod/scripting/include/shavit/anti-sv_cheats.sp
View File

@ -1,4 +1,22 @@
/*
* shavit's Timer - anti-sv_cheats.sp
* by: rtldg
*
* This file is part of shavit's Timer.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
Convar gCV_DisableSvCheats = null;

2
addons/sourcemod/scripting/include/shavit/bhopstats-timerified.sp
View File

@ -124,7 +124,6 @@ public void Bhopstats_PostThinkPost(int client)
gB_PlayerTouchingGround[client] = false;
}
else if(!gB_PlayerTouchingGround[client] && ((gB_JumpHeld[client] && iGroundEntity != -1) || iGroundEntity == -1 || bOnLadder))
{
Call_StartForward(gH_Forwards_OnLeaveGround);
@ -156,7 +155,6 @@ public void Bhopstats_PostThinkPost(int client)
}
}
}
else if(gI_Buttons[client] & IN_JUMP && !(buttons & IN_JUMP))
{
Call_StartForward(gH_Forwards_OnJumpReleased);

21
addons/sourcemod/scripting/include/shavit/replay-file.inc
View File

@ -1,3 +1,23 @@
/*
* shavit's Timer - replay file stocks & format
* by: shavit
*
* This file is part of shavit's Timer.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#if defined _shavit_replay_file_included
#endinput
#endif
@ -371,4 +391,3 @@ stock void WriteReplayFrames(ArrayList playerrecording, int iSize, File file_a,
}
}
}

19
addons/sourcemod/scripting/include/shavit/replay-stocks.sp
View File

@ -1,3 +1,22 @@
/*
* shavit's Timer - stocks used by the replay plugins
* by: shavit
*
* This file is part of shavit's Timer.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
stock bool Shavit_ReplayEnabledStyle(int style)
{

17
addons/sourcemod/scripting/include/shavit/steamid-stocks.inc
View File

@ -1,3 +1,20 @@
/*
* Steam ID handling stocks
* by: rtldg
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#if defined _steamid_stocks_included
#endinput

1
addons/sourcemod/scripting/include/shavit/style-settings.sp
View File

@ -372,6 +372,7 @@ public SMCResult OnStyleKeyValue(SMCParser smc, const char[] key, const char[] v
{
SetStyleSetting(gI_CurrentParserIndex, key, value);
gSM_StyleKeysSet.SetValue(key, true);
return SMCParse_Continue;
}

19
addons/sourcemod/scripting/include/shavit/weapon-stocks.inc
View File

@ -1,3 +1,22 @@
/*
* shavit's Timer - weapon stocks
* by: shavit
*
* This file is part of shavit's Timer.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#if defined _shavit_weapon_stocks_included
#endinput

17
addons/sourcemod/scripting/shavit-chat.sp
View File

@ -379,7 +379,6 @@ bool LoadChatSettings()
{
failed = !kv.JumpToKey("CS:S");
}
else if(gEV_Type == Engine_CSGO)
{
failed = !kv.JumpToKey("CS:GO");
@ -448,7 +447,6 @@ public Action Hook_SayText2(UserMsg msg_id, any msg, const int[] players, int pl
pbmsg.ReadString("params", sOriginalName, MAXLENGTH_NAME, 0);
pbmsg.ReadString("params", sOriginalText, MAXLENGTH_TEXT, 1);
}
else
{
BfRead bfmsg = UserMessageToBfRead(msg);
@ -520,7 +518,6 @@ public Action Hook_SayText2(UserMsg msg_id, any msg, const int[] players, int pl
TrimString(sOriginalText);
Format(sOriginalText, MAXLENGTH_MESSAGE, "%s%s", sFixedMessage, sCMessage);
}
else
{
Format(sOriginalText, MAXLENGTH_MESSAGE, "%s%s", sCMessage, sOriginalText);
@ -604,7 +601,6 @@ void Frame_SendText(DataPack pack)
pbmsg.AddString("params", "");
}
}
else
{
BfWrite bfmsg = UserMessageToBfWrite(hSayText2);
@ -622,12 +618,10 @@ public void OnLibraryAdded(const char[] name)
{
gB_RTLer = true;
}
else if(StrEqual(name, "shavit-rankings"))
{
gB_Rankings = true;
}
else if(StrEqual(name, "shavit-stats"))
{
gB_Stats = true;
@ -640,12 +634,10 @@ public void OnLibraryRemoved(const char[] name)
{
gB_RTLer = false;
}
else if(StrEqual(name, "shavit-rankings"))
{
gB_Rankings = false;
}
else if(StrEqual(name, "shavit-stats"))
{
gB_Stats = false;
@ -662,7 +654,6 @@ public void OnClientCookiesCached(int client)
SetClientCookie(client, gH_ChatCookie, "-2");
gI_ChatSelection[client] = -2;
}
else
{
gI_ChatSelection[client] = StringToInt(sChatSettings);
@ -718,7 +709,6 @@ public Action Command_CCHelp(int client, int args)
"CCHelp_CSS_1", client,
"CCHelp_CSS_2", client);
}
else
{
PrintToConsole(client, "%T", "CCHelp_CSGO_1", client);
@ -754,7 +744,6 @@ public Action Command_CCName(int client, int args)
return Plugin_Handled;
}
else if(StrEqual(sArgs, "off"))
{
Shavit_PrintToChat(client, "%T", "NameOff", client, sArgs);
@ -804,7 +793,6 @@ public Action Command_CCMessage(int client, int args)
return Plugin_Handled;
}
else if(StrEqual(sArgs, "off"))
{
Shavit_PrintToChat(client, "%T", "MessageOff", client, sArgs);
@ -1055,7 +1043,6 @@ void PreviewChat(int client, int rank)
pbmsg.AddString("params", "");
}
}
else
{
BfWrite bfmsg = UserMessageToBfWrite(hSayText2);
@ -1080,7 +1067,6 @@ bool HasRankAccess(int client, int rank)
{
return true;
}
else if(!(0 <= rank <= (gA_ChatRanks.Length - 1)))
{
return false;
@ -1099,7 +1085,6 @@ bool HasRankAccess(int client, int rank)
{
bFlagAccess = true;
}
else if(iSize == 1)
{
AdminFlag afFlag = view_as<AdminFlag>(0);
@ -1109,7 +1094,6 @@ bool HasRankAccess(int client, int rank)
bFlagAccess = GetAdminFlag(GetUserAdmin(client), afFlag);
}
}
else
{
bFlagAccess = CheckCommandAccess(client, sFlag, 0, true);
@ -1396,7 +1380,6 @@ void FormatRandom(char[] buffer, int size)
{
FormatEx(temp, 8, "\x07%06X", GetRandomInt(0, 0xFFFFFF));
}
else
{
strcopy(temp, 8, gS_CSGOColors[GetRandomInt(0, sizeof(gS_CSGOColors) - 1)]);

4
addons/sourcemod/scripting/shavit-checkpoints.sp
View File

@ -1007,7 +1007,6 @@ public int MenuHandler_KZCheckpoints(Menu menu, MenuAction action, int param1, i
OpenCheckpointsMenu(param1);
}
else if(action == MenuAction_Cancel)
{
if(param2 == MenuCancel_Exit)
@ -1015,7 +1014,6 @@ public int MenuHandler_KZCheckpoints(Menu menu, MenuAction action, int param1, i
gB_ClosedKZCP[param1] = true;
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -1041,7 +1039,6 @@ void OpenNormalCPMenu(int client)
{
menu.SetTitle("%T\n%T\n ", "MiscCheckpointMenu", client, "MiscCheckpointWarning", client);
}
else
{
menu.SetTitle("%T\n ", "MiscCheckpointMenuSegmented", client);
@ -1244,7 +1241,6 @@ public int MenuHandler_CheckpointsDelete(Menu menu, MenuAction action, int param
OpenCheckpointsMenu(param1);
}
else if(action == MenuAction_End)
{
delete menu;

10
addons/sourcemod/scripting/shavit-core.sp
View File

@ -264,7 +264,6 @@ public void OnPluginStart()
sv_autobunnyhopping = FindConVar("sv_autobunnyhopping");
sv_autobunnyhopping.BoolValue = false;
}
else if(gEV_Type != Engine_CSS && gEV_Type != Engine_TF2)
{
SetFailState("This plugin was meant to be used in CS:S, CS:GO and TF2 *only*.");
@ -770,7 +769,6 @@ public Action Command_TogglePause(int client, int args)
Shavit_PrintToChat(client, "%T", "MessageUnpause", client, gS_ChatStrings.sText, gS_ChatStrings.sVariable, gS_ChatStrings.sText);
}
else
{
if((iFlags & CPR_NotOnGround) > 0)
@ -1006,7 +1004,6 @@ public Action Command_Migration(int client, int args)
bApplyMigration[i] = true;
}
}
else
{
int iMigration = StringToInt(sArg);
@ -1063,7 +1060,6 @@ public Action Command_WipePlayer(int client, int args)
Shavit_PrintToChat(client, "Preparing to delete all user data for SteamID %s[U:1:%d]%s. To confirm, enter %s!wipeplayer %s",
gS_ChatStrings.sVariable, gI_WipePlayerID[client], gS_ChatStrings.sText, gS_ChatStrings.sVariable2, gS_Verification[client]);
}
else
{
Shavit_PrintToChat(client, "Deleting data for SteamID %s[U:1:%d]%s...",
@ -1275,7 +1271,6 @@ public Action Command_Style(int client, int args)
{
menu.AddItem("-1", "Nothing");
}
else if(menu.ItemCount <= ((gEV_Type == Engine_CSS)? 9:8))
{
menu.Pagination = MENU_NO_PAGINATION;
@ -1303,7 +1298,6 @@ public int StyleMenu_Handler(Menu menu, MenuAction action, int param1, int param
ChangeClientStyle(param1, style, true);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1567,7 +1561,6 @@ void VelocityChanges(int data)
{
SetEntPropVector(client, Prop_Data, "m_vecAbsVelocity", fAbsVelocity);
}
else
{
TeleportEntity(client, NULL_VECTOR, NULL_VECTOR, fAbsVelocity);
@ -2546,7 +2539,6 @@ public void OnClientPutInServer(int client)
"INSERT INTO %susers (auth, name, ip, lastlogin) VALUES (%d, '%s', %d, %d) ON DUPLICATE KEY UPDATE name = '%s', ip = %d, lastlogin = %d;",
gS_MySQLPrefix, iSteamID, sEscapedName, iIPAddress, iTime, sEscapedName, iIPAddress, iTime);
}
else
{
FormatEx(sQuery, 512,
@ -2567,7 +2559,6 @@ public void SQL_InsertUser_Callback(Database db, DBResultSet results, const char
{
LogError("Timer error! Failed to insert a disconnected player's data to the table. Reason: %s", error);
}
else
{
LogError("Timer error! Failed to insert \"%N\"'s data to the table. Reason: %s", client, error);
@ -2648,7 +2639,6 @@ public void Shavit_OnEnterZone(int client, int type, int track, int id, int enti
UpdateAiraccelerate(client, gF_ZoneAiraccelerate[client]);
}
else if(type == Zone_CustomSpeedLimit)
{
gF_ZoneSpeedLimit[client] = float(Shavit_GetZoneData(id));

20
addons/sourcemod/scripting/shavit-hud.sp
View File

@ -280,22 +280,18 @@ public void OnLibraryAdded(const char[] name)
{
gB_ReplayPlayback = true;
}
else if(StrEqual(name, "shavit-zones"))
{
gB_Zones = true;
}
else if(StrEqual(name, "shavit-sounds"))
{
gB_Sounds = true;
}
else if(StrEqual(name, "shavit-rankings"))
{
gB_Rankings = true;
}
else if(StrEqual(name, "DynamicChannels"))
{
gB_DynamicChannels = true;
@ -308,22 +304,18 @@ public void OnLibraryRemoved(const char[] name)
{
gB_ReplayPlayback = false;
}
else if(StrEqual(name, "shavit-zones"))
{
gB_Zones = false;
}
else if(StrEqual(name, "shavit-sounds"))
{
gB_Sounds = false;
}
else if(StrEqual(name, "shavit-rankings"))
{
gB_Rankings = false;
}
else if(StrEqual(name, "DynamicChannels"))
{
gB_DynamicChannels = false;
@ -453,7 +445,6 @@ public void OnClientCookiesCached(int client)
SetClientCookie(client, gH_HUDCookie, sHUDSettings);
gI_HUDSettings[client] = gCV_DefaultHUD.IntValue;
}
else
{
gI_HUDSettings[client] = StringToInt(sHUDSettings);
@ -468,7 +459,6 @@ public void OnClientCookiesCached(int client)
SetClientCookie(client, gH_HUDCookieMain, sHUDSettings);
gI_HUD2Settings[client] = gCV_DefaultHUD2.IntValue;
}
else
{
gI_HUD2Settings[client] = StringToInt(sHUDSettings);
@ -565,7 +555,6 @@ void ToggleHUD(int client, int hud, bool chat)
Shavit_PrintToChat(client, "%T", "HudEnabledComponent", client,
gS_ChatStrings.sVariable, sHUDSetting, gS_ChatStrings.sText, gS_ChatStrings.sVariable2, gS_ChatStrings.sText);
}
else
{
Shavit_PrintToChat(client, "%T", "HudDisabledComponent", client,
@ -839,7 +828,6 @@ public int MenuHandler_HUD(Menu menu, MenuAction action, int param1, int param2)
ShowHUDMenu(param1, GetMenuSelectionPosition());
}
else if(action == MenuAction_DisplayItem)
{
char sInfo[16];
@ -871,7 +859,6 @@ public int MenuHandler_HUD(Menu menu, MenuAction action, int param1, int param2)
return RedrawMenuItem(sDisplay);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1231,7 +1218,6 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
AddHUDLine(buffer, maxlen, sLine, iLines);
}
}
else
{
FormatEx(sLine, 128, "%T", (gEV_Type == Engine_TF2)? "NoReplayDataTF2":"NoReplayData", client);
@ -1253,7 +1239,6 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
{
FormatEx(sLine, 128, "%T ", "HudInStartZone", client, data.iSpeed);
}
else
{
FormatEx(sLine, 128, "%T ", "HudInEndZone", client, data.iSpeed);
@ -1299,7 +1284,6 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
{
FormatEx(sLine, 128, "%T: %s%s (%d)", "HudTimeText", client, sTime, sTimeDiff, data.iRank);
}
else
{
FormatEx(sLine, 128, "%T: %s%s", "HudTimeText", client, sTime, sTimeDiff);
@ -1345,7 +1329,6 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
FormatEx(sLine, 128, "%T: %d", "HudSpeedText", client, data.iSpeed);
}
}
else
{
IntToString(data.iSpeed, sLine, 128);
@ -1361,7 +1344,6 @@ int AddHUDToBuffer_Source2013(int client, huddata_t data, char[] buffer, int max
{
FormatEx(sLine, 128, "%T", "HudNoSpeedLimit", data.iTarget);
}
else
{
FormatEx(sLine, 128, "%T", "HudCustomSpeedLimit", client, gI_ZoneSpeedLimit[data.iTarget]);
@ -1436,7 +1418,6 @@ int AddHUDToBuffer_CSGO(int client, huddata_t data, char[] buffer, int maxlen)
AddHUDLine(buffer, maxlen, sLine, iLines);
}
}
else
{
FormatEx(sLine, 128, "%T", "NoReplayData", client);
@ -1541,7 +1522,6 @@ int AddHUDToBuffer_CSGO(int client, huddata_t data, char[] buffer, int maxlen)
{
FormatEx(sLine, 128, "<span color='#%06X'>%s%s</span> (#%d)", iColor, sTime, sTimeDiff, data.iRank);
}
else
{
FormatEx(sLine, 128, "<span color='#%06X'>%s%s</span>", iColor, sTime, sTimeDiff);

13
addons/sourcemod/scripting/shavit-misc.sp
View File

@ -423,7 +423,6 @@ public void OnClientCookiesCached(int client)
SetClientCookie(client, gH_HideCookie, "0");
gB_Hide[client] = false;
}
else
{
gB_Hide[client] = view_as<bool>(StringToInt(sSetting));
@ -710,7 +709,6 @@ int GetHumanTeam()
{
return 2;
}
else if(StrEqual(sTeam, "ct", false) || StrContains(sTeam, "blu", false) != -1)
{
return 3;
@ -1645,7 +1643,6 @@ public Action Command_Teleport(int client, int args)
Teleport(client, GetClientSerial(iTarget));
}
else
{
Menu menu = new Menu(MenuHandler_Teleport);
@ -1686,7 +1683,6 @@ public int MenuHandler_Teleport(Menu menu, MenuAction action, int param1, int pa
Command_Teleport(param1, 0);
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -1859,7 +1855,6 @@ public int MenuHandler_StopWarning(Menu menu, MenuAction action, int param1, int
Call_Finish();
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -1961,13 +1956,11 @@ public Action CommandListener_Noclip(int client, const char[] command, int args)
Shavit_StopTimer(client);
SetEntityMoveType(client, MOVETYPE_NOCLIP);
}
else
{
OpenStopWarningMenu(client, DoNoclip);
}
}
else if(GetEntityMoveType(client) == MOVETYPE_NOCLIP)
{
SetEntityMoveType(client, MOVETYPE_WALK);
@ -2064,7 +2057,6 @@ public Action Command_Specs(int client, int args)
{
FormatEx(sSpecs, 192, "%s%N", gS_ChatStrings.sVariable2, i);
}
else
{
Format(sSpecs, 192, "%s%s, %s%N", sSpecs, gS_ChatStrings.sText, gS_ChatStrings.sVariable2, i);
@ -2076,7 +2068,6 @@ public Action Command_Specs(int client, int args)
{
Shavit_PrintToChat(client, "%T", "SpectatorCount", client, gS_ChatStrings.sVariable2, iObserverTarget, gS_ChatStrings.sText, gS_ChatStrings.sVariable, iCount, gS_ChatStrings.sText, sSpecs);
}
else
{
Shavit_PrintToChat(client, "%T", "SpectatorCountZero", client, gS_ChatStrings.sVariable2, iObserverTarget, gS_ChatStrings.sText);
@ -2171,7 +2162,6 @@ public void Shavit_OnWorldRecord(int client, int style, float time, int jumps, i
{
Shavit_PrintToChatAll("%t", "WRNotice", gS_ChatStrings.sWarning, sUpperCase);
}
else
{
Shavit_PrintToChatAll("%s[%s]%s %t", gS_ChatStrings.sVariable, sTrack, gS_ChatStrings.sText, "WRNotice", gS_ChatStrings.sWarning, sUpperCase);
@ -2256,7 +2246,6 @@ public Action Respawn(Handle timer, any data)
{
TF2_RespawnPlayer(client);
}
else
{
CS_RespawnPlayer(client);
@ -2432,7 +2421,6 @@ public Action Shotgun_Shot(const char[] te_name, const int[] Players, int numCli
TE_WriteFloat("m_fInaccuracy", TE_ReadFloat("m_fInaccuracy"));
TE_WriteFloat("m_fSpread", TE_ReadFloat("m_fSpread"));
}
else if(gEV_Type == Engine_CSGO)
{
TE_WriteNum("m_weapon", TE_ReadNum("m_weapon"));
@ -2442,7 +2430,6 @@ public Action Shotgun_Shot(const char[] te_name, const int[] Players, int numCli
TE_WriteNum("m_nItemDefIndex", TE_ReadNum("m_nItemDefIndex"));
TE_WriteNum("m_iSoundType", TE_ReadNum("m_iSoundType"));
}
else if(gEV_Type == Engine_TF2)
{
TE_WriteNum("m_iWeaponID", TE_ReadNum("m_iWeaponID"));

6
addons/sourcemod/scripting/shavit-replay-playback.sp
View File

@ -718,7 +718,6 @@ public void AdminMenu_DeleteReplay(Handle topmenu, TopMenuAction action, TopMenu
{
FormatEx(buffer, maxlength, "%t", "DeleteReplayAdminMenu");
}
else if(action == TopMenuAction_SelectOption)
{
Command_DeleteReplay(param, 0);
@ -2154,7 +2153,6 @@ void UpdateReplayClient(int client)
{
ChangeClientTeam(client, gCV_DefaultTeam.IntValue);
}
else
{
CS_SwitchTeam(client, gCV_DefaultTeam.IntValue);
@ -2704,7 +2702,6 @@ public Action Command_DeleteReplay(int client, int args)
FormatEx(sDisplay, 64, "%s (%s) - %s", gS_StyleStrings[iStyle].sStyleName, sTrack, sTime);
}
else
{
FormatEx(sDisplay, 64, "%s (%s)", gS_StyleStrings[iStyle].sStyleName, sTrack);
@ -2769,7 +2766,6 @@ public int DeleteReplay_Callback(Menu menu, MenuAction action, int param1, int p
submenu.ExitButton = true;
submenu.Display(param1, MENU_TIME_FOREVER);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2795,7 +2791,6 @@ public int DeleteConfirmation_Callback(Menu menu, MenuAction action, int param1,
Shavit_PrintToChat(param1, "%T (%s%s%s)", "ReplayDeleted", param1, gS_ChatStrings.sStyle, gS_StyleStrings[style].sStyleName, gS_ChatStrings.sText, gS_ChatStrings.sVariable, sTrack, gS_ChatStrings.sText);
}
else
{
Shavit_PrintToChat(param1, "%T", "ReplayDeleteFailure", param1, gS_ChatStrings.sStyle, gS_StyleStrings[style].sStyleName, gS_ChatStrings.sText);
@ -2803,7 +2798,6 @@ public int DeleteConfirmation_Callback(Menu menu, MenuAction action, int param1,
Command_DeleteReplay(param1, 0);
}
else if(action == MenuAction_End)
{
delete menu;

10
addons/sourcemod/scripting/shavit-sounds.sp
View File

@ -121,7 +121,6 @@ public void OnMapStart()
{
SetFailState("Cannot open \"configs/shavit-sounds.cfg\". Make sure this file exists and that the server has read permissions to it.");
}
else
{
char sLine[PLATFORM_MAX_PATH*2];
@ -145,27 +144,22 @@ public void OnMapStart()
{
gA_FirstSounds.PushString(sExploded[1]);
}
else if(StrEqual(sExploded[0], "personal"))
{
gA_PersonalSounds.PushString(sExploded[1]);
}
else if(StrEqual(sExploded[0], "world"))
{
gA_WorldSounds.PushString(sExploded[1]);
}
else if(StrEqual(sExploded[0], "worst"))
{
gA_WorstSounds.PushString(sExploded[1]);
}
else if(StrEqual(sExploded[0], "worse") || StrEqual(sExploded[0], "noimprovement"))
{
gA_NoImprovementSounds.PushString(sExploded[1]);
}
else
{
gSM_RankSounds.SetString(sExploded[0], sExploded[1]);
@ -176,7 +170,6 @@ public void OnMapStart()
FormatEx(sDownloadString, PLATFORM_MAX_PATH, "sound/%s", sExploded[1]);
AddFileToDownloadsTable(sDownloadString);
}
else
{
LogError("\"sound/%s\" could not be accessed.", sExploded[1]);
@ -222,19 +215,16 @@ public void Shavit_OnFinish_Post(int client, int style, float time, int jumps, i
{
bEveryone = true;
}
else if(gA_WorldSounds.Length != 0 && rank == 1)
{
bEveryone = true;
gA_WorldSounds.GetString(GetRandomInt(0, gA_WorldSounds.Length - 1), sSound, PLATFORM_MAX_PATH);
}
else if(gA_PersonalSounds.Length != 0 && time < fOldTime)
{
gA_PersonalSounds.GetString(GetRandomInt(0, gA_PersonalSounds.Length - 1), sSound, PLATFORM_MAX_PATH);
}
else if(gA_FirstSounds.Length != 0 && overwrite == 1)
{
gA_FirstSounds.GetString(GetRandomInt(0, gA_FirstSounds.Length - 1), sSound, PLATFORM_MAX_PATH);

12
addons/sourcemod/scripting/shavit-stats.sp
View File

@ -634,7 +634,6 @@ public Action Command_MapsDoneLeft(int client, int args)
gI_MapType[client] = MAPSDONE;
menu.SetTitle("%T\n ", "MapsDoneOnStyle", client, gS_TargetName[client]);
}
else
{
gI_MapType[client] = MAPSLEFT;
@ -685,7 +684,6 @@ public int MenuHandler_MapsDoneLeft(Menu menu, MenuAction action, int param1, in
submenu.Display(param1, MENU_TIME_FOREVER);
}
else if(action == MenuAction_End)
{
delete menu;
@ -704,7 +702,6 @@ public int MenuHandler_MapsDoneLeft_Track(Menu menu, MenuAction action, int para
ShowMaps(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1104,7 +1101,6 @@ public int MenuHandler_ProfileHandler(Menu menu, MenuAction action, int param1,
OpenStatsMenu(param1, gI_TargetSteamID[param1], iSelectedStyle, gI_MenuPos[param1]);
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -1128,12 +1124,10 @@ public int MenuHandler_TypeHandler(Menu menu, MenuAction action, int param1, int
ShowMaps(param1);
}
else if(action == MenuAction_Cancel && param2 == MenuCancel_ExitBack)
{
OpenStatsMenu(param1, gI_TargetSteamID[param1], gI_Style[param1], gI_MenuPos[param1]);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1157,7 +1151,6 @@ void ShowMaps(int client)
"SELECT a.map, a.time, a.jumps, a.id, COUNT(b.map) + 1 as 'rank', a.points FROM %splayertimes a LEFT JOIN %splayertimes b ON a.time > b.time AND a.map = b.map AND a.style = b.style AND a.track = b.track WHERE a.auth = %d AND a.style = %d AND a.track = %d GROUP BY a.map, a.time, a.jumps, a.id, a.points ORDER BY a.%s;",
gS_MySQLPrefix, gS_MySQLPrefix, gI_TargetSteamID[client], gI_Style[client], gI_Track[client], (gB_Rankings)? "points DESC":"map");
}
else
{
if(gB_Rankings)
@ -1166,7 +1159,6 @@ void ShowMaps(int client)
"SELECT DISTINCT m.map, t.tier FROM %smapzones m LEFT JOIN %smaptiers t ON m.map = t.map WHERE m.type = 0 AND m.track = %d AND m.map NOT IN (SELECT DISTINCT map FROM %splayertimes WHERE auth = %d AND style = %d AND track = %d) ORDER BY m.map;",
gS_MySQLPrefix, gS_MySQLPrefix, gI_Track[client], gS_MySQLPrefix, gI_TargetSteamID[client], gI_Style[client], gI_Track[client]);
}
else
{
FormatEx(sQuery, 512,
@ -1302,7 +1294,6 @@ public int MenuHandler_ShowMaps(Menu menu, MenuAction action, int param1, int pa
return 0;
}
else if(StringToInt(sInfo) == 0)
{
FakeClientCommand(param1, "sm_nominate %s", sInfo);
@ -1315,12 +1306,10 @@ public int MenuHandler_ShowMaps(Menu menu, MenuAction action, int param1, int pa
gH_SQL.Query2(SQL_SubMenu_Callback, sQuery, GetClientSerial(param1));
}
else if(action == MenuAction_Cancel && param2 == MenuCancel_ExitBack)
{
OpenStatsMenu(param1, gI_TargetSteamID[param1], gI_Style[param1], gI_MenuPos[param1]);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1425,7 +1414,6 @@ public int SubMenu_Handler(Menu menu, MenuAction action, int param1, int param2)
{
ShowMaps(param1);
}
else if(action == MenuAction_End)
{
delete menu;

4
addons/sourcemod/scripting/shavit-timelimit.sp
View File

@ -142,7 +142,6 @@ public void OnConVarChanged(ConVar convar, const char[] oldValue, const char[] n
delete gH_Timer;
gH_Timer = CreateTimer(1.0, Timer_PrintToChat, 0, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
}
else
{
delete gH_Timer;
@ -195,7 +194,6 @@ public void OnConfigsExecuted()
{
StartCalculating();
}
else
{
SetLimit(RoundToNearest(gCV_DefaultLimit.FloatValue));
@ -270,7 +268,6 @@ public void SQL_GetMapTimes(Database db, DBResultSet results, const char[] error
{
fAverage = gCV_MinimumLimit.FloatValue;
}
else if(fAverage > gCV_MaximumLimit.FloatValue)
{
fAverage = gCV_MaximumLimit.FloatValue;
@ -278,7 +275,6 @@ public void SQL_GetMapTimes(Database db, DBResultSet results, const char[] error
SetLimit(RoundToCeil(fAverage / 10) * 10);
}
else
{
SetLimit(RoundToNearest(gCV_DefaultLimit.FloatValue));

31
addons/sourcemod/scripting/shavit-wr.sp
View File

@ -238,7 +238,6 @@ public void CategoryHandler(Handle topmenu, TopMenuAction action, TopMenuObject
{
FormatEx(buffer, maxlength, "%T:", "TimerCommands", param);
}
else if(action == TopMenuAction_DisplayOption)
{
FormatEx(buffer, maxlength, "%T", "TimerCommands", param);
@ -270,7 +269,6 @@ public void AdminMenu_Delete(Handle topmenu, TopMenuAction action, TopMenuObject
{
FormatEx(buffer, maxlength, "%t", "DeleteSingleRecord");
}
else if(action == TopMenuAction_SelectOption)
{
Command_Delete(param, 0);
@ -283,7 +281,6 @@ public void AdminMenu_DeleteAll(Handle topmenu, TopMenuAction action, TopMenuOb
{
FormatEx(buffer, maxlength, "%t", "DeleteAllRecords");
}
else if(action == TopMenuAction_SelectOption)
{
Command_DeleteAll(param, 0);
@ -296,12 +293,10 @@ public void OnLibraryAdded(const char[] name)
{
gB_Rankings = true;
}
else if(StrEqual(name, "shavit-stats"))
{
gB_Stats = true;
}
else if (StrEqual(name, "adminmenu"))
{
if ((gH_AdminMenu = GetAdminTopMenu()) != null)
@ -317,12 +312,10 @@ public void OnLibraryRemoved(const char[] name)
{
gB_Rankings = false;
}
else if(StrEqual(name, "shavit-stats"))
{
gB_Stats = false;
}
else if (StrEqual(name, "adminmenu"))
{
gH_AdminMenu = null;
@ -1003,7 +996,6 @@ public int MenuHandler_Delete_First(Menu menu, MenuAction action, int param1, in
DeleteSubmenu(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1120,7 +1112,6 @@ public int MenuHandler_DeleteAll_First(Menu menu, MenuAction action, int param1,
subMenu.ExitButton = true;
subMenu.Display(param1, 300);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1139,7 +1130,6 @@ public int MenuHandler_DeleteAll_Second(Menu menu, MenuAction action, int param1
DeleteAllSubmenu(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1208,7 +1198,6 @@ public int MenuHandler_DeleteAll(Menu menu, MenuAction action, int param1, int p
gH_SQL.Query2(DeleteAll_Callback, sQuery, hPack, DBPrio_High);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1227,7 +1216,6 @@ public int MenuHandler_Delete(Menu menu, MenuAction action, int param1, int para
OpenDelete(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1320,7 +1308,6 @@ public int OpenDelete_Handler(Menu menu, MenuAction action, int param1, int para
OpenDeleteMenu(param1, id);
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -1384,7 +1371,6 @@ public int DeleteConfirm_Handler(Menu menu, MenuAction action, int param1, int p
gH_SQL.Query2(GetRecordDetails_Callback, sQuery, GetSteamAccountID(param1), DBPrio_High);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1830,7 +1816,6 @@ public int MenuHandler_StyleChooser(Menu menu, MenuAction action, int param1, in
StartWRMenu(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1934,7 +1919,6 @@ public void SQL_WR_Callback(Database db, DBResultSet results, const char[] error
hMenu.AddItem("-1", sNoRecords);
}
else
{
int iStyle = gA_WRCache[client].iLastStyle;
@ -1947,7 +1931,6 @@ public void SQL_WR_Callback(Database db, DBResultSet results, const char[] error
{
FormatEx(sRanks, 32, "(%d %T)", iRecords, "WRRecord", client);
}
else
{
FormatEx(sRanks, 32, "(#%d/%d)", iMyRank, iRecords);
@ -1976,18 +1959,15 @@ public int WRMenu_Handler(Menu menu, MenuAction action, int param1, int param2)
{
OpenSubMenu(param1, id);
}
else
{
ShowWRStyleMenu(param1);
}
}
else if(action == MenuAction_Cancel && param2 == MenuCancel_ExitBack)
{
ShowWRStyleMenu(param1, gA_WRCache[param1].iPagePosition);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2095,18 +2075,15 @@ public int RRMenu_Handler(Menu menu, MenuAction action, int param1, int param2)
OpenSubMenu(param1, StringToInt(sExploded[0]));
}
else
{
RetrieveWRMenu(param1, gA_WRCache[param1].iLastTrack);
}
}
else if(action == MenuAction_Cancel && param2 == MenuCancel_ExitBack)
{
RetrieveWRMenu(param1, gA_WRCache[param1].iLastTrack);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2176,7 +2153,6 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[]
{
FormatEx(sDisplay, 128, "%T: %d", "WRJumps", client, iJumps);
}
else
{
FormatEx(sDisplay, 128, "%T: %d (%.2f%%)", "WRJumps", client, iJumps, fPerfs);
@ -2242,7 +2218,6 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[]
GetTrackName(client, results.FetchInt(11), sTrack, 32);
}
else
{
char sMenuItem[64];
@ -2254,7 +2229,6 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[]
{
FormatEx(sFormattedTitle, 256, "%s [U:1:%d]\n--- %s: [%s]", sName, iSteamID, sMap, sTrack);
}
else
{
FormatEx(sFormattedTitle, 256, "%T", "Error", client);
@ -2291,18 +2265,15 @@ public int SubMenu_Handler(Menu menu, MenuAction action, int param1, int param2)
}
}
}
else
{
StartWRMenu(param1);
}
}
else if(action == MenuAction_Cancel && param2 == MenuCancel_ExitBack)
{
StartWRMenu(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2352,12 +2323,10 @@ public void Shavit_OnFinish(int client, int style, float time, int jumps, int st
iOverwrite = 0; // ugly way of not writing to database
bIncrementCompletions = false;
}
else if(gF_PlayerRecord[client][style][track] == 0.0)
{
iOverwrite = 1;
}
else if(time < gF_PlayerRecord[client][style][track])
{
iOverwrite = 2;

39
addons/sourcemod/scripting/shavit-zones.sp
View File

@ -278,7 +278,6 @@ public void OnPluginStart()
{
HookEvent("teamplay_round_start", Round_Start);
}
else
{
HookEvent("round_start", Round_Start);
@ -453,7 +452,6 @@ public void CategoryHandler(Handle topmenu, TopMenuAction action, TopMenuObject
{
FormatEx(buffer, maxlength, "%T:", "TimerCommands", param);
}
else if(action == TopMenuAction_DisplayOption)
{
FormatEx(buffer, maxlength, "%T", "TimerCommands", param);
@ -488,7 +486,6 @@ public void AdminMenu_Zones(Handle topmenu, TopMenuAction action, TopMenuObject
{
FormatEx(buffer, maxlength, "%T", "AddMapZone", param);
}
else if(action == TopMenuAction_SelectOption)
{
Command_Zones(param, 0);
@ -501,7 +498,6 @@ public void AdminMenu_DeleteZone(Handle topmenu, TopMenuAction action, TopMenuOb
{
FormatEx(buffer, maxlength, "%T", "DeleteMapZone", param);
}
else if(action == TopMenuAction_SelectOption)
{
Command_DeleteZone(param, 0);
@ -514,7 +510,6 @@ public void AdminMenu_DeleteAllZones(Handle topmenu, TopMenuAction action, TopM
{
FormatEx(buffer, maxlength, "%T", "DeleteAllMapZone", param);
}
else if(action == TopMenuAction_SelectOption)
{
Command_DeleteAllZones(param, 0);
@ -527,7 +522,6 @@ public void AdminMenu_ZoneEdit(Handle topmenu, TopMenuAction action, TopMenuObje
{
FormatEx(buffer, maxlength, "%T", "ZoneEdit", param);
}
else if(action == TopMenuAction_SelectOption)
{
Reset(param);
@ -633,7 +627,6 @@ bool InsideZone(int client, int type, int track)
{
return gB_InsideZone[client][type][track];
}
else
{
for(int i = 0; i < TRACKS_SIZE; i++)
@ -1749,7 +1742,6 @@ public int MenuHandler_AddCustomSpawn(Menu menu, MenuAction action, int param1,
InsertZone(param1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -1818,7 +1810,6 @@ public int MenuHandler_DeleteCustomSpawn(Menu menu, MenuAction action, int param
gH_SQL.Query2(SQL_DeleteCustom_Spawn_Callback, sQuery, GetClientSerial(param1));
}
else if(action == MenuAction_End)
{
delete menu;
@ -1961,7 +1952,6 @@ public Action Command_Stages(int client, int args)
{
TeleportEntity(client, gV_Destinations[i], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
}
else
{
TeleportEntity(client, gV_ZoneCenter[i], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
@ -2013,13 +2003,11 @@ public int MenuHandler_SelectStage(Menu menu, MenuAction action, int param1, int
{
TeleportEntity(param1, gV_Destinations[iIndex], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
}
else
{
TeleportEntity(param1, gV_ZoneCenter[iIndex], NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -2092,7 +2080,6 @@ public int MenuHandler_SelectZoneTrack(Menu menu, MenuAction action, int param1,
submenu.ExitButton = true;
submenu.Display(param1, 300);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2298,7 +2285,6 @@ public int MenuHandler_ZoneEdit(Menu menu, MenuAction action, int param1, int pa
}
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -2406,7 +2392,6 @@ public int MenuHandler_DeleteZone(Menu menu, MenuAction action, int param1, int
}
}
}
else if(action == MenuAction_End)
{
delete menu;
@ -2495,7 +2480,6 @@ public int MenuHandler_DeleteAllZones(Menu menu, MenuAction action, int param1,
gH_SQL.Query2(SQL_DeleteAllZones_Callback, sQuery, GetClientSerial(param1));
}
else if(action == MenuAction_End)
{
delete menu;
@ -2542,7 +2526,6 @@ public int MenuHandler_SelectZoneType(Menu menu, MenuAction action, int param1,
ShowPanel(param1, 1);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2588,7 +2571,6 @@ void ShowPanel(int client, int step)
{
FormatEx(sPanelText, 128, "%T", "ZonePlaceTextTF2", client, (step == 1)? sFirst:sSecond);
}
else
{
FormatEx(sPanelText, 128, "%T", "ZonePlaceText", client, (step == 1)? sFirst:sSecond);
@ -2678,7 +2660,6 @@ public int ZoneCreation_Handler(Menu menu, MenuAction action, int param1, int pa
ShowPanel(param1, gI_MapStep[param1]);
}
else if(action == MenuAction_End)
{
delete menu;
@ -2857,12 +2838,10 @@ public Action Shavit_OnUserCmdPre(int client, int &buttons, int &impulse, float
{
origin = GetAimPosition(client);
}
else if(!(gB_SnapToWall[client] && SnapToWall(vPlayerOrigin, client, origin)))
{
origin = SnapToGrid(vPlayerOrigin, gI_GridSnap[client], false);
}
else
{
gV_WallSnap[client] = origin;
@ -2947,7 +2926,6 @@ public int CreateZoneConfirm_Handler(Menu menu, MenuAction action, int param1, i
return 0;
}
else if(StrEqual(sInfo, "no"))
{
if (gI_ZoneID[param1] != -1)
@ -2959,19 +2937,16 @@ public int CreateZoneConfirm_Handler(Menu menu, MenuAction action, int param1, i
return 0;
}
else if(StrEqual(sInfo, "adjust"))
{
CreateAdjustMenu(param1, 0);
return 0;
}
else if(StrEqual(sInfo, "tpzone"))
{
UpdateTeleportZone(param1);
}
else if(StrEqual(sInfo, "datafromchat"))
{
gI_ZoneData[param1] = 0;
@ -2981,7 +2956,6 @@ public int CreateZoneConfirm_Handler(Menu menu, MenuAction action, int param1, i
return 0;
}
else if(StrEqual(sInfo, "forcerender"))
{
gI_ZoneFlags[param1] ^= ZF_ForceRender;
@ -3040,7 +3014,6 @@ void UpdateTeleportZone(int client)
Shavit_PrintToChat(client, "%T", "ZoneTeleportUpdated", client);
}
else
{
bool bInside = true;
@ -3057,7 +3030,6 @@ void UpdateTeleportZone(int client)
{
Shavit_PrintToChat(client, "%T", "ZoneTeleportInsideZone", client);
}
else
{
gV_Teleport[client] = vTeleport;
@ -3085,7 +3057,6 @@ void CreateEditMenu(int client)
FormatEx(sMenuItem, 64, "%T", "ZoneSetTP", client);
menu.AddItem("-1", sMenuItem, ITEMDRAW_DISABLED);
}
else
{
FormatEx(sMenuItem, 64, "%T", "ZoneSetYes", client);
@ -3134,7 +3105,6 @@ void CreateEditMenu(int client)
{
FormatEx(sMenuItem, 64, "%T", "ZoneSetSpeedLimitUnlimited", client, gI_ZoneData[client]);
}
else
{
FormatEx(sMenuItem, 64, "%T", "ZoneSetSpeedLimit", client, gI_ZoneData[client]);
@ -3198,7 +3168,6 @@ public int ZoneAdjuster_Handler(Menu menu, MenuAction action, int param1, int pa
{
CreateEditMenu(param1);
}
else if(StrEqual(sInfo, "cancel"))
{
if (gI_ZoneID[param1] != -1)
@ -3209,7 +3178,6 @@ public int ZoneAdjuster_Handler(Menu menu, MenuAction action, int param1, int pa
Reset(param1);
}
else
{
char sAxis[4];
@ -3288,7 +3256,6 @@ void InsertZone(int client)
"INSERT INTO %smapzones (map, type, destination_x, destination_y, destination_z, track) VALUES ('%s', %d, '%.03f', '%.03f', '%.03f', %d);",
gS_MySQLPrefix, gS_Map, Zone_CustomSpawn, gV_Point1[client][0], gV_Point1[client][1], gV_Point1[client][2], gI_ZoneTrack[client]);
}
else if(bInsert) // insert
{
Shavit_LogMessage("%L - added %s %s to map `%s`.", client, sTrack, gS_ZoneNames[iType], gS_Map);
@ -3297,7 +3264,6 @@ void InsertZone(int client)
"INSERT INTO %smapzones (map, type, corner1_x, corner1_y, corner1_z, corner2_x, corner2_y, corner2_z, destination_x, destination_y, destination_z, track, flags, data) VALUES ('%s', %d, '%.03f', '%.03f', '%.03f', '%.03f', '%.03f', '%.03f', '%.03f', '%.03f', '%.03f', %d, %d, %d);",
gS_MySQLPrefix, gS_Map, iType, gV_Point1[client][0], gV_Point1[client][1], gV_Point1[client][2], gV_Point2[client][0], gV_Point2[client][1], gV_Point2[client][2], gV_Teleport[client][0], gV_Teleport[client][1], gV_Teleport[client][2], gI_ZoneTrack[client], gI_ZoneFlags[client], gI_ZoneData[client]);
}
else // update
{
Shavit_LogMessage("%L - updated %s %s in map `%s`.", client, sTrack, gS_ZoneNames[iType], gS_Map);
@ -3474,12 +3440,10 @@ public Action Timer_Draw(Handle Timer, any data)
{
origin = GetAimPosition(client);
}
else if(!(gB_SnapToWall[client] && SnapToWall(vPlayerOrigin, client, origin)))
{
origin = SnapToGrid(vPlayerOrigin, gI_GridSnap[client], false);
}
else
{
gV_WallSnap[client] = origin;
@ -3489,7 +3453,6 @@ public Action Timer_Draw(Handle Timer, any data)
{
origin[2] = (vPlayerOrigin[2] + gCV_Height.FloatValue);
}
else
{
origin = gV_Point2[client];
@ -3622,7 +3585,6 @@ void CreateZonePoints(float point[8][3], float offset = 0.0)
{
point[i][j] += offset;
}
else if(point[i][j] > center[j])
{
point[i][j] -= offset;
@ -4068,7 +4030,6 @@ public void TouchPost(int entity, int other)
{
Shavit_StartTimer(other, gA_ZoneCache[gI_EntityZone[entity]].iZoneTrack);
}
else if(gA_ZoneCache[gI_EntityZone[entity]].iZoneTrack == Track_Main)
{
Shavit_StartTimer(other, Track_Main);