From e39f70037230754325e788c17aaade039695da1b Mon Sep 17 00:00:00 2001 From: Jan Borsodi Date: Sat, 23 Oct 2010 00:04:00 +0200 Subject: [PATCH] Removed unnecessary methods. --- apps/openmw/mwgui/window_manager.cpp | 37 ---------------------------- apps/openmw/mwgui/window_manager.hpp | 3 --- 2 files changed, 40 deletions(-) diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp index 410a86d4f..6e588406e 100644 --- a/apps/openmw/mwgui/window_manager.cpp +++ b/apps/openmw/mwgui/window_manager.cpp @@ -476,17 +476,6 @@ const std::string &WindowManager::getGameSettingString(const std::string &id, co return default_; } -void WindowManager::updateCharacterGeneration() -{ - if (raceDialog) - { - // TOOD: Uncomment when methods in mechanics manager is implemented - //raceDialog->setRace(environment.mMechanicsManager->getPlayerRace()); - //raceDialog->setGender(environment.mMechanicsManager->getPlayerMale() ? RaceDialog::GM_Male : RaceDialog::GM_Female); - // TODO: Face/Hair - } -} - void WindowManager::onNameDialogDone() { if (nameDialog) @@ -498,8 +487,6 @@ void WindowManager::onNameDialogDone() bool goNext = nameChosen; // Go to next dialog if name was previously chosen nameChosen = true; - updateCharacterGeneration(); - if (reviewNext) setGuiMode(GM_Review); else if (goNext) @@ -521,8 +508,6 @@ void WindowManager::onRaceDialogDone() bool goNext = raceChosen; // Go to next dialog if race was previously chosen raceChosen = true; - updateCharacterGeneration(); - if (reviewNext) setGuiMode(GM_Review); else if (goNext) @@ -541,8 +526,6 @@ void WindowManager::onRaceDialogBack() removeDialog(raceDialog); } - updateCharacterGeneration(); - setGuiMode(GM_Name); } @@ -650,8 +633,6 @@ void WindowManager::onGenerateClassBack() removeDialog(generateClassResultDialog); environment.mMechanicsManager->setPlayerClass(generateClass); - updateCharacterGeneration(); - setGuiMode(GM_Class); } @@ -664,8 +645,6 @@ void WindowManager::onGenerateClassDone() removeDialog(generateClassResultDialog); environment.mMechanicsManager->setPlayerClass(generateClass); - updateCharacterGeneration(); - if (reviewNext) setGuiMode(GM_Review); else if (goNext) @@ -688,8 +667,6 @@ void WindowManager::onPickClassDialogDone() bool goNext = classChosen; // Go to next dialog if class was previously chosen classChosen = true; - updateCharacterGeneration(); - if (reviewNext) setGuiMode(GM_Review); else if (goNext) @@ -708,8 +685,6 @@ void WindowManager::onPickClassDialogBack() removeDialog(pickClassDialog); } - updateCharacterGeneration(); - setGuiMode(GM_Class); } @@ -746,8 +721,6 @@ void WindowManager::onCreateClassDialogDone() bool goNext = classChosen; // Go to next dialog if class was previously chosen classChosen = true; - updateCharacterGeneration(); - if (reviewNext) setGuiMode(GM_Review); else if (goNext) @@ -761,8 +734,6 @@ void WindowManager::onCreateClassDialogBack() if (createClassDialog) removeDialog(createClassDialog); - updateCharacterGeneration(); - setGuiMode(GM_Class); } @@ -777,8 +748,6 @@ void WindowManager::onBirthSignDialogDone() bool goNext = birthSignChosen; // Go to next dialog if birth sign was previously chosen birthSignChosen = true; - updateCharacterGeneration(); - if (reviewNext || goNext) setGuiMode(GM_Review); else @@ -793,8 +762,6 @@ void WindowManager::onBirthSignDialogBack() removeDialog(birthSignDialog); } - updateCharacterGeneration(); - setGuiMode(GM_Class); } @@ -803,8 +770,6 @@ void WindowManager::onReviewDialogDone() if (reviewDialog) removeDialog(reviewDialog); - updateCharacterGeneration(); - setGuiMode(GM_Game); } @@ -813,7 +778,5 @@ void WindowManager::onReviewDialogBack() if (reviewDialog) removeDialog(reviewDialog); - updateCharacterGeneration(); - setGuiMode(GM_Birth); } diff --git a/apps/openmw/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp index c0ac2b6d1..75aa427ac 100644 --- a/apps/openmw/mwgui/window_manager.hpp +++ b/apps/openmw/mwgui/window_manager.hpp @@ -248,9 +248,6 @@ namespace MWGui const std::string &getGameSettingString(const std::string &id, const std::string &default_); private: - void updateCharacterGeneration(); - void checkCharacterGeneration(GuiMode mode); - // Character generation: Name dialog void onNameDialogDone();