1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 11:06:43 +00:00

Disallowed quicksave/load in character creation

This commit is contained in:
Thomas 2014-04-23 21:21:11 -04:00
parent e873135da7
commit 49620968b9

View file

@ -646,6 +646,7 @@ namespace MWInput
} }
void InputManager::quickLoad() { void InputManager::quickLoad() {
if(MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1) {
MWState::Character* mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter(false); //Get current character MWState::Character* mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter(false); //Get current character
if(mCurrentCharacter) { //Ensure a current character exists if(mCurrentCharacter) { //Ensure a current character exists
const MWState::Slot* slot = &*mCurrentCharacter->begin(); //Get newest save const MWState::Slot* slot = &*mCurrentCharacter->begin(); //Get newest save
@ -653,11 +654,13 @@ namespace MWInput
MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, slot); //load newest save. That was easy! MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, slot); //load newest save. That was easy!
} }
} }
}
void InputManager::quickSave() { void InputManager::quickSave() {
if(MWBase::Environment::get().getWorld()->getGlobalInt ("chargenstate")==-1) { //ensure you're not in character creation
const MWState::Slot* slot = NULL; const MWState::Slot* slot = NULL;
MWState::Character* mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter(false); //Get current character MWState::Character* mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter(true); //Get current character
if (mCurrentCharacter) //Ensure one exists, otherwise do nothing if (mCurrentCharacter) //Ensure one exists
{ {
//Find quicksave slot //Find quicksave slot
for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it) for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it)
@ -673,6 +676,7 @@ namespace MWInput
MWBase::Environment::get().getStateManager()->saveGame("Quicksave", slot); MWBase::Environment::get().getStateManager()->saveGame("Quicksave", slot);
} }
} }
}
void InputManager::toggleSpell() void InputManager::toggleSpell()
{ {
if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return; if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;