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

more minor bug fixes for _zm_gametype

Browse Source
This commit is contained in:
JezuzLizard 2020-05-14 20:04:18 -07:00
parent cf41cab73b
commit 3f65ee59c8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patch_zm/maps/mp/gametypes_zm/_zm_gametype.gsc
View File

@ -113,7 +113,7 @@ game_objects_allowed( mode, location ) //checked partially changed to match cerb
{ {
isallowed = maps/mp/gametypes_zm/_gameobjects::entity_is_allowed( entities[ i ], allowed ); isallowed = maps/mp/gametypes_zm/_gameobjects::entity_is_allowed( entities[ i ], allowed );
isvalidlocation = maps/mp/gametypes_zm/_gameobjects::location_is_allowed( entities[ i ], location ); isvalidlocation = maps/mp/gametypes_zm/_gameobjects::location_is_allowed( entities[ i ], location );
if ( !isallowed || !isvalidlocation && !is_classic() ) if ( !isallowed || !isvalidlocation && is_classic() )
{ {
if ( isDefined( entities[ i ].spawnflags ) && entities[ i ].spawnflags == 1 ) if ( isDefined( entities[ i ].spawnflags ) && entities[ i ].spawnflags == 1 )
{ {
@ -243,20 +243,17 @@ 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, " " );
j = 0; foreach ( token in tokens )
while ( j < tokens.size )
{ {
if ( tokens[ j ] == level.scr_zm_ui_gametype && tokens[ j ] != "zstandard" ) if ( token == level.scr_zm_ui_gametype && token != "zstandard" )
{ {
keep = 1; keep = 1;
j++;
continue; continue;
} }
if ( tokens[ j ] == "zstandard" ) else if ( token == "zstandard" )
{ {
keep = 1; keep = 1;
} }
j++;
} }
if ( !keep ) if ( !keep )
{ {
@ -857,12 +854,13 @@ setup_classic_gametype() //checked did not change to match cerberus output
} }
if ( should_remove ) if ( should_remove )
{ {
ent delete(); ents[ i ] delete();
} }
} }
i++; i++;
} }
structs = getstructarray( "game_mode_object" ); structs = getstructarray( "game_mode_object" );
i = 0;
while ( i < structs.size ) while ( i < structs.size )
{ {
if ( !isdefined( structs[ i ].script_string ) ) if ( !isdefined( structs[ i ].script_string ) )
@ -884,9 +882,9 @@ setup_classic_gametype() //checked did not change to match cerberus output
i++; i++;
continue; continue;
} }
barricade = spawn( "script_model", struct.origin ); barricade = spawn( "script_model", structs[ i ].origin );
barricade.angles = struct.angles; barricade.angles = structs[ i ].angles;
barricade setmodel( struct.script_parameters ); barricade setmodel( structs[ i ].script_parameters );
i++; i++;
} }
unlink_meat_traversal_nodes(); unlink_meat_traversal_nodes();
@ -1994,3 +1992,5 @@ blank()