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 bugs with _zm_gametype
level.wavespawntimer has been uncommented and now references its overrride in _globallogic. A for loop that wasn't fully made into a for loop has been fixed. A bug causing players to not spawn at proper spawnpoints has been fixed.
This commit is contained in:
parent
3f65ee59c8
commit
3a1b3ccfc2
@ -7,14 +7,17 @@
|
|||||||
#include maps/mp/gametypes_zm/_hud;
|
#include maps/mp/gametypes_zm/_hud;
|
||||||
#include maps/mp/zombies/_zm_audio_announcer;
|
#include maps/mp/zombies/_zm_audio_announcer;
|
||||||
#include maps/mp/zombies/_zm_audio;
|
#include maps/mp/zombies/_zm_audio;
|
||||||
|
#include maps/mp/zombies/_zm;
|
||||||
#include maps/mp/zombies/_zm_laststand;
|
#include maps/mp/zombies/_zm_laststand;
|
||||||
#include maps/mp/gametypes_zm/_globallogic_ui;
|
#include maps/mp/gametypes_zm/_globallogic_ui;
|
||||||
#include maps/mp/gametypes_zm/_hud_message;
|
#include maps/mp/gametypes_zm/_hud_message;
|
||||||
#include maps/mp/gametypes_zm/_globallogic_score;
|
#include maps/mp/gametypes_zm/_globallogic_score;
|
||||||
#include maps/mp/gametypes_zm/_globallogic_defaults;
|
#include maps/mp/gametypes_zm/_globallogic_defaults;
|
||||||
|
#include maps/mp/gametypes_zm/_globallogic_spawn;
|
||||||
#include maps/mp/gametypes_zm/_gameobjects;
|
#include maps/mp/gametypes_zm/_gameobjects;
|
||||||
#include maps/mp/gametypes_zm/_weapons;
|
#include maps/mp/gametypes_zm/_weapons;
|
||||||
#include maps/mp/gametypes_zm/_callbacksetup;
|
#include maps/mp/gametypes_zm/_callbacksetup;
|
||||||
|
#include maps/mp/gametypes_zm/_globallogic;
|
||||||
#include maps/mp/zombies/_zm_utility;
|
#include maps/mp/zombies/_zm_utility;
|
||||||
#include common_scripts/utility;
|
#include common_scripts/utility;
|
||||||
#include maps/mp/gametypes_zm/_hud_util;
|
#include maps/mp/gametypes_zm/_hud_util;
|
||||||
@ -184,7 +187,7 @@ globallogic_setupdefault_zombiecallbacks() //checked matches cerberus output
|
|||||||
level.onteamscore = ::blank;
|
level.onteamscore = ::blank;
|
||||||
|
|
||||||
//doesn't exist in any dump or any other script no idea what its trying to override to
|
//doesn't exist in any dump or any other script no idea what its trying to override to
|
||||||
//level.wavespawntimer = ::wavespawntimer;
|
level.wavespawntimer = maps/mp/gametypes_zm/_globallogic::wavespawntimer;
|
||||||
level.onspawnplayer = ::blank;
|
level.onspawnplayer = ::blank;
|
||||||
level.onspawnplayerunified = ::blank;
|
level.onspawnplayerunified = ::blank;
|
||||||
level.onspawnspectator = ::onspawnspectator;
|
level.onspawnspectator = ::onspawnspectator;
|
||||||
@ -646,7 +649,7 @@ respawn_spectators_and_freeze_players() //checked changed to match cerberus outp
|
|||||||
}
|
}
|
||||||
player [[ level.spawnplayer ]]();
|
player [[ level.spawnplayer ]]();
|
||||||
}
|
}
|
||||||
player freeze_player_controls(1);
|
player freeze_player_controls( 1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1295,7 +1298,7 @@ start_round() //checked changed to match 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();
|
||||||
while ( i = 0; i < players.size; i++; )
|
for ( i = 0; i < players.size; i++ )
|
||||||
{
|
{
|
||||||
players[ i ] freeze_player_controls( 0 );
|
players[ i ] freeze_player_controls( 0 );
|
||||||
players[ i ] sprintuprequired();
|
players[ i ] sprintuprequired();
|
||||||
@ -1445,6 +1448,8 @@ 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 );
|
||||||
@ -1455,7 +1460,6 @@ 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();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user