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

Add handling for func_rot_button zones

Browse Source
This commit is contained in:
rtldg 2025-02-16 02:07:00 +00:00
parent 94ebb97c79
commit 04ad339fe8
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sourcemod/scripting/include/shavit/zones.inc
View File

@ -53,7 +53,7 @@ enum
enum enum
{ {
ZF_ForceRender = (1 << 0), ZF_ForceRender = (1 << 0),
ZF_Hammerid = (1 << 1), // used by ZoneForm_{trigger_{multiple, teleport}, func_button} sometimes ZF_Hammerid = (1 << 1), // used by ZoneForm_{trigger_{multiple, teleport}, func_[rot_]button} sometimes
ZF_Solid = (1 << 2), // forces the zone to physically block people... ZF_Solid = (1 << 2), // forces the zone to physically block people...
ZF_Origin = (1 << 4), // sTarget is the entity's origin formatted as "%X %X %X" ZF_Origin = (1 << 4), // sTarget is the entity's origin formatted as "%X %X %X"
}; };

4
addons/sourcemod/scripting/shavit-zones-json.sp
View File

@ -503,7 +503,7 @@ JSONObject FillYourMom(zone_cache_t cache)
public Action Command_DumpZones(int client, int args) public Action Command_DumpZones(int client, int args)
{ {
int count = Shavit_GetZoneCount(); int count = Shavit_GetZoneCount();
if (!count) if (!count)
{ {
ReplyToCommand(client, "Map doesn't have any zones..."); ReplyToCommand(client, "Map doesn't have any zones...");
@ -582,7 +582,7 @@ int MenuHandler_MapInfo(Menu menu, MenuAction action, int param1, int param2)
++empties; ++empties;
continue; continue;
} }
for (; empties; --empties) for (; empties; --empties)
arr.Push(empty); arr.Push(empty);
arr.Push(obj); arr.Push(obj);

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

@ -618,6 +618,7 @@ public void OnConVarChanged(ConVar convar, const char[] oldValue, const char[] n
} }
if (convar.BoolValue) add_prebuilts_to_cache("func_button", true); if (convar.BoolValue) add_prebuilts_to_cache("func_button", true);
if (convar.BoolValue) add_prebuilts_to_cache("func_rot_button", true);
} }
} }
@ -1219,6 +1220,7 @@ public void Shavit_LoadZonesHere()
if (gCV_ClimbButtons.BoolValue) if (gCV_ClimbButtons.BoolValue)
{ {
add_prebuilts_to_cache("func_button", true); add_prebuilts_to_cache("func_button", true);
add_prebuilts_to_cache("func_rot_button", true);
} }
} }
@ -1329,6 +1331,7 @@ public void OnGameFrame()
if (search_func_button) if (search_func_button)
{ {
FindEntitiesToHook("func_button", ZoneForm_func_button); FindEntitiesToHook("func_button", ZoneForm_func_button);
FindEntitiesToHook("func_rot_button", ZoneForm_func_button);
} }
} }
@ -3017,6 +3020,23 @@ void OpenHookMenu_List(int client, int form, int pos = 0)
list.PushArray(thing); list.PushArray(thing);
} }
// copy & paste for func_rot_button because it's shrimple and I can't think of how to do it cleanly otherwise right now
if (form == ZoneForm_func_button)
{
while ((ent = FindEntityByClassname(ent, "func_rot_button")) != -1)
{
if (gI_EntityZone[ent] > -1) continue;
float ent_origin[3];
GetEntPropVector(ent, Prop_Send, "m_vecOrigin", ent_origin);
ent_list_thing thing;
thing.dist = GetVectorDistance(player_origin, ent_origin);
thing.ent = ent;
list.PushArray(thing);
}
}
if (!list.Length) if (!list.Length)
{ {
Shavit_PrintToChat(client, "No unhooked entities found"); Shavit_PrintToChat(client, "No unhooked entities found");
@ -3067,7 +3087,7 @@ bool TeleportFilter(int entity)
char classname[20]; char classname[20];
GetEntityClassname(entity, classname, sizeof(classname)); GetEntityClassname(entity, classname, sizeof(classname));
if (StrEqual(classname, "trigger_teleport") || StrEqual(classname, "trigger_multiple") || StrEqual(classname, "func_button")) if (StrEqual(classname, "trigger_teleport") || StrEqual(classname, "trigger_multiple") || StrEqual(classname, "func_button") || StrEqual("func_rot_button"))
{ {
//TR_ClipCurrentRayToEntity(MASK_ALL, entity); //TR_ClipCurrentRayToEntity(MASK_ALL, entity);
gI_CurrentTraceEntity = entity; gI_CurrentTraceEntity = entity;
@ -3116,7 +3136,7 @@ public int MenuHandle_HookZone_Form(Menu menu, MenuAction action, int param1, in
char classname[32]; char classname[32];
GetEntityClassname(ent, classname, sizeof(classname)); GetEntityClassname(ent, classname, sizeof(classname));
if (StrEqual(classname, "func_button")) if (StrEqual(classname, "func_button") || StrEqual(classname, "func_rot_button"))
{ {
form = ZoneForm_func_button; form = ZoneForm_func_button;
} }