From 93de570f9a5f43b7d87826b1457cca52b7465143 Mon Sep 17 00:00:00 2001 From: Glorf Date: Sun, 10 Mar 2013 15:58:29 +0100 Subject: [PATCH] Moved specializations out of step --- apps/openmw/mwgui/charactercreation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp index ba0f6004a..b98fd2bd9 100644 --- a/apps/openmw/mwgui/charactercreation.cpp +++ b/apps/openmw/mwgui/charactercreation.cpp @@ -20,9 +20,10 @@ namespace const std::string mText; const std::string mButtons[3]; const std::string mSound; - const ESM::Class::Specialization mSpecializations[3]; // The specialization for each answer }; + const ESM::Class::Specialization mSpecializations[3]={ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}; // The specialization for each answer + Step sGenerateClassSteps(int number) { MWBase::World *world = MWBase::Environment::get().getWorld(); number++; @@ -30,8 +31,7 @@ namespace {world->getFallback("Question_"+boost::lexical_cast(number)+"_AnswerOne"), world->getFallback("Question_"+boost::lexical_cast(number)+"_AnswerTwo"), world->getFallback("Question_"+boost::lexical_cast(number)+"_AnswerThree")}, - "vo\\misc\\chargen qa"+boost::lexical_cast(number)+".wav", - {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth} + "vo\\misc\\chargen qa"+boost::lexical_cast(number)+".wav" }; return step; } @@ -568,7 +568,7 @@ void CharacterCreation::onClassQuestionChosen(int _index) return; } - ESM::Class::Specialization specialization = sGenerateClassSteps(mGenerateClassStep).mSpecializations[_index]; + ESM::Class::Specialization specialization = mSpecializations[_index]; if (specialization == ESM::Class::Stealth) ++mGenerateClassSpecializations[0]; else if (specialization == ESM::Class::Combat)