Skip to content

feat: update to latest sourcemod 1.11 #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hackmastr merged 1 commit into from
Sep 26, 2022
Merged

feat: update to latest sourcemod 1.11 #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions game/addons/sourcemod/scripting/sbpp_comms.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ public Action Event_OnPlayerName(Handle event, const char[] name, bool dontBroad
int client = GetClientOfUserId(GetEventInt(event, "userid"));
if (client > 0 && IsClientInGame(client))
GetEventString(event, "newname", g_sName[client], sizeof(g_sName[]));
return Plugin_Continue;
}

public void BaseComm_OnClientMute(int client, bool muteState)
Expand Down Expand Up @@ -605,6 +606,7 @@ public int Handle_Commands(TopMenu menu, TopMenuAction action, TopMenuObject obj
case TopMenuAction_DisplayTitle:
Format(buffer, maxlength, "%T", "AdminMenu_Select_Main", param1);
}
return 0;
}

public int Handle_MenuGag(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -616,6 +618,7 @@ public int Handle_MenuGag(TopMenu menu, TopMenuAction action, TopMenuObject obje
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_GAG);
}
return 0;
}

public int Handle_MenuUnGag(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -627,6 +630,7 @@ public int Handle_MenuUnGag(TopMenu menu, TopMenuAction action, TopMenuObject ob
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_UNGAG);
}
return 0;
}

public int Handle_MenuMute(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -638,6 +642,7 @@ public int Handle_MenuMute(TopMenu menu, TopMenuAction action, TopMenuObject obj
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_MUTE);
}
return 0;
}

public int Handle_MenuUnMute(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -649,6 +654,7 @@ public int Handle_MenuUnMute(TopMenu menu, TopMenuAction action, TopMenuObject o
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_UNMUTE);
}
return 0;
}

public int Handle_MenuSilence(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -660,6 +666,7 @@ public int Handle_MenuSilence(TopMenu menu, TopMenuAction action, TopMenuObject
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_SILENCE);
}
return 0;
}

public int Handle_MenuUnSilence(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -671,6 +678,7 @@ public int Handle_MenuUnSilence(TopMenu menu, TopMenuAction action, TopMenuObjec
case TopMenuAction_SelectOption:
AdminMenu_Target(param1, TYPE_UNSILENCE);
}
return 0;
}

public int Handle_MenuList(TopMenu menu, TopMenuAction action, TopMenuObject object_id, int param1, char[] buffer, int maxlength)
Expand All @@ -685,6 +693,7 @@ public int Handle_MenuList(TopMenu menu, TopMenuAction action, TopMenuObject obj
AdminMenu_List(param1, 0);
}
}
return 0;
}

void AdminMenu_Target(int client, int type)
Expand Down Expand Up @@ -826,6 +835,7 @@ public int MenuHandler_MenuTarget(Menu menu, MenuAction action, int param1, int
}
}
}
return 0;
}

void AdminMenu_Duration(int client, int target, int type)
Expand Down Expand Up @@ -879,6 +889,7 @@ public int MenuHandler_MenuDuration(Menu menu, MenuAction action, int param1, in
}
}
}
return 0;
}

void AdminMenu_Reason(int client, int target, int type, int lengthIndex)
Expand Down Expand Up @@ -935,6 +946,7 @@ public int MenuHandler_MenuReason(Menu menu, MenuAction action, int param1, int
}
}
}
return 0;
}

void AdminMenu_List(int client, int index)
Expand Down Expand Up @@ -993,6 +1005,7 @@ public int MenuHandler_MenuList(Menu menu, MenuAction action, int param1, int pa
AdminMenu_List(param1, GetMenuSelectionPosition());
}
}
return 0;
}

void AdminMenu_ListTarget(int client, int target, int index, int viewMute = 0, int viewGag = 0)
Expand Down Expand Up @@ -1173,6 +1186,7 @@ public int MenuHandler_MenuListTarget(Menu menu, MenuAction action, int param1,

}
}
return 0;
}

void AdminMenu_ListTargetReason(int client, int target, int showMute, int showGag)
Expand Down Expand Up @@ -1238,6 +1252,7 @@ public int PanelHandler_ListTargetReason(Menu menu, MenuAction action, int param
g_iPeskyPanels[param1][viewingMute],
g_iPeskyPanels[param1][viewingGag]);
}
return 0;
}


Expand Down Expand Up @@ -1791,12 +1806,13 @@ public Action ClientRecheck(Handle timer, any userid)

int client = GetClientOfUserId(userid);
if (!client)
return;
return Plugin_Continue;

if (IsClientConnected(client))
OnClientPostAdminCheck(client);

g_hPlayerRecheck[client] = null;
return Plugin_Continue;
}

public Action Timer_MuteExpire(Handle timer, DataPack dataPack)
Expand All @@ -1806,7 +1822,7 @@ public Action Timer_MuteExpire(Handle timer, DataPack dataPack)

int client = GetClientOfUserId(dataPack.ReadCell());
if (!client)
return;
return Plugin_Continue;

#if defined DEBUG
char clientAuth[64];
Expand All @@ -1819,6 +1835,7 @@ public Action Timer_MuteExpire(Handle timer, DataPack dataPack)
MarkClientAsUnMuted(client);
if (IsClientInGame(client))
BaseComm_SetClientMute(client, false);
return Plugin_Continue;
}

public Action Timer_GagExpire(Handle timer, DataPack dataPack)
Expand All @@ -1828,7 +1845,7 @@ public Action Timer_GagExpire(Handle timer, DataPack dataPack)

int client = GetClientOfUserId(dataPack.ReadCell());
if (!client)
return;
return Plugin_Continue;

#if defined DEBUG
char clientAuth[64];
Expand All @@ -1841,12 +1858,14 @@ public Action Timer_GagExpire(Handle timer, DataPack dataPack)
MarkClientAsUnGagged(client);
if (IsClientInGame(client))
BaseComm_SetClientGag(client, false);
return Plugin_Continue;
}

public Action Timer_StopWait(Handle timer, any data)
{
g_DatabaseState = DatabaseState_None;
DB_Connect();
return Plugin_Continue;
}

// PARSER //
Expand Down
13 changes: 9 additions & 4 deletions game/addons/sourcemod/scripting/sbpp_main.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,14 +816,14 @@ public int ReasonSelected(Menu menu, MenuAction action, int param1, int param2)
if (StrEqual("Hacking", key))
{
HackingMenuHandle.Display(param1, MENU_TIME_FOREVER);
return;
return 0;
}

else if (StrEqual("Own Reason", key)) // admin wants to use his own reason
{
g_ownReasons[param1] = true;
PrintToChat(param1, "%s%t", Prefix, "Chat Reason");
return;
return 0;
}

else if (g_BanTarget[param1] != -1 && g_BanTime[param1] != -1)
Expand All @@ -846,6 +846,7 @@ public int ReasonSelected(Menu menu, MenuAction action, int param1, int param2)
}
}
}
return 0;
}

public int HackingSelected(Menu menu, MenuAction action, int param1, int param2)
Expand Down Expand Up @@ -894,6 +895,7 @@ public int HackingSelected(Menu menu, MenuAction action, int param1, int param2)
}
}
}
return 0;
}

public int MenuHandler_BanPlayerList(Menu menu, MenuAction action, int param1, int param2)
Expand Down Expand Up @@ -940,6 +942,7 @@ public int MenuHandler_BanPlayerList(Menu menu, MenuAction action, int param1, i
}
}
}
return 0;
}

public int MenuHandler_BanTimeList(Menu menu, MenuAction action, int param1, int param2)
Expand Down Expand Up @@ -2165,6 +2168,7 @@ public Action ProcessQueue(Handle timer, any data)
char buffer[512];
Format(buffer, sizeof(buffer), "SELECT steam_id, time, start_time, reason, name, ip, admin_id, admin_ip FROM queue");
SQLiteDB.Query(ProcessQueueCallback, buffer);
return Plugin_Continue;
}

// PARSER //
Expand Down Expand Up @@ -2363,7 +2367,7 @@ public int Native_SBReportPlayer(Handle plugin, int numParams)
if (numParams < 3)
{
ThrowNativeError(SP_ERROR_NATIVE, "Invalid amount of arguments. Received %d arguments", numParams);
return;
return 0;
}

int iReporter = GetNativeCell(1)
Expand Down Expand Up @@ -2411,6 +2415,7 @@ public int Native_SBReportPlayer(Handle plugin, int numParams)
dataPack.WriteString(sReason);

DB.Query(SQL_OnReportPlayer, sQuery, dataPack);
return 0;
}

public void SQL_OnReportPlayer(Database db, DBResultSet results, const char[] error, DataPack dataPack)
Expand Down Expand Up @@ -2765,7 +2770,7 @@ stock void ParseBackupConfig_Overrides()
delete hKV;
}

stock AdminFlag CreateFlagLetters()
stock AdminFlag[] CreateFlagLetters()
{
AdminFlag FlagLetters[FLAG_LETTERS_SIZE];

Expand Down
1 change: 1 addition & 0 deletions game/addons/sourcemod/scripting/sbpp_report.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public int ReportMenu(Menu menu, MenuAction action, int iClient, int iItem)
case MenuAction_End:
delete menu;
}
return 0;
}

public Action OnClientSayCommand(int iClient, const char[] sCommand, const char[] sArgs)
Expand Down