From 1b350b627b141bba3248d0414379b335488a9cd9 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Sun, 1 Feb 2015 18:40:20 +0100 Subject: [PATCH 1/4] MAX_PLAYERS: Change value in includes --- plugins/include/amxconst.inc | 2 +- plugins/include/amxmodx.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/include/amxconst.inc b/plugins/include/amxconst.inc index 7616d819..84d61b02 100755 --- a/plugins/include/amxconst.inc +++ b/plugins/include/amxconst.inc @@ -37,7 +37,7 @@ * all possible server situations. MaxClients changes based on the * server the plugin is deployed on.. */ -#define MAX_PLAYERS 33 /* Maximum number of players AMX Mod X supports */ +#define MAX_PLAYERS 32 /* Maximum number of players AMX Mod X supports */ public stock const MaxClients; /* Maximum number of players the server supports */ diff --git a/plugins/include/amxmodx.inc b/plugins/include/amxmodx.inc index d09d0edb..d8178038 100755 --- a/plugins/include/amxmodx.inc +++ b/plugins/include/amxmodx.inc @@ -1221,7 +1221,7 @@ native get_playersnum(flag=0); * * @noreturn */ -native get_players(players[32], &num, const flags[]="", const team[]=""); +native get_players(players[MAX_PLAYERS], &num, const flags[]="", const team[]=""); /** * Retrieves argument of client command. From e4419082304c993ab7a2c555ecb00d476c2cb8b2 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Sun, 1 Feb 2015 19:20:55 +0100 Subject: [PATCH 2/4] MAX_PLAYERS: Fix plugins --- plugins/admin.sma | 8 ++-- plugins/adminchat.sma | 12 +++--- plugins/admincmd.sma | 14 +++--- plugins/adminvote.sma | 4 +- plugins/antiflood.sma | 4 +- plugins/cmdmenu.sma | 8 ++-- plugins/cstrike/miscstats.sma | 20 ++++----- plugins/cstrike/restmenu.sma | 8 ++-- plugins/cstrike/stats_logging.sma | 6 +-- plugins/cstrike/statsx.sma | 72 +++++++++++++++---------------- plugins/dod/plmenu.sma | 14 +++--- plugins/dod/stats.sma | 32 +++++++------- plugins/dod/stats_logging.sma | 4 +- plugins/mapsmenu.sma | 10 ++--- plugins/menufront.sma | 4 +- plugins/multilingual.sma | 2 +- plugins/ns/idlekicker.sma | 16 ++----- plugins/ns/nextmap.sma | 6 +-- plugins/ns/nscommands.sma | 19 ++------ plugins/ns/plmenu.sma | 14 +++--- plugins/ns/unstuck.sma | 2 +- plugins/pausecfg.sma | 2 +- plugins/plmenu.sma | 18 ++++---- plugins/pluginmenu.sma | 14 +++--- plugins/statscfg.sma | 2 +- plugins/telemenu.sma | 12 +++--- plugins/tfc/plmenu.sma | 14 +++--- plugins/tfc/stats.sma | 18 ++++---- plugins/tfc/stats_logging.sma | 4 +- plugins/timeleft.sma | 2 +- plugins/ts/stats.sma | 14 +++--- plugins/ts/stats_logging.sma | 4 +- 32 files changed, 181 insertions(+), 202 deletions(-) diff --git a/plugins/admin.sma b/plugins/admin.sma index 16e26230..a40626b5 100755 --- a/plugins/admin.sma +++ b/plugins/admin.sma @@ -32,7 +32,7 @@ new PLUGINNAME[] = "AMX Mod X" #define ADMIN_IPADDR (1<<3) #define ADMIN_NAME (1<<4) -new bool:g_CaseSensitiveName[MAX_PLAYERS]; +new bool:g_CaseSensitiveName[MAX_PLAYERS + 1]; // pcvars new amx_mode; @@ -145,7 +145,7 @@ public addadminfn(id, level, cid) player = cmd_target(id, arg, CMDTARGET_ALLOW_SELF | CMDTARGET_NO_BOTS) } else { new _steamid[44] - static _players[32], _num, _pv + static _players[MAX_PLAYERS], _num, _pv get_players(_players, _num) for (new _i=0; _i<_num; _i++) { @@ -583,7 +583,7 @@ public cmdReload(id, level, cid) } #endif - new players[32], num, pv + new players[MAX_PLAYERS], num, pv new name[MAX_NAME_LENGTH] get_players(players, num) for (new i=0; i<%s><>^" set xvar (name ^"%s^") (value ^"%s^")", name, get_user_userid(id), authid, arg1, arg2); // Display the message to all clients - new players[32], pnum, plr; + new players[MAX_PLAYERS], pnum, plr; get_players(players, pnum, "ch"); for (new i; i -new Float:g_Flooding[MAX_PLAYERS] = {0.0, ...} -new g_Flood[MAX_PLAYERS] = {0, ...} +new Float:g_Flooding[MAX_PLAYERS + 1] = {0.0, ...} +new g_Flood[MAX_PLAYERS + 1] = {0, ...} new amx_flood_time; diff --git a/plugins/cmdmenu.sma b/plugins/cmdmenu.sma index 8ec0570d..2d11745f 100755 --- a/plugins/cmdmenu.sma +++ b/plugins/cmdmenu.sma @@ -65,10 +65,10 @@ new g_cvarCmd[MAX_CVARS*5][32] new g_cvarCmdNum new g_cvarNum -new g_menuPosition[MAX_PLAYERS] -new g_menuSelect[MAX_PLAYERS][MAX_CMDS] -new g_menuSelectNum[MAX_PLAYERS] -new g_menuLayer[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] +new g_menuSelect[MAX_PLAYERS + 1][MAX_CMDS] +new g_menuSelectNum[MAX_PLAYERS + 1] +new g_menuLayer[MAX_PLAYERS + 1] new g_coloredMenus diff --git a/plugins/cstrike/miscstats.sma b/plugins/cstrike/miscstats.sma index d64a1332..3b6de0d2 100755 --- a/plugins/cstrike/miscstats.sma +++ b/plugins/cstrike/miscstats.sma @@ -57,8 +57,8 @@ public GrenadeSuicideSound const SOUNDFILE_PATH_MAXLEN = 64 const SOUND_SHORTPATH_MAXLEN = SOUNDFILE_PATH_MAXLEN - 10 // 64 (sound/ [ 54 ] .wav) critical value for fast dl -new g_streakKills[MAX_PLAYERS][2] -new g_multiKills[MAX_PLAYERS][2] +new g_streakKills[MAX_PLAYERS + 1][2] +new g_multiKills[MAX_PLAYERS + 1][2] new g_C4Timer new g_Defusing new g_Planter @@ -67,7 +67,7 @@ new g_LastAnnounce new g_roundCount new Float:g_doubleKill new g_doubleKillId -new g_friend[MAX_PLAYERS] +new g_friend[MAX_PLAYERS + 1] new g_firstBlood new g_center1_sync new g_announce_sync @@ -84,8 +84,8 @@ const TASK_DELAYED_NEW_ROUND = 98038 const TEAM_T = 1 const TEAM_CT = 2 -new g_connected[MAX_PLAYERS] -new g_msounds[MAX_PLAYERS] +new g_connected[MAX_PLAYERS + 1] +new g_msounds[MAX_PLAYERS + 1] new const _msound[] = "_msound" new g_MultiKillMsg[7][] = @@ -548,7 +548,7 @@ public client_death(killer, victim, wpnindex, hitplace, TK) { if( TEAM_T <= team <= TEAM_CT ) { - new ppl[32], pplnum, epplnum, a + new ppl[MAX_PLAYERS], pplnum, epplnum, a get_players(ppl, epplnum, "ae", team == TEAM_T ? "CT" : "TERRORIST") get_players(ppl, pplnum, "ae", team == TEAM_T ? "TERRORIST" : "CT") if( victim_alive ) @@ -592,7 +592,7 @@ public client_death(killer, victim, wpnindex, hitplace, TK) if (LastMan || LastManSound) { - new cts[32], ts[32], ctsnum, tsnum, b + new cts[MAX_PLAYERS], ts[MAX_PLAYERS], ctsnum, tsnum, b get_players(cts, ctsnum, "ae", "CT") get_players(ts, tsnum, "ae", "TERRORIST") @@ -744,7 +744,7 @@ public client_death(killer, victim, wpnindex, hitplace, TK) { if (HeadShotKill && wpnindex) { - new killer_name[MAX_NAME_LENGTH], victim_name[MAX_NAME_LENGTH], weapon_name[32], message[256], players[32], pnum, plr + new killer_name[MAX_NAME_LENGTH], victim_name[MAX_NAME_LENGTH], weapon_name[32], message[256], players[MAX_PLAYERS], pnum, plr xmod_get_wpnname(wpnindex, weapon_name, charsmax(weapon_name)) get_user_name(killer, killer_name, charsmax(killer_name)) @@ -866,7 +866,7 @@ public LogEvent_Round_Start() { if (KillingStreak) { - new appl[32], ppl, i + new appl[MAX_PLAYERS], ppl, i get_players(appl, ppl, "ac") for (new a = 0; a < ppl; ++a) @@ -1088,7 +1088,7 @@ play_sound(id, sound[]) } else { - new players[32], pnum, id + new players[MAX_PLAYERS], pnum, id get_players(players, pnum, "ch") for(--pnum; pnum>=0; pnum--) diff --git a/plugins/cstrike/restmenu.sma b/plugins/cstrike/restmenu.sma index cc72f1f2..fffe3cce 100755 --- a/plugins/cstrike/restmenu.sma +++ b/plugins/cstrike/restmenu.sma @@ -19,14 +19,14 @@ #define MAXMENUPOS 34 -new g_Position[MAX_PLAYERS] +new g_Position[MAX_PLAYERS + 1] new g_Modified new g_blockPos[112] new g_saveFile[64] new g_Restricted[] = "* This item is restricted *" new g_szWeapRestr[27] = "00000000000000000000000000" new g_szEquipAmmoRestr[10] = "000000000" -new g_InBuyMenu[MAX_PLAYERS] +new g_InBuyMenu[MAX_PLAYERS + 1] new g_RegisteredMenus[10] new g_menuStrings[6][] = @@ -283,8 +283,8 @@ new g_Aliases2[MAXMENUPOS][] = } #define AUTOBUYLENGTH 511 -new g_Autobuy[MAX_PLAYERS][AUTOBUYLENGTH + 1] -//new g_Rebuy[MAX_PLAYERS][AUTOBUYLENGTH + 1] +new g_Autobuy[MAX_PLAYERS + 1][AUTOBUYLENGTH + 1] +//new g_Rebuy[MAX_PLAYERS + 1][AUTOBUYLENGTH + 1] bool:IsOurMenuID(id) { diff --git a/plugins/cstrike/stats_logging.sma b/plugins/cstrike/stats_logging.sma index ff9cdaab..de4f7047 100755 --- a/plugins/cstrike/stats_logging.sma +++ b/plugins/cstrike/stats_logging.sma @@ -14,9 +14,9 @@ #include #include -new g_pingSum[MAX_PLAYERS] -new g_pingCount[MAX_PLAYERS] -new g_inGame[MAX_PLAYERS] +new g_pingSum[MAX_PLAYERS + 1] +new g_pingCount[MAX_PLAYERS + 1] +new g_inGame[MAX_PLAYERS + 1] public plugin_init() { diff --git a/plugins/cstrike/statsx.sma b/plugins/cstrike/statsx.sma index 882f1494..1effdc4c 100755 --- a/plugins/cstrike/statsx.sma +++ b/plugins/cstrike/statsx.sma @@ -107,56 +107,56 @@ new BODY_PART[8][] = #define KILLED_TEAM 3 // Killer's team #define KILLED_KILLER_STATSFIX 4 // Fix to register the last hit/kill -new g_izKilled[MAX_PLAYERS][5] +new g_izKilled[MAX_PLAYERS + 1][5] // Menu variables and configuration #define MAX_PPL_MENU_ACTIONS 2 // Number of player menu actions #define PPL_MENU_OPTIONS 7 // Number of player options per displayed menu -new g_iPluginMode = 0 +new g_iPluginMode = 0 -new g_izUserMenuPosition[MAX_PLAYERS] = {0, ...} -new g_izUserMenuAction[MAX_PLAYERS] = {0, ...} -new g_izUserMenuPlayers[MAX_PLAYERS][32] +new g_izUserMenuPosition[MAX_PLAYERS + 1] = {0, ...} +new g_izUserMenuAction[MAX_PLAYERS + 1] = {0, ...} +new g_izUserMenuPlayers[MAX_PLAYERS + 1][32] -new g_izSpecMode[MAX_PLAYERS] = {0, ...} +new g_izSpecMode[MAX_PLAYERS + 1] = {0, ...} -new g_izShowStatsFlags[MAX_PLAYERS] = {0, ...} -new g_izStatsSwitch[MAX_PLAYERS] = {0, ...} -new Float:g_fzShowUserStatsTime[MAX_PLAYERS] = {0.0, ...} -new Float:g_fShowStatsTime = 0.0 -new Float:g_fFreezeTime = 0.0 -new Float:g_fFreezeLimitTime = 0.0 -new Float:g_fHUDDuration = 0.0 +new g_izShowStatsFlags[MAX_PLAYERS + 1] = {0, ...} +new g_izStatsSwitch[MAX_PLAYERS + 1] = {0, ...} +new Float:g_fzShowUserStatsTime[MAX_PLAYERS + 1] = {0.0, ...} +new Float:g_fShowStatsTime = 0.0 +new Float:g_fFreezeTime = 0.0 +new Float:g_fFreezeLimitTime = 0.0 +new Float:g_fHUDDuration = 0.0 -new g_iRoundEndTriggered = 0 -new g_iRoundEndProcessed = 0 +new g_iRoundEndTriggered = 0 +new g_iRoundEndProcessed = 0 -new g_pFreezeTime = 0 -new g_pRoundTime = 0 -new g_pHudDuration = 0 -new g_pHudFreezeLimit = 0 +new g_pFreezeTime = 0 +new g_pRoundTime = 0 +new g_pHudDuration = 0 +new g_pHudFreezeLimit = 0 -new Float:g_fStartGame = 0.0 -new g_izTeamScore[MAX_TEAMS] = {0, ...} -new g_izTeamEventScore[MAX_TEAMS] = {0, ...} +new Float:g_fStartGame = 0.0 +new g_izTeamScore[MAX_TEAMS] = {0, ...} +new g_izTeamEventScore[MAX_TEAMS] = {0, ...} new g_izTeamRndStats[MAX_TEAMS][8] new g_izTeamGameStats[MAX_TEAMS][8] -new g_izUserUserID[MAX_PLAYERS] = {0, ...} -new g_izUserAttackerDistance[MAX_PLAYERS] = {0, ...} -new g_izUserVictimDistance[MAX_PLAYERS][MAX_PLAYERS] -new g_izUserRndName[MAX_PLAYERS][MAX_NAME_LENGTH] -new g_izUserRndStats[MAX_PLAYERS][8] -new g_izUserGameStats[MAX_PLAYERS][8] +new g_izUserUserID[MAX_PLAYERS + 1] = {0, ...} +new g_izUserAttackerDistance[MAX_PLAYERS + 1] = {0, ...} +new g_izUserVictimDistance[MAX_PLAYERS + 1][MAX_PLAYERS + 1] +new g_izUserRndName[MAX_PLAYERS + 1][MAX_NAME_LENGTH] +new g_izUserRndStats[MAX_PLAYERS + 1][8] +new g_izUserGameStats[MAX_PLAYERS + 1][8] // Common buffer to improve performance, as Small always zero-initializes all vars -new g_sBuffer[MAX_BUFFER_LENGTH + 1] = "" -new g_sScore[MAX_TEXT_LENGTH + 1] = "" -new g_sAwardAndScore[MAX_BUFFER_LENGTH + 1] = "" +new g_sBuffer[MAX_BUFFER_LENGTH + 1] = "" +new g_sScore[MAX_TEXT_LENGTH + 1] = "" +new g_sAwardAndScore[MAX_BUFFER_LENGTH + 1] = "" -new t_sText[MAX_TEXT_LENGTH + 1] = "" -new t_sName[MAX_NAME_LENGTH + 1] = "" -new t_sWpn[MAX_WEAPON_LENGTH + 1] = "" +new t_sText[MAX_TEXT_LENGTH + 1] = "" +new t_sName[MAX_NAME_LENGTH + 1] = "" +new t_sWpn[MAX_WEAPON_LENGTH + 1] = "" new g_HudSync_EndRound new g_HudSync_SpecInfo @@ -1547,7 +1547,7 @@ endround_stats() if (g_iRoundEndProcessed || !g_iRoundEndTriggered) return - new iaPlayers[32], iPlayer, iPlayers, id + new iaPlayers[MAX_PLAYERS], iPlayer, iPlayers, id get_players(iaPlayers, iPlayers) @@ -1599,7 +1599,7 @@ public eventIntermission() public end_game_stats() { - new iaPlayers[32], iPlayer, iPlayers, id + new iaPlayers[MAX_PLAYERS], iPlayer, iPlayers, id if (EndPlayer) { diff --git a/plugins/dod/plmenu.sma b/plugins/dod/plmenu.sma index 46822632..031e462a 100755 --- a/plugins/dod/plmenu.sma +++ b/plugins/dod/plmenu.sma @@ -15,14 +15,14 @@ #include #include -new g_menuPosition[MAX_PLAYERS] -new g_menuPlayers[MAX_PLAYERS][32] -new g_menuPlayersNum[MAX_PLAYERS] -new g_menuOption[MAX_PLAYERS] -new g_menuSettings[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] +new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayersNum[MAX_PLAYERS + 1] +new g_menuOption[MAX_PLAYERS + 1] +new g_menuSettings[MAX_PLAYERS + 1] -new g_menuSelect[MAX_PLAYERS][64] -new g_menuSelectNum[MAX_PLAYERS] +new g_menuSelect[MAX_PLAYERS + 1][64] +new g_menuSelectNum[MAX_PLAYERS + 1] #define MAX_CLCMDS 24 diff --git a/plugins/dod/stats.sma b/plugins/dod/stats.sma index 2e3cebb3..e61ad543 100755 --- a/plugins/dod/stats.sma +++ b/plugins/dod/stats.sma @@ -66,20 +66,20 @@ public EnemyGreKillSound public LeadSounds public MortarKill -new g_streakKills[MAX_PLAYERS][2] -new g_multiKills[MAX_PLAYERS][2] +new g_streakKills[MAX_PLAYERS + 1][2] +new g_multiKills[MAX_PLAYERS + 1][2] new Float:g_prevKill new g_prevKillerId new g_KillCount; new g_RoundScore[2] -new g_userPosition[MAX_PLAYERS] -new g_userState[MAX_PLAYERS] -new g_userPlayers[MAX_PLAYERS][32] +new g_userPosition[MAX_PLAYERS + 1] +new g_userState[MAX_PLAYERS + 1] +new g_userPlayers[MAX_PLAYERS + 1][32] new g_Buffer[2048] -new g_Killers[MAX_PLAYERS][3] -new Float:g_DeathStats[MAX_PLAYERS] +new g_Killers[MAX_PLAYERS + 1][3] +new Float:g_DeathStats[MAX_PLAYERS + 1] new g_damage_sync new g_center1_sync @@ -259,14 +259,14 @@ public cmdFF(id){ public endGameStats(){ new i if ( EndPlayer ){ - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) for(i = 0; i < inum; ++i){ displayStats_steam(players[i],players[i]) } } else if ( EndTop15 ){ - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) new g_Top[16], top = get_cvar_num("dodstats_topvalue") @@ -479,7 +479,7 @@ public round_end(){ if ( !EndRoundStats ) return PLUGIN_CONTINUE - new g_Buffer2[1024], len, players[32], pnum, stats[9],bodyhits[8] + new g_Buffer2[1024], len, players[MAX_PLAYERS], pnum, stats[9],bodyhits[8] get_players( players , pnum ) @@ -719,7 +719,7 @@ public client_death(killer,victim,wpnindex,hitplace,TK) if ( headshot && (HeadShotKill || HeadShotKillSound) && !xmod_is_melee_wpn(wpnindex) ){ if ( HeadShotKill ){ - new weapon[32], message[256], players[32], pnum + new weapon[32], message[256], players[MAX_PLAYERS], pnum xmod_get_wpnname(wpnindex,weapon,charsmax(weapon)) get_players(players,pnum,"c") @@ -817,7 +817,7 @@ public checkKills(param[]){ new LeaderScore new NumOfLeaders new LeaderID -new PScore[MAX_PLAYERS] +new PScore[MAX_PLAYERS + 1] public client_disconnect(id) { if ( !LeadSounds || isDSMActive() ) return PLUGIN_CONTINUE @@ -826,7 +826,7 @@ public client_disconnect(id) { PScore[id] = 0 if ( NumOfLeaders == 0 ){ LeaderScore = 0 - for ( new i=1; i LeaderScore ){ @@ -853,7 +853,7 @@ public client_disconnect(id) { client_cmd( LeaderID,"spk misc/takenlead" ) } else { - for ( new i=1; i 1 ){ - for ( new i=1; i #include -new g_pingSum[MAX_PLAYERS] -new g_pingCount[MAX_PLAYERS] +new g_pingSum[MAX_PLAYERS + 1] +new g_pingCount[MAX_PLAYERS + 1] public plugin_init() register_plugin("Stats Logging",AMXX_VERSION_STR,"AMXX Dev Team") diff --git a/plugins/mapsmenu.sma b/plugins/mapsmenu.sma index 15d49ccd..8d775ae5 100755 --- a/plugins/mapsmenu.sma +++ b/plugins/mapsmenu.sma @@ -16,12 +16,12 @@ new Array:g_mapName; new g_mapNums -new g_menuPosition[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] new g_voteCount[5] -new g_voteSelected[MAX_PLAYERS][4] -new g_voteSelectedNum[MAX_PLAYERS] +new g_voteSelected[MAX_PLAYERS + 1][4] +new g_voteSelectedNum[MAX_PLAYERS + 1] new g_coloredMenus @@ -97,7 +97,7 @@ public actionResult(id, key) public checkVotes(id) { id -= 34567 - new num, ppl[32], a = 0 + new num, ppl[MAX_PLAYERS], a = 0 get_players(ppl, num, "c") if (num == 0) num = 1 @@ -334,7 +334,7 @@ public actionVoteMapMenu(id, key) set_task(vote_time, "checkVotes", 34567 + id) new menuBody[512] - new players[32] + new players[MAX_PLAYERS] new pnum, keys, len get_players(players, pnum) diff --git a/plugins/menufront.sma b/plugins/menufront.sma index 4ef6fdab..d7ad3dec 100755 --- a/plugins/menufront.sma +++ b/plugins/menufront.sma @@ -20,7 +20,7 @@ #define MENUITEMSPERPAGE 8 //#define MENUS_NUMBER 16 -new g_menuPosition[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] new g_menusNumber = 0 new g_menuBody[MAXMENUS][STRINGSIZE] new bool:g_menuBodyPhrase[MAXMENUS] @@ -30,7 +30,7 @@ new g_menuPlugin[MAXMENUS][STRINGSIZE] new g_coloredMenus -new g_clientMenuPosition[MAX_PLAYERS] +new g_clientMenuPosition[MAX_PLAYERS + 1] new g_clientMenusNumber = 0 new g_clientMenuBody[MAXMENUS][STRINGSIZE] new bool:g_clientMenuBodyPhrase[MAXMENUS] diff --git a/plugins/multilingual.sma b/plugins/multilingual.sma index 6c41a2fe..253fda3c 100755 --- a/plugins/multilingual.sma +++ b/plugins/multilingual.sma @@ -14,7 +14,7 @@ #include #include -new g_menuLang[MAX_PLAYERS] +new g_menuLang[MAX_PLAYERS + 1] new g_langNum new g_coloredMenus diff --git a/plugins/ns/idlekicker.sma b/plugins/ns/idlekicker.sma index 1cc9c3cd..47c045a3 100755 --- a/plugins/ns/idlekicker.sma +++ b/plugins/ns/idlekicker.sma @@ -19,10 +19,10 @@ #define CHECK_FREQ 5 // This is also the warning message frequency. #define CLASS_GESTATE 9 -new g_oldangles[MAX_PLAYERS][3] -new g_idletime[MAX_PLAYERS] -new bool:g_spawned[MAX_PLAYERS] = {true, ...} -new g_class[MAX_PLAYERS] // stored info from the "ScoreInfo" message +new g_oldangles[MAX_PLAYERS + 1][3] +new g_idletime[MAX_PLAYERS + 1] +new bool:g_spawned[MAX_PLAYERS + 1] = {true, ...} +new g_class[MAX_PLAYERS + 1] // stored info from the "ScoreInfo" message new mp_tournamentmode; new amx_idle_time; @@ -129,17 +129,9 @@ public delayedSpawn(sid[]) { public msgScoreInfo() { new id=read_data(1); - if (id>32||id<1) { - // just incase.. - return; - } g_class[id]=read_data(5); } public msgScoreInfo32() { new id=read_data(1); - if (id>32||id<1) { - // just incase.. - return; - } g_class[id]=read_data(6); } diff --git a/plugins/ns/nextmap.sma b/plugins/ns/nextmap.sma index 3aff535d..f04fb637 100755 --- a/plugins/ns/nextmap.sma +++ b/plugins/ns/nextmap.sma @@ -115,7 +115,7 @@ public getNextValidMap(szNextMap[]) { while(looped < 2) { new minPlayers = g_mapCycle[g_nextPos][MIN] new maxPlayers = g_mapCycle[g_nextPos][MAX] - if (maxPlayers == 0) maxPlayers = 32 + if (maxPlayers == 0) maxPlayers = MAX_PLAYERS if (minPlayers <= g_numPlayers <= maxPlayers) break if (minPlayers <= curNumPlayers <= maxPlayers) { g_numPlayers = curNumPlayers @@ -215,9 +215,9 @@ readMapCycle() { new szKey1[11], szKey2[11], szValue1[3], szValue2[3] parse(szMapPlayerNum, szKey1, charsmax(szKey1), szValue1, charsmax(szValue1), szKey2, charsmax(szKey2), szValue2, charsmax(szValue2)) if (equal(szKey1, "minplayers")) - g_mapCycle[g_numMaps][MIN] = clamp(str_to_num(szValue1), 0, 32) + g_mapCycle[g_numMaps][MIN] = clamp(str_to_num(szValue1), 0, MAX_PLAYERS) if (equal(szKey2, "maxplayers")) - g_mapCycle[g_numMaps][MAX] = clamp(str_to_num(szValue2), 0, 32) + g_mapCycle[g_numMaps][MAX] = clamp(str_to_num(szValue2), 0, MAX_PLAYERS) if (++g_numMaps == MAX_MAPS) break } diff --git a/plugins/ns/nscommands.sma b/plugins/ns/nscommands.sma index 48b0e128..faef04be 100755 --- a/plugins/ns/nscommands.sma +++ b/plugins/ns/nscommands.sma @@ -50,9 +50,8 @@ enum { TEAM_SPECTATOR }; - -new g_Class[MAX_PLAYERS]; // stored info from the "ScoreInfo" message -new g_Team[MAX_PLAYERS]; +new g_Class[MAX_PLAYERS + 1] = {0, ...}; // stored info from the "ScoreInfo" message +new g_Team[MAX_PLAYERS + 1] = {1, ...}; new g_ScoreInfo_Class; new g_ScoreInfo_Team; @@ -80,14 +79,6 @@ public plugin_init() { register_concmd("amx_random","cmdRandom",ADMIN_LEVEL_H," - omit to do all in rr"); register_concmd("amx_readyroom","cmdReadyRoom",ADMIN_LEVEL_H," - omit to do everybody"); - // clear class info.. - new i=0; - while (i32||id<1) { - // just incase.. - return; - } g_Class[id]=read_data(g_ScoreInfo_Class); g_Team[id]=read_data(g_ScoreInfo_Team); } @@ -123,7 +110,7 @@ public client_connect(id) { } stock UTIL_FindCommander() { new i=1; - while (i #include -new g_menuPosition[MAX_PLAYERS] -new g_menuPlayers[MAX_PLAYERS][32] -new g_menuPlayersNum[MAX_PLAYERS] -new g_menuOption[MAX_PLAYERS] -new g_menuSettings[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] +new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayersNum[MAX_PLAYERS + 1] +new g_menuOption[MAX_PLAYERS + 1] +new g_menuSettings[MAX_PLAYERS + 1] -new g_menuSelect[MAX_PLAYERS][64] -new g_menuSelectNum[MAX_PLAYERS] +new g_menuSelect[MAX_PLAYERS + 1][64] +new g_menuSelectNum[MAX_PLAYERS + 1] #define MAX_CLCMDS 24 diff --git a/plugins/ns/unstuck.sma b/plugins/ns/unstuck.sma index d5121885..256ea019 100755 --- a/plugins/ns/unstuck.sma +++ b/plugins/ns/unstuck.sma @@ -18,7 +18,7 @@ #define MAX_ATTEMPTS 128 // How many times to search in an area for a free space #define BLOCKED_MASKS MASK_PLAYER_STUNNED | MASK_ENSNARED | MASK_ALIEN_EMBRYO -new Float:g_lastcmdtime[MAX_PLAYERS] +new Float:g_lastcmdtime[MAX_PLAYERS + 1] new amx_unstuck_frequency; diff --git a/plugins/pausecfg.sma b/plugins/pausecfg.sma index 43897a8b..db4d0168 100755 --- a/plugins/pausecfg.sma +++ b/plugins/pausecfg.sma @@ -21,7 +21,7 @@ #define MAX_SYSTEM 32 -new g_menuPos[MAX_PLAYERS] +new g_menuPos[MAX_PLAYERS + 1] new g_fileToSave[64] new g_coloredMenus new g_Modified diff --git a/plugins/plmenu.sma b/plugins/plmenu.sma index 33b029fe..aae4b43e 100755 --- a/plugins/plmenu.sma +++ b/plugins/plmenu.sma @@ -19,14 +19,14 @@ #include #include -new g_menuPosition[MAX_PLAYERS]; -new g_menuPlayers[MAX_PLAYERS][32]; -new g_menuPlayersNum[MAX_PLAYERS]; -new g_menuOption[MAX_PLAYERS]; -new g_menuSettings[MAX_PLAYERS]; +new g_menuPosition[MAX_PLAYERS + 1]; +new g_menuPlayers[MAX_PLAYERS + 1][32]; +new g_menuPlayersNum[MAX_PLAYERS + 1]; +new g_menuOption[MAX_PLAYERS + 1]; +new g_menuSettings[MAX_PLAYERS + 1]; -new g_menuSelect[MAX_PLAYERS][64]; -new g_menuSelectNum[MAX_PLAYERS]; +new g_menuSelect[MAX_PLAYERS + 1][64]; +new g_menuSelectNum[MAX_PLAYERS + 1]; #define MAX_CLCMDS 24 @@ -58,7 +58,7 @@ new g_CSTeamiNumbers[3] = { 3 }; -new g_CSPlayerCanSwitchFromSpec[MAX_PLAYERS]; +new g_CSPlayerCanSwitchFromSpec[MAX_PLAYERS + 1]; new g_transferingAdmin; new allow_spectators, mp_limitteams; @@ -66,7 +66,7 @@ new allow_spectators, mp_limitteams; new p_amx_tempban_maxtime; new Trie:g_tempBans; -new g_silent[MAX_PLAYERS]; +new g_silent[MAX_PLAYERS + 1]; public plugin_natives() { diff --git a/plugins/pluginmenu.sma b/plugins/pluginmenu.sma index b35dfdd2..01d50a50 100644 --- a/plugins/pluginmenu.sma +++ b/plugins/pluginmenu.sma @@ -20,25 +20,25 @@ new DisabledCallback; new EnabledCallback; // pcvar that the client is currently modifying -new CurrentCvar[MAX_PLAYERS]; +new CurrentCvar[MAX_PLAYERS + 1]; // Name of the cvar being modified -new CurrentCvarName[MAX_PLAYERS][32]; +new CurrentCvarName[MAX_PLAYERS + 1][32]; // Plugin ID that the client is modifying -new CurrentPlid[MAX_PLAYERS]; +new CurrentPlid[MAX_PLAYERS + 1]; // Page that the client is currently on -new CurrentPage[MAX_PLAYERS]; +new CurrentPage[MAX_PLAYERS + 1]; // Menu function ID that the client is in -new CurrentMenuFunction[MAX_PLAYERS] = { -1,... }; +new CurrentMenuFunction[MAX_PLAYERS + 1] = { -1,... }; -new CurrentCommand[MAX_PLAYERS][32]; +new CurrentCommand[MAX_PLAYERS + 1][32]; new cvarmenu_cmdid; new cmdmenu_cmdid; -new ExplicitPlugin[MAX_PLAYERS]; +new ExplicitPlugin[MAX_PLAYERS + 1]; public plugin_init() { diff --git a/plugins/statscfg.sma b/plugins/statscfg.sma index fc4a663a..665d9351 100755 --- a/plugins/statscfg.sma +++ b/plugins/statscfg.sma @@ -20,7 +20,7 @@ new g_menuData[MAX_MENU_DATA][32] new g_menuDataVar[MAX_MENU_DATA][32] new g_menuDataId[MAX_MENU_DATA] new g_menuDataNum -new g_menuPosition[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] new g_fileToSave[64] new bool:g_modified new g_coloredMenus diff --git a/plugins/telemenu.sma b/plugins/telemenu.sma index c3314e86..2d9c90cf 100755 --- a/plugins/telemenu.sma +++ b/plugins/telemenu.sma @@ -15,12 +15,12 @@ #include #include -new g_menuPosition[MAX_PLAYERS] -new g_menuPlayers[MAX_PLAYERS][32] -new g_menuPlayersNum[MAX_PLAYERS] -new g_menuOption[MAX_PLAYERS] = {-1, ...} -new Float:g_menuOrigin[MAX_PLAYERS][3] -new Float:g_menuVAngle[MAX_PLAYERS][3] +new g_menuPosition[MAX_PLAYERS + 1] +new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayersNum[MAX_PLAYERS + 1] +new g_menuOption[MAX_PLAYERS + 1] = {-1, ...} +new Float:g_menuOrigin[MAX_PLAYERS + 1][3] +new Float:g_menuVAngle[MAX_PLAYERS + 1][3] new g_coloredMenus new g_bDuckingStateSaved diff --git a/plugins/tfc/plmenu.sma b/plugins/tfc/plmenu.sma index afa41b0c..3700aa28 100755 --- a/plugins/tfc/plmenu.sma +++ b/plugins/tfc/plmenu.sma @@ -15,14 +15,14 @@ #include #include -new g_menuPosition[MAX_PLAYERS] -new g_menuPlayers[MAX_PLAYERS][32] -new g_menuPlayersNum[MAX_PLAYERS] -new g_menuOption[MAX_PLAYERS] -new g_menuSettings[MAX_PLAYERS] +new g_menuPosition[MAX_PLAYERS + 1] +new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayersNum[MAX_PLAYERS + 1] +new g_menuOption[MAX_PLAYERS + 1] +new g_menuSettings[MAX_PLAYERS + 1] -new g_menuSelect[MAX_PLAYERS][64] -new g_menuSelectNum[MAX_PLAYERS] +new g_menuSelect[MAX_PLAYERS + 1][64] +new g_menuSelectNum[MAX_PLAYERS + 1] #define MAX_CLCMDS 24 diff --git a/plugins/tfc/stats.sma b/plugins/tfc/stats.sma index 4ccde47b..1d804ad1 100755 --- a/plugins/tfc/stats.sma +++ b/plugins/tfc/stats.sma @@ -55,20 +55,20 @@ public DoubleKill public DoubleKillSound public BulletDamage -new g_streakKills[MAX_PLAYERS][2] -new g_multiKills[MAX_PLAYERS][2] +new g_streakKills[MAX_PLAYERS + 1][2] +new g_multiKills[MAX_PLAYERS + 1][2] new Float:g_prevKill new g_prevKillerId new g_KillCount; -new g_userPosition[MAX_PLAYERS] -new g_userState[MAX_PLAYERS] -new g_userPlayers[MAX_PLAYERS][32] +new g_userPosition[MAX_PLAYERS + 1] +new g_userState[MAX_PLAYERS + 1] +new g_userPlayers[MAX_PLAYERS + 1][32] new g_Buffer[2048] -new g_Killers[MAX_PLAYERS][4] -new Float:g_DeathStats[MAX_PLAYERS] +new g_Killers[MAX_PLAYERS + 1][4] +new Float:g_DeathStats[MAX_PLAYERS + 1] new g_center1_sync new g_center2_sync @@ -286,14 +286,14 @@ getTop15(){ public endGameStats(){ if ( EndPlayer ){ - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) for(new i = 0; i < inum; ++i){ displayStats(players[i],players[i]) } } else if ( EndTop15 ){ - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) getTop15() for(new i = 0; i < inum; ++i) diff --git a/plugins/tfc/stats_logging.sma b/plugins/tfc/stats_logging.sma index e7957629..9a6750a8 100755 --- a/plugins/tfc/stats_logging.sma +++ b/plugins/tfc/stats_logging.sma @@ -14,8 +14,8 @@ #include #include -new g_pingSum[MAX_PLAYERS] -new g_pingCount[MAX_PLAYERS] +new g_pingSum[MAX_PLAYERS + 1] +new g_pingCount[MAX_PLAYERS + 1] public plugin_init() register_plugin("TFC Stats Logging",AMXX_VERSION_STR,"AMXX Dev Team") diff --git a/plugins/timeleft.sma b/plugins/timeleft.sma index ae785b8d..e03b77a2 100755 --- a/plugins/timeleft.sma +++ b/plugins/timeleft.sma @@ -245,7 +245,7 @@ public timeRemain(param[]) if (flags & TD_BOTTOM_WHITE_TEXT) { - new players[32], pnum, plr + new players[MAX_PLAYERS], pnum, plr get_players(players, pnum, "c") diff --git a/plugins/ts/stats.sma b/plugins/ts/stats.sma index 56439e41..10de534a 100755 --- a/plugins/ts/stats.sma +++ b/plugins/ts/stats.sma @@ -57,12 +57,12 @@ public BulletDamage public TAInfo public FragInfo -new g_userPosition[MAX_PLAYERS] -new g_userState[MAX_PLAYERS] -new g_userPlayers[MAX_PLAYERS][32] +new g_userPosition[MAX_PLAYERS + 1] +new g_userState[MAX_PLAYERS + 1] +new g_userPlayers[MAX_PLAYERS + 1][32] new g_Buffer[2048] -new g_Killers[MAX_PLAYERS][3] -new Float:g_DeathStats[MAX_PLAYERS] +new g_Killers[MAX_PLAYERS + 1][3] +new Float:g_DeathStats[MAX_PLAYERS + 1] new g_center1_sync new g_damage_sync @@ -231,13 +231,13 @@ getTop15(){ public endGameStats(){ if ( EndPlayer ){ - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) for(new i = 0; i < inum; ++i) displayStats(players[i],players[i]) } else if ( EndTop15 ) { - new players[32], inum + new players[MAX_PLAYERS], inum get_players(players,inum) getTop15() for(new i = 0; i < inum; ++i) diff --git a/plugins/ts/stats_logging.sma b/plugins/ts/stats_logging.sma index fd6e8ae7..91631995 100755 --- a/plugins/ts/stats_logging.sma +++ b/plugins/ts/stats_logging.sma @@ -16,8 +16,8 @@ #include #include -new g_pingSum[MAX_PLAYERS] -new g_pingCount[MAX_PLAYERS] +new g_pingSum[MAX_PLAYERS + 1] +new g_pingCount[MAX_PLAYERS + 1] public plugin_init() register_plugin("Stats Logging",AMXX_VERSION_STR,"AMXX Dev Team") From 91c4b5d708d4fe461c85be2ea47b44b404d32d32 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Sun, 1 Feb 2015 20:34:35 +0100 Subject: [PATCH 3/4] =?UTF-8?q?MAX=5F=C2=A8PLAYERS:=20Fix=20more.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/dod/stats.sma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dod/stats.sma b/plugins/dod/stats.sma index e61ad543..e9313b1a 100755 --- a/plugins/dod/stats.sma +++ b/plugins/dod/stats.sma @@ -75,7 +75,7 @@ new g_RoundScore[2] new g_userPosition[MAX_PLAYERS + 1] new g_userState[MAX_PLAYERS + 1] -new g_userPlayers[MAX_PLAYERS + 1][32] +new g_userPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_Buffer[2048] new g_Killers[MAX_PLAYERS + 1][3] From 14f06ca1bb06e2e77e16abb72293695b6557811b Mon Sep 17 00:00:00 2001 From: Arkshine Date: Sun, 1 Feb 2015 21:45:16 +0100 Subject: [PATCH 4/4] MAX_PLAYERS: Fix moar --- plugins/cstrike/statsx.sma | 2 +- plugins/dod/plmenu.sma | 2 +- plugins/ns/plmenu.sma | 2 +- plugins/plmenu.sma | 2 +- plugins/telemenu.sma | 2 +- plugins/tfc/plmenu.sma | 2 +- plugins/tfc/stats.sma | 2 +- plugins/ts/stats.sma | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/cstrike/statsx.sma b/plugins/cstrike/statsx.sma index 1effdc4c..bfe8e433 100755 --- a/plugins/cstrike/statsx.sma +++ b/plugins/cstrike/statsx.sma @@ -117,7 +117,7 @@ new g_iPluginMode = 0 new g_izUserMenuPosition[MAX_PLAYERS + 1] = {0, ...} new g_izUserMenuAction[MAX_PLAYERS + 1] = {0, ...} -new g_izUserMenuPlayers[MAX_PLAYERS + 1][32] +new g_izUserMenuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_izSpecMode[MAX_PLAYERS + 1] = {0, ...} diff --git a/plugins/dod/plmenu.sma b/plugins/dod/plmenu.sma index 031e462a..00961517 100755 --- a/plugins/dod/plmenu.sma +++ b/plugins/dod/plmenu.sma @@ -16,7 +16,7 @@ #include new g_menuPosition[MAX_PLAYERS + 1] -new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_menuPlayersNum[MAX_PLAYERS + 1] new g_menuOption[MAX_PLAYERS + 1] new g_menuSettings[MAX_PLAYERS + 1] diff --git a/plugins/ns/plmenu.sma b/plugins/ns/plmenu.sma index aa713cda..9e17572f 100644 --- a/plugins/ns/plmenu.sma +++ b/plugins/ns/plmenu.sma @@ -16,7 +16,7 @@ #include new g_menuPosition[MAX_PLAYERS + 1] -new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_menuPlayersNum[MAX_PLAYERS + 1] new g_menuOption[MAX_PLAYERS + 1] new g_menuSettings[MAX_PLAYERS + 1] diff --git a/plugins/plmenu.sma b/plugins/plmenu.sma index aae4b43e..672dc9e1 100755 --- a/plugins/plmenu.sma +++ b/plugins/plmenu.sma @@ -20,7 +20,7 @@ #include new g_menuPosition[MAX_PLAYERS + 1]; -new g_menuPlayers[MAX_PLAYERS + 1][32]; +new g_menuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS]; new g_menuPlayersNum[MAX_PLAYERS + 1]; new g_menuOption[MAX_PLAYERS + 1]; new g_menuSettings[MAX_PLAYERS + 1]; diff --git a/plugins/telemenu.sma b/plugins/telemenu.sma index 2d9c90cf..37fc8208 100755 --- a/plugins/telemenu.sma +++ b/plugins/telemenu.sma @@ -16,7 +16,7 @@ #include new g_menuPosition[MAX_PLAYERS + 1] -new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_menuPlayersNum[MAX_PLAYERS + 1] new g_menuOption[MAX_PLAYERS + 1] = {-1, ...} new Float:g_menuOrigin[MAX_PLAYERS + 1][3] diff --git a/plugins/tfc/plmenu.sma b/plugins/tfc/plmenu.sma index 3700aa28..d93289f9 100755 --- a/plugins/tfc/plmenu.sma +++ b/plugins/tfc/plmenu.sma @@ -16,7 +16,7 @@ #include new g_menuPosition[MAX_PLAYERS + 1] -new g_menuPlayers[MAX_PLAYERS + 1][32] +new g_menuPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_menuPlayersNum[MAX_PLAYERS + 1] new g_menuOption[MAX_PLAYERS + 1] new g_menuSettings[MAX_PLAYERS + 1] diff --git a/plugins/tfc/stats.sma b/plugins/tfc/stats.sma index 1d804ad1..ad4b4122 100755 --- a/plugins/tfc/stats.sma +++ b/plugins/tfc/stats.sma @@ -63,7 +63,7 @@ new g_KillCount; new g_userPosition[MAX_PLAYERS + 1] new g_userState[MAX_PLAYERS + 1] -new g_userPlayers[MAX_PLAYERS + 1][32] +new g_userPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_Buffer[2048] diff --git a/plugins/ts/stats.sma b/plugins/ts/stats.sma index 10de534a..2209d4a7 100755 --- a/plugins/ts/stats.sma +++ b/plugins/ts/stats.sma @@ -59,7 +59,7 @@ public FragInfo new g_userPosition[MAX_PLAYERS + 1] new g_userState[MAX_PLAYERS + 1] -new g_userPlayers[MAX_PLAYERS + 1][32] +new g_userPlayers[MAX_PLAYERS + 1][MAX_PLAYERS] new g_Buffer[2048] new g_Killers[MAX_PLAYERS + 1][3] new Float:g_DeathStats[MAX_PLAYERS + 1]