TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Inline trigger_init

Browse source 
It is used in only one place.  Move it inline.
This commit is contained in:
Kp 2022-04-17 22:27:19 +00:00
parent da85bd4cd1
commit 211dcede72
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/switch.h
View file

@ -200,7 +200,6 @@ struct d_level_unique_trigger_state
constexpr std::integral_constant<trgnum_t, trgnum_t::None> 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);

3
similar/main/gamesave.cpp
View file

@ -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];

10
similar/main/switch.cpp
View file

@ -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 <typename SF, typename O, typename... Oa>
static inline void trigger_wall_op(const trigger &t, SF &segment_factory, const O &op, Oa &&... oargs)
{