From 0cb0b5cdc05a3dc94713b8fda8932bf43da3c4ae Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 23 Jul 2022 20:58:10 +0000 Subject: [PATCH] Use playernum_t for guided missile player number --- common/main/laser.h | 5 +---- common/main/object.h | 12 ++++++------ similar/main/laser.cpp | 2 +- similar/main/object.cpp | 12 ++++++------ 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common/main/laser.h b/common/main/laser.h index fe157b56b..a8ee2ed3f 100644 --- a/common/main/laser.h +++ b/common/main/laser.h @@ -28,7 +28,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "vecmat.h" -#ifdef __cplusplus #include "fwd-segment.h" #include "fwd-object.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) // 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. #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 diff --git a/common/main/object.h b/common/main/object.h index e543caf71..d9dc22b24 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -705,18 +705,18 @@ struct d_level_unique_control_center_state : class d_guided_missile_indices : std::array { template - 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 &); public: constexpr d_guided_missile_indices() : std::array(init_object_number_array(std::make_index_sequence())) { } - imobjidx_t get_player_active_guided_missile(unsigned pnum) const; - imobjptr_t get_player_active_guided_missile(fvmobjptr &vmobjptr, unsigned pnum) const; - imobjptridx_t get_player_active_guided_missile(fvmobjptridx &vmobjptridx, unsigned pnum) const; - void set_player_active_guided_missile(vmobjidx_t, unsigned pnum); - void clear_player_active_guided_missile(unsigned pnum); + imobjidx_t get_player_active_guided_missile(playernum_t pnum) const; + imobjptr_t get_player_active_guided_missile(fvmobjptr &vmobjptr, playernum_t pnum) const; + imobjptridx_t get_player_active_guided_missile(fvmobjptridx &vmobjptridx, playernum_t pnum) const; + void set_player_active_guided_missile(vmobjidx_t, playernum_t pnum); + void clear_player_active_guided_missile(playernum_t pnum); }; struct d_level_unique_boss_state : ::dcx::d_level_unique_boss_state diff --git a/similar/main/laser.cpp b/similar/main/laser.cpp index a4b556263..b8f8b1b8f 100644 --- a/similar/main/laser.cpp +++ b/similar/main/laser.cpp @@ -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 -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) { diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 137c18f8e..aee225d4f 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -1717,7 +1717,7 @@ static void spin_object(object_base &obj) } #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); } @@ -1738,7 +1738,7 @@ bool d_guided_missile_indices::debug_check_current_object(const object_base &obj } template -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); if (gmidx == object_none) @@ -1749,23 +1749,23 @@ R d_guided_missile_indices::get_player_active_guided_missile_tmpl(F &fobjptr, co 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(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(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); 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); i = object_none;