mirror of
https://github.com/JezuzLizard/Recompilable-gscs-for-BO2-zombies-and-multiplayer.git
synced 2025-06-08 01:47:50 -05:00
fixed some newly found errors in _zm_gametype and replaced _globallogic with a better dump
This commit is contained in:
parent
e7e138c126
commit
fdffeb40bb
File diff suppressed because it is too large
Load Diff
@ -25,6 +25,7 @@ patch_mp/maps/mp/bots/_bot_loadout.gsc
|
|||||||
|
|
||||||
patch_mp/maps/mp/gametypes/_callbacksetup.gsc
|
patch_mp/maps/mp/gametypes/_callbacksetup.gsc
|
||||||
patch_mp/maps/mp/gametypes/_damagefeedback.gsc
|
patch_mp/maps/mp/gametypes/_damagefeedback.gsc
|
||||||
|
patch_mp/maps/mp/gametypes/_globallogic.gsc
|
||||||
patch_mp/maps/mp/gametypes/_healthoverlay.gsc
|
patch_mp/maps/mp/gametypes/_healthoverlay.gsc
|
||||||
patch_mp/maps/mp/gametypes/_hostmigration.gsc
|
patch_mp/maps/mp/gametypes/_hostmigration.gsc
|
||||||
patch_mp/maps/mp/gametypes/_hud.gsc
|
patch_mp/maps/mp/gametypes/_hud.gsc
|
||||||
@ -65,7 +66,6 @@ patch_mp/maps/mp/gametypes/_copter.gsc
|
|||||||
patch_mp/maps/mp/gametypes/_deathicons.gsc
|
patch_mp/maps/mp/gametypes/_deathicons.gsc
|
||||||
patch_mp/maps/mp/gametypes/_friendicons.gsc
|
patch_mp/maps/mp/gametypes/_friendicons.gsc
|
||||||
patch_mp/maps/mp/gametypes/_gameobjects.gsc
|
patch_mp/maps/mp/gametypes/_gameobjects.gsc
|
||||||
patch_mp/maps/mp/gametypes/_globallogic.gsc
|
|
||||||
patch_mp/maps/mp/gametypes/_globallogic_actor.gsc
|
patch_mp/maps/mp/gametypes/_globallogic_actor.gsc
|
||||||
patch_mp/maps/mp/gametypes/_globallogic_audio.gsc
|
patch_mp/maps/mp/gametypes/_globallogic_audio.gsc
|
||||||
patch_mp/maps/mp/gametypes/_globallogic_defaults.gsc
|
patch_mp/maps/mp/gametypes/_globallogic_defaults.gsc
|
||||||
|
@ -243,19 +243,20 @@ setup_standard_objects( location ) //checked partially used cerberus output
|
|||||||
{
|
{
|
||||||
keep = 0;
|
keep = 0;
|
||||||
tokens = strtok( structs[ i ].script_string, " " );
|
tokens = strtok( structs[ i ].script_string, " " );
|
||||||
i = 0;
|
j = 0;
|
||||||
while ( i < tokens.size )
|
while ( j < tokens.size )
|
||||||
{
|
{
|
||||||
if ( tokens[ i ] == level.scr_zm_ui_gametype && tokens[ i ] != "zstandard" )
|
if ( tokens[ j ] == level.scr_zm_ui_gametype && tokens[ j ] != "zstandard" )
|
||||||
{
|
{
|
||||||
keep = 1;
|
keep = 1;
|
||||||
i++;
|
j++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ( tokens[ i ] == "zstandard" )
|
if ( tokens[ j ] == "zstandard" )
|
||||||
{
|
{
|
||||||
keep = 1;
|
keep = 1;
|
||||||
}
|
}
|
||||||
|
j++;
|
||||||
}
|
}
|
||||||
if ( !keep )
|
if ( !keep )
|
||||||
{
|
{
|
||||||
@ -266,6 +267,7 @@ setup_standard_objects( location ) //checked partially used cerberus output
|
|||||||
barricade = spawn( "script_model", structs[ i ].origin );
|
barricade = spawn( "script_model", structs[ i ].origin );
|
||||||
barricade.angles = structs[ i ].angles;
|
barricade.angles = structs[ i ].angles;
|
||||||
barricade setmodel( structs[ i ].script_parameters );
|
barricade setmodel( structs[ i ].script_parameters );
|
||||||
|
i++;
|
||||||
}
|
}
|
||||||
objects = getentarray();
|
objects = getentarray();
|
||||||
i = 0;
|
i = 0;
|
||||||
@ -1259,7 +1261,7 @@ startnextzmround( winner ) //checked matches cerberus output
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
start_round() //checked matches cerberus output
|
start_round() //checked changed to match cerberus output
|
||||||
{
|
{
|
||||||
flag_clear( "start_encounters_match_logic" );
|
flag_clear( "start_encounters_match_logic" );
|
||||||
if ( !isDefined( level._module_round_hud ) )
|
if ( !isDefined( level._module_round_hud ) )
|
||||||
@ -1277,11 +1279,9 @@ start_round() //checked matches cerberus output
|
|||||||
level._module_round_hud.sort = 0;
|
level._module_round_hud.sort = 0;
|
||||||
}
|
}
|
||||||
players = get_players();
|
players = get_players();
|
||||||
i = 0;
|
for ( i = 0; i < players.size; i++ )
|
||||||
while ( i < players.size )
|
|
||||||
{
|
{
|
||||||
players[ i ] freeze_player_controls( 1 );
|
players[ i ] freeze_player_controls( 1 );
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
level._module_round_hud.alpha = 1;
|
level._module_round_hud.alpha = 1;
|
||||||
label = &"Next Round Starting In ^2";
|
label = &"Next Round Starting In ^2";
|
||||||
@ -1297,12 +1297,10 @@ start_round() //checked matches cerberus output
|
|||||||
wait 1;
|
wait 1;
|
||||||
level thread play_sound_2d( "zmb_air_horn" );
|
level thread play_sound_2d( "zmb_air_horn" );
|
||||||
players = get_players();
|
players = get_players();
|
||||||
i = 0;
|
while ( i = 0; i < players.size; i++; )
|
||||||
while ( i < players.size )
|
|
||||||
{
|
{
|
||||||
players[ i ] freeze_player_controls( 0 );
|
players[ i ] freeze_player_controls( 0 );
|
||||||
players[ i ] sprintuprequired();
|
players[ i ] sprintuprequired();
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
flag_set( "start_encounters_match_logic" );
|
flag_set( "start_encounters_match_logic" );
|
||||||
flag_clear( "pregame" );
|
flag_clear( "pregame" );
|
||||||
@ -1410,9 +1408,6 @@ onspawnplayer( predictedspawn ) //fixed checked changed partially to match cerbe
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( flag( "begin_spawning" ) )
|
if ( flag( "begin_spawning" ) )
|
||||||
{
|
{
|
||||||
spawnpoint = maps/mp/zombies/_zm::check_for_valid_spawn_near_team( self, 1 );
|
spawnpoint = maps/mp/zombies/_zm::check_for_valid_spawn_near_team( self, 1 );
|
||||||
@ -1421,13 +1416,11 @@ onspawnplayer( predictedspawn ) //fixed checked changed partially to match cerbe
|
|||||||
{
|
{
|
||||||
match_string = "";
|
match_string = "";
|
||||||
location = level.scr_zm_map_start_location;
|
location = level.scr_zm_map_start_location;
|
||||||
|
|
||||||
if ( ( location == "default" || location == "" ) && isDefined( level.default_start_location ) )
|
if ( ( location == "default" || location == "" ) && isDefined( level.default_start_location ) )
|
||||||
{
|
{
|
||||||
location = level.default_start_location;
|
location = level.default_start_location;
|
||||||
}
|
}
|
||||||
match_string = level.scr_zm_ui_gametype + "_" + location;
|
match_string = level.scr_zm_ui_gametype + "_" + location;
|
||||||
|
|
||||||
spawnpoints = [];
|
spawnpoints = [];
|
||||||
structs = getstructarray( "initial_spawn", "script_noteworthy" );
|
structs = getstructarray( "initial_spawn", "script_noteworthy" );
|
||||||
if ( isdefined( structs ) )
|
if ( isdefined( structs ) )
|
||||||
@ -1453,10 +1446,7 @@ onspawnplayer( predictedspawn ) //fixed checked changed partially to match cerbe
|
|||||||
{
|
{
|
||||||
spawnpoints = getstructarray( "initial_spawn_points", "targetname" );
|
spawnpoints = getstructarray( "initial_spawn_points", "targetname" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
spawnpoint = maps/mp/zombies/_zm::getfreespawnpoint( spawnpoints, self );
|
spawnpoint = maps/mp/zombies/_zm::getfreespawnpoint( spawnpoints, self );
|
||||||
}
|
|
||||||
if ( predictedspawn )
|
if ( predictedspawn )
|
||||||
{
|
{
|
||||||
self predictspawnpoint( spawnpoint.origin, spawnpoint.angles );
|
self predictspawnpoint( spawnpoint.origin, spawnpoint.angles );
|
||||||
@ -1466,6 +1456,8 @@ onspawnplayer( predictedspawn ) //fixed checked changed partially to match cerbe
|
|||||||
{
|
{
|
||||||
self spawn( spawnpoint.origin, spawnpoint.angles, "zsurvival" );
|
self spawn( spawnpoint.origin, spawnpoint.angles, "zsurvival" );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
self.entity_num = self getentitynumber();
|
self.entity_num = self getentitynumber();
|
||||||
self thread maps/mp/zombies/_zm::onplayerspawned();
|
self thread maps/mp/zombies/_zm::onplayerspawned();
|
||||||
self thread maps/mp/zombies/_zm::player_revive_monitor();
|
self thread maps/mp/zombies/_zm::player_revive_monitor();
|
||||||
@ -1521,11 +1513,10 @@ get_player_spawns_for_gametype() //fixed checked partially changed to match cerb
|
|||||||
player_spawns[ player_spawns.size ] = structs[ i ];
|
player_spawns[ player_spawns.size ] = structs[ i ];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
player_spawns[ player_spawns.size ] = structs[ i ];
|
player_spawns[ player_spawns.size ] = structs[ i ];
|
||||||
}
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
return player_spawns;
|
return player_spawns;
|
||||||
@ -2002,3 +1993,4 @@ blank()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user