diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7936bba8..38edabc5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI env: - SM_VERSION: "1.10" + SM_VERSION: "1.11" on: push: diff --git a/addons/sourcemod/scripting/gokz-anticheat/bhop_tracking.sp b/addons/sourcemod/scripting/gokz-anticheat/bhop_tracking.sp index d2deacec..5607b07d 100644 --- a/addons/sourcemod/scripting/gokz-anticheat/bhop_tracking.sp +++ b/addons/sourcemod/scripting/gokz-anticheat/bhop_tracking.sp @@ -309,7 +309,7 @@ static bool JustLanded(int client, int cmdnum) } // Records current button inputs -static int RecordButtons(int client, int buttons) +static void RecordButtons(int client, int buttons) { gI_ButtonsIndex[client] = NextIndex(gI_ButtonsIndex[client], AC_MAX_BUTTON_SAMPLES); gI_Buttons[client][gI_ButtonsIndex[client]] = buttons; diff --git a/addons/sourcemod/scripting/gokz-chat.sp b/addons/sourcemod/scripting/gokz-chat.sp index d3ff3388..67bc04f5 100644 --- a/addons/sourcemod/scripting/gokz-chat.sp +++ b/addons/sourcemod/scripting/gokz-chat.sp @@ -305,4 +305,5 @@ public int Native_SetChatTag(Handle plugin, int numParams) } GetNativeString(3, gC_PlayerTagColors[client], sizeof(gC_PlayerTagColors[])); + return 0; } diff --git a/addons/sourcemod/scripting/gokz-core.sp b/addons/sourcemod/scripting/gokz-core.sp index 04943eb3..7feeed2c 100644 --- a/addons/sourcemod/scripting/gokz-core.sp +++ b/addons/sourcemod/scripting/gokz-core.sp @@ -52,8 +52,6 @@ ConVar gCV_gokz_chat_prefix; ConVar gCV_sv_full_alltalk; #include "gokz-core/commands.sp" -#include "gokz-core/forwards.sp" -#include "gokz-core/natives.sp" #include "gokz-core/modes.sp" #include "gokz-core/misc.sp" #include "gokz-core/options.sp" @@ -77,6 +75,9 @@ ConVar gCV_sv_full_alltalk; #include "gokz-core/timer/timer.sp" #include "gokz-core/timer/virtual_buttons.sp" +#include "gokz-core/forwards.sp" +#include "gokz-core/natives.sp" + // =====[ PLUGIN EVENTS ]===== @@ -370,7 +371,7 @@ public void OnConfigsExecuted() OnConfigsExecuted_OptionsMenu(); } -public Action OnNormalSound(int[] clients, int &numClients, char[] sample, int &entity, int &channel, float &volume, int &level, int &pitch, int &flags, char[] soundEntry, int &seed) +public Action OnNormalSound(int clients[MAXPLAYERS], int &numClients, char sample[PLATFORM_MAX_PATH], int &entity, int &channel, float &volume, int &level, int &pitch, int &flags, char soundEntry[PLATFORM_MAX_PATH], int &seed) { if (OnNormalSound_StopSounds(entity) == Plugin_Handled) { @@ -484,7 +485,7 @@ static void HookEvents() HookEvent("player_death", OnPlayerDeath, EventHookMode_Pre); HookEvent("player_jump", OnPlayerJump); HookEvent("round_start", OnRoundStart, EventHookMode_PostNoCopy); - AddNormalSoundHook(view_as(OnNormalSound)); + AddNormalSoundHook(OnNormalSound); GameData gameData = new GameData("sdktools.games"); int offset; diff --git a/addons/sourcemod/scripting/gokz-core/demofix.sp b/addons/sourcemod/scripting/gokz-core/demofix.sp index a37c80f1..84a93076 100644 --- a/addons/sourcemod/scripting/gokz-core/demofix.sp +++ b/addons/sourcemod/scripting/gokz-core/demofix.sp @@ -34,6 +34,7 @@ void OnRoundStart_Demofix() public Action Command_Demorestart(int client, const char[] command, int argc) { FixRecord(client); + return Plugin_Continue; } static void FixRecord(int client) diff --git a/addons/sourcemod/scripting/gokz-core/map/mapfile.sp b/addons/sourcemod/scripting/gokz-core/map/mapfile.sp index 886acaaf..db60e7e9 100644 --- a/addons/sourcemod/scripting/gokz-core/map/mapfile.sp +++ b/addons/sourcemod/scripting/gokz-core/map/mapfile.sp @@ -209,7 +209,7 @@ static int EntlumpGetString(char[] result, int maxLength, int copyCount, char[] return finalLength; } -static EntlumpToken[] EntlumpGetToken(char[] entityLump, int &entlumpIndex) +static EntlumpToken EntlumpGetToken(char[] entityLump, int &entlumpIndex) { EntlumpToken result; diff --git a/addons/sourcemod/scripting/gokz-core/menus/mode_menu.sp b/addons/sourcemod/scripting/gokz-core/menus/mode_menu.sp index b54b1f48..934d29cf 100644 --- a/addons/sourcemod/scripting/gokz-core/menus/mode_menu.sp +++ b/addons/sourcemod/scripting/gokz-core/menus/mode_menu.sp @@ -36,4 +36,5 @@ public int MenuHandler_Mode(Menu menu, MenuAction action, int param1, int param2 { delete menu; } + return 0; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-core/misc.sp b/addons/sourcemod/scripting/gokz-core/misc.sp index 70efc7d1..fb1a5634 100644 --- a/addons/sourcemod/scripting/gokz-core/misc.sp +++ b/addons/sourcemod/scripting/gokz-core/misc.sp @@ -500,6 +500,7 @@ public Action Timer_TimeLimit(Handle timer) public Action Timer_EndRound(Handle timer) { CS_TerminateRound(1.0, CSRoundEnd_Draw, true); + return Plugin_Continue; } diff --git a/addons/sourcemod/scripting/gokz-core/natives.sp b/addons/sourcemod/scripting/gokz-core/natives.sp index 9ae61555..9cd8b45c 100644 --- a/addons/sourcemod/scripting/gokz-core/natives.sp +++ b/addons/sourcemod/scripting/gokz-core/natives.sp @@ -82,6 +82,7 @@ public int Native_GetModeVersion(Handle plugin, int numParams) public int Native_SetModeLoaded(Handle plugin, int numParams) { SetModeLoaded(GetNativeCell(1), GetNativeCell(2), GetNativeCell(3)); + return 0; } public int Native_GetLoadedModeCount(Handle plugin, int numParams) @@ -97,11 +98,13 @@ public int Native_SetMode(Handle plugin, int numParams) public int Native_PrintToChatAndLog(Handle plugin, int numParams) { NativeHelper_PrintToChatOrLog(true); + return 0; } public int Native_PrintToChat(Handle plugin, int numParams) { NativeHelper_PrintToChatOrLog(false); + return 0; } static int NativeHelper_PrintToChatOrLog(bool alwaysLog) @@ -155,6 +158,7 @@ static int NativeHelper_PrintToChatOrLog(bool alwaysLog) CPrintToChat(client, "%s", buffer); } + return 0; } public int Native_GetOptionsTopMenu(Handle plugin, int numParams) @@ -195,16 +199,19 @@ public int Native_StopTimer(Handle plugin, int numParams) public int Native_StopTimerAll(Handle plugin, int numParams) { TimerStopAll(GetNativeCell(1)); + return 0; } public int Native_TeleportToStart(Handle plugin, int numParams) { TeleportToStart(GetNativeCell(1)); + return 0; } public int Native_TeleportToSearchStart(Handle plugin, int numParams) { TeleportToSearchStart(GetNativeCell(1), GetNativeCell(2)); + return 0; } public int Native_GetVirtualButtonPosition(Handle plugin, int numParams) @@ -224,11 +231,13 @@ public int Native_SetVirtualButtonPosition(Handle plugin, int numParams) GetNativeArray(2, position, sizeof(position)); SetVirtualButtonPosition(GetNativeCell(1), position, GetNativeCell(3), view_as(GetNativeCell(4))); + return 0; } public int Native_LockVirtualButtons(Handle plugin, int numParams) { LockVirtualButtons(GetNativeCell(1)); + return 0; } public int Native_GetStartPosition(Handle plugin, int numParams) @@ -250,11 +259,13 @@ public int Native_SetStartPosition(Handle plugin, int numParams) GetNativeArray(3, position, sizeof(position)); GetNativeArray(4, angles, sizeof(angles)); SetStartPosition(GetNativeCell(1), GetNativeCell(2), position, angles); + return 0; } public int Native_TeleportToEnd(Handle plugin, int numParams) { TeleportToEnd(GetNativeCell(1), GetNativeCell(2)); + return 0; } public int Native_GetStartPositionType(Handle plugin, int numParams) @@ -270,11 +281,13 @@ public int Native_SetStartPositionToMapStart(Handle plugin, int numParams) public int Native_MakeCheckpoint(Handle plugin, int numParams) { MakeCheckpoint(GetNativeCell(1)); + return 0; } public int Native_TeleportToCheckpoint(Handle plugin, int numParams) { TeleportToCheckpoint(GetNativeCell(1)); + return 0; } public int Native_GetCanTeleportToCheckpoint(Handle plugin, int numParams) @@ -285,6 +298,7 @@ public int Native_GetCanTeleportToCheckpoint(Handle plugin, int numParams) public int Native_PrevCheckpoint(Handle plugin, int numParams) { PrevCheckpoint(GetNativeCell(1)); + return 0; } public int Native_GetCanPrevCheckpoint(Handle plugin, int numParams) @@ -295,6 +309,7 @@ public int Native_GetCanPrevCheckpoint(Handle plugin, int numParams) public int Native_NextCheckpoint(Handle plugin, int numParams) { NextCheckpoint(GetNativeCell(1)); + return 0; } public int Native_GetCanNextCheckpoint(Handle plugin, int numParams) @@ -305,6 +320,7 @@ public int Native_GetCanNextCheckpoint(Handle plugin, int numParams) public int Native_UndoTeleport(Handle plugin, int numParams) { UndoTeleport(GetNativeCell(1)); + return 0; } public int Native_GetCanUndoTeleport(Handle plugin, int numParams) @@ -315,6 +331,7 @@ public int Native_GetCanUndoTeleport(Handle plugin, int numParams) public int Native_Pause(Handle plugin, int numParams) { Pause(GetNativeCell(1)); + return 0; } public int Native_GetCanPause(Handle plugin, int numParams) @@ -325,16 +342,19 @@ public int Native_GetCanPause(Handle plugin, int numParams) public int Native_Resume(Handle plugin, int numParams) { Resume(GetNativeCell(1)); + return 0; } public int Native_TogglePause(Handle plugin, int numParams) { TogglePause(GetNativeCell(1)); + return 0; } public int Native_PlayErrorSound(Handle plugin, int numParams) { PlayErrorSound(GetNativeCell(1)); + return 0; } public int Native_SetValidJumpOrigin(Handle plugin, int numParams) @@ -348,6 +368,7 @@ public int Native_SetValidJumpOrigin(Handle plugin, int numParams) // Using Movement_SetOrigin instead causes considerable lag for spectators SetEntPropVector(client, Prop_Data, "m_vecAbsOrigin", origin); + return 0; } public int Native_GetTimerRunning(Handle plugin, int numParams) @@ -522,6 +543,7 @@ public int Native_GetHitPerf(Handle plugin, int numParams) public int Native_SetHitPerf(Handle plugin, int numParams) { SetGOKZHitPerf(GetNativeCell(1), view_as(GetNativeCell(2))); + return 0; } public int Native_GetTakeoffSpeed(Handle plugin, int numParams) @@ -532,6 +554,7 @@ public int Native_GetTakeoffSpeed(Handle plugin, int numParams) public int Native_SetTakeoffSpeed(Handle plugin, int numParams) { SetGOKZTakeoffSpeed(GetNativeCell(1), view_as(GetNativeCell(2))); + return 0; } public int Native_GetValidJump(Handle plugin, int numParams) @@ -542,6 +565,7 @@ public int Native_GetValidJump(Handle plugin, int numParams) public int Native_JoinTeam(Handle plugin, int numParams) { JoinTeam(GetNativeCell(1), GetNativeCell(2), GetNativeCell(3)); + return 0; } diff --git a/addons/sourcemod/scripting/gokz-core/options.sp b/addons/sourcemod/scripting/gokz-core/options.sp index 3eaf124e..b7f21fc0 100644 --- a/addons/sourcemod/scripting/gokz-core/options.sp +++ b/addons/sourcemod/scripting/gokz-core/options.sp @@ -285,7 +285,7 @@ static bool IsValueInRange(OptionType type, any value, any minValue, any maxValu } } -static bool LoadOption(int client, const char[] option) +static void LoadOption(int client, const char[] option) { char valueString[100]; Cookie cookie = GetOptionProp(option, OptionProp_Cookie); diff --git a/addons/sourcemod/scripting/gokz-core/teleports.sp b/addons/sourcemod/scripting/gokz-core/teleports.sp index 4996e762..b5abd326 100644 --- a/addons/sourcemod/scripting/gokz-core/teleports.sp +++ b/addons/sourcemod/scripting/gokz-core/teleports.sp @@ -756,16 +756,6 @@ void OnStartZoneStartTouch_Teleports(int client, int course) // =====[ PRIVATE ]===== -static int NextIndex(int current, int maximum) -{ - int next = current + 1; - if (next >= maximum) - { - return 0; - } - return next; -} - static int PrevIndex(int current, int maximum) { int prev = current - 1; diff --git a/addons/sourcemod/scripting/gokz-core/timer/virtual_buttons.sp b/addons/sourcemod/scripting/gokz-core/timer/virtual_buttons.sp index e1172225..8701f023 100644 --- a/addons/sourcemod/scripting/gokz-core/timer/virtual_buttons.sp +++ b/addons/sourcemod/scripting/gokz-core/timer/virtual_buttons.sp @@ -43,7 +43,7 @@ bool ToggleVirtualButtonsLock(int client) return virtualButtonsLocked[client]; } -bool LockVirtualButtons(int client) +void LockVirtualButtons(int client) { virtualButtonsLocked[client] = true; } diff --git a/addons/sourcemod/scripting/gokz-global.sp b/addons/sourcemod/scripting/gokz-global.sp index 1243e355..8c129754 100644 --- a/addons/sourcemod/scripting/gokz-global.sp +++ b/addons/sourcemod/scripting/gokz-global.sp @@ -606,7 +606,7 @@ public int GetAuthStatusCallback(JSON_Object auth_json, GlobalAPIRequestData req if (request.Failure) { LogError("Failed to check API key with Global API."); - return; + return 0; } APIAuth auth = view_as(auth_json); @@ -615,6 +615,7 @@ public int GetAuthStatusCallback(JSON_Object auth_json, GlobalAPIRequestData req LogError("Global API key was found to be missing or invalid."); } gB_APIKeyCheck = auth.IsValid; + return 0; } public int GetModeInfoCallback(JSON_Object modes, GlobalAPIRequestData request) @@ -622,13 +623,13 @@ public int GetModeInfoCallback(JSON_Object modes, GlobalAPIRequestData request) if (request.Failure) { LogError("Failed to check mode versions with Global API."); - return; + return 0; } if (!modes.IsArray) { LogError("GlobalAPI returned a malformed response while looking up the modes."); - return; + return 0; } for (int i = 0; i < modes.Length; i++) @@ -653,6 +654,7 @@ public int GetModeInfoCallback(JSON_Object modes, GlobalAPIRequestData request) gC_ModeNames[mode_id], mode.LatestVersion, desc, GOKZ_GetModeVersion(mode_id), GOKZ_VERSION); } } + return 0; } public int GetMapCallback(JSON_Object map_json, GlobalAPIRequestData request) @@ -660,7 +662,7 @@ public int GetMapCallback(JSON_Object map_json, GlobalAPIRequestData request) if (request.Failure || map_json == INVALID_HANDLE) { LogError("Failed to get map info."); - return; + return 0; } APIMap map = view_as(map_json); @@ -678,6 +680,7 @@ public int GetMapCallback(JSON_Object map_json, GlobalAPIRequestData request) UpdatePoints(client); } } + return 0; } void CheckClientGlobalBan(int client) diff --git a/addons/sourcemod/scripting/gokz-global/api.sp b/addons/sourcemod/scripting/gokz-global/api.sp index 6f1a7c39..23caa15a 100644 --- a/addons/sourcemod/scripting/gokz-global/api.sp +++ b/addons/sourcemod/scripting/gokz-global/api.sp @@ -66,6 +66,7 @@ public int Native_PrintRecords(Handle plugin, int numParams) { PrintRecords(GetNativeCell(1), map, GetNativeCell(3), GetNativeCell(4), steamid); } + return 0; } public int Native_DisplayMapTopMenu(Handle plugin, int numParams) @@ -85,6 +86,7 @@ public int Native_DisplayMapTopMenu(Handle plugin, int numParams) { DisplayMapTopSubmenu(GetNativeCell(1), map, GetNativeCell(3), GetNativeCell(4), GetNativeCell(5), localRanksCall); } + return 0; } public int Native_GetPoints(Handle plugin, int numParams) @@ -111,6 +113,7 @@ public int Native_UpdatePoints(Handle plugin, int numParams) { // We're gonna always force an update here, cause otherwise the call doesn't really make sense UpdatePoints(GetNativeCell(1), true, GetNativeCell(2)); + return 0; } public int Native_GetAPIKeyValid(Handle plugin, int numParams) diff --git a/addons/sourcemod/scripting/gokz-global/ban_player.sp b/addons/sourcemod/scripting/gokz-global/ban_player.sp index 489edf41..835d9e51 100644 --- a/addons/sourcemod/scripting/gokz-global/ban_player.sp +++ b/addons/sourcemod/scripting/gokz-global/ban_player.sp @@ -38,4 +38,5 @@ public int BanPlayerCallback(JSON_Object response, GlobalAPIRequestData request, { LogError("Failed to globally ban %s (%s).", playerName, steamid); } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-global/maptop_menu.sp b/addons/sourcemod/scripting/gokz-global/maptop_menu.sp index 05628553..0c713469 100644 --- a/addons/sourcemod/scripting/gokz-global/maptop_menu.sp +++ b/addons/sourcemod/scripting/gokz-global/maptop_menu.sp @@ -71,6 +71,7 @@ public int MenuHandler_MapTopModeMenu(Menu menu, MenuAction action, int param1, { delete menu; } + return 0; } public int MenuHandler_MapTopMenu(Menu menu, MenuAction action, int param1, int param2) @@ -90,6 +91,7 @@ public int MenuHandler_MapTopMenu(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } public int MenuHandler_MapTopSubmenu(Menu menu, MenuAction action, int param1, int param2) @@ -109,6 +111,7 @@ public int MenuHandler_MapTopSubmenu(Menu menu, MenuAction action, int param1, i { delete menu; } + return 0; } @@ -159,18 +162,18 @@ public int DisplayMapTopSubmenuCallback(JSON_Object top, GlobalAPIRequestData re if (request.Failure) { LogError("Failed to get top records with Global API."); - return; + return 0; } if (!top.IsArray) { LogError("GlobalAPI returned a malformed response while looking up the top records."); - return; + return 0; } if (!IsValidClient(client)) { - return; + return 0; } Menu menu = new Menu(MenuHandler_MapTopSubmenu); @@ -210,6 +213,7 @@ public int DisplayMapTopSubmenuCallback(JSON_Object top, GlobalAPIRequestData re menu.Pagination = 5; menu.Display(client, MENU_TIME_FOREVER); } + return 0; } // Returns number of record times added to the menu diff --git a/addons/sourcemod/scripting/gokz-global/print_records.sp b/addons/sourcemod/scripting/gokz-global/print_records.sp index 9e9aa982..3966ed51 100644 --- a/addons/sourcemod/scripting/gokz-global/print_records.sp +++ b/addons/sourcemod/scripting/gokz-global/print_records.sp @@ -57,12 +57,12 @@ public int PrintRecordsCallback(JSON_Object records, GlobalAPIRequestData reques if (request.Failure) { LogError("Failed to retrieve record from the Global API for printing."); - return; + return 0; } if (!IsValidClient(client)) { - return; + return 0; } if (records.Length <= 0) @@ -93,6 +93,7 @@ public int PrintRecordsCallback(JSON_Object records, GlobalAPIRequestData reques { waitingForOtherCallback[client] = false; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-global/send_run.sp b/addons/sourcemod/scripting/gokz-global/send_run.sp index 95b4e01b..e098d072 100644 --- a/addons/sourcemod/scripting/gokz-global/send_run.sp +++ b/addons/sourcemod/scripting/gokz-global/send_run.sp @@ -45,13 +45,13 @@ public int SendTimeCallback(JSON_Object response, GlobalAPIRequestData request, if (!IsValidClient(client)) { - return; + return 0; } if (request.Failure) { LogError("Failed to send a time to the global API."); - return; + return 0; } int top_place = response.GetInt("top_100"); @@ -78,7 +78,7 @@ public int SendTimeCallback(JSON_Object response, GlobalAPIRequestData request, storedTimeType[client] = timeType; storedTime[client] = time; } - + return 0; } public void OnReplaySaved_SendReplay(int client, int replayType, const char[] map, int course, int timeType, float time, const char[] filePath, bool tempReplay) @@ -139,4 +139,5 @@ public int SendReplayCallback(JSON_Object response, GlobalAPIRequestData request DeleteFile(replayPath); } delete dp; + return 0; } diff --git a/addons/sourcemod/scripting/gokz-goto.sp b/addons/sourcemod/scripting/gokz-goto.sp index e9e238bd..0828b950 100644 --- a/addons/sourcemod/scripting/gokz-goto.sp +++ b/addons/sourcemod/scripting/gokz-goto.sp @@ -153,6 +153,7 @@ public int MenuHandler_Goto(Menu menu, MenuAction action, int param1, int param2 { delete menu; } + return 0; } // Returns number of items added to the menu diff --git a/addons/sourcemod/scripting/gokz-hud.sp b/addons/sourcemod/scripting/gokz-hud.sp index 7a44a4aa..2d2c3a31 100644 --- a/addons/sourcemod/scripting/gokz-hud.sp +++ b/addons/sourcemod/scripting/gokz-hud.sp @@ -182,6 +182,7 @@ public void OnPlayerSpawn(Event event, const char[] name, bool dontBroadcast) // public Action OnPlayerDeath(Event event, const char[] name, bool dontBroadcast) // player_death pre hook { event.BroadcastDisabled = true; // Block death notices + return Plugin_Continue; } public void GOKZ_OnJoinTeam(int client, int team) diff --git a/addons/sourcemod/scripting/gokz-hud/racing_text.sp b/addons/sourcemod/scripting/gokz-hud/racing_text.sp index a341a14e..e6f7477b 100644 --- a/addons/sourcemod/scripting/gokz-hud/racing_text.sp +++ b/addons/sourcemod/scripting/gokz-hud/racing_text.sp @@ -127,7 +127,7 @@ static void ShowCountdownText(KZPlayer player, KZPlayer targetPlayer) ShowSyncHudText(player.ID, racingHudSynchronizer, "%t\n\n%d", "Get Ready", IntMax(RoundToCeil(timeToStart), 1)); } -static float[] GetCountdownColour(float timeToStart, int buffer[4]) +static void GetCountdownColour(float timeToStart, int buffer[4]) { // From red to green if (timeToStart >= RC_COUNTDOWN_TIME) diff --git a/addons/sourcemod/scripting/gokz-hud/timer_text.sp b/addons/sourcemod/scripting/gokz-hud/timer_text.sp index 6785a648..292b6bec 100644 --- a/addons/sourcemod/scripting/gokz-hud/timer_text.sp +++ b/addons/sourcemod/scripting/gokz-hud/timer_text.sp @@ -74,6 +74,7 @@ public int PanelHandler_Menu(Menu menu, MenuAction action, int param1, int param { gB_MenuShowing[param1] = false; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-hud/tp_menu.sp b/addons/sourcemod/scripting/gokz-hud/tp_menu.sp index ac74f220..5c103af2 100644 --- a/addons/sourcemod/scripting/gokz-hud/tp_menu.sp +++ b/addons/sourcemod/scripting/gokz-hud/tp_menu.sp @@ -75,6 +75,7 @@ public int MenuHandler_TPMenu(Menu menu, MenuAction action, int param1, int para { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-jumpstats/api.sp b/addons/sourcemod/scripting/gokz-jumpstats/api.sp index 513dec59..2625fda7 100644 --- a/addons/sourcemod/scripting/gokz-jumpstats/api.sp +++ b/addons/sourcemod/scripting/gokz-jumpstats/api.sp @@ -74,4 +74,5 @@ void CreateNatives() public int Native_InvalidateJump(Handle plugin, int numParams) { InvalidateJumpstat(GetNativeCell(1)); + return 0; } diff --git a/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp b/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp index bb026efb..cb495796 100644 --- a/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp +++ b/addons/sourcemod/scripting/gokz-jumpstats/jump_tracking.sp @@ -560,7 +560,7 @@ enum struct JumpTracker // at least the middle of the gap. CopyVector(this.takeoffOrigin, block); block[coordDist] = 2 * failstatPosition[coordDist] - this.takeoffOrigin[coordDist]; - block[!coordDist] = failstatPosition[!coordDist]; + block[view_as(!coordDist)] = failstatPosition[view_as(!coordDist)]; block[2] = this.failstatBlockHeight; // Calculate block stats diff --git a/addons/sourcemod/scripting/gokz-localdb/api.sp b/addons/sourcemod/scripting/gokz-localdb/api.sp index 803bb61c..a4bc29c3 100644 --- a/addons/sourcemod/scripting/gokz-localdb/api.sp +++ b/addons/sourcemod/scripting/gokz-localdb/api.sp @@ -122,4 +122,5 @@ public int Native_IsCheater(Handle plugin, int numParams) public int Native_SetCheater(Handle plugin, int numParams) { DB_SetCheater(GetNativeCell(1), GetNativeCell(2)); + return 0; } diff --git a/addons/sourcemod/scripting/gokz-localranks/api.sp b/addons/sourcemod/scripting/gokz-localranks/api.sp index d1795795..34b3ece8 100644 --- a/addons/sourcemod/scripting/gokz-localranks/api.sp +++ b/addons/sourcemod/scripting/gokz-localranks/api.sp @@ -116,4 +116,5 @@ public int Native_GetPBMissed(Handle plugin, int numParams) public int Native_ReopenMapTopMenu(Handle plugin, int numParams) { ReopenMapTopMenu(GetNativeCell(1)); + return 0; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-localranks/commands.sp b/addons/sourcemod/scripting/gokz-localranks/commands.sp index ff4d619d..44063af9 100644 --- a/addons/sourcemod/scripting/gokz-localranks/commands.sp +++ b/addons/sourcemod/scripting/gokz-localranks/commands.sp @@ -386,6 +386,7 @@ public Action CommandRecentRecords(int client, int args) public Action CommandUpdateMapPool(int client, int args) { DB_UpdateRankedMapPool(client); + return Plugin_Handled; } public Action CommandLJPB(int client, int args) diff --git a/addons/sourcemod/scripting/gokz-localranks/db/display_js.sp b/addons/sourcemod/scripting/gokz-localranks/db/display_js.sp index b2a363e4..779148fc 100644 --- a/addons/sourcemod/scripting/gokz-localranks/db/display_js.sp +++ b/addons/sourcemod/scripting/gokz-localranks/db/display_js.sp @@ -290,6 +290,7 @@ public int MenuHandler_JumpStatsMode(Menu menu, MenuAction action, int param1, i { delete menu; } + return 0; } public int MenuHandler_JumpStatsBlockType(Menu menu, MenuAction action, int param1, int param2) @@ -307,6 +308,7 @@ public int MenuHandler_JumpStatsBlockType(Menu menu, MenuAction action, int para { delete menu; } + return 0; } public int MenuHandler_JumpStatsSubmenu(Menu menu, MenuAction action, int param1, int param2) @@ -319,4 +321,5 @@ public int MenuHandler_JumpStatsSubmenu(Menu menu, MenuAction action, int param1 { delete menu; } + return 0; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-localranks/db/js_top.sp b/addons/sourcemod/scripting/gokz-localranks/db/js_top.sp index d07b676c..90f7395b 100644 --- a/addons/sourcemod/scripting/gokz-localranks/db/js_top.sp +++ b/addons/sourcemod/scripting/gokz-localranks/db/js_top.sp @@ -215,6 +215,7 @@ public int MenuHandler_JumpTopMode(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } public int MenuHandler_JumpTopType(Menu menu, MenuAction action, int param1, int param2) @@ -232,6 +233,7 @@ public int MenuHandler_JumpTopType(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } public int MenuHandler_JumpTopBlockType(Menu menu, MenuAction action, int param1, int param2) @@ -249,6 +251,7 @@ public int MenuHandler_JumpTopBlockType(Menu menu, MenuAction action, int param1 { delete menu; } + return 0; } public int MenuHandler_JumpTopList(Menu menu, MenuAction action, int param1, int param2) @@ -279,6 +282,7 @@ public int MenuHandler_JumpTopList(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } // =====[ UTILITY ]===== @@ -291,6 +295,7 @@ public Action Timer_ResetSpectate(Handle timer, int clientUID) SetEntProp(client, Prop_Send, "m_iObserverMode", -1); SetEntPropEnt(client, Prop_Send, "m_hObserverTarget", -1); } + return Plugin_Continue; } public Action Timer_SpectateBot(Handle timer, DataPack data) { diff --git a/addons/sourcemod/scripting/gokz-localranks/db/map_top.sp b/addons/sourcemod/scripting/gokz-localranks/db/map_top.sp index a2acdcf3..5b296e92 100644 --- a/addons/sourcemod/scripting/gokz-localranks/db/map_top.sp +++ b/addons/sourcemod/scripting/gokz-localranks/db/map_top.sp @@ -338,6 +338,7 @@ public int MenuHandler_MapTopMode(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } public int MenuHandler_MapTop(Menu menu, MenuAction action, int param1, int param2) @@ -369,6 +370,7 @@ public int MenuHandler_MapTop(Menu menu, MenuAction action, int param1, int para { delete menu; } + return 0; } public int MenuHandler_MapTopSubmenu(Menu menu, MenuAction action, int param1, int param2) @@ -382,4 +384,5 @@ public int MenuHandler_MapTopSubmenu(Menu menu, MenuAction action, int param1, i { delete menu; } + return 0; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-localranks/db/player_top.sp b/addons/sourcemod/scripting/gokz-localranks/db/player_top.sp index e0f8b461..0348eec7 100644 --- a/addons/sourcemod/scripting/gokz-localranks/db/player_top.sp +++ b/addons/sourcemod/scripting/gokz-localranks/db/player_top.sp @@ -130,6 +130,7 @@ public int MenuHandler_PlayerTopMode(Menu menu, MenuAction action, int param1, i { delete menu; } + return 0; } public int MenuHandler_PlayerTop(Menu menu, MenuAction action, int param1, int param2) @@ -146,6 +147,7 @@ public int MenuHandler_PlayerTop(Menu menu, MenuAction action, int param1, int p { delete menu; } + return 0; } public int MenuHandler_PlayerTopSubmenu(Menu menu, MenuAction action, int param1, int param2) @@ -159,4 +161,5 @@ public int MenuHandler_PlayerTopSubmenu(Menu menu, MenuAction action, int param1 { delete menu; } + return 0; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-localranks/db/recent_records.sp b/addons/sourcemod/scripting/gokz-localranks/db/recent_records.sp index 65e64dba..939b132a 100644 --- a/addons/sourcemod/scripting/gokz-localranks/db/recent_records.sp +++ b/addons/sourcemod/scripting/gokz-localranks/db/recent_records.sp @@ -136,6 +136,7 @@ public int MenuHandler_RecentRecordsMode(Menu menu, MenuAction action, int param { delete menu; } + return 0; } public int MenuHandler_RecentRecordsTimeType(Menu menu, MenuAction action, int param1, int param2) @@ -152,6 +153,7 @@ public int MenuHandler_RecentRecordsTimeType(Menu menu, MenuAction action, int p { delete menu; } + return 0; } public int MenuHandler_RecentRecordsSubmenu(Menu menu, MenuAction action, int param1, int param2) @@ -165,4 +167,5 @@ public int MenuHandler_RecentRecordsSubmenu(Menu menu, MenuAction action, int pa { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-measure/measure_menu.sp b/addons/sourcemod/scripting/gokz-measure/measure_menu.sp index 91238b5a..cf9deb37 100644 --- a/addons/sourcemod/scripting/gokz-measure/measure_menu.sp +++ b/addons/sourcemod/scripting/gokz-measure/measure_menu.sp @@ -59,6 +59,7 @@ public int MenuHandler_Measure(Menu menu, MenuAction action, int param1, int par { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-measure/measurer.sp b/addons/sourcemod/scripting/gokz-measure/measurer.sp index cece391c..f88e79cd 100644 --- a/addons/sourcemod/scripting/gokz-measure/measurer.sp +++ b/addons/sourcemod/scripting/gokz-measure/measurer.sp @@ -83,6 +83,7 @@ public Action Timer_P2PRed(Handle timer, int userid) { P2PXBeam(client, 0); } + return Plugin_Continue; } public Action Timer_P2PGreen(Handle timer, int userid) @@ -92,6 +93,7 @@ public Action Timer_P2PGreen(Handle timer, int userid) { P2PXBeam(client, 1); } + return Plugin_Continue; } public Action Timer_DeletePoints(Handle timer, int userid) @@ -101,6 +103,7 @@ public Action Timer_DeletePoints(Handle timer, int userid) { MeasureResetPos(client); } + return Plugin_Continue; } diff --git a/addons/sourcemod/scripting/gokz-mode-simplekz.sp b/addons/sourcemod/scripting/gokz-mode-simplekz.sp index f5502df1..cf1012b7 100644 --- a/addons/sourcemod/scripting/gokz-mode-simplekz.sp +++ b/addons/sourcemod/scripting/gokz-mode-simplekz.sp @@ -534,7 +534,7 @@ float CalcPreRewardSpeed(float yawDiff, float baseSpeed) // =====[ JUMPING ]===== -Action TweakJump(KZPlayer player, float[3] origin, float[3] velocity) +Action TweakJump(KZPlayer player, float origin[3], float velocity[3]) { // TakeoffCmdnum and TakeoffSpeed is not defined here because the player technically hasn't taken off yet. int cmdsSinceLanding = gI_Cmdnum[player.ID] - player.LandingCmdNum; diff --git a/addons/sourcemod/scripting/gokz-paint.sp b/addons/sourcemod/scripting/gokz-paint.sp index ade41d1d..9813413a 100644 --- a/addons/sourcemod/scripting/gokz-paint.sp +++ b/addons/sourcemod/scripting/gokz-paint.sp @@ -26,23 +26,23 @@ public Plugin myinfo = #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-paint.txt" -char gC_PaintColors[][16] = +char gC_PaintColors[][32] = { - { "paint_red" }, - { "paint_white" }, - { "paint_black" }, - { "paint_blue" }, - { "paint_brown" }, - { "paint_green" }, - { "paint_yellow" }, - { "paint_purple" } + "paint_red", + "paint_white", + "paint_black", + "paint_blue", + "paint_brown", + "paint_green", + "paint_yellow", + "paint_purple" }; char gC_PaintSizePostfix[][8] = { - { "_small" }, - { "_med" }, - { "_large" } + "_small", + "_med", + "_large" }; int gI_Decals[sizeof(gC_PaintColors)][sizeof(gC_PaintSizePostfix)]; @@ -161,6 +161,7 @@ public Action Timer_Paint(Handle timer) Paint(client); } } + return Plugin_Continue; } void TE_SetupWorldDecal(const float origin[3], int index) diff --git a/addons/sourcemod/scripting/gokz-pistol.sp b/addons/sourcemod/scripting/gokz-pistol.sp index bb7d24f6..b0807858 100644 --- a/addons/sourcemod/scripting/gokz-pistol.sp +++ b/addons/sourcemod/scripting/gokz-pistol.sp @@ -198,6 +198,7 @@ public int MenuHandler_Pistol(Menu menu, MenuAction action, int param1, int para { delete menu; } + return 0; } void PistolMenuAddItems(int client, Menu menu) diff --git a/addons/sourcemod/scripting/gokz-profile/profile.sp b/addons/sourcemod/scripting/gokz-profile/profile.sp index 46e66eb9..fabdb0e7 100644 --- a/addons/sourcemod/scripting/gokz-profile/profile.sp +++ b/addons/sourcemod/scripting/gokz-profile/profile.sp @@ -83,12 +83,12 @@ public int MenuHandler_Profile(Menu menu, MenuAction action, int param1, int par else if (StrEqual(info, ITEM_INFO_RANK, false)) { ShowRankInfo(param1); - return; + return 0; } else if (StrEqual(info, ITEM_INFO_POINTS, false)) { ShowPointsInfo(param1); - return; + return 0; } ShowProfile(param1); @@ -97,6 +97,7 @@ public int MenuHandler_Profile(Menu menu, MenuAction action, int param1, int par { delete menu; } + return 0; } @@ -173,6 +174,7 @@ static int MenuHandler_RankInfo(Menu menu, MenuAction action, int param1, int pa { delete menu; } + return 0; } static void ShowPointsInfo(int client) @@ -216,4 +218,5 @@ static int MenuHandler_PointsInfo(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-racing/duel_menu.sp b/addons/sourcemod/scripting/gokz-racing/duel_menu.sp index 8757092c..44c519f6 100644 --- a/addons/sourcemod/scripting/gokz-racing/duel_menu.sp +++ b/addons/sourcemod/scripting/gokz-racing/duel_menu.sp @@ -85,6 +85,7 @@ public int MenuHandler_Duel(Menu menu, MenuAction action, int param1, int param2 { delete menu; } + return 0; } void DuelMenuAddItems(int client, Menu menu) @@ -145,6 +146,7 @@ public int MenuHandler_DuelMode(Menu menu, MenuAction action, int param1, int pa { delete menu; } + return 0; } @@ -197,6 +199,7 @@ public int MenuHandler_DuelCheckpoint(Menu menu, MenuAction action, int param1, { delete menu; } + return 0; } void DuelCheckpointMenuAddItems(int client, Menu menu) @@ -305,7 +308,7 @@ public int MenuHandler_DuelCheckpointLimit(Menu menu, MenuAction action, int par { duelMenuCheckpointLimit[param1] = -1; DisplayDuelCheckpointMenu(param1); - return; + return 0; } duelMenuCheckpointLimit[param1] = duelMenuCheckpointLimit[param1] < 0 ? 0 : duelMenuCheckpointLimit[param1]; @@ -319,6 +322,7 @@ public int MenuHandler_DuelCheckpointLimit(Menu menu, MenuAction action, int par { delete menu; } + return 0; } @@ -394,7 +398,7 @@ public int MenuHandler_DuelCPCooldown(Menu menu, MenuAction action, int param1, { duelMenuCheckpointCooldown[param1] = 0; DisplayDuelCheckpointMenu(param1); - return; + return 0; } duelMenuCheckpointCooldown[param1] = duelMenuCheckpointCooldown[param1] < 0 ? 0 : duelMenuCheckpointCooldown[param1]; @@ -408,6 +412,7 @@ public int MenuHandler_DuelCPCooldown(Menu menu, MenuAction action, int param1, { delete menu; } + return 0; } @@ -481,6 +486,7 @@ public int MenuHandler_DuelOpponent(Menu menu, MenuAction action, int param1, in { delete menu; } + return 0; } static bool SendDuelRequest(int host, int target) diff --git a/addons/sourcemod/scripting/gokz-racing/race.sp b/addons/sourcemod/scripting/gokz-racing/race.sp index 22fa7c9c..5ddc2a80 100644 --- a/addons/sourcemod/scripting/gokz-racing/race.sp +++ b/addons/sourcemod/scripting/gokz-racing/race.sp @@ -161,6 +161,7 @@ bool StartRace(int raceID) public Action Timer_EndCountdown(Handle timer, int raceID) { SetRaceInfo(raceID, RaceInfo_Status, RaceStatus_Started); + return Plugin_Continue; } diff --git a/addons/sourcemod/scripting/gokz-racing/race_menu.sp b/addons/sourcemod/scripting/gokz-racing/race_menu.sp index fa906c43..0518a2a8 100644 --- a/addons/sourcemod/scripting/gokz-racing/race_menu.sp +++ b/addons/sourcemod/scripting/gokz-racing/race_menu.sp @@ -98,6 +98,7 @@ public int MenuHandler_Race(Menu menu, MenuAction action, int param1, int param2 { delete menu; } + return 0; } void RaceMenuAddItems(int client, Menu menu) @@ -162,6 +163,7 @@ public int MenuHandler_RaceMode(Menu menu, MenuAction action, int param1, int pa { delete menu; } + return 0; } @@ -214,6 +216,7 @@ public int MenuHandler_RaceCheckpoint(Menu menu, MenuAction action, int param1, { delete menu; } + return 0; } void RaceCheckpointMenuAddItems(int client, Menu menu) @@ -322,7 +325,7 @@ public int MenuHandler_RaceCheckpointLimit(Menu menu, MenuAction action, int par { raceMenuCheckpointLimit[param1] = -1; DisplayRaceCheckpointMenu(param1); - return; + return 0; } raceMenuCheckpointLimit[param1] = raceMenuCheckpointLimit[param1] < 0 ? 0 : raceMenuCheckpointLimit[param1]; @@ -336,6 +339,7 @@ public int MenuHandler_RaceCheckpointLimit(Menu menu, MenuAction action, int par { delete menu; } + return 0; } @@ -411,7 +415,7 @@ public int MenuHandler_RaceCPCooldown(Menu menu, MenuAction action, int param1, { raceMenuCheckpointCooldown[param1] = 0; DisplayRaceCheckpointMenu(param1); - return; + return 0; } raceMenuCheckpointCooldown[param1] = raceMenuCheckpointCooldown[param1] < 0 ? 0 : raceMenuCheckpointCooldown[param1]; @@ -425,6 +429,7 @@ public int MenuHandler_RaceCPCooldown(Menu menu, MenuAction action, int param1, { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-racing/racer.sp b/addons/sourcemod/scripting/gokz-racing/racer.sp index ba6c584f..eb4ff3f7 100644 --- a/addons/sourcemod/scripting/gokz-racing/racer.sp +++ b/addons/sourcemod/scripting/gokz-racing/racer.sp @@ -28,6 +28,7 @@ Action OnTimerStart_Racer(int client, int course) Action OnTimerStart_Post_Racer(int client) { lastTimerStartTime[client] = GetGameTime(); + return Plugin_Continue; } Action OnMakeCheckpoint_Racer(int client) @@ -357,7 +358,7 @@ public Action Timer_RequestTimeout(Handle timer, DataPack data) if (!IsValidClient(host) || racerRaceID[host] != raceID || !IsValidClient(target) || racerRaceID[target] != raceID) { - return; + return Plugin_Continue; } // If haven't accepted by now, auto decline the race @@ -365,6 +366,7 @@ public Action Timer_RequestTimeout(Handle timer, DataPack data) { DeclineRequest(target, true); } + return Plugin_Continue; } int SendRequestAll(int host) diff --git a/addons/sourcemod/scripting/gokz-replays/playback.sp b/addons/sourcemod/scripting/gokz-replays/playback.sp index c13ea424..320a505d 100644 --- a/addons/sourcemod/scripting/gokz-replays/playback.sp +++ b/addons/sourcemod/scripting/gokz-replays/playback.sp @@ -586,14 +586,14 @@ static bool LoadFormatVersion2Replay(File file, int client, int bot) case ReplayType_Cheater: { // Reason - int ACReason; - file.ReadInt8(ACReason); + int reason; + file.ReadInt8(reason); // Type botReplayType[bot] = ReplayType_Cheater; // Finish spit to console - PrintToConsole(client, "AC Reason: %s", gC_ACReasons[ACReason]); + PrintToConsole(client, "AC Reason: %s", gC_ACReasons[reason]); } case ReplayType_Jump: { @@ -1382,4 +1382,5 @@ public Action Timer_UpdateBotName(Handle timer, int botUID) Event e = CreateEvent("spec_target_updated"); e.SetInt("userid", botUID); e.Fire(); + return Plugin_Continue; } \ No newline at end of file diff --git a/addons/sourcemod/scripting/gokz-replays/replay_menu.sp b/addons/sourcemod/scripting/gokz-replays/replay_menu.sp index 1e77dc6d..d878b724 100644 --- a/addons/sourcemod/scripting/gokz-replays/replay_menu.sp +++ b/addons/sourcemod/scripting/gokz-replays/replay_menu.sp @@ -40,6 +40,7 @@ public int MenuHandler_ReplayMode(Menu menu, MenuAction action, int param1, int { delete menu; } + return 0; } public int MenuHandler_Replay(Menu menu, MenuAction action, int param1, int param2) @@ -65,7 +66,7 @@ public int MenuHandler_Replay(Menu menu, MenuAction action, int param1, int para { LogError("Failed to load file: \"%s\".", path); GOKZ_PrintToChat(param1, true, "%t", "Replay Menu - No File"); - return; + return 0; } } @@ -79,6 +80,7 @@ public int MenuHandler_Replay(Menu menu, MenuAction action, int param1, int para { delete menu; } + return 0; } diff --git a/addons/sourcemod/scripting/gokz-saveloc.sp b/addons/sourcemod/scripting/gokz-saveloc.sp index cee91d69..27c0d4a5 100644 --- a/addons/sourcemod/scripting/gokz-saveloc.sp +++ b/addons/sourcemod/scripting/gokz-saveloc.sp @@ -204,6 +204,7 @@ public Action GOKZ_OnTimerStart(int client, int course) { CloseLocMenu(client); gB_UsedLoc[client] = false; + return Plugin_Continue; } public Action GOKZ_OnTimerEnd(int client, int course, float time) diff --git a/addons/sourcemod/scripting/gokz-spec.sp b/addons/sourcemod/scripting/gokz-spec.sp index 25fd6cee..eb14b8ba 100644 --- a/addons/sourcemod/scripting/gokz-spec.sp +++ b/addons/sourcemod/scripting/gokz-spec.sp @@ -152,6 +152,7 @@ public int MenuHandler_Spec(Menu menu, MenuAction action, int param1, int param2 { delete menu; } + return 0; } // Returns number of items added to the menu diff --git a/addons/sourcemod/scripting/gokz-tips.sp b/addons/sourcemod/scripting/gokz-tips.sp index 83d3b8f6..4dc1b9ff 100644 --- a/addons/sourcemod/scripting/gokz-tips.sp +++ b/addons/sourcemod/scripting/gokz-tips.sp @@ -253,6 +253,7 @@ public Action Timer_PrintTip(Handle timer) } gI_CurrentTip = NextIndex(gI_CurrentTip, g_TipPhrases.Length); + return Plugin_Continue; } diff --git a/addons/sourcemod/scripting/include/GlobalAPI.inc b/addons/sourcemod/scripting/include/GlobalAPI.inc index 1f14f5ca..88136450 100644 --- a/addons/sourcemod/scripting/include/GlobalAPI.inc +++ b/addons/sourcemod/scripting/include/GlobalAPI.inc @@ -557,11 +557,11 @@ native bool GlobalAPI_GetRecordsTopRecent(OnAPICallFinished callback = INVALID_F * @return Whether request was successfully sent */ native bool GlobalAPI_GetRecordsTopWorldRecords(OnAPICallFinished callback = INVALID_FUNCTION, any data = DEFAULT_DATA, - int[] ids = DEFAULT_INT, int idsLength = DEFAULT_INT, - int[] mapIds = DEFAULT_INT, int mapIdsLength = DEFAULT_INT, - int[] stages = DEFAULT_INT, int stagesLength = DEFAULT_INT, - int[] modeIds = DEFAULT_INT, int modeIdsLength = DEFAULT_INT, - int[] tickRates = DEFAULT_INT, int tickRatesLength = DEFAULT_INT, + int[] ids = {}, int idsLength = DEFAULT_INT, + int[] mapIds = {}, int mapIdsLength = DEFAULT_INT, + int[] stages = {}, int stagesLength = DEFAULT_INT, + int[] modeIds = {}, int modeIdsLength = DEFAULT_INT, + int[] tickRates = {}, int tickRatesLength = DEFAULT_INT, bool hasTeleports = DEFAULT_BOOL, char[] mapTag = DEFAULT_STRING, int offset = DEFAULT_INT, int limit = DEFAULT_INT); @@ -634,11 +634,11 @@ native bool GlobalAPI_GetPlayerRanks(OnAPICallFinished callback = INVALID_FUNCTI int pointsGreaterThan = DEFAULT_INT, float averageGreaterThan = DEFAULT_FLOAT, float ratingGreaterThan = DEFAULT_FLOAT, int finishesGreaterThan = DEFAULT_INT, const char[] steamId64List = DEFAULT_STRING, - int[] recordFilterIds = DEFAULT_INT, int recordFilterIdsLength = DEFAULT_INT, - int[] mapIds = DEFAULT_INT, int mapIdsLength = DEFAULT_INT, - int[] stages = DEFAULT_INT, int stagesLength = DEFAULT_INT, - int[] modeIds = DEFAULT_INT, int modeIdsLength = DEFAULT_INT, - int[] tickRates = DEFAULT_INT, int tickRatesLength = DEFAULT_INT, + int[] recordFilterIds = {}, int recordFilterIdsLength = DEFAULT_INT, + int[] mapIds = {}, int mapIdsLength = DEFAULT_INT, + int[] stages = {}, int stagesLength = DEFAULT_INT, + int[] modeIds = {}, int modeIdsLength = DEFAULT_INT, + int[] tickRates = {}, int tickRatesLength = DEFAULT_INT, bool hasTeleports = DEFAULT_BOOL, int offset = DEFAULT_INT, int limit = DEFAULT_INT); /** @@ -662,11 +662,11 @@ native bool GlobalAPI_GetPlayerRanks(OnAPICallFinished callback = INVALID_FUNCTI * @return Whether request was successfully sent */ native bool GlobalAPI_GetRecordFilters(OnAPICallFinished callback = INVALID_FUNCTION, any data = DEFAULT_DATA, - int[] ids = DEFAULT_INT, int idsLength = DEFAULT_INT, - int[] mapIds = DEFAULT_INT, int mapIdsLength = DEFAULT_INT, - int[] stages = DEFAULT_INT, int stagesLength = DEFAULT_INT, - int[] modeIds = DEFAULT_INT, int modeIdsLength = DEFAULT_INT, - int[] tickRates = DEFAULT_INT, int tickRatesLength = DEFAULT_INT, + int[] ids = {}, int idsLength = DEFAULT_INT, + int[] mapIds = {}, int mapIdsLength = DEFAULT_INT, + int[] stages = {}, int stagesLength = DEFAULT_INT, + int[] modeIds = {}, int modeIdsLength = DEFAULT_INT, + int[] tickRates = {}, int tickRatesLength = DEFAULT_INT, bool hasTeleports = DEFAULT_BOOL, bool isOverall = DEFAULT_BOOL, int offset = DEFAULT_INT, int limit = DEFAULT_INT); @@ -691,11 +691,11 @@ native bool GlobalAPI_GetRecordFilters(OnAPICallFinished callback = INVALID_FUNC * @return Whether request was successfully sent */ native bool GlobalAPI_GetRecordFilterDistributions(OnAPICallFinished callback = INVALID_FUNCTION, any data = DEFAULT_DATA, - int[] ids = DEFAULT_INT, int idsLength = DEFAULT_INT, - int[] mapIds = DEFAULT_INT, int mapIdsLength = DEFAULT_INT, - int[] stages = DEFAULT_INT, int stagesLength = DEFAULT_INT, - int[] modeIds = DEFAULT_INT, int modeIdsLength = DEFAULT_INT, - int[] tickRates = DEFAULT_INT, int tickRatesLength = DEFAULT_INT, + int[] ids = {}, int idsLength = DEFAULT_INT, + int[] mapIds = {}, int mapIdsLength = DEFAULT_INT, + int[] stages = {}, int stagesLength = DEFAULT_INT, + int[] modeIds = {}, int modeIdsLength = DEFAULT_INT, + int[] tickRates = {}, int tickRatesLength = DEFAULT_INT, bool hasTeleports = DEFAULT_BOOL, bool isOverall = DEFAULT_BOOL, int offset = DEFAULT_INT, int limit = DEFAULT_INT); diff --git a/addons/sourcemod/scripting/include/GlobalAPI/stocks.inc b/addons/sourcemod/scripting/include/GlobalAPI/stocks.inc index 13fcd8c0..52596c4d 100644 --- a/addons/sourcemod/scripting/include/GlobalAPI/stocks.inc +++ b/addons/sourcemod/scripting/include/GlobalAPI/stocks.inc @@ -13,7 +13,7 @@ * @param plugin Plugin handle to retrieve name from * @return String representation of the plugin name */ -stock char GetPluginDisplayName(Handle plugin) +stock char[] GetPluginDisplayName(Handle plugin) { char pluginName[GlobalAPI_Max_PluginName_Length] = "Unknown"; GetPluginInfo(plugin, PlInfo_Name, pluginName, sizeof(pluginName)); @@ -27,7 +27,7 @@ stock char GetPluginDisplayName(Handle plugin) * @param plugin Plugin handle to retrieve version from * @return String representation of the plugin version */ -stock char GetPluginVersion(Handle plugin) +stock char[] GetPluginVersion(Handle plugin) { char pluginVersion[GlobalAPI_Max_PluginVersion_Length] = "Unknown"; GetPluginInfo(plugin, PlInfo_Version, pluginVersion, sizeof(pluginVersion)); diff --git a/addons/sourcemod/scripting/include/gokz.inc b/addons/sourcemod/scripting/include/gokz.inc index b1e23444..bf06312e 100644 --- a/addons/sourcemod/scripting/include/gokz.inc +++ b/addons/sourcemod/scripting/include/gokz.inc @@ -8,7 +8,7 @@ #endinput #endif #define _gokz_included_ - +#include #include #include diff --git a/addons/sourcemod/scripting/include/gokz/global.inc b/addons/sourcemod/scripting/include/gokz/global.inc index 01480574..0f23a0c8 100644 --- a/addons/sourcemod/scripting/include/gokz/global.inc +++ b/addons/sourcemod/scripting/include/gokz/global.inc @@ -46,6 +46,7 @@ enum enum GlobalMode { + GlobalMode_Invalid = -1, GlobalMode_KZTimer = 200, GlobalMode_KZSimple, GlobalMode_Vanilla @@ -241,7 +242,7 @@ stock GlobalMode GOKZ_GL_GetGlobalMode(int mode) case Mode_SimpleKZ:return GlobalMode_KZSimple; case Mode_KZTimer:return GlobalMode_KZTimer; } - return GlobalMode; + return GlobalMode_Invalid; } /** diff --git a/addons/sourcemod/scripting/include/gokz/replays.inc b/addons/sourcemod/scripting/include/gokz/replays.inc index 4101349e..9f601033 100644 --- a/addons/sourcemod/scripting/include/gokz/replays.inc +++ b/addons/sourcemod/scripting/include/gokz/replays.inc @@ -43,11 +43,20 @@ enum { RPDELTA_DELTAFLAGS = 0, RPDELTA_DELTAFLAGS2, - RPDELTA_VEL[3], - RPDELTA_MOUSE[2], - RPDELTA_ORIGIN[3], - RPDELTA_ANGLES[3], - RPDELTA_VELOCITY[3], + RPDELTA_VEL_X, + RPDELTA_VEL_Y, + RPDELTA_VEL_Z, + RPDELTA_MOUSE_X, + RPDELTA_MOUSE_Y, + RPDELTA_ORIGIN_X, + RPDELTA_ORIGIN_Y, + RPDELTA_ORIGIN_Z, + RPDELTA_ANGLES_X, + RPDELTA_ANGLES_Y, + RPDELTA_ANGLES_Z, + RPDELTA_VELOCITY_X, + RPDELTA_VELOCITY_Y, + RPDELTA_VELOCITY_Z, RPDELTA_FLAGS, RPDELTA_PACKETSPERSECOND, RPDELTA_LAGGEDMOVEMENTVALUE,