UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

"say timeleft" changed to use new Core timeleft functionality.

Browse Source 
Minor fix to mapchooser, in case no maps were loaded to the list

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401473
This commit is contained in:
Michael McKoy 2007-09-23 20:33:22 +00:00
parent 87c78064c1
commit 7df54ec38d
2 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
plugins/basetriggers.sp
View File

@ -44,10 +44,8 @@ public Plugin:myinfo =
url = "http://www.sourcemod.net/" url = "http://www.sourcemod.net/"
}; };
new Float:g_fStartTime;
new Handle:g_Cvar_TriggerShow = INVALID_HANDLE; new Handle:g_Cvar_TriggerShow = INVALID_HANDLE;
new Handle:g_Cvar_TimeleftInterval = INVALID_HANDLE; new Handle:g_Cvar_TimeleftInterval = INVALID_HANDLE;
new Handle:g_Cvar_Timelimit = INVALID_HANDLE;
new Handle:g_Cvar_FriendlyFire = INVALID_HANDLE; new Handle:g_Cvar_FriendlyFire = INVALID_HANDLE;
new Handle:g_Timer_TimeShow = INVALID_HANDLE; new Handle:g_Timer_TimeShow = INVALID_HANDLE;
@ -59,14 +57,11 @@ public OnPluginStart()
g_Cvar_TriggerShow = CreateConVar("sm_trigger_show", "1", "Display triggers message to all players? (0 off, 1 on, def. 1)", 0, true, 0.0, true, 1.0); g_Cvar_TriggerShow = CreateConVar("sm_trigger_show", "1", "Display triggers message to all players? (0 off, 1 on, def. 1)", 0, true, 0.0, true, 1.0);
g_Cvar_TimeleftInterval = CreateConVar("sm_timeleft_interval", "0.0", "Display timeleft every x seconds. Default 0.", 0, true, 0.0, true, 1800.0); g_Cvar_TimeleftInterval = CreateConVar("sm_timeleft_interval", "0.0", "Display timeleft every x seconds. Default 0.", 0, true, 0.0, true, 1800.0);
g_Cvar_Timelimit = FindConVar("mp_timelimit");
g_Cvar_FriendlyFire = FindConVar("mp_friendlyfire"); g_Cvar_FriendlyFire = FindConVar("mp_friendlyfire");
RegConsoleCmd("say", Command_Say); RegConsoleCmd("say", Command_Say);
RegConsoleCmd("say_team", Command_Say); RegConsoleCmd("say_team", Command_Say);
HookEvent("round_end", Event_RoundEnd, EventHookMode_Post);
HookConVarChange(g_Cvar_TimeleftInterval, ConVarChange_TimeleftInterval); HookConVarChange(g_Cvar_TimeleftInterval, ConVarChange_TimeleftInterval);
} }
@ -95,16 +90,19 @@ public ConVarChange_TimeleftInterval(Handle:convar, const String:oldValue[], con
public Action:Timer_DisplayTimeleft(Handle:timer) public Action:Timer_DisplayTimeleft(Handle:timer)
{ {
new mins, secs; new timeleft;
new timeleft = RoundToNearest(GetTimeLeft()); if (GetMapTimeLeft(timeleft))
if (timeleft > 0)
{ {
mins = timeleft / 60; new mins, secs;
secs = timeleft % 60;
if (timeleft > 0)
{
mins = timeleft / 60;
secs = timeleft % 60;
}
PrintToChatAll("[SM] %T %d:%02d", "Timeleft", LANG_SERVER, mins, secs);
} }
PrintToChatAll("[SM] %T %d:%02d", "Timeleft", LANG_SERVER, mins, secs);
} }
public Action:Command_Say(client, args) public Action:Command_Say(client, args)
@ -127,22 +125,25 @@ public Action:Command_Say(client, args)
if (strcmp(text[startidx], "timeleft", false) == 0) if (strcmp(text[startidx], "timeleft", false) == 0)
{ {
new mins, secs; new timeleft;
new timeleft = RoundToNearest(GetTimeLeft()); if (GetMapTimeLeft(timeleft))
if (timeleft > 0)
{ {
mins = timeleft / 60; new mins, secs;
secs = timeleft % 60;
} if (timeleft > 0)
{
if(GetConVarInt(g_Cvar_TriggerShow)) mins = timeleft / 60;
{ secs = timeleft % 60;
PrintToChatAll("[SM] %t %d:%02d", "Timeleft", mins, secs); }
}
else if(GetConVarInt(g_Cvar_TriggerShow))
{ {
PrintToChat(client,"[SM] %t %d:%02d", "Timeleft", mins, secs); PrintToChatAll("[SM] %t %d:%02d", "Timeleft", mins, secs);
}
else
{
PrintToChat(client,"[SM] %t %d:%02d", "Timeleft", mins, secs);
}
} }
} }
@ -200,26 +201,4 @@ public Action:Command_Say(client, args)
} }
return Plugin_Continue; return Plugin_Continue;
} }
public Event_RoundEnd(Handle:event, const String:name[], bool:dontBroadcast)
{
new reason = GetEventInt(event, "reason");
if(reason == 16)
{
g_fStartTime = GetEngineTime();
}
}
public OnMapStart()
{
g_fStartTime = GetEngineTime();
}
Float:GetTimeLeft()
{
new Float:fLimit = GetConVarFloat(g_Cvar_Timelimit);
new Float:fElapsed = GetEngineTime() - g_fStartTime;
return (fLimit*60.0) - fElapsed;
}

9
plugins/mapchooser.sp
View File

@ -86,6 +86,8 @@ public OnPluginStart()
{ {
HookEvent("round_end", Event_RoundEnd); HookEvent("round_end", Event_RoundEnd);
} }
AutoExecConfig(true, "mapchooser");
} }
public OnMapStart() public OnMapStart()
@ -114,8 +116,11 @@ public OnMapEnd()
public OnMapTimeLeftChanged() public OnMapTimeLeftChanged()
{ {
SetupTimeleftTimer(); if (GetArraySize(g_MapList))
LogMessage("[MC] Timeleft changed, resetting timer."); {
SetupTimeleftTimer();
LogMessage("[MC] Timeleft changed, resetting timer.");
}
} }
SetupTimeleftTimer() SetupTimeleftTimer()