diff --git a/common/main/switch.h b/common/main/switch.h index b7eeca80d..a43a1b4eb 100644 --- a/common/main/switch.h +++ b/common/main/switch.h @@ -200,7 +200,6 @@ struct d_level_unique_trigger_state constexpr std::integral_constant trigger_none{}; -extern void trigger_init(); namespace dsx { window_event_result check_trigger(vcsegptridx_t seg, sidenum_t side, object &plrobj, vcobjptridx_t objnum, int shot); window_event_result check_trigger_sub(object &, trgnum_t trigger_num, playernum_t player_num, unsigned shot); diff --git a/similar/main/gamesave.cpp b/similar/main/gamesave.cpp index 9b13bfd19..964073e13 100644 --- a/similar/main/gamesave.cpp +++ b/similar/main/gamesave.cpp @@ -1649,7 +1649,8 @@ int create_new_mine(void) auto &ActiveDoors = LevelUniqueWallSubsystemState.ActiveDoors; ActiveDoors.set_count(0); wall_init(); - trigger_init(); + auto &Triggers = LevelUniqueWallSubsystemState.Triggers; + Triggers.set_count(0); // Create New_segment, which is the segment we will be adding at each instance. med_create_new_segment({DEFAULT_X_SIZE, DEFAULT_Y_SIZE, DEFAULT_Z_SIZE}); // New_segment = Segments[0]; diff --git a/similar/main/switch.cpp b/similar/main/switch.cpp index ce38e594a..ba5e941fe 100644 --- a/similar/main/switch.cpp +++ b/similar/main/switch.cpp @@ -56,16 +56,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "compiler-range_for.h" #include "partial_range.h" -#if DXX_USE_EDITOR -//----------------------------------------------------------------- -// Initializes all the switches. -void trigger_init() -{ - auto &Triggers = LevelUniqueWallSubsystemState.Triggers; - Triggers.set_count(0); -} -#endif - template static inline void trigger_wall_op(const trigger &t, SF &segment_factory, const O &op, Oa &&... oargs) {