diff --git a/scripts/zm/locs/common.gsc b/scripts/zm/locs/loc_common.gsc similarity index 98% rename from scripts/zm/locs/common.gsc rename to scripts/zm/locs/loc_common.gsc index d27401b2..7aa2f8b8 100644 --- a/scripts/zm/locs/common.gsc +++ b/scripts/zm/locs/loc_common.gsc @@ -2,7 +2,7 @@ #include maps/mp/zombies/_zm_utility; #include common_scripts/utility; -common_init() +init() { level.enemy_location_override_func = ::enemy_location_override; flag_wait( "initial_blackscreen_passed" ); diff --git a/scripts/zm/locs/zm_transit_diner.gsc b/scripts/zm/locs/zm_transit_loc_diner.gsc similarity index 98% rename from scripts/zm/locs/zm_transit_diner.gsc rename to scripts/zm/locs/zm_transit_loc_diner.gsc index 3ce4654e..38405cdc 100644 --- a/scripts/zm/locs/zm_transit_diner.gsc +++ b/scripts/zm/locs/zm_transit_loc_diner.gsc @@ -5,7 +5,7 @@ #include maps/mp/zombies/_zm; #include scripts/zm/replaced/utility; -#include scripts/zm/locs/common; +#include scripts/zm/locs/loc_common; struct_init() { @@ -60,7 +60,7 @@ main() init_barriers(); generatebuildabletarps(); disable_zombie_spawn_locations(); - scripts/zm/locs/common::common_init(); + scripts/zm/locs/loc_common::init(); } treasure_chest_init() diff --git a/scripts/zm/locs/zm_transit_power.gsc b/scripts/zm/locs/zm_transit_loc_power.gsc similarity index 99% rename from scripts/zm/locs/zm_transit_power.gsc rename to scripts/zm/locs/zm_transit_loc_power.gsc index fdcda787..71c725df 100644 --- a/scripts/zm/locs/zm_transit_power.gsc +++ b/scripts/zm/locs/zm_transit_loc_power.gsc @@ -6,7 +6,7 @@ #include maps/mp/zombies/_zm_zonemgr; #include scripts/zm/replaced/utility; -#include scripts/zm/locs/common; +#include scripts/zm/locs/loc_common; struct_init() { @@ -50,7 +50,7 @@ main() show_powerswitch(); disable_zombie_spawn_locations(); level thread maps/mp/zm_transit::falling_death_init(); - scripts/zm/locs/common::common_init(); + scripts/zm/locs/loc_common::init(); } treasure_chest_init() diff --git a/scripts/zm/replaced/zm_transit_gamemodes.gsc b/scripts/zm/replaced/zm_transit_gamemodes.gsc index 4060449e..7d164f61 100644 --- a/scripts/zm/replaced/zm_transit_gamemodes.gsc +++ b/scripts/zm/replaced/zm_transit_gamemodes.gsc @@ -13,8 +13,8 @@ #include maps/mp/_utility; #include common_scripts/utility; -#include scripts/zm/locs/zm_transit_diner; -#include scripts/zm/locs/zm_transit_power; +#include scripts/zm/locs/zm_transit_loc_diner; +#include scripts/zm/locs/zm_transit_loc_power; init() { @@ -27,17 +27,17 @@ init() add_map_location_gamemode( "zstandard", "transit", maps/mp/zm_transit_standard_station::precache, maps/mp/zm_transit_standard_station::main ); add_map_location_gamemode( "zstandard", "farm", maps/mp/zm_transit_standard_farm::precache, maps/mp/zm_transit_standard_farm::main ); add_map_location_gamemode( "zstandard", "town", maps/mp/zm_transit_standard_town::precache, maps/mp/zm_transit_standard_town::main ); - add_map_location_gamemode( "zstandard", "diner", scripts/zm/locs/zm_transit_diner::precache, scripts/zm/locs/zm_transit_diner::main ); - add_map_location_gamemode( "zstandard", "power", scripts/zm/locs/zm_transit_power::precache, scripts/zm/locs/zm_transit_power::main ); + add_map_location_gamemode( "zstandard", "diner", scripts/zm/locs/zm_transit_loc_diner::precache, scripts/zm/locs/zm_transit_loc_diner::main ); + add_map_location_gamemode( "zstandard", "power", scripts/zm/locs/zm_transit_loc_power::precache, scripts/zm/locs/zm_transit_loc_power::main ); add_map_location_gamemode( "zgrief", "transit", maps/mp/zm_transit_grief_station::precache, maps/mp/zm_transit_grief_station::main ); add_map_location_gamemode( "zgrief", "farm", maps/mp/zm_transit_grief_farm::precache, maps/mp/zm_transit_grief_farm::main ); add_map_location_gamemode( "zgrief", "town", maps/mp/zm_transit_grief_town::precache, maps/mp/zm_transit_grief_town::main ); - add_map_location_gamemode( "zgrief", "diner", scripts/zm/locs/zm_transit_diner::precache, scripts/zm/locs/zm_transit_diner::main ); - add_map_location_gamemode( "zgrief", "power", scripts/zm/locs/zm_transit_power::precache, scripts/zm/locs/zm_transit_power::main ); + add_map_location_gamemode( "zgrief", "diner", scripts/zm/locs/zm_transit_loc_diner::precache, scripts/zm/locs/zm_transit_loc_diner::main ); + add_map_location_gamemode( "zgrief", "power", scripts/zm/locs/zm_transit_loc_power::precache, scripts/zm/locs/zm_transit_loc_power::main ); - scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zstandard", "diner", scripts/zm/locs/zm_transit_diner::struct_init ); - scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zgrief", "diner", scripts/zm/locs/zm_transit_diner::struct_init ); - scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zstandard", "power", scripts/zm/locs/zm_transit_power::struct_init ); - scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zgrief", "power", scripts/zm/locs/zm_transit_power::struct_init ); + scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zstandard", "diner", scripts/zm/locs/zm_transit_loc_diner::struct_init ); + scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zgrief", "diner", scripts/zm/locs/zm_transit_loc_diner::struct_init ); + scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zstandard", "power", scripts/zm/locs/zm_transit_loc_power::struct_init ); + scripts/zm/replaced/utility::add_struct_location_gamemode_func( "zgrief", "power", scripts/zm/locs/zm_transit_loc_power::struct_init ); } \ No newline at end of file