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

Use reference_wrapper for cheat bits

Browse source
This commit is contained in:
Kp 2015-11-14 18:17:21 +00:00
parent f509073b65
commit 794e7ddece
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
similar/main/gamecntl.cpp
View file

@ -1741,13 +1741,14 @@ public:
} }
}; };
class cheat_menu_bit_invulnerability : public menu_bit_wrapper_t<player_flags, PLAYER_FLAG> class cheat_menu_bit_invulnerability :
std::reference_wrapper<player>,
public menu_bit_wrapper_t<player_flags, PLAYER_FLAG>
{ {
player &m_player;
public: public:
cheat_menu_bit_invulnerability(player &plr) : cheat_menu_bit_invulnerability(player &plr) :
menu_bit_wrapper_t(vobjptr(plr.objnum)->ctype.player_info.powerup_flags, PLAYER_FLAGS_INVULNERABLE), reference_wrapper(plr),
m_player(plr) menu_bit_wrapper_t(vobjptr(get().objnum)->ctype.player_info.powerup_flags, PLAYER_FLAGS_INVULNERABLE)
{ {
} }
cheat_menu_bit_invulnerability &operator=(uint32_t n) cheat_menu_bit_invulnerability &operator=(uint32_t n)
@ -1755,19 +1756,20 @@ public:
this->menu_bit_wrapper_t::operator=(n); this->menu_bit_wrapper_t::operator=(n);
if (n) if (n)
{ {
m_player.invulnerable_time = GameTime64+i2f(1000); get().invulnerable_time = GameTime64+i2f(1000);
} }
return *this; return *this;
} }
}; };
class cheat_menu_bit_cloak : public menu_bit_wrapper_t<player_flags, PLAYER_FLAG> class cheat_menu_bit_cloak :
std::reference_wrapper<player>,
public menu_bit_wrapper_t<player_flags, PLAYER_FLAG>
{ {
player &m_player;
public: public:
cheat_menu_bit_cloak(player &plr) : cheat_menu_bit_cloak(player &plr) :
menu_bit_wrapper_t(vobjptr(plr.objnum)->ctype.player_info.powerup_flags, PLAYER_FLAGS_CLOAKED), reference_wrapper(plr),
m_player(plr) menu_bit_wrapper_t(vobjptr(get().objnum)->ctype.player_info.powerup_flags, PLAYER_FLAGS_CLOAKED)
{ {
} }
cheat_menu_bit_cloak &operator=(uint32_t n) cheat_menu_bit_cloak &operator=(uint32_t n)
@ -1778,7 +1780,7 @@ public:
if (Game_mode & GM_MULTI) if (Game_mode & GM_MULTI)
multi_send_cloak(); multi_send_cloak();
ai_do_cloak_stuff(); ai_do_cloak_stuff();
m_player.cloak_time = GameTime64; get().cloak_time = GameTime64;
} }
return *this; return *this;
} }