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

Fixed caching for styles from core and modules. (#494)

Browse Source 
Added `bool manual` to `Shavit_OnStyleChanged`.
This commit is contained in:
shavitush 2017-10-16 22:04:58 +03:00
parent b56b4ccff6
commit a9bd3d8827
4 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripting/include/shavit.inc
View File

@ -413,14 +413,16 @@ forward void Shavit_OnResume(int client, int track);
/** /**
* Called when a player changes their bhopstyle. * Called when a player changes their bhopstyle.
* Note: Doesn't guarantee that the player is in-game or connected.
* *
* @param client Client index. * @param client Client index.
* @param oldstyle Old bhop style. * @param oldstyle Old bhop style.
* @param newstyle New bhop style. * @param newstyle New bhop style.
* @param track Timer track. * @param track Timer track.
* @param manual Was the change manual, or assigned automatically?
* @noreturn * @noreturn
*/ */
forward void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle, int track); forward void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle, int track, bool manual);
/** /**
* Called when the styles configuration finishes loading and it's ready to load everything into the cache. * Called when the styles configuration finishes loading and it's ready to load everything into the cache.

33
scripting/shavit-core.sp
View File

@ -191,7 +191,7 @@ public void OnPluginStart()
gH_Forwards_OnEnd = CreateGlobalForward("Shavit_OnEnd", ET_Event, Param_Cell, Param_Cell); gH_Forwards_OnEnd = CreateGlobalForward("Shavit_OnEnd", ET_Event, Param_Cell, Param_Cell);
gH_Forwards_OnPause = CreateGlobalForward("Shavit_OnPause", ET_Event, Param_Cell, Param_Cell); gH_Forwards_OnPause = CreateGlobalForward("Shavit_OnPause", ET_Event, Param_Cell, Param_Cell);
gH_Forwards_OnResume = CreateGlobalForward("Shavit_OnResume", ET_Event, Param_Cell, Param_Cell); gH_Forwards_OnResume = CreateGlobalForward("Shavit_OnResume", ET_Event, Param_Cell, Param_Cell);
gH_Forwards_OnStyleChanged = CreateGlobalForward("Shavit_OnStyleChanged", ET_Event, Param_Cell, Param_Cell, Param_Cell, Param_Cell); gH_Forwards_OnStyleChanged = CreateGlobalForward("Shavit_OnStyleChanged", ET_Event, Param_Cell, Param_Cell, Param_Cell, Param_Cell, Param_Cell);
gH_Forwards_OnStyleConfigLoaded = CreateGlobalForward("Shavit_OnStyleConfigLoaded", ET_Event, Param_Cell); gH_Forwards_OnStyleConfigLoaded = CreateGlobalForward("Shavit_OnStyleConfigLoaded", ET_Event, Param_Cell);
gH_Forwards_OnDatabaseLoaded = CreateGlobalForward("Shavit_OnDatabaseLoaded", ET_Event); gH_Forwards_OnDatabaseLoaded = CreateGlobalForward("Shavit_OnDatabaseLoaded", ET_Event);
gH_Forwards_OnChatConfigLoaded = CreateGlobalForward("Shavit_OnChatConfigLoaded", ET_Event); gH_Forwards_OnChatConfigLoaded = CreateGlobalForward("Shavit_OnChatConfigLoaded", ET_Event);
@ -730,7 +730,7 @@ public int StyleMenu_Handler(Menu menu, MenuAction action, int param1, int param
return 0; return 0;
} }
ChangeClientStyle(param1, style); ChangeClientStyle(param1, style, true);
} }
else if(action == MenuAction_End) else if(action == MenuAction_End)
@ -741,21 +741,30 @@ public int StyleMenu_Handler(Menu menu, MenuAction action, int param1, int param
return 0; return 0;
} }
void ChangeClientStyle(int client, int style) void CallOnStyleChanged(int client, int oldstyle, int newstyle, bool manual)
{
Call_StartForward(gH_Forwards_OnStyleChanged);
Call_PushCell(client);
Call_PushCell(oldstyle);
Call_PushCell(newstyle);
Call_PushCell(gI_Track[client]);
Call_PushCell(manual);
Call_Finish();
}
void ChangeClientStyle(int client, int style, bool manual)
{ {
if(!IsValidClient(client)) if(!IsValidClient(client))
{ {
return; return;
} }
Call_StartForward(gH_Forwards_OnStyleChanged); CallOnStyleChanged(client, gBS_Style[client], style, manual);
Call_PushCell(client);
Call_PushCell(gBS_Style[client]);
Call_PushCell(style);
Call_PushCell(gI_Track[client]);
Call_Finish();
if(manual)
{
Shavit_PrintToChat(client, "%T", "StyleSelection", client, gS_ChatStrings[sMessageStyle], gS_StyleStrings[style][sStyleName], gS_ChatStrings[sMessageText]); Shavit_PrintToChat(client, "%T", "StyleSelection", client, gS_ChatStrings[sMessageStyle], gS_StyleStrings[style][sStyleName], gS_ChatStrings[sMessageText]);
}
if(gA_StyleSettings[style][bUnranked]) if(gA_StyleSettings[style][bUnranked])
{ {
@ -1327,6 +1336,7 @@ public void OnClientCookiesCached(int client)
} }
gBS_Style[client] = (style >= 0 && style < gI_Styles)? style:0; gBS_Style[client] = (style >= 0 && style < gI_Styles)? style:0;
CallOnStyleChanged(client, 0, gBS_Style[client], false);
UpdateAutoBhop(client); UpdateAutoBhop(client);
UpdateAiraccelerate(client); UpdateAiraccelerate(client);
@ -1359,9 +1369,10 @@ public void OnClientPutInServer(int client)
UpdateAutoBhop(client); UpdateAutoBhop(client);
UpdateAiraccelerate(client); UpdateAiraccelerate(client);
UpdateBunnyhopping(client); UpdateBunnyhopping(client);
}
CallOnStyleChanged(client, 0, 0, false);
gBS_Style[client] = 0; gBS_Style[client] = 0;
}
if(gH_SQL == null) if(gH_SQL == null)
{ {
@ -1534,7 +1545,7 @@ public Action Command_StyleChange(int client, int args)
if(gSM_StyleCommands.GetValue(sCommand, style)) if(gSM_StyleCommands.GetValue(sCommand, style))
{ {
ChangeClientStyle(client, style); ChangeClientStyle(client, style, true);
return Plugin_Handled; return Plugin_Handled;
} }

9
scripting/shavit-hud.sp
View File

@ -1083,11 +1083,14 @@ public int PanelHandler_Nothing(Menu m, MenuAction action, int param1, int param
return 0; return 0;
} }
public void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle) public void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle, int track, bool manual)
{
gBS_Style[client] = newstyle;
if(IsClientInGame(client))
{ {
UpdateTopLeftHUD(client, false); UpdateTopLeftHUD(client, false);
}
gBS_Style[client] = newstyle;
} }
public int Native_ForceHUDUpdate(Handle handler, int numParams) public int Native_ForceHUDUpdate(Handle handler, int numParams)

2
scripting/shavit-misc.sp
View File

@ -445,7 +445,7 @@ public void Shavit_OnChatConfigLoaded()
} }
} }
public void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle) public void Shavit_OnStyleChanged(int client, int oldstyle, int newstyle, int track, bool manual)
{ {
gBS_Style[client] = newstyle; gBS_Style[client] = newstyle;
} }