mirror of
https://github.com/JezuzLizard/Recompilable-gscs-for-BO2-zombies-and-multiplayer.git
synced 2025-06-08 01:47:50 -05:00
made a small change relating to zone_flag_wait
This commit is contained in:
parent
5eb1b54b84
commit
057e88ea38
@ -1,3 +1,4 @@
|
||||
//checked include match cerberus output
|
||||
#include maps/mp/zombies/_zm_zonemgr;
|
||||
#include maps/mp/gametypes_zm/_zm_gametype;
|
||||
#include maps/mp/zombies/_zm_utility;
|
||||
@ -158,10 +159,12 @@ deactivate_initial_barrier_goals() //checked changed to match cerberus output
|
||||
|
||||
zone_init( zone_name ) //checked changed to match cerberus output
|
||||
{
|
||||
|
||||
if ( isDefined( level.zones[ zone_name ] ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
level.zones[ zone_name ] = spawnstruct();
|
||||
zone = level.zones[ zone_name ];
|
||||
zone.is_enabled = 0;
|
||||
@ -169,6 +172,7 @@ zone_init( zone_name ) //checked changed to match cerberus output
|
||||
zone.is_active = 0;
|
||||
zone.adjacent_zones = [];
|
||||
zone.is_spawning_allowed = 0;
|
||||
|
||||
spawn_points = maps/mp/gametypes_zm/_zm_gametype::get_player_spawns_for_gametype();
|
||||
for( i = 0; i < spawn_points.size; i++ )
|
||||
{
|
||||
@ -533,8 +537,9 @@ zone_flag_wait( flag_name )
|
||||
break;
|
||||
}
|
||||
}
|
||||
//break;
|
||||
}
|
||||
else
|
||||
{
|
||||
flags_set = 1;
|
||||
for ( f = 0; f < azone.flags.size; f++ )
|
||||
{
|
||||
@ -543,6 +548,7 @@ zone_flag_wait( flag_name )
|
||||
flags_set = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( flags_set )
|
||||
{
|
||||
enable_zone( zkeys[ z ] ); //essential priority over manage_zones //was disabled
|
||||
@ -569,7 +575,7 @@ zone_flag_wait( flag_name )
|
||||
{
|
||||
flag_set( check_flag[ k ] );
|
||||
}
|
||||
//break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -629,13 +635,13 @@ manage_zones( initial_zone ) //checked changed to match cerberus output
|
||||
for ( i = 0; i < initial_zone.size; i++ )
|
||||
{
|
||||
zone_init( initial_zone[ i ] );
|
||||
enable_zone( initial_zone[ i ] ); //was disabled
|
||||
enable_zone( initial_zone[ i ] );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
zone_init( initial_zone );
|
||||
enable_zone( initial_zone ); //was disabled
|
||||
enable_zone( initial_zone );
|
||||
}
|
||||
setup_zone_flag_waits();
|
||||
zkeys = getarraykeys( level.zones );
|
||||
@ -650,11 +656,6 @@ manage_zones( initial_zone ) //checked changed to match cerberus output
|
||||
flag_wait( "begin_spawning" );
|
||||
while ( getDvarInt( "noclip" ) == 0 || getDvarInt( "notarget" ) != 0 )
|
||||
{
|
||||
|
||||
players = get_players();
|
||||
zone = players[ 0 ] get_current_zone();
|
||||
players[ 0 ] iprintln( zone );
|
||||
|
||||
for( z = 0; z < zkeys.size; z++ )
|
||||
{
|
||||
level.newzones[ zkeys[ z ] ].is_active = 0;
|
||||
@ -1095,7 +1096,7 @@ is_player_in_zone( zone_name ) //checked changed to match cerberus output
|
||||
zone = level.zones[ zone_name ];
|
||||
for ( i = 0; i < zone.volumes.size; i++ )
|
||||
{
|
||||
if ( self istouching( level.zones[ zone_name ].volumes[ i ] ) && self.sessionstate != "spectator")
|
||||
if ( self istouching( level.zones[zone_name].volumes[ i ] ) && !self.sessionstate == "spectator" )
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user