mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-19 14:46:36 +00:00
Code Issues Releases Wiki Activity

Select a fallback character if possible

Browse source
This commit is contained in:
Evil Eye 2025-07-02 20:28:16 +02:00
parent c3a5ad4328
commit 7c1dbdd191
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -198,12 +198,11 @@ namespace MWGui
<< MyGUI::TextIterator::toTagsString(MyGUI::UString(className)) << ")"; << MyGUI::TextIterator::toTagsString(MyGUI::UString(className)) << ")";
const MyGUI::UString playerDesc = MyGUI::LanguageManager::getInstance().replaceTags(title.str()); const MyGUI::UString playerDesc = MyGUI::LanguageManager::getInstance().replaceTags(title.str());
mCharacterSelection->addItem(playerDesc, signature.mPlayerName); mCharacterSelection->addItem(playerDesc, &*it);
if (mCurrentCharacter == &*it if (mCurrentCharacter == &*it
|| (!mCurrentCharacter && !mSaving || (!mCurrentCharacter && !mSaving
&& Misc::StringUtils::ciEqual( && Misc::StringUtils::ciEqual(directory, Files::pathToUnicodeString(it->getPath().filename()))))
directory, Files::pathToUnicodeString(it->begin()->mPath.parent_path().filename()))))
{ {
mCurrentCharacter = &*it; mCurrentCharacter = &*it;
selectedIndex = mCharacterSelection->getItemCount() - 1; selectedIndex = mCharacterSelection->getItemCount() - 1;
@ -211,6 +210,11 @@ namespace MWGui
} }
} }
if (selectedIndex == MyGUI::ITEM_NONE && !mSaving && mCharacterSelection->getItemCount() != 0)
{
selectedIndex = 0;
mCurrentCharacter = *mCharacterSelection->getItemDataAt<const MWState::Character*>(0);
}
mCharacterSelection->setIndexSelected(selectedIndex); mCharacterSelection->setIndexSelected(selectedIndex);
if (selectedIndex == MyGUI::ITEM_NONE) if (selectedIndex == MyGUI::ITEM_NONE)
mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}"); mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}");
@ -324,14 +328,7 @@ namespace MWGui
{ {
MWBase::StateManager* mgr = MWBase::Environment::get().getStateManager(); MWBase::StateManager* mgr = MWBase::Environment::get().getStateManager();
unsigned int i = 0; const MWState::Character* character = *mCharacterSelection->getItemDataAt<const MWState::Character*>(pos);
const MWState::Character* character = nullptr;
for (MWBase::StateManager::CharacterIterator it = mgr->characterBegin(); it != mgr->characterEnd(); ++it, ++i)
{
if (i == pos)
character = &*it;
}
assert(character && "Can't find selected character");
mCurrentCharacter = character; mCurrentCharacter = character;
mCurrentSlot = nullptr; mCurrentSlot = nullptr;
@ -402,7 +399,7 @@ namespace MWGui
mSaveNameEdit->setCaption(sender->getItemNameAt(pos)); mSaveNameEdit->setCaption(sender->getItemNameAt(pos));
mCurrentSlot = nullptr; mCurrentSlot = nullptr;
unsigned int i = 0; size_t i = 0;
for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end();
++it, ++i) ++it, ++i)
{ {
@ -416,8 +413,9 @@ namespace MWGui
const size_t profileIndex = mCharacterSelection->getIndexSelected(); const size_t profileIndex = mCharacterSelection->getIndexSelected();
const std::string& slotPlayerName = mCurrentSlot->mProfile.mPlayerName; const std::string& slotPlayerName = mCurrentSlot->mProfile.mPlayerName;
const std::string& profilePlayerName = *mCharacterSelection->getItemDataAt<std::string>(profileIndex); const ESM::SavedGame& profileSavedGame
if (slotPlayerName != profilePlayerName) = (*mCharacterSelection->getItemDataAt<const MWState::Character*>(profileIndex))->getSignature();
if (slotPlayerName != profileSavedGame.mPlayerName)
text << slotPlayerName << "\n"; text << slotPlayerName << "\n";
text << "#{OMWEngine:Level} " << mCurrentSlot->mProfile.mPlayerLevel << "\n"; text << "#{OMWEngine:Level} " << mCurrentSlot->mProfile.mPlayerLevel << "\n";