Core/Players: Remove ForceDontShowChoicesAsList from playerchoice table (not a static value) and rename it in packets
This commit is contained in:
@@ -0,0 +1 @@
|
||||
ALTER TABLE `playerchoice` DROP `ForceDontShowChoicesAsList`;
|
||||
@@ -30139,7 +30139,6 @@ void Player::SendPlayerChoice(ObjectGuid sender, int32 choiceId)
|
||||
displayPlayerChoice.HideWarboardHeader = playerChoice->HideWarboardHeader;
|
||||
displayPlayerChoice.KeepOpenAfterChoice = playerChoice->KeepOpenAfterChoice;
|
||||
displayPlayerChoice.ShowChoicesAsList = playerChoice->ShowChoicesAsList;
|
||||
displayPlayerChoice.ForceDontShowChoicesAsList = playerChoice->ForceDontShowChoicesAsList;
|
||||
displayPlayerChoice.RequiresSelection = playerChoice->RequiresSelection;
|
||||
|
||||
for (std::size_t i = 0; i < playerChoice->Responses.size() && (!playerChoice->MaxResponses || displayPlayerChoice.Responses.size() < *playerChoice->MaxResponses); ++i)
|
||||
@@ -30224,6 +30223,8 @@ void Player::SendPlayerChoice(ObjectGuid sender, int32 choiceId)
|
||||
mawPower.Rarity = playerChoiceResponseTemplate.MawPower->Rarity;
|
||||
mawPower.SpellID = playerChoiceResponseTemplate.MawPower->SpellID;
|
||||
mawPower.MaxStacks = playerChoiceResponseTemplate.MawPower->MaxStacks;
|
||||
|
||||
displayPlayerChoice.HasPowerChoice = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10988,7 +10988,7 @@ void ObjectMgr::LoadPlayerChoices()
|
||||
_playerChoices.clear();
|
||||
|
||||
QueryResult choices = WorldDatabase.Query("SELECT ChoiceId, UiTextureKitId, SoundKitId, CloseSoundKitId, Duration, Question, PendingChoiceText, "
|
||||
"InfiniteRange, HideWarboardHeader, KeepOpenAfterChoice, ShowChoicesAsList, ForceDontShowChoicesAsList, RequiresSelection, MaxResponses, ScriptName FROM playerchoice");
|
||||
"InfiniteRange, HideWarboardHeader, KeepOpenAfterChoice, ShowChoicesAsList, RequiresSelection, MaxResponses, ScriptName FROM playerchoice");
|
||||
if (!choices)
|
||||
{
|
||||
TC_LOG_INFO("server.loading", ">> Loaded 0 player choices. DB table `playerchoice` is empty.");
|
||||
@@ -11007,7 +11007,7 @@ void ObjectMgr::LoadPlayerChoices()
|
||||
do
|
||||
{
|
||||
DEFINE_FIELD_ACCESSOR_CACHE_ANONYMOUS(ResultSet, (ChoiceId)(UiTextureKitId)(SoundKitId)(CloseSoundKitId)(Duration)(Question)(PendingChoiceText)
|
||||
(InfiniteRange)(HideWarboardHeader)(KeepOpenAfterChoice)(ShowChoicesAsList)(ForceDontShowChoicesAsList)(RequiresSelection)(MaxResponses)(ScriptName)) fields { *choices };
|
||||
(InfiniteRange)(HideWarboardHeader)(KeepOpenAfterChoice)(ShowChoicesAsList)(RequiresSelection)(MaxResponses)(ScriptName)) fields { *choices };
|
||||
|
||||
int32 choiceId = fields.ChoiceId().GetInt32();
|
||||
|
||||
@@ -11024,7 +11024,6 @@ void ObjectMgr::LoadPlayerChoices()
|
||||
choice.HideWarboardHeader = fields.HideWarboardHeader().GetBool();
|
||||
choice.KeepOpenAfterChoice = fields.KeepOpenAfterChoice().GetBool();
|
||||
choice.ShowChoicesAsList = fields.ShowChoicesAsList().GetBool();
|
||||
choice.ForceDontShowChoicesAsList = fields.ForceDontShowChoicesAsList().GetBool();
|
||||
choice.RequiresSelection = fields.RequiresSelection().GetBool();
|
||||
choice.MaxResponses = fields.MaxResponses().GetUInt32OrNull();
|
||||
choice.ScriptId = GetScriptId(fields.ScriptName().GetStringView());
|
||||
|
||||
@@ -118,7 +118,6 @@ struct PlayerChoice
|
||||
bool HideWarboardHeader = false;
|
||||
bool KeepOpenAfterChoice = false;
|
||||
bool ShowChoicesAsList = false;
|
||||
bool ForceDontShowChoicesAsList = false;
|
||||
bool RequiresSelection = false;
|
||||
|
||||
Optional<uint32> MaxResponses;
|
||||
|
||||
@@ -852,7 +852,7 @@ WorldPacket const* DisplayPlayerChoice::Write()
|
||||
_worldPacket << Bits<1>(HideWarboardHeader);
|
||||
_worldPacket << Bits<1>(KeepOpenAfterChoice);
|
||||
_worldPacket << Bits<1>(ShowChoicesAsList);
|
||||
_worldPacket << Bits<1>(ForceDontShowChoicesAsList);
|
||||
_worldPacket << Bits<1>(HasPowerChoice);
|
||||
_worldPacket << Bits<1>(RequiresSelection);
|
||||
_worldPacket.FlushBits();
|
||||
|
||||
|
||||
@@ -800,7 +800,7 @@ namespace WorldPackets
|
||||
bool HideWarboardHeader = false;
|
||||
bool KeepOpenAfterChoice = false;
|
||||
bool ShowChoicesAsList = false;
|
||||
bool ForceDontShowChoicesAsList = false;
|
||||
bool HasPowerChoice = false;
|
||||
bool RequiresSelection = false;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user