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

Remove unnecessary definitions of static member variables

Browse source 
C++17 permits, but deprecates, this form.  Remove it to simplify the
code.
This commit is contained in:
Kp 2020-12-27 22:03:09 +00:00
parent e7629f35ee
commit 80fc124a63
8 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/ui/gadget.cpp
View file

@ -37,15 +37,6 @@ namespace dcx {
UI_GADGET * selected_gadget;
constexpr std::integral_constant<uint8_t, 1> UI_GADGET_BUTTON::s_kind;
constexpr std::integral_constant<uint8_t, 2> UI_GADGET_LISTBOX::s_kind;
constexpr std::integral_constant<uint8_t, 3> UI_GADGET_SCROLLBAR::s_kind;
constexpr std::integral_constant<uint8_t, 4> UI_GADGET_RADIO::s_kind;
constexpr std::integral_constant<uint8_t, 5> UI_GADGET_CHECKBOX::s_kind;
constexpr std::integral_constant<uint8_t, 6> UI_GADGET_INPUTBOX::s_kind;
constexpr std::integral_constant<uint8_t, 7> UI_GADGET_USERBOX::s_kind;
constexpr std::integral_constant<uint8_t, 9> UI_GADGET_ICON::s_kind;
namespace {
struct event_gadget : d_event

2
similar/3d/interp.cpp
View file

@ -553,8 +553,6 @@ public:
};
#endif
constexpr const glow_values_t *g3_draw_morphing_model_state::glow_values;
template <typename P, typename State>
static std::size_t dispatch_polymodel_op(const P p, State &state, const uint_fast32_t op)
{

3
similar/main/ai.cpp
View file

@ -103,9 +103,6 @@ static void ai_multi_send_robot_position(object &objnum, int force);
#if defined(DXX_BUILD_DESCENT_I)
#define BOSS_DEATH_SOUND_DURATION 0x2ae14 // 2.68 seconds
constexpr d_level_shared_boss_state::D1_Boss_cloak_interval d_level_shared_boss_state::Boss_cloak_interval;
constexpr d_level_shared_boss_state::D1_Boss_teleport_interval d_level_shared_boss_state::Boss_teleport_interval;
#elif defined(DXX_BUILD_DESCENT_II)
#define FIRE_AT_NEARBY_PLAYER_THRESHOLD (F1_0*40)

2
similar/main/digiobj.cpp
View file

@ -148,8 +148,6 @@ static std::pair<sound_objects_t::iterator, sound_objects_t::iterator> find_soun
namespace dsx {
constexpr std::integral_constant<int, -1> RAIIdigi_sound::invalid_channel;
/* Find the sound which actually equates to a sound number */
int digi_xlat_sound(int soundno)
{

3
similar/main/multi.cpp
View file

@ -5485,9 +5485,6 @@ public:
}
};
constexpr std::integral_constant<int, -1> hoard_resources_type::invalid_bm_idx;
constexpr std::integral_constant<unsigned, ~0u> hoard_resources_type::invalid_snd_idx;
static hoard_resources_type hoard_resources;
}

5
similar/main/multibot.cpp
View file

@ -68,11 +68,6 @@ static void multi_send_robot_position_sub(const vmobjptridx_t objnum, int now);
static void multi_send_release_robot(vmobjptridx_t objnum);
static void multi_delete_controlled_robot(const vmobjptridx_t objnum);
constexpr serial::endian_access::foreign_endian_type serial::endian_access::foreign_endian;
constexpr serial::endian_access::little_endian_type serial::endian_access::little_endian;
constexpr serial::endian_access::big_endian_type serial::endian_access::big_endian;
constexpr serial::endian_access::native_endian_type serial::endian_access::native_endian;
//
// Code for controlling robots in multiplayer games
//

6
similar/main/newmenu.cpp
View file

@ -79,12 +79,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define MESSAGEBOX_TEXT_SIZE 2176 // How many characters in messagebox
#define MAX_TEXT_WIDTH FSPACX(120) // How many pixels wide a input box can be
constexpr std::integral_constant<unsigned, NM_TYPE_INPUT> newmenu_item::input_specific_type::nm_type;
constexpr std::integral_constant<unsigned, NM_TYPE_RADIO> newmenu_item::radio_specific_type::nm_type;
constexpr std::integral_constant<unsigned, NM_TYPE_NUMBER> newmenu_item::number_specific_type::nm_type;
constexpr std::integral_constant<unsigned, NM_TYPE_INPUT_MENU> newmenu_item::imenu_specific_type::nm_type;
constexpr std::integral_constant<unsigned, NM_TYPE_SLIDER> newmenu_item::slider_specific_type::nm_type;
namespace dcx {
int passive_newmenu::subfunction_handler(const d_event &)

13
similar/main/weapon.cpp
View file

@ -61,10 +61,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
//ubyte Default_primary_ammo_level[MAX_PRIMARY_WEAPONS] = {255, 0, 255, 255, 255};
//ubyte Default_secondary_ammo_level[MAX_SECONDARY_WEAPONS] = {3, 0, 0, 0, 0};
constexpr std::integral_constant<uint8_t, 1> has_weapon_result::has_weapon_flag;
constexpr std::integral_constant<uint8_t, 2> has_weapon_result::has_energy_flag;
constexpr std::integral_constant<uint8_t, 4> has_weapon_result::has_ammo_flag;
// Convert primary weapons to indices in Weapon_info array.
#if defined(DXX_BUILD_DESCENT_I)
namespace dsx {
@ -426,15 +422,6 @@ public:
}
};
constexpr std::integral_constant<uint8_t, 255> cycle_weapon_state::cycle_never_autoselect_below;
constexpr char cycle_weapon_state::DXX_WEAPON_TEXT_NEVER_AUTOSELECT[];
constexpr std::integral_constant<uint_fast32_t, MAX_PRIMARY_WEAPONS> cycle_primary_state::max_weapons;
constexpr char cycle_primary_state::reorder_title[];
constexpr char cycle_primary_state::error_weapon_list_corrupt[];
constexpr std::integral_constant<uint_fast32_t, MAX_SECONDARY_WEAPONS> cycle_secondary_state::max_weapons;
constexpr char cycle_secondary_state::reorder_title[];
constexpr char cycle_secondary_state::error_weapon_list_corrupt[];
void cycle_weapon_state::report_runtime_error(const char *const p)
{
throw std::runtime_error(p);