From 82829e8b1615f7c6b8ceeab0ec615dbd6775b7b2 Mon Sep 17 00:00:00 2001 From: shavitush Date: Fri, 4 Nov 2016 09:50:16 +0200 Subject: [PATCH] Minor optimizations. --- scripting/shavit-core.sp | 16 +++++++--------- scripting/shavit-misc.sp | 17 ++++++++--------- scripting/shavit-rankings.sp | 15 ++++++--------- scripting/shavit-stats.sp | 15 ++++++--------- scripting/shavit-timelimit.sp | 15 ++++++--------- scripting/shavit-wr.sp | 15 ++++++--------- scripting/shavit-zones.sp | 15 ++++++--------- 7 files changed, 45 insertions(+), 63 deletions(-) diff --git a/scripting/shavit-core.sp b/scripting/shavit-core.sp index 5e8e271c..72476b39 100644 --- a/scripting/shavit-core.sp +++ b/scripting/shavit-core.sp @@ -427,6 +427,7 @@ public Action Command_TeleportEnd(int client, int args) if(gB_Zones && Shavit_ZoneExists(Zone_End)) { Shavit_StopTimer(client); + Call_StartForward(gH_Forwards_OnEnd); Call_PushCell(client); Call_Finish(); @@ -1202,18 +1203,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH*2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile; diff --git a/scripting/shavit-misc.sp b/scripting/shavit-misc.sp index 8a5ca75c..59f027e8 100644 --- a/scripting/shavit-misc.sp +++ b/scripting/shavit-misc.sp @@ -240,7 +240,6 @@ public void OnPluginStart() // crons CreateTimer(1.0, Timer_Scoreboard, 0, TIMER_REPEAT); - CreateTimer(gF_AdvertisementInterval, Timer_Advertisement, 0, TIMER_REPEAT); if(LibraryExists("dhooks")) { @@ -370,6 +369,8 @@ public void OnMapStart() Shavit_OnStyleConfigLoaded(-1); Shavit_OnChatConfigLoaded(); } + + CreateTimer(gF_AdvertisementInterval, Timer_Advertisement, 0, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); } bool LoadAdvertisementsConfig() @@ -723,12 +724,10 @@ public void OnWeaponDrop(int client, int entity) // hide public Action OnSetTransmit(int entity, int client) { - if(client != entity && gB_Hide[client]) + if(gB_Hide[client] && client != entity && (!IsClientObserver(client) || (GetEntProp(client, Prop_Send, "m_iObserverMode") != 6 && + GetEntPropEnt(client, Prop_Send, "m_hObserverTarget") != entity))) { - if(!IsClientObserver(client) || (GetEntProp(client, Prop_Send, "m_iObserverMode") != 6 && GetEntPropEnt(client, Prop_Send, "m_hObserverTarget") != entity)) - { - return Plugin_Handled; - } + return Plugin_Handled; } return Plugin_Continue; @@ -881,10 +880,10 @@ public int MenuHandler_Teleport(Menu menu, MenuAction action, int param1, int pa { if(action == MenuAction_Select) { - char[] info = new char[16]; - menu.GetItem(param2, info, 16); + char[] sInfo = new char[16]; + menu.GetItem(param2, sInfo, 16); - if(!Teleport(param1, StringToInt(info))) + if(!Teleport(param1, StringToInt(sInfo))) { Command_Teleport(param1, 0); } diff --git a/scripting/shavit-rankings.sp b/scripting/shavit-rankings.sp index de50a23e..a5bb687a 100644 --- a/scripting/shavit-rankings.sp +++ b/scripting/shavit-rankings.sp @@ -991,18 +991,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH*2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile; diff --git a/scripting/shavit-stats.sp b/scripting/shavit-stats.sp index dbbc6533..16b795f9 100644 --- a/scripting/shavit-stats.sp +++ b/scripting/shavit-stats.sp @@ -217,18 +217,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH*2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile; diff --git a/scripting/shavit-timelimit.sp b/scripting/shavit-timelimit.sp index b5b886fb..ea533a5e 100644 --- a/scripting/shavit-timelimit.sp +++ b/scripting/shavit-timelimit.sp @@ -142,18 +142,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH*2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile; diff --git a/scripting/shavit-wr.sp b/scripting/shavit-wr.sp index b5e06ae1..65ff036d 100644 --- a/scripting/shavit-wr.sp +++ b/scripting/shavit-wr.sp @@ -1327,18 +1327,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH*2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile; diff --git a/scripting/shavit-zones.sp b/scripting/shavit-zones.sp index 5978cd90..c2eba77f 100644 --- a/scripting/shavit-zones.sp +++ b/scripting/shavit-zones.sp @@ -2053,18 +2053,15 @@ void SQL_SetPrefix() { SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it."); } + + char[] sLine = new char[PLATFORM_MAX_PATH*2]; - else + while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2)) { - char[] sLine = new char[PLATFORM_MAX_PATH * 2]; + TrimString(sLine); + strcopy(gS_MySQLPrefix, 32, sLine); - while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH * 2)) - { - TrimString(sLine); - strcopy(gS_MySQLPrefix, 32, sLine); - - break; - } + break; } delete fFile;