RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore(glue): tidy up CCharacterCreation::SetSelectedRace for consistency

Browse Source
This commit is contained in:
fallenoak 2026-01-04 13:27:37 -06:00
parent 3d41f0cf26
commit 6f97bf6d5d
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/glue/CCharacterCreation.cpp
View File

@ -315,8 +315,8 @@ void CCharacterCreation::SetSelectedRace(int32_t raceIndex) {
return; return;
} }
auto selectedRaceID = CCharacterCreation::s_races[raceIndex]; auto raceID = CCharacterCreation::s_races[raceIndex];
auto selectedSexID = CCharacterCreation::s_character->m_data.sexID; auto currentSexID = CCharacterCreation::s_character->m_data.sexID;
CCharacterCreation::SavePreferences(); CCharacterCreation::SavePreferences();
@ -328,12 +328,13 @@ void CCharacterCreation::SetSelectedRace(int32_t raceIndex) {
? CCharacterSelection::GetCharacterDisplay(CCharacterCreation::s_existingCharacterIndex) ? CCharacterSelection::GetCharacterDisplay(CCharacterCreation::s_existingCharacterIndex)
: nullptr; : nullptr;
auto preferences = CCharacterCreation::s_charPreferences[raceID][currentSexID];
bool useExistingCharacter = existingCharacter bool useExistingCharacter = existingCharacter
&& existingCharacter->m_info.raceID == selectedRaceID && existingCharacter->m_info.raceID == raceID
&& existingCharacter->m_info.customizeFlags & 0x110000; && existingCharacter->m_info.customizeFlags & 0x110000;
bool usePreferences = !useExistingCharacter && bool usePreferences = !useExistingCharacter && preferences;
CCharacterCreation::s_charPreferences[selectedRaceID][selectedSexID];
if (useExistingCharacter) { if (useExistingCharacter) {
data.raceID = existingCharacter->m_info.raceID; data.raceID = existingCharacter->m_info.raceID;
@ -349,7 +350,6 @@ void CCharacterCreation::SetSelectedRace(int32_t raceIndex) {
CCharacterCreation::SetSelectedSex(existingCharacter->m_info.sexID); CCharacterCreation::SetSelectedSex(existingCharacter->m_info.sexID);
} else if (usePreferences) { } else if (usePreferences) {
auto preferences = CCharacterCreation::s_charPreferences[selectedRaceID][selectedSexID];
data.SetPreferences(preferences); data.SetPreferences(preferences);
CCharacterCreation::CalcClasses(data.raceID); CCharacterCreation::CalcClasses(data.raceID);
@ -364,8 +364,8 @@ void CCharacterCreation::SetSelectedRace(int32_t raceIndex) {
CCharacterCreation::CreateComponent(&data, false); CCharacterCreation::CreateComponent(&data, false);
} else { } else {
data.raceID = selectedRaceID; data.raceID = raceID;
data.sexID = selectedSexID; data.sexID = currentSexID;
CCharacterCreation::CalcClasses(data.raceID); CCharacterCreation::CalcClasses(data.raceID);