INSANEMODE/Recompilable-gscs-for-BO2-zombies-and-multiplayer
1
0
Fork 0
mirror of https://github.com/JezuzLizard/Recompilable-gscs-for-BO2-zombies-and-multiplayer.git synced 2025-06-08 01:47:50 -05:00
Code Issues Releases Wiki Activity

fixed several syntax errors and replace for loops with continues with while loops

Browse Source 
For loops and foreaches with continues cause an infinite loop with the current compiler. As a result they can only be used in a while loop so any instances of a foreach or for loop with a continue must be converted to a while loop.
This commit is contained in:
JezuzLizard 2020-05-07 15:29:11 -07:00
parent fdffeb40bb
commit 04c4467ded
1 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
patch_mp/maps/mp/gametypes/_globallogic.gsc
View File

@ -49,8 +49,6 @@
#include maps/mp/_utility; #include maps/mp/_utility;
#include common_scripts\utility;
init() //checked matches bo3 _globallogic.gsc within reason init() //checked matches bo3 _globallogic.gsc within reason
{ {
@ -66,10 +64,10 @@ init() //checked matches bo3 _globallogic.gsc within reason
level.wiiu = (GetDvar( "wiiuGame") == "true"); level.wiiu = (GetDvar( "wiiuGame") == "true");
level.onlineGame = SessionModeIsOnlineGame(); level.onlineGame = SessionModeIsOnlineGame();
level.console = (level.xenon || level.ps3 || level.wiiu); level.console = 0;
level.rankedMatch = ( GameModeIsUsingXP() && !isPreGame() ); level.rankedMatch = GameModeIsUsingXP();
level.leagueMatch = ( GameModeIsMode( level.GAMEMODE_LEAGUE_MATCH ) ); level.leagueMatch = GameModeIsMode( level.GAMEMODE_LEAGUE_MATCH );
level.contractsEnabled = !GetGametypeSetting( "disableContracts" ); level.contractsEnabled = !GetGametypeSetting( "disableContracts" );
@ -546,7 +544,7 @@ doSpawnQueueUpdates() //checked matches bo3 _globallogic.gsc within reason
isTeamAllDead( team ) //checked matches bo3 _globallogic.gsc within reason isTeamAllDead( team ) //checked matches bo3 _globallogic.gsc within reason
{ {
return (level.everExisted[team] && !level.aliveCount[team] && !level.playerLives[team] ); return level.everExisted[team] && !level.aliveCount[team] && !level.playerLives[team];
} }
areAllTeamsDead( ) //checked matches bo3 _globallogic.gsc within reason areAllTeamsDead( ) //checked matches bo3 _globallogic.gsc within reason
@ -613,10 +611,10 @@ doDeadEventUpdates() //checked changed to match bo3 _globallogic.gsc
else else
{ {
// everyone is dead // everyone is dead
if ( (totalAliveCount() == 0) && (totalPlayerLives() == 0) && level.maxPlayerCount > 1 ) if ( totalAliveCount() == 0 && totalPlayerLives() == 0 && level.maxPlayerCount > 1 )
{ {
[[level.onDeadEvent]]( "all" ); [[ level.onDeadEvent ]]( "all" );
return true;; return true;
} }
} }
@ -625,7 +623,7 @@ doDeadEventUpdates() //checked changed to match bo3 _globallogic.gsc
isOnlyOneLeftAliveOnTeam( team ) //checked matches bo3 _globallogic.gsc within reason isOnlyOneLeftAliveOnTeam( team ) //checked matches bo3 _globallogic.gsc within reason
{ {
return (level.lastAliveCount[team] > 1 && level.aliveCount[team] == 1 && level.playerLives[team] == 1 ); return level.lastAliveCount[team] > 1 && level.aliveCount[team] == 1 && level.playerLives[team] == 1 ;
} }
@ -639,7 +637,7 @@ doOneLeftEventUpdates() //checked matches bo3 _globallogic.gsc within reason
if ( isOnlyOneLeftAliveOnTeam( team ) ) if ( isOnlyOneLeftAliveOnTeam( team ) )
{ {
[[level.onOneLeftEvent]]( team ); [[level.onOneLeftEvent]]( team );
return true;; return true;
} }
} }
} }
@ -649,7 +647,7 @@ doOneLeftEventUpdates() //checked matches bo3 _globallogic.gsc within reason
if ( (totalAliveCount() == 1) && (totalPlayerLives() == 1) && level.maxPlayerCount > 1 ) if ( (totalAliveCount() == 1) && (totalPlayerLives() == 1) && level.maxPlayerCount > 1 )
{ {
[[level.onOneLeftEvent]]( "all" ); [[level.onOneLeftEvent]]( "all" );
return true;; return true;
} }
} }
@ -666,7 +664,7 @@ updateGameEvents() //checked matches bo3 _globallogic.gsc within reason
} }
#/ #/
*/ */
if ( ( level.rankedMatch || level.wagerMatch || level.leagueMatch ) && !level.inGracePeriod ) if ( level.rankedMatch && !level.inGracePeriod || level.wagerMatch && !level.inGracePeriod || level.leagueMatch && !level.inGracePeriod )
{ {
if ( level.teamBased ) if ( level.teamBased )
{ {
@ -867,12 +865,14 @@ sendAfterActionReport() //checked matches bo3 _globallogic.gsc within reason
} }
//Send After Action Report information to the client //Send After Action Report information to the client
for ( index = 0; index < level.players.size; index++ ) index = 0;
while ( index < level.players.size )
{ {
player = level.players[index]; player = level.players[index];
if ( player is_bot() ) if ( player is_bot() )
{ {
index++;
continue; continue;
} }
@ -890,7 +890,7 @@ sendAfterActionReport() //checked matches bo3 _globallogic.gsc within reason
if( player.pers["cur_kill_streak"] > player.pers["best_kill_streak"] ) if( player.pers["cur_kill_streak"] > player.pers["best_kill_streak"] )
player.pers["best_kill_streak"] = player.pers["cur_kill_streak"]; player.pers["best_kill_streak"] = player.pers["cur_kill_streak"];
if ( ( level.rankedMatch || level.wagerMatch || level.leagueMatch ) ) if ( level.rankedMatch || level.wagerMatch || level.leagueMatch )
player maps\mp\gametypes\_persistence::setAfterActionReportStat( "privateMatch", 0 ); player maps\mp\gametypes\_persistence::setAfterActionReportStat( "privateMatch", 0 );
else else
player maps\mp\gametypes\_persistence::setAfterActionReportStat( "privateMatch", 1 ); player maps\mp\gametypes\_persistence::setAfterActionReportStat( "privateMatch", 1 );
@ -942,7 +942,7 @@ sendAfterActionReport() //checked matches bo3 _globallogic.gsc within reason
} }
player maps\mp\gametypes\_persistence::setAfterActionReportStat( "wagerMatchFailed", 0 ); player maps\mp\gametypes\_persistence::setAfterActionReportStat( "wagerMatchFailed", 0 );
if ( ( level.rankedMatch || level.wagerMatch || level.leagueMatch ) ) if ( level.rankedMatch || level.wagerMatch || level.leagueMatch )
player maps\mp\gametypes\_persistence::setAfterActionReportStat( "valid", 1 ); player maps\mp\gametypes\_persistence::setAfterActionReportStat( "valid", 1 );
if ( IsDefined( player.pers["matchesPlayedStatsTracked"] ) ) if ( IsDefined( player.pers["matchesPlayedStatsTracked"] ) )
@ -967,6 +967,7 @@ sendAfterActionReport() //checked matches bo3 _globallogic.gsc within reason
recordPlayerMatchEnd( player ); recordPlayerMatchEnd( player );
RecordPlayerStats(player, "presentAtEnd", 1 ); RecordPlayerStats(player, "presentAtEnd", 1 );
index++;
} }
} }
@ -985,7 +986,8 @@ displayRoundEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc
setmatchflag( "cg_drawSpectatorMessages", 0 ); setmatchflag( "cg_drawSpectatorMessages", 0 );
players = level.players; players = level.players;
for ( index = 0; index < players.size; index++ ) index = 0;
while ( index < players.size )
{ {
player = players[index]; player = players[index];
@ -994,6 +996,7 @@ displayRoundEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc
player [[level.spawnIntermission]]( true ); player [[level.spawnIntermission]]( true );
player closeMenu(); player closeMenu();
player closeInGameMenu(); player closeInGameMenu();
index++;
continue; continue;
} }
@ -1018,8 +1021,9 @@ displayRoundEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc
} }
} }
player setClientUIVisibilityFlag( "hud_visible", 0 ); player setClientUIVisibilityFlag( "hud_visible", 0 );
player setClientUIVisibilityFlag( "g_compassShowEnemies", 0 ); player setClientUIVisibilityFlag( "g_compassShowEnemies", 0 );
index++;
} }
} }
@ -1071,7 +1075,8 @@ displayRoundSwitch( winner, endReasonText ) //checked matches bo3 _globallogic.g
SetMatchTalkFlag( "EveryoneHearsEveryone", 1 ); SetMatchTalkFlag( "EveryoneHearsEveryone", 1 );
players = level.players; players = level.players;
for ( index = 0; index < players.size; index++ ) index = 0;
while ( index < players.size )
{ {
player = players[index]; player = players[index];
@ -1080,6 +1085,7 @@ displayRoundSwitch( winner, endReasonText ) //checked matches bo3 _globallogic.g
player [[level.spawnIntermission]]( true ); player [[level.spawnIntermission]]( true );
player closeMenu(); player closeMenu();
player closeInGameMenu(); player closeInGameMenu();
index++;
continue; continue;
} }
@ -1091,6 +1097,7 @@ displayRoundSwitch( winner, endReasonText ) //checked matches bo3 _globallogic.g
else else
player thread [[level.onTeamOutcomeNotify]]( switchType, false, level.halftimeSubCaption ); player thread [[level.onTeamOutcomeNotify]]( switchType, false, level.halftimeSubCaption );
player setClientUIVisibilityFlag( "hud_visible", 0 ); player setClientUIVisibilityFlag( "hud_visible", 0 );
index++;
} }
roundEndWait( level.halftimeRoundEndDelay, false ); roundEndWait( level.halftimeRoundEndDelay, false );
@ -1114,7 +1121,8 @@ displayGameEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc w
} }
// catching gametype, since DM forceEnd sends winner as player entity, instead of string // catching gametype, since DM forceEnd sends winner as player entity, instead of string
players = level.players; players = level.players;
for ( index = 0; index < players.size; index++ ) index = 0;
while ( index < players.size )
{ {
player = players[index]; player = players[index];
@ -1123,6 +1131,7 @@ displayGameEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc w
player [[level.spawnIntermission]]( true ); player [[level.spawnIntermission]]( true );
player closeMenu(); player closeMenu();
player closeInGameMenu(); player closeInGameMenu();
index++;
continue; continue;
} }
@ -1157,6 +1166,7 @@ displayGameEnd( winner, endReasonText ) //checked matches bo3 _globallogic.gsc w
player setClientUIVisibilityFlag( "hud_visible", 0 ); player setClientUIVisibilityFlag( "hud_visible", 0 );
player setClientUIVisibilityFlag( "g_compassShowEnemies", 0 ); player setClientUIVisibilityFlag( "g_compassShowEnemies", 0 );
index++;
} }
if ( level.teamBased ) if ( level.teamBased )
@ -1419,7 +1429,7 @@ endGame( winner, endReasonText ) //checked matches bo3 _globallogic.gsc within r
} }
} }
if ( isdefined( winner ) && ( level.teambased && isdefined( level.teams[winner] ) ) ) if ( isdefined( winner ) && level.teambased && isdefined( level.teams[winner] ) )
{ {
level.finalKillCam_winner = winner; level.finalKillCam_winner = winner;
} }
@ -1470,8 +1480,8 @@ endGame( winner, endReasonText ) //checked matches bo3 _globallogic.gsc within r
} }
} }
} }
index = 0;
for ( index = 0; index < players.size; index++ ) while ( index < players.size )
{ {
player = players[index]; player = players[index];
player maps\mp\gametypes\_globallogic_player::freezePlayerForRoundEnd(); player maps\mp\gametypes\_globallogic_player::freezePlayerForRoundEnd();
@ -1485,15 +1495,17 @@ endGame( winner, endReasonText ) //checked matches bo3 _globallogic.gsc within r
player bbPlayerMatchEnd( gameLength, endReasonText, bbGameOver ); player bbPlayerMatchEnd( gameLength, endReasonText, bbGameOver );
if( isPregame() ) if( isPregame() )
index++;
continue; continue;
if( ( level.rankedMatch || level.wagerMatch || level.leagueMatch ) && !player IsSplitscreen() ) if( level.rankedMatch || level.wagerMatch || level.leagueMatch && !player IsSplitscreen() )
{ {
if ( isDefined( player.setPromotion ) ) if ( isDefined( player.setPromotion ) )
player setDStat( "AfterActionReportStats", "lobbyPopup", "promotion" ); player setDStat( "AfterActionReportStats", "lobbyPopup", "promotion" );
else else
player setDStat( "AfterActionReportStats", "lobbyPopup", "summary" ); player setDStat( "AfterActionReportStats", "lobbyPopup", "summary" );
} }
index++;
} }
maps\mp\_music::setmusicstate( "SILENT" ); maps\mp\_music::setmusicstate( "SILENT" );
@ -1532,7 +1544,7 @@ endGame( winner, endReasonText ) //checked matches bo3 _globallogic.gsc within r
setTopPlayerStats(); setTopPlayerStats();
thread maps\mp\_challenges::gameEnd( winner ); thread maps\mp\_challenges::gameEnd( winner );
if ( IsDefined( winner ) && ( !isDefined( level.skipGameEnd ) || !level.skipGameEnd ) ) if ( IsDefined( winner ) && !isDefined( level.skipGameEnd ) || !level.skipGameEnd )
displayGameEnd( winner, endReasonText ); displayGameEnd( winner, endReasonText );
if ( isOneRound() ) if ( isOneRound() )
@ -1609,12 +1621,15 @@ roundEndWait( defaultDelay, matchBonus ) //checked matches bo3 _globallogic.gsc
{ {
players = level.players; players = level.players;
notifiesDone = true; notifiesDone = true;
for ( index = 0; index < players.size; index++ ) index = 0;
while ( index < players.size )
{ {
if ( !isDefined( players[index].doingNotify ) || !players[index].doingNotify ) if ( !isDefined( players[index].doingNotify ) || !players[index].doingNotify )
index++;
continue; continue;
notifiesDone = false; notifiesDone = false;
index++;
} }
wait ( 0.5 ); wait ( 0.5 );
} }
@ -1635,12 +1650,15 @@ roundEndWait( defaultDelay, matchBonus ) //checked matches bo3 _globallogic.gsc
{ {
players = level.players; players = level.players;
notifiesDone = true; notifiesDone = true;
for ( index = 0; index < players.size; index++ ) index = 0;
while ( index < players.size )
{ {
if ( !isDefined( players[index].doingNotify ) || !players[index].doingNotify ) if ( !isDefined( players[index].doingNotify ) || !players[index].doingNotify )
index++;
continue; continue;
notifiesDone = false; notifiesDone = false;
index++;
} }
wait ( 0.5 ); wait ( 0.5 );
} }
@ -1834,11 +1852,11 @@ updatePlacement() //checked matches bo3 _globallogic.gsc within reason
for ( i = 1; i < placementAll.size; i++ ) for ( i = 1; i < placementAll.size; i++ )
{ {
player = placementAll[i]; player = placementAll[ i ];
playerScore = player.score; playerScore = player.score;
for ( j = i - 1; j >= 0 && (playerScore > placementAll[j].score || (playerScore == placementAll[j].score && player.deaths < placementAll[j].deaths)); j-- ) for ( j = i - 1; j >= 0 && playerScore > placementAll[j].score || playerScore == placementAll[j].score && player.deaths < placementAll[j].deaths; j-- )
placementAll[j + 1] = placementAll[j]; placementAll[ j + 1 ] = placementAll[ j ];
placementAll[j + 1] = player; placementAll[ j + 1 ] = player;
} }
level.placement["all"] = placementAll; level.placement["all"] = placementAll;
@ -2006,17 +2024,19 @@ updateTeamStatus() //checked matches bo3 _globallogic.gsc within reason
level.activePlayers = []; level.activePlayers = [];
players = level.players; players = level.players;
for ( i = 0; i < players.size; i++ ) i = 0;
while ( i < players.size )
{ {
player = players[i]; player = players[i];
if ( !isDefined( player ) && level.splitscreen ) if ( !isDefined( player ) && level.splitscreen )
i++;
continue; continue;
team = player.team; team = player.team;
class = player.class; class = player.class;
if ( team != "spectator" && (isDefined( class ) && class != "") ) if ( team != "spectator" && isDefined( class ) && class != "" )
{ {
level.playerCount[team]++; level.playerCount[team]++;
@ -2046,6 +2066,7 @@ updateTeamStatus() //checked matches bo3 _globallogic.gsc within reason
level.playerLives[team]++; level.playerLives[team]++;
} }
} }
i++;
} }
totalAlive = totalAliveCount(); totalAlive = totalAliveCount();
@ -2146,7 +2167,7 @@ timeLimitClock() //checked matches bo3 _globallogic.gsc within reason
if( timeLeftInt <= 32 ) if( timeLeftInt <= 32 )
level notify ( "match_ending_vox" ); level notify ( "match_ending_vox" );
if ( timeLeftInt <= 10 || (timeLeftInt <= 30 && timeLeftInt % 2 == 0) ) if ( timeLeftInt <= 10 || timeLeftInt <= 30 && timeLeftInt % 2 == 0 )
{ {
level notify ( "match_ending_very_soon", "time" ); level notify ( "match_ending_very_soon", "time" );
// don't play a tick at exactly 0 seconds, that's when something should be happening! // don't play a tick at exactly 0 seconds, that's when something should be happening!
@ -2629,8 +2650,9 @@ Callback_StartGameType() //checked does not match bo3 _globallogic.gsc did not c
stringNames = getArrayKeys( game["strings"] ); stringNames = getArrayKeys( game["strings"] );
for ( index = 0; index < stringNames.size; index++ ) for ( index = 0; index < stringNames.size; index++ )
precacheString( game["strings"][stringNames[index]] ); {
precacheString( game[ "strings" ][ stringNames[ index ] ] );
}
foreach( team in level.teams ) foreach( team in level.teams )
{ {
initTeamVariables( team ); initTeamVariables( team );
@ -2822,8 +2844,8 @@ getKillStreaks( player ) //checked matches bo3 _globallogic.gsc within reason
killstreak[ killstreakNum ] = "killstreak_null"; killstreak[ killstreakNum ] = "killstreak_null";
} }
if ( isPlayer( player ) && !level.oldschool && ( level.disableCAC != 1 ) && if ( isPlayer( player ) && !level.oldschool && level.disableCAC != 1 &&
( !isdefined( player.pers["isBot"] ) && isdefined(player.killstreak) ) ) !isdefined( player.pers["isBot"] ) && isdefined( player.killstreak ) )
{ {
currentKillstreak = 0; currentKillstreak = 0;
for ( killstreakNum = 0; killstreakNum < level.maxKillstreaks; killstreakNum++ ) for ( killstreakNum = 0; killstreakNum < level.maxKillstreaks; killstreakNum++ )
@ -2857,3 +2879,5 @@ updateRankedMatch(winner) //checked matches bo3 _globallogic.gsc within reason
} }
} }