incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix enum/non-enum ternary

Browse Source
This commit is contained in:
Martin Michelsen
2024-02-05 08:38:01 -08:00
parent 7a23b37c0c
commit 964f646654
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/PlayerState.cc
+1 -1
View File
@@ -1788,7 +1788,7 @@ void PlayerState::dice_phase_before() {
this->assist_flags &= (AssistFlag::HAS_WON_BATTLE | this->assist_flags &= (AssistFlag::HAS_WON_BATTLE |
AssistFlag::WINNER_DECIDED_BY_DEFEAT | AssistFlag::WINNER_DECIDED_BY_DEFEAT |
AssistFlag::WINNER_DECIDED_BY_RANDOM | AssistFlag::WINNER_DECIDED_BY_RANDOM |
(this->server()->options.is_trial() ? 0 : AssistFlag::ELIGIBLE_FOR_DICE_BOOST)); (this->server()->options.is_trial() ? AssistFlag::NONE : AssistFlag::ELIGIBLE_FOR_DICE_BOOST));
this->set_assist_flags_from_assist_effects(); this->set_assist_flags_from_assist_effects();
this->update_hand_and_equip_state_and_send_6xB4x02_if_needed(0); this->update_hand_and_equip_state_and_send_6xB4x02_if_needed(0);
this->send_set_card_updates(); this->send_set_card_updates();
src/Episode3/PlayerState.hh
+1
View File
@@ -20,6 +20,7 @@ enum AssistFlag : uint32_t {
// be bits used only by the client which are not documented here. // be bits used only by the client which are not documented here.
// clang-format off // clang-format off
NONE = 0x0000,
READY_TO_END_PHASE = 0x0001, READY_TO_END_PHASE = 0x0001,
DICE_WERE_EXCHANGED = 0x0002, DICE_WERE_EXCHANGED = 0x0002,
HAS_WON_BATTLE = 0x0004, HAS_WON_BATTLE = 0x0004,