From 730a9a4a400b99c17df20957bf99c78cca145657 Mon Sep 17 00:00:00 2001 From: Maxim Telezhenko Date: Wed, 27 Apr 2016 06:19:53 +0300 Subject: [PATCH] Transitional Syntax for reservedslots.sp (#501) --- plugins/reservedslots.sp | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/plugins/reservedslots.sp b/plugins/reservedslots.sp index 71d100e3..32480728 100644 --- a/plugins/reservedslots.sp +++ b/plugins/reservedslots.sp @@ -35,7 +35,7 @@ #include -public Plugin:myinfo = +public Plugin myinfo = { name = "Reserved Slots", author = "AlliedModders LLC", @@ -44,8 +44,8 @@ public Plugin:myinfo = url = "http://www.sourcemod.net/" }; -new g_adminCount = 0; -new bool:g_isAdmin[MAXPLAYERS+1]; +int g_adminCount = 0; +bool g_isAdmin[MAXPLAYERS+1]; /* Handles to convars used by plugin */ ConVar sm_reserved_slots; @@ -62,7 +62,7 @@ enum KickType Kick_Random, }; -public OnPluginStart() +public void OnPluginStart() { LoadTranslations("reservedslots.phrases"); @@ -77,23 +77,23 @@ public OnPluginStart() sm_hide_slots.AddChangeHook(SlotHideChanged); } -public OnPluginEnd() +public void OnPluginEnd() { /* If the plugin has been unloaded, reset visiblemaxplayers. In the case of the server shutting down this effect will not be visible */ ResetVisibleMax(); } -public OnMapStart() +public void OnMapStart() { CheckHiddenSlots(); } -public OnConfigsExecuted() +public void OnConfigsExecuted() { CheckHiddenSlots(); } -public Action:OnTimedKick(Handle:timer, any:client) +public Action OnTimedKick(Handle timer, any client) { if (!client || !IsClientInGame(client)) { @@ -107,17 +107,17 @@ public Action:OnTimedKick(Handle:timer, any:client) return Plugin_Handled; } -public OnClientPostAdminCheck(client) +public void OnClientPostAdminCheck(int client) { - new reserved = sm_reserved_slots.IntValue; + int reserved = sm_reserved_slots.IntValue; if (reserved > 0) { - new clients = GetClientCount(false); - new limit = GetMaxHumanPlayers() - reserved; - new flags = GetUserFlagBits(client); + int clients = GetClientCount(false); + int limit = GetMaxHumanPlayers() - reserved; + int flags = GetUserFlagBits(client); - new type = sm_reserve_type.IntValue; + int type = sm_reserve_type.IntValue; if (type == 0) { @@ -140,7 +140,7 @@ public OnClientPostAdminCheck(client) { if (flags & ADMFLAG_ROOT || flags & ADMFLAG_RESERVATION) { - new target = SelectKickClient(); + int target = SelectKickClient(); if (target) { @@ -169,7 +169,7 @@ public OnClientPostAdminCheck(client) if (g_isAdmin[client]) { - new target = SelectKickClient(); + int target = SelectKickClient(); if (target) { @@ -187,7 +187,7 @@ public OnClientPostAdminCheck(client) } } -public OnClientDisconnect_Post(client) +public void OnClientDisconnect_Post(int client) { CheckHiddenSlots(); @@ -198,10 +198,10 @@ public OnClientDisconnect_Post(client) } } -public SlotCountChanged(ConVar convar, const String:oldValue[], const String:newValue[]) +public void SlotCountChanged(ConVar convar, const char[] oldValue, const char[] newValue) { /* Reserved slots or hidden slots have been disabled - reset sv_visiblemaxplayers */ - new slotcount = convar.IntValue; + int slotcount = convar.IntValue; if (slotcount == 0) { ResetVisibleMax(); @@ -212,7 +212,7 @@ public SlotCountChanged(ConVar convar, const String:oldValue[], const String:new } } -public SlotHideChanged(ConVar convar, const String:oldValue[], const String:newValue[]) +public void SlotHideChanged(ConVar convar, const char[] oldValue, const char[] newValue) { /* Reserved slots or hidden slots have been disabled - reset sv_visiblemaxplayers */ if (!convar.BoolValue) @@ -225,7 +225,7 @@ public SlotHideChanged(ConVar convar, const String:oldValue[], const String:newV } } -CheckHiddenSlots() +void CheckHiddenSlots() { if (sm_hide_slots.BoolValue) { @@ -233,9 +233,9 @@ CheckHiddenSlots() } } -SetVisibleMaxSlots(clients, limit) +void SetVisibleMaxSlots(int clients, int limit) { - new num = clients; + int num = clients; if (clients == GetMaxHumanPlayers()) { @@ -247,33 +247,33 @@ SetVisibleMaxSlots(clients, limit) sv_visiblemaxplayers.IntValue = num; } -ResetVisibleMax() +void ResetVisibleMax() { sv_visiblemaxplayers.IntValue = -1; } -SelectKickClient() +int SelectKickClient() { - new KickType:type = KickType:sm_reserve_kicktype.IntValue; + KickType type = view_as(sm_reserve_kicktype.IntValue); - new Float:highestValue; - new highestValueId; + float highestValue; + int highestValueId; - new Float:highestSpecValue; - new highestSpecValueId; + float highestSpecValue; + int highestSpecValueId; - new bool:specFound; + bool specFound; - new Float:value; + float value; - for (new i=1; i<=MaxClients; i++) + for (int i=1; i<=MaxClients; i++) { if (!IsClientConnected(i)) { continue; } - new flags = GetUserFlagBits(i); + int flags = GetUserFlagBits(i); if (IsFakeClient(i) || flags & ADMFLAG_ROOT || flags & ADMFLAG_RESERVATION || CheckCommandAccess(i, "sm_reskick_immunity", ADMFLAG_RESERVATION, true)) {