mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 03:45:32 +00:00
Code Issues Releases Wiki Activity

fixes for class selection merge

Browse source
This commit is contained in:
Marc Zinnschlag 2010-12-30 14:27:19 +01:00
parent f8b96703e6
commit e404d71e4f
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwgui/window_manager.cpp
View file

@ -649,10 +649,9 @@ namespace MWGui
} }; } };
} }
void WindowManager::showClassQuestionDialog() namespace MWGui
{
if (generateClassStep == generateClassSteps.size())
{ {
struct ClassPoint struct ClassPoint
{ {
const char *id; const char *id;
@ -660,6 +659,12 @@ void WindowManager::showClassQuestionDialog()
// Note: Order is taken from http://www.uesp.net/wiki/Morrowind:Class_Quiz // Note: Order is taken from http://www.uesp.net/wiki/Morrowind:Class_Quiz
int points[3]; int points[3];
}; };
}
void WindowManager::showClassQuestionDialog()
{
if (generateClassStep == generateClassSteps.size())
{
static boost::array<ClassPoint, 23> classes = { { static boost::array<ClassPoint, 23> classes = { {
{"Acrobat", {6, 2, 2}}, {"Acrobat", {6, 2, 2}},
@ -709,7 +714,12 @@ void WindowManager::showClassQuestionDialog()
else if (generateClassSpecializations[2] >= 7) else if (generateClassSpecializations[2] >= 7)
generateClass = "Mage"; generateClass = "Mage";
else else
throw new std::exception("Failed to deduce class from chosen answers in generate class dialog"); {
std::cerr
<< "Failed to deduce class from chosen answers in generate class dialog"
<< std::endl;
generateClass = "Thief";
}
} }
if (generateClassResultDialog) if (generateClassResultDialog)
@ -834,7 +844,6 @@ void WindowManager::onCreateClassDialogDone()
{ {
if (createClassDialog) if (createClassDialog)
{ {
// TODO: The ESM::Class should have methods to set these values to ensure correct data is assigned
ESM::Class klass; ESM::Class klass;
klass.name = createClassDialog->getName(); klass.name = createClassDialog->getName();
klass.description = createClassDialog->getDescription(); klass.description = createClassDialog->getDescription();