Use playernum_t for guided missile player number
This commit is contained in:
parent
4886afdf93
commit
0cb0b5cdc0
|
@ -28,7 +28,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#include "maths.h"
|
#include "maths.h"
|
||||||
#include "vecmat.h"
|
#include "vecmat.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#include "fwd-segment.h"
|
#include "fwd-segment.h"
|
||||||
#include "fwd-object.h"
|
#include "fwd-object.h"
|
||||||
#include "fwd-player.h"
|
#include "fwd-player.h"
|
||||||
|
@ -113,7 +112,7 @@ imobjptridx_t Laser_create_new_easy(const d_robot_info_array &Robot_info, const
|
||||||
|
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
// give up control of the guided missile
|
// give up control of the guided missile
|
||||||
void release_guided_missile(d_level_unique_object_state &, unsigned player_num);
|
void release_guided_missile(d_level_unique_object_state &, playernum_t player_num);
|
||||||
|
|
||||||
// Omega cannon stuff.
|
// Omega cannon stuff.
|
||||||
#define MAX_OMEGA_CHARGE (F1_0) // Maximum charge level for omega cannonw
|
#define MAX_OMEGA_CHARGE (F1_0) // Maximum charge level for omega cannonw
|
||||||
|
@ -176,5 +175,3 @@ static inline int is_proximity_bomb_or_player_smart_mine_or_placed_mine(const we
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -705,18 +705,18 @@ struct d_level_unique_control_center_state :
|
||||||
class d_guided_missile_indices : std::array<imobjidx_t, MAX_PLAYERS>
|
class d_guided_missile_indices : std::array<imobjidx_t, MAX_PLAYERS>
|
||||||
{
|
{
|
||||||
template <typename R, typename F>
|
template <typename R, typename F>
|
||||||
R get_player_active_guided_missile_tmpl(F &fvcobj, unsigned pnum) const;
|
R get_player_active_guided_missile_tmpl(F &fvcobj, playernum_t pnum) const;
|
||||||
static bool debug_check_current_object(const object_base &);
|
static bool debug_check_current_object(const object_base &);
|
||||||
public:
|
public:
|
||||||
constexpr d_guided_missile_indices() :
|
constexpr d_guided_missile_indices() :
|
||||||
std::array<imobjidx_t, MAX_PLAYERS>(init_object_number_array<imobjidx_t>(std::make_index_sequence<MAX_PLAYERS>()))
|
std::array<imobjidx_t, MAX_PLAYERS>(init_object_number_array<imobjidx_t>(std::make_index_sequence<MAX_PLAYERS>()))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
imobjidx_t get_player_active_guided_missile(unsigned pnum) const;
|
imobjidx_t get_player_active_guided_missile(playernum_t pnum) const;
|
||||||
imobjptr_t get_player_active_guided_missile(fvmobjptr &vmobjptr, unsigned pnum) const;
|
imobjptr_t get_player_active_guided_missile(fvmobjptr &vmobjptr, playernum_t pnum) const;
|
||||||
imobjptridx_t get_player_active_guided_missile(fvmobjptridx &vmobjptridx, unsigned pnum) const;
|
imobjptridx_t get_player_active_guided_missile(fvmobjptridx &vmobjptridx, playernum_t pnum) const;
|
||||||
void set_player_active_guided_missile(vmobjidx_t, unsigned pnum);
|
void set_player_active_guided_missile(vmobjidx_t, playernum_t pnum);
|
||||||
void clear_player_active_guided_missile(unsigned pnum);
|
void clear_player_active_guided_missile(playernum_t pnum);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct d_level_unique_boss_state : ::dcx::d_level_unique_boss_state
|
struct d_level_unique_boss_state : ::dcx::d_level_unique_boss_state
|
||||||
|
|
|
@ -2304,7 +2304,7 @@ void create_robot_smart_children(const vmobjptridx_t objp, const uint_fast32_t n
|
||||||
}
|
}
|
||||||
|
|
||||||
//give up control of the guided missile
|
//give up control of the guided missile
|
||||||
void release_guided_missile(d_level_unique_object_state &LevelUniqueObjectState, const unsigned player_num)
|
void release_guided_missile(d_level_unique_object_state &LevelUniqueObjectState, const playernum_t player_num)
|
||||||
{
|
{
|
||||||
if (player_num == Player_num)
|
if (player_num == Player_num)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1717,7 +1717,7 @@ static void spin_object(object_base &obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
imobjidx_t d_guided_missile_indices::get_player_active_guided_missile(const unsigned pnum) const
|
imobjidx_t d_guided_missile_indices::get_player_active_guided_missile(const playernum_t pnum) const
|
||||||
{
|
{
|
||||||
return operator[](pnum);
|
return operator[](pnum);
|
||||||
}
|
}
|
||||||
|
@ -1738,7 +1738,7 @@ bool d_guided_missile_indices::debug_check_current_object(const object_base &obj
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename R, typename F>
|
template <typename R, typename F>
|
||||||
R d_guided_missile_indices::get_player_active_guided_missile_tmpl(F &fobjptr, const unsigned pnum) const
|
R d_guided_missile_indices::get_player_active_guided_missile_tmpl(F &fobjptr, const playernum_t pnum) const
|
||||||
{
|
{
|
||||||
const auto gmidx = get_player_active_guided_missile(pnum);
|
const auto gmidx = get_player_active_guided_missile(pnum);
|
||||||
if (gmidx == object_none)
|
if (gmidx == object_none)
|
||||||
|
@ -1749,23 +1749,23 @@ R d_guided_missile_indices::get_player_active_guided_missile_tmpl(F &fobjptr, co
|
||||||
return gmobj;
|
return gmobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
imobjptr_t d_guided_missile_indices::get_player_active_guided_missile(fvmobjptr &vmobjptr, const unsigned pnum) const
|
imobjptr_t d_guided_missile_indices::get_player_active_guided_missile(fvmobjptr &vmobjptr, const playernum_t pnum) const
|
||||||
{
|
{
|
||||||
return this->template get_player_active_guided_missile_tmpl<imobjptr_t>(vmobjptr, pnum);
|
return this->template get_player_active_guided_missile_tmpl<imobjptr_t>(vmobjptr, pnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
imobjptridx_t d_guided_missile_indices::get_player_active_guided_missile(fvmobjptridx &vmobjptridx, const unsigned pnum) const
|
imobjptridx_t d_guided_missile_indices::get_player_active_guided_missile(fvmobjptridx &vmobjptridx, const playernum_t pnum) const
|
||||||
{
|
{
|
||||||
return this->template get_player_active_guided_missile_tmpl<imobjptridx_t>(vmobjptridx, pnum);
|
return this->template get_player_active_guided_missile_tmpl<imobjptridx_t>(vmobjptridx, pnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
void d_guided_missile_indices::set_player_active_guided_missile(const vmobjidx_t obji, const unsigned pnum)
|
void d_guided_missile_indices::set_player_active_guided_missile(const vmobjidx_t obji, const playernum_t pnum)
|
||||||
{
|
{
|
||||||
auto &i = operator[](pnum);
|
auto &i = operator[](pnum);
|
||||||
i = obji;
|
i = obji;
|
||||||
}
|
}
|
||||||
|
|
||||||
void d_guided_missile_indices::clear_player_active_guided_missile(const unsigned pnum)
|
void d_guided_missile_indices::clear_player_active_guided_missile(const playernum_t pnum)
|
||||||
{
|
{
|
||||||
auto &i = operator[](pnum);
|
auto &i = operator[](pnum);
|
||||||
i = object_none;
|
i = object_none;
|
||||||
|
|
Loading…
Reference in a new issue