@ -1,6 +1,5 @@
# include "class.hpp" # include "class.hpp"
# include <assert.h>
# include <iterator> # include <iterator>
# include <boost/algorithm/string.hpp> # include <boost/algorithm/string.hpp>
@ -26,8 +25,8 @@ GenerateClassResultDialog::GenerateClassResultDialog(WindowManager& parWindowMan
setText ( " ReflectT " , mWindowManager . getGameSettingString ( " sMessageQuestionAnswer1 " , " " ) ) ;
setText ( " ReflectT " , mWindowManager . getGameSettingString ( " sMessageQuestionAnswer1 " , " " ) ) ;
getWidget ( c lassImage, " ClassImage " ) ;
getWidget ( mC lassImage, " ClassImage " ) ;
getWidget ( c lassName, " ClassName " ) ;
getWidget ( mC lassName, " ClassName " ) ;
MyGUI : : ButtonPtr backButton ;
MyGUI : : ButtonPtr backButton ;
getWidget ( backButton , " BackButton " ) ;
getWidget ( backButton , " BackButton " ) ;
@ -51,15 +50,15 @@ void GenerateClassResultDialog::open()
std : : string GenerateClassResultDialog : : getClassId ( ) const std : : string GenerateClassResultDialog : : getClassId ( ) const
{ {
return c lassName- > getCaption ( ) ;
return mC lassName- > getCaption ( ) ;
} }
void GenerateClassResultDialog : : setClassId ( const std : : string & classId ) void GenerateClassResultDialog : : setClassId ( const std : : string & classId )
{ {
c urrentClassId = classId ;
mC urrentClassId = classId ;
c lassImage- > setImageTexture ( std : : string ( " textures \\ levelup \\ " ) + c urrentClassId + " .dds " ) ;
mC lassImage- > setImageTexture ( std : : string ( " textures \\ levelup \\ " ) + mC urrentClassId + " .dds " ) ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
c lassName- > setCaption ( store . classes . find ( c urrentClassId) - > name ) ;
mC lassName- > setCaption ( store . classes . find ( mC urrentClassId) - > name ) ;
} }
// widget controls
// widget controls
@ -82,29 +81,29 @@ PickClassDialog::PickClassDialog(WindowManager& parWindowManager)
// Centre dialog
// Centre dialog
center ( ) ;
center ( ) ;
getWidget ( s pecializationName, " SpecializationName " ) ;
getWidget ( mS pecializationName, " SpecializationName " ) ;
getWidget ( f avoriteAttribute[ 0 ] , " FavoriteAttribute0 " ) ;
getWidget ( mF avoriteAttribute[ 0 ] , " FavoriteAttribute0 " ) ;
getWidget ( f avoriteAttribute[ 1 ] , " FavoriteAttribute1 " ) ;
getWidget ( mF avoriteAttribute[ 1 ] , " FavoriteAttribute1 " ) ;
f avoriteAttribute[ 0 ] - > setWindowManager ( & mWindowManager ) ;
mF avoriteAttribute[ 0 ] - > setWindowManager ( & mWindowManager ) ;
f avoriteAttribute[ 1 ] - > setWindowManager ( & mWindowManager ) ;
mF avoriteAttribute[ 1 ] - > setWindowManager ( & mWindowManager ) ;
for ( int i = 0 ; i < 5 ; i + + )
for ( int i = 0 ; i < 5 ; i + + )
{
{
char theIndex = ' 0 ' + i ;
char theIndex = ' 0 ' + i ;
getWidget ( m ajorSkill[ i ] , std : : string ( " MajorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m M ajorSkill[ i ] , std : : string ( " MajorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m inorSkill[ i ] , std : : string ( " MinorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m M inorSkill[ i ] , std : : string ( " MinorSkill " ) . append ( 1 , theIndex ) ) ;
m ajorSkill[ i ] - > setWindowManager ( & mWindowManager ) ;
m M ajorSkill[ i ] - > setWindowManager ( & mWindowManager ) ;
m inorSkill[ i ] - > setWindowManager ( & mWindowManager ) ;
m M inorSkill[ i ] - > setWindowManager ( & mWindowManager ) ;
}
}
getWidget ( c lassList, " ClassList " ) ;
getWidget ( mC lassList, " ClassList " ) ;
c lassList- > setScrollVisible ( true ) ;
mC lassList- > setScrollVisible ( true ) ;
c lassList- > eventListSelectAccept + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
mC lassList- > eventListSelectAccept + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
c lassList- > eventListMouseItemActivate + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
mC lassList- > eventListMouseItemActivate + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
c lassList- > eventListChangePosition + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
mC lassList- > eventListChangePosition + = MyGUI : : newDelegate ( this , & PickClassDialog : : onSelectClass ) ;
getWidget ( c lassImage, " ClassImage " ) ;
getWidget ( mC lassImage, " ClassImage " ) ;
MyGUI : : ButtonPtr backButton ;
MyGUI : : ButtonPtr backButton ;
getWidget ( backButton , " BackButton " ) ;
getWidget ( backButton , " BackButton " ) ;
@ -148,14 +147,14 @@ void PickClassDialog::open()
void PickClassDialog : : setClassId ( const std : : string & classId ) void PickClassDialog : : setClassId ( const std : : string & classId )
{ {
c urrentClassId = classId ;
mC urrentClassId = classId ;
c lassList- > setIndexSelected ( MyGUI : : ITEM_NONE ) ;
mC lassList- > setIndexSelected ( MyGUI : : ITEM_NONE ) ;
size_t count = c lassList- > getItemCount ( ) ;
size_t count = mC lassList- > getItemCount ( ) ;
for ( size_t i = 0 ; i < count ; + + i )
for ( size_t i = 0 ; i < count ; + + i )
{
{
if ( boost : : iequals ( * c lassList- > getItemDataAt < std : : string > ( i ) , classId ) )
if ( boost : : iequals ( * mC lassList- > getItemDataAt < std : : string > ( i ) , classId ) )
{
{
c lassList- > setIndexSelected ( i ) ;
mC lassList- > setIndexSelected ( i ) ;
break ;
break ;
}
}
}
}
@ -180,11 +179,11 @@ void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
if ( _index = = MyGUI : : ITEM_NONE )
if ( _index = = MyGUI : : ITEM_NONE )
return ;
return ;
const std : : string * classId = c lassList- > getItemDataAt < std : : string > ( _index ) ;
const std : : string * classId = mC lassList- > getItemDataAt < std : : string > ( _index ) ;
if ( boost : : iequals ( c urrentClassId, * classId ) )
if ( boost : : iequals ( mC urrentClassId, * classId ) )
return ;
return ;
c urrentClassId = * classId ;
mC urrentClassId = * classId ;
updateStats ( ) ;
updateStats ( ) ;
} }
@ -192,7 +191,7 @@ void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
void PickClassDialog : : updateClasses ( ) void PickClassDialog : : updateClasses ( )
{ {
c lassList- > removeAllItems ( ) ;
mC lassList- > removeAllItems ( ) ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
@ -207,19 +206,19 @@ void PickClassDialog::updateClasses()
continue ;
continue ;
const std : : string & id = it - > first ;
const std : : string & id = it - > first ;
c lassList- > addItem ( klass . name , id ) ;
mC lassList- > addItem ( klass . name , id ) ;
if ( boost : : iequals ( id , c urrentClassId) )
if ( boost : : iequals ( id , mC urrentClassId) )
c lassList- > setIndexSelected ( index ) ;
mC lassList- > setIndexSelected ( index ) ;
+ + index ;
+ + index ;
}
}
} }
void PickClassDialog : : updateStats ( ) void PickClassDialog : : updateStats ( )
{ {
if ( c urrentClassId. empty ( ) )
if ( mC urrentClassId. empty ( ) )
return ;
return ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
const ESMS : : ESMStore & store = mWindowManager . getStore ( ) ;
const ESM : : Class * klass = store . classes . search ( c urrentClassId) ;
const ESM : : Class * klass = store . classes . search ( mC urrentClassId) ;
if ( ! klass )
if ( ! klass )
return ;
return ;
@ -231,23 +230,23 @@ void PickClassDialog::updateStats()
" sSpecializationStealth "
" sSpecializationStealth "
} ;
} ;
std : : string specName = mWindowManager . getGameSettingString ( specIds [ specialization ] , specIds [ specialization ] ) ;
std : : string specName = mWindowManager . getGameSettingString ( specIds [ specialization ] , specIds [ specialization ] ) ;
s pecializationName- > setCaption ( specName ) ;
mS pecializationName- > setCaption ( specName ) ;
ToolTips : : createSpecializationToolTip ( s pecializationName, specName , specialization ) ;
ToolTips : : createSpecializationToolTip ( mS pecializationName, specName , specialization ) ;
f avoriteAttribute[ 0 ] - > setAttributeId ( klass - > data . attribute [ 0 ] ) ;
mF avoriteAttribute[ 0 ] - > setAttributeId ( klass - > data . attribute [ 0 ] ) ;
f avoriteAttribute[ 1 ] - > setAttributeId ( klass - > data . attribute [ 1 ] ) ;
mF avoriteAttribute[ 1 ] - > setAttributeId ( klass - > data . attribute [ 1 ] ) ;
ToolTips : : createAttributeToolTip ( favoriteAttribute[ 0 ] , f avoriteAttribute[ 0 ] - > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( mFavoriteAttribute[ 0 ] , mF avoriteAttribute[ 0 ] - > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( favoriteAttribute[ 1 ] , f avoriteAttribute[ 1 ] - > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( mFavoriteAttribute[ 1 ] , mF avoriteAttribute[ 1 ] - > getAttributeId ( ) ) ;
for ( int i = 0 ; i < 5 ; + + i )
for ( int i = 0 ; i < 5 ; + + i )
{
{
m inorSkill[ i ] - > setSkillNumber ( klass - > data . skills [ i ] [ 0 ] ) ;
m M inorSkill[ i ] - > setSkillNumber ( klass - > data . skills [ i ] [ 0 ] ) ;
m ajorSkill[ i ] - > setSkillNumber ( klass - > data . skills [ i ] [ 1 ] ) ;
m M ajorSkill[ i ] - > setSkillNumber ( klass - > data . skills [ i ] [ 1 ] ) ;
ToolTips : : createSkillToolTip ( m inorSkill[ i ] , klass - > data . skills [ i ] [ 0 ] ) ;
ToolTips : : createSkillToolTip ( m M inorSkill[ i ] , klass - > data . skills [ i ] [ 0 ] ) ;
ToolTips : : createSkillToolTip ( m ajorSkill[ i ] , klass - > data . skills [ i ] [ 1 ] ) ;
ToolTips : : createSkillToolTip ( m M ajorSkill[ i ] , klass - > data . skills [ i ] [ 1 ] ) ;
}
}
c lassImage- > setImageTexture ( std : : string ( " textures \\ levelup \\ " ) + c urrentClassId + " .dds " ) ;
mC lassImage- > setImageTexture ( std : : string ( " textures \\ levelup \\ " ) + mC urrentClassId + " .dds " ) ;
} }
/* InfoBoxDialog */ /* InfoBoxDialog */
@ -284,59 +283,59 @@ void InfoBoxDialog::layoutVertically(MyGUI::WidgetPtr widget, int margin)
InfoBoxDialog : : InfoBoxDialog ( WindowManager & parWindowManager ) InfoBoxDialog : : InfoBoxDialog ( WindowManager & parWindowManager )
: WindowBase ( " openmw_infobox.layout " , parWindowManager )
: WindowBase ( " openmw_infobox.layout " , parWindowManager )
, c urrentButton( - 1 )
, mC urrentButton( - 1 )
{ {
getWidget ( t extBox, " TextBox " ) ;
getWidget ( mT extBox, " TextBox " ) ;
getWidget ( t ext, " Text " ) ;
getWidget ( mT ext, " Text " ) ;
t ext- > getSubWidgetText ( ) - > setWordWrap ( true ) ;
mT ext- > getSubWidgetText ( ) - > setWordWrap ( true ) ;
getWidget ( b uttonBar, " ButtonBar " ) ;
getWidget ( mB uttonBar, " ButtonBar " ) ;
center ( ) ;
center ( ) ;
} }
void InfoBoxDialog : : setText ( const std : : string & str ) void InfoBoxDialog : : setText ( const std : : string & str )
{ {
t ext- > setCaption ( str ) ;
mT ext- > setCaption ( str ) ;
t extBox- > setVisible ( ! str . empty ( ) ) ;
mT extBox- > setVisible ( ! str . empty ( ) ) ;
fitToText ( t ext) ;
fitToText ( mT ext) ;
} }
std : : string InfoBoxDialog : : getText ( ) const std : : string InfoBoxDialog : : getText ( ) const
{ {
return t ext- > getCaption ( ) ;
return mT ext- > getCaption ( ) ;
} }
void InfoBoxDialog : : setButtons ( ButtonList & buttons ) void InfoBoxDialog : : setButtons ( ButtonList & buttons )
{ {
for ( std : : vector < MyGUI : : ButtonPtr > : : iterator it = this - > b uttons. begin ( ) ; it ! = this - > b uttons. end ( ) ; + + it )
for ( std : : vector < MyGUI : : ButtonPtr > : : iterator it = this - > mB uttons. begin ( ) ; it ! = this - > mB uttons. end ( ) ; + + it )
{
{
MyGUI : : Gui : : getInstance ( ) . destroyWidget ( * it ) ;
MyGUI : : Gui : : getInstance ( ) . destroyWidget ( * it ) ;
}
}
this - > b uttons. clear ( ) ;
this - > mB uttons. clear ( ) ;
c urrentButton = - 1 ;
mC urrentButton = - 1 ;
// TODO: The buttons should be generated from a template in the layout file, ie. cloning an existing widget
// TODO: The buttons should be generated from a template in the layout file, ie. cloning an existing widget
MyGUI : : ButtonPtr button ;
MyGUI : : ButtonPtr button ;
MyGUI : : IntCoord coord = MyGUI : : IntCoord ( 0 , 0 , b uttonBar- > getWidth ( ) , 10 ) ;
MyGUI : : IntCoord coord = MyGUI : : IntCoord ( 0 , 0 , mB uttonBar- > getWidth ( ) , 10 ) ;
ButtonList : : const_iterator end = buttons . end ( ) ;
ButtonList : : const_iterator end = buttons . end ( ) ;
for ( ButtonList : : const_iterator it = buttons . begin ( ) ; it ! = end ; + + it )
for ( ButtonList : : const_iterator it = buttons . begin ( ) ; it ! = end ; + + it )
{
{
const std : : string & text = * it ;
const std : : string & text = * it ;
button = b uttonBar- > createWidget < MyGUI : : Button > ( " MW_Button " , coord , MyGUI : : Align : : Top | MyGUI : : Align : : HCenter , " " ) ;
button = mB uttonBar- > createWidget < MyGUI : : Button > ( " MW_Button " , coord , MyGUI : : Align : : Top | MyGUI : : Align : : HCenter , " " ) ;
button - > getSubWidgetText ( ) - > setWordWrap ( true ) ;
button - > getSubWidgetText ( ) - > setWordWrap ( true ) ;
button - > setCaption ( text ) ;
button - > setCaption ( text ) ;
fitToText ( button ) ;
fitToText ( button ) ;
button - > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & InfoBoxDialog : : onButtonClicked ) ;
button - > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & InfoBoxDialog : : onButtonClicked ) ;
coord . top + = button - > getHeight ( ) ;
coord . top + = button - > getHeight ( ) ;
this - > b uttons. push_back ( button ) ;
this - > mB uttons. push_back ( button ) ;
}
}
} }
void InfoBoxDialog : : open ( ) void InfoBoxDialog : : open ( )
{ {
// Fix layout
// Fix layout
layoutVertically ( t extBox, 4 ) ;
layoutVertically ( mT extBox, 4 ) ;
layoutVertically ( b uttonBar, 6 ) ;
layoutVertically ( mB uttonBar, 6 ) ;
layoutVertically ( mMainWidget , 4 + 6 ) ;
layoutVertically ( mMainWidget , 4 + 6 ) ;
center ( ) ;
center ( ) ;
@ -345,18 +344,18 @@ void InfoBoxDialog::open()
int InfoBoxDialog : : getChosenButton ( ) const int InfoBoxDialog : : getChosenButton ( ) const
{ {
return c urrentButton;
return mC urrentButton;
} }
void InfoBoxDialog : : onButtonClicked ( MyGUI : : WidgetPtr _sender ) void InfoBoxDialog : : onButtonClicked ( MyGUI : : WidgetPtr _sender )
{ {
std : : vector < MyGUI : : ButtonPtr > : : const_iterator end = b uttons. end ( ) ;
std : : vector < MyGUI : : ButtonPtr > : : const_iterator end = mB uttons. end ( ) ;
int i = 0 ;
int i = 0 ;
for ( std : : vector < MyGUI : : ButtonPtr > : : const_iterator it = b uttons. begin ( ) ; it ! = end ; + + it )
for ( std : : vector < MyGUI : : ButtonPtr > : : const_iterator it = mB uttons. begin ( ) ; it ! = end ; + + it )
{
{
if ( * it = = _sender )
if ( * it = = _sender )
{
{
c urrentButton = i ;
mC urrentButton = i ;
eventButtonSelected ( i ) ;
eventButtonSelected ( i ) ;
return ;
return ;
}
}
@ -382,49 +381,49 @@ ClassChoiceDialog::ClassChoiceDialog(WindowManager& parWindowManager)
CreateClassDialog : : CreateClassDialog ( WindowManager & parWindowManager ) CreateClassDialog : : CreateClassDialog ( WindowManager & parWindowManager )
: WindowBase ( " openmw_chargen_create_class.layout " , parWindowManager )
: WindowBase ( " openmw_chargen_create_class.layout " , parWindowManager )
, s pecDialog( nullptr )
, mS pecDialog( nullptr )
, a ttribDialog( nullptr )
, mA ttribDialog( nullptr )
, s killDialog( nullptr )
, mS killDialog( nullptr )
, d escDialog( nullptr )
, mD escDialog( nullptr )
{ {
// Centre dialog
// Centre dialog
center ( ) ;
center ( ) ;
setText ( " SpecializationT " , mWindowManager . getGameSettingString ( " sChooseClassMenu1 " , " Specialization " ) ) ;
setText ( " SpecializationT " , mWindowManager . getGameSettingString ( " sChooseClassMenu1 " , " Specialization " ) ) ;
getWidget ( s pecializationName, " SpecializationName " ) ;
getWidget ( mS pecializationName, " SpecializationName " ) ;
s pecializationName- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSpecializationClicked ) ;
mS pecializationName- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSpecializationClicked ) ;
setText ( " FavoriteAttributesT " , mWindowManager . getGameSettingString ( " sChooseClassMenu2 " , " Favorite Attributes: " ) ) ;
setText ( " FavoriteAttributesT " , mWindowManager . getGameSettingString ( " sChooseClassMenu2 " , " Favorite Attributes: " ) ) ;
getWidget ( f avoriteAttribute0, " FavoriteAttribute0 " ) ;
getWidget ( mF avoriteAttribute0, " FavoriteAttribute0 " ) ;
getWidget ( f avoriteAttribute1, " FavoriteAttribute1 " ) ;
getWidget ( mF avoriteAttribute1, " FavoriteAttribute1 " ) ;
f avoriteAttribute0- > setWindowManager ( & mWindowManager ) ;
mF avoriteAttribute0- > setWindowManager ( & mWindowManager ) ;
f avoriteAttribute1- > setWindowManager ( & mWindowManager ) ;
mF avoriteAttribute1- > setWindowManager ( & mWindowManager ) ;
f avoriteAttribute0- > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeClicked ) ;
mF avoriteAttribute0- > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeClicked ) ;
f avoriteAttribute1- > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeClicked ) ;
mF avoriteAttribute1- > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeClicked ) ;
setText ( " MajorSkillT " , mWindowManager . getGameSettingString ( " sSkillClassMajor " , " " ) ) ;
setText ( " MajorSkillT " , mWindowManager . getGameSettingString ( " sSkillClassMajor " , " " ) ) ;
setText ( " MinorSkillT " , mWindowManager . getGameSettingString ( " sSkillClassMinor " , " " ) ) ;
setText ( " MinorSkillT " , mWindowManager . getGameSettingString ( " sSkillClassMinor " , " " ) ) ;
for ( int i = 0 ; i < 5 ; i + + )
for ( int i = 0 ; i < 5 ; i + + )
{
{
char theIndex = ' 0 ' + i ;
char theIndex = ' 0 ' + i ;
getWidget ( m ajorSkill[ i ] , std : : string ( " MajorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m M ajorSkill[ i ] , std : : string ( " MajorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m inorSkill[ i ] , std : : string ( " MinorSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m M inorSkill[ i ] , std : : string ( " MinorSkill " ) . append ( 1 , theIndex ) ) ;
skills. push_back ( m ajorSkill[ i ] ) ;
mSkills. push_back ( mM ajorSkill[ i ] ) ;
skills. push_back ( m inorSkill[ i ] ) ;
mSkills. push_back ( mM inorSkill[ i ] ) ;
}
}
std : : vector < Widgets : : MWSkillPtr > : : const_iterator end = s kills. end ( ) ;
std : : vector < Widgets : : MWSkillPtr > : : const_iterator end = mS kills. end ( ) ;
for ( std : : vector < Widgets : : MWSkillPtr > : : const_iterator it = s kills. begin ( ) ; it ! = end ; + + it )
for ( std : : vector < Widgets : : MWSkillPtr > : : const_iterator it = mS kills. begin ( ) ; it ! = end ; + + it )
{
{
( * it ) - > setWindowManager ( & mWindowManager ) ;
( * it ) - > setWindowManager ( & mWindowManager ) ;
( * it ) - > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSkillClicked ) ;
( * it ) - > eventClicked + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSkillClicked ) ;
}
}
setText ( " LabelT " , mWindowManager . getGameSettingString ( " sName " , " " ) ) ;
setText ( " LabelT " , mWindowManager . getGameSettingString ( " sName " , " " ) ) ;
getWidget ( e ditName, " EditName " ) ;
getWidget ( mE ditName, " EditName " ) ;
// Make sure the edit box has focus
// Make sure the edit box has focus
MyGUI : : InputManager : : getInstance ( ) . setKeyFocusWidget ( e ditName) ;
MyGUI : : InputManager : : getInstance ( ) . setKeyFocusWidget ( mE ditName) ;
MyGUI : : ButtonPtr descriptionButton ;
MyGUI : : ButtonPtr descriptionButton ;
getWidget ( descriptionButton , " DescriptionButton " ) ;
getWidget ( descriptionButton , " DescriptionButton " ) ;
@ -441,20 +440,20 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
// Set default skills, attributes
// Set default skills, attributes
f avoriteAttribute0- > setAttributeId ( ESM : : Attribute : : Strength ) ;
mF avoriteAttribute0- > setAttributeId ( ESM : : Attribute : : Strength ) ;
f avoriteAttribute1- > setAttributeId ( ESM : : Attribute : : Agility ) ;
mF avoriteAttribute1- > setAttributeId ( ESM : : Attribute : : Agility ) ;
m ajorSkill[ 0 ] - > setSkillId ( ESM : : Skill : : Block ) ;
m M ajorSkill[ 0 ] - > setSkillId ( ESM : : Skill : : Block ) ;
m ajorSkill[ 1 ] - > setSkillId ( ESM : : Skill : : Armorer ) ;
m M ajorSkill[ 1 ] - > setSkillId ( ESM : : Skill : : Armorer ) ;
m ajorSkill[ 2 ] - > setSkillId ( ESM : : Skill : : MediumArmor ) ;
m M ajorSkill[ 2 ] - > setSkillId ( ESM : : Skill : : MediumArmor ) ;
m ajorSkill[ 3 ] - > setSkillId ( ESM : : Skill : : HeavyArmor ) ;
m M ajorSkill[ 3 ] - > setSkillId ( ESM : : Skill : : HeavyArmor ) ;
m ajorSkill[ 4 ] - > setSkillId ( ESM : : Skill : : BluntWeapon ) ;
m M ajorSkill[ 4 ] - > setSkillId ( ESM : : Skill : : BluntWeapon ) ;
m inorSkill[ 0 ] - > setSkillId ( ESM : : Skill : : LongBlade ) ;
m M inorSkill[ 0 ] - > setSkillId ( ESM : : Skill : : LongBlade ) ;
m inorSkill[ 1 ] - > setSkillId ( ESM : : Skill : : Axe ) ;
m M inorSkill[ 1 ] - > setSkillId ( ESM : : Skill : : Axe ) ;
m inorSkill[ 2 ] - > setSkillId ( ESM : : Skill : : Spear ) ;
m M inorSkill[ 2 ] - > setSkillId ( ESM : : Skill : : Spear ) ;
m inorSkill[ 3 ] - > setSkillId ( ESM : : Skill : : Athletics ) ;
m M inorSkill[ 3 ] - > setSkillId ( ESM : : Skill : : Athletics ) ;
m inorSkill[ 4 ] - > setSkillId ( ESM : : Skill : : Enchant ) ;
m M inorSkill[ 4 ] - > setSkillId ( ESM : : Skill : : Enchant ) ;
setSpecialization ( 0 ) ;
setSpecialization ( 0 ) ;
update ( ) ;
update ( ) ;
@ -462,44 +461,44 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
CreateClassDialog : : ~ CreateClassDialog ( ) CreateClassDialog : : ~ CreateClassDialog ( )
{ {
delete s pecDialog;
delete mS pecDialog;
delete a ttribDialog;
delete mA ttribDialog;
delete s killDialog;
delete mS killDialog;
delete d escDialog;
delete mD escDialog;
} }
void CreateClassDialog : : update ( ) void CreateClassDialog : : update ( )
{ {
for ( int i = 0 ; i < 5 ; + + i )
for ( int i = 0 ; i < 5 ; + + i )
{
{
ToolTips : : createSkillToolTip ( m ajorSkill[ i ] , m ajorSkill[ i ] - > getSkillId ( ) ) ;
ToolTips : : createSkillToolTip ( m M ajorSkill[ i ] , m M ajorSkill[ i ] - > getSkillId ( ) ) ;
ToolTips : : createSkillToolTip ( m inorSkill[ i ] , m inorSkill[ i ] - > getSkillId ( ) ) ;
ToolTips : : createSkillToolTip ( m M inorSkill[ i ] , m M inorSkill[ i ] - > getSkillId ( ) ) ;
}
}
ToolTips : : createAttributeToolTip ( favoriteAttribute0, f avoriteAttribute0- > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( mFavoriteAttribute0, mF avoriteAttribute0- > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( favoriteAttribute1, f avoriteAttribute1- > getAttributeId ( ) ) ;
ToolTips : : createAttributeToolTip ( mFavoriteAttribute1, mF avoriteAttribute1- > getAttributeId ( ) ) ;
} }
std : : string CreateClassDialog : : getName ( ) const std : : string CreateClassDialog : : getName ( ) const
{ {
return e ditName- > getOnlyText ( ) ;
return mE ditName- > getOnlyText ( ) ;
} }
std : : string CreateClassDialog : : getDescription ( ) const std : : string CreateClassDialog : : getDescription ( ) const
{ {
return d escription;
return mD escription;
} }
ESM : : Class : : Specialization CreateClassDialog : : getSpecializationId ( ) const ESM : : Class : : Specialization CreateClassDialog : : getSpecializationId ( ) const
{ {
return s pecializationId;
return mS pecializationId;
} }
std : : vector < int > CreateClassDialog : : getFavoriteAttributes ( ) const std : : vector < int > CreateClassDialog : : getFavoriteAttributes ( ) const
{ {
std : : vector < int > v ;
std : : vector < int > v ;
v . push_back ( f avoriteAttribute0- > getAttributeId ( ) ) ;
v . push_back ( mF avoriteAttribute0- > getAttributeId ( ) ) ;
v . push_back ( f avoriteAttribute1- > getAttributeId ( ) ) ;
v . push_back ( mF avoriteAttribute1- > getAttributeId ( ) ) ;
return v ;
return v ;
} }
@ -508,7 +507,7 @@ std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMajorSkills() const
std : : vector < ESM : : Skill : : SkillEnum > v ;
std : : vector < ESM : : Skill : : SkillEnum > v ;
for ( int i = 0 ; i < 5 ; i + + )
for ( int i = 0 ; i < 5 ; i + + )
{
{
v . push_back ( m ajorSkill[ i ] - > getSkillId ( ) ) ;
v . push_back ( m M ajorSkill[ i ] - > getSkillId ( ) ) ;
}
}
return v ;
return v ;
} }
@ -518,7 +517,7 @@ std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMinorSkills() const
std : : vector < ESM : : Skill : : SkillEnum > v ;
std : : vector < ESM : : Skill : : SkillEnum > v ;
for ( int i = 0 ; i < 5 ; i + + )
for ( int i = 0 ; i < 5 ; i + + )
{
{
v . push_back ( m inorSkill[ i ] - > getSkillId ( ) ) ;
v . push_back ( m M inorSkill[ i ] - > getSkillId ( ) ) ;
}
}
return v ;
return v ;
} }
@ -557,108 +556,108 @@ void CreateClassDialog::open()
void CreateClassDialog : : onDialogCancel ( ) void CreateClassDialog : : onDialogCancel ( )
{ {
if ( s pecDialog)
if ( mS pecDialog)
{
{
mWindowManager . removeDialog ( s pecDialog) ;
mWindowManager . removeDialog ( mS pecDialog) ;
s pecDialog = 0 ;
mS pecDialog = 0 ;
}
}
if ( a ttribDialog)
if ( mA ttribDialog)
{
{
mWindowManager . removeDialog ( a ttribDialog) ;
mWindowManager . removeDialog ( mA ttribDialog) ;
a ttribDialog = 0 ;
mA ttribDialog = 0 ;
}
}
if ( s killDialog)
if ( mS killDialog)
{
{
mWindowManager . removeDialog ( s killDialog) ;
mWindowManager . removeDialog ( mS killDialog) ;
s killDialog = 0 ;
mS killDialog = 0 ;
}
}
if ( d escDialog)
if ( mD escDialog)
{
{
mWindowManager . removeDialog ( d escDialog) ;
mWindowManager . removeDialog ( mD escDialog) ;
d escDialog = 0 ;
mD escDialog = 0 ;
}
}
} }
void CreateClassDialog : : onSpecializationClicked ( MyGUI : : WidgetPtr _sender ) void CreateClassDialog : : onSpecializationClicked ( MyGUI : : WidgetPtr _sender )
{ {
delete s pecDialog;
delete mS pecDialog;
s pecDialog = new SelectSpecializationDialog ( mWindowManager ) ;
mS pecDialog = new SelectSpecializationDialog ( mWindowManager ) ;
s pecDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
mS pecDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
s pecDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSpecializationSelected ) ;
mS pecDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSpecializationSelected ) ;
s pecDialog- > setVisible ( true ) ;
mS pecDialog- > setVisible ( true ) ;
} }
void CreateClassDialog : : onSpecializationSelected ( ) void CreateClassDialog : : onSpecializationSelected ( )
{ {
specializationId = s pecDialog- > getSpecializationId ( ) ;
mSpecializationId = mS pecDialog- > getSpecializationId ( ) ;
setSpecialization ( s pecializationId) ;
setSpecialization ( mS pecializationId) ;
mWindowManager . removeDialog ( s pecDialog) ;
mWindowManager . removeDialog ( mS pecDialog) ;
s pecDialog = 0 ;
mS pecDialog = 0 ;
} }
void CreateClassDialog : : setSpecialization ( int id ) void CreateClassDialog : : setSpecialization ( int id )
{ {
s pecializationId = ( ESM : : Class : : Specialization ) id ;
mS pecializationId = ( ESM : : Class : : Specialization ) id ;
static const char * specIds [ 3 ] = {
static const char * specIds [ 3 ] = {
" sSpecializationCombat " ,
" sSpecializationCombat " ,
" sSpecializationMagic " ,
" sSpecializationMagic " ,
" sSpecializationStealth "
" sSpecializationStealth "
} ;
} ;
std : : string specName = mWindowManager . getGameSettingString ( specIds [ specializationId] , specIds [ s pecializationId] ) ;
std : : string specName = mWindowManager . getGameSettingString ( specIds [ mSpecializationId] , specIds [ mS pecializationId] ) ;
s pecializationName- > setCaption ( specName ) ;
mS pecializationName- > setCaption ( specName ) ;
ToolTips : : createSpecializationToolTip ( specializationName, specName , s pecializationId) ;
ToolTips : : createSpecializationToolTip ( mSpecializationName, specName , mS pecializationId) ;
} }
void CreateClassDialog : : onAttributeClicked ( Widgets : : MWAttributePtr _sender ) void CreateClassDialog : : onAttributeClicked ( Widgets : : MWAttributePtr _sender )
{ {
delete a ttribDialog;
delete mA ttribDialog;
a ttribDialog = new SelectAttributeDialog ( mWindowManager ) ;
mA ttribDialog = new SelectAttributeDialog ( mWindowManager ) ;
a ttribDialog- > setAffectedWidget ( _sender ) ;
mA ttribDialog- > setAffectedWidget ( _sender ) ;
a ttribDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
mA ttribDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
a ttribDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeSelected ) ;
mA ttribDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onAttributeSelected ) ;
a ttribDialog- > setVisible ( true ) ;
mA ttribDialog- > setVisible ( true ) ;
} }
void CreateClassDialog : : onAttributeSelected ( ) void CreateClassDialog : : onAttributeSelected ( )
{ {
ESM : : Attribute : : AttributeID id = a ttribDialog- > getAttributeId ( ) ;
ESM : : Attribute : : AttributeID id = mA ttribDialog- > getAttributeId ( ) ;
Widgets : : MWAttributePtr attribute = a ttribDialog- > getAffectedWidget ( ) ;
Widgets : : MWAttributePtr attribute = mA ttribDialog- > getAffectedWidget ( ) ;
if ( attribute = = f avoriteAttribute0)
if ( attribute = = mF avoriteAttribute0)
{
{
if ( f avoriteAttribute1- > getAttributeId ( ) = = id )
if ( mF avoriteAttribute1- > getAttributeId ( ) = = id )
favoriteAttribute1- > setAttributeId ( f avoriteAttribute0- > getAttributeId ( ) ) ;
mFavoriteAttribute1- > setAttributeId ( mF avoriteAttribute0- > getAttributeId ( ) ) ;
}
}
else if ( attribute = = f avoriteAttribute1)
else if ( attribute = = mF avoriteAttribute1)
{
{
if ( f avoriteAttribute0- > getAttributeId ( ) = = id )
if ( mF avoriteAttribute0- > getAttributeId ( ) = = id )
favoriteAttribute0- > setAttributeId ( f avoriteAttribute1- > getAttributeId ( ) ) ;
mFavoriteAttribute0- > setAttributeId ( mF avoriteAttribute1- > getAttributeId ( ) ) ;
}
}
attribute - > setAttributeId ( id ) ;
attribute - > setAttributeId ( id ) ;
mWindowManager . removeDialog ( a ttribDialog) ;
mWindowManager . removeDialog ( mA ttribDialog) ;
a ttribDialog = 0 ;
mA ttribDialog = 0 ;
update ( ) ;
update ( ) ;
} }
void CreateClassDialog : : onSkillClicked ( Widgets : : MWSkillPtr _sender ) void CreateClassDialog : : onSkillClicked ( Widgets : : MWSkillPtr _sender )
{ {
delete s killDialog;
delete mS killDialog;
s killDialog = new SelectSkillDialog ( mWindowManager ) ;
mS killDialog = new SelectSkillDialog ( mWindowManager ) ;
s killDialog- > setAffectedWidget ( _sender ) ;
mS killDialog- > setAffectedWidget ( _sender ) ;
s killDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
mS killDialog- > eventCancel + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDialogCancel ) ;
s killDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSkillSelected ) ;
mS killDialog- > eventItemSelected + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onSkillSelected ) ;
s killDialog- > setVisible ( true ) ;
mS killDialog- > setVisible ( true ) ;
} }
void CreateClassDialog : : onSkillSelected ( ) void CreateClassDialog : : onSkillSelected ( )
{ {
ESM : : Skill : : SkillEnum id = s killDialog- > getSkillId ( ) ;
ESM : : Skill : : SkillEnum id = mS killDialog- > getSkillId ( ) ;
Widgets : : MWSkillPtr skill = s killDialog- > getAffectedWidget ( ) ;
Widgets : : MWSkillPtr skill = mS killDialog- > getAffectedWidget ( ) ;
// Avoid duplicate skills by swapping any skill field that matches the selected one
// Avoid duplicate skills by swapping any skill field that matches the selected one
std : : vector < Widgets : : MWSkillPtr > : : const_iterator end = s kills. end ( ) ;
std : : vector < Widgets : : MWSkillPtr > : : const_iterator end = mS kills. end ( ) ;
for ( std : : vector < Widgets : : MWSkillPtr > : : const_iterator it = s kills. begin ( ) ; it ! = end ; + + it )
for ( std : : vector < Widgets : : MWSkillPtr > : : const_iterator it = mS kills. begin ( ) ; it ! = end ; + + it )
{
{
if ( * it = = skill )
if ( * it = = skill )
continue ;
continue ;
@ -669,25 +668,25 @@ void CreateClassDialog::onSkillSelected()
}
}
}
}
skill - > setSkillId ( s killDialog- > getSkillId ( ) ) ;
skill - > setSkillId ( mS killDialog- > getSkillId ( ) ) ;
mWindowManager . removeDialog ( s killDialog) ;
mWindowManager . removeDialog ( mS killDialog) ;
s killDialog = 0 ;
mS killDialog = 0 ;
update ( ) ;
update ( ) ;
} }
void CreateClassDialog : : onDescriptionClicked ( MyGUI : : Widget * _sender ) void CreateClassDialog : : onDescriptionClicked ( MyGUI : : Widget * _sender )
{ {
d escDialog = new DescriptionDialog ( mWindowManager ) ;
mD escDialog = new DescriptionDialog ( mWindowManager ) ;
descDialog- > setTextInput ( d escription) ;
mDescDialog- > setTextInput ( mD escription) ;
d escDialog- > eventDone + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDescriptionEntered ) ;
mD escDialog- > eventDone + = MyGUI : : newDelegate ( this , & CreateClassDialog : : onDescriptionEntered ) ;
d escDialog- > setVisible ( true ) ;
mD escDialog- > setVisible ( true ) ;
} }
void CreateClassDialog : : onDescriptionEntered ( WindowBase * parWindow ) void CreateClassDialog : : onDescriptionEntered ( WindowBase * parWindow )
{ {
description = d escDialog- > getTextInput ( ) ;
mDescription = mD escDialog- > getTextInput ( ) ;
mWindowManager . removeDialog ( d escDialog) ;
mWindowManager . removeDialog ( mD escDialog) ;
d escDialog = 0 ;
mD escDialog = 0 ;
} }
void CreateClassDialog : : onOkClicked ( MyGUI : : Widget * _sender ) void CreateClassDialog : : onOkClicked ( MyGUI : : Widget * _sender )
@ -710,24 +709,24 @@ SelectSpecializationDialog::SelectSpecializationDialog(WindowManager& parWindowM
setText ( " LabelT " , mWindowManager . getGameSettingString ( " sSpecializationMenu1 " , " " ) ) ;
setText ( " LabelT " , mWindowManager . getGameSettingString ( " sSpecializationMenu1 " , " " ) ) ;
getWidget ( s pecialization0, " Specialization0 " ) ;
getWidget ( mS pecialization0, " Specialization0 " ) ;
getWidget ( s pecialization1, " Specialization1 " ) ;
getWidget ( mS pecialization1, " Specialization1 " ) ;
getWidget ( s pecialization2, " Specialization2 " ) ;
getWidget ( mS pecialization2, " Specialization2 " ) ;
std : : string combat = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Combat ] , " " ) ;
std : : string combat = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Combat ] , " " ) ;
std : : string magic = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Magic ] , " " ) ;
std : : string magic = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Magic ] , " " ) ;
std : : string stealth = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Stealth ] , " " ) ;
std : : string stealth = mWindowManager . getGameSettingString ( ESM : : Class : : gmstSpecializationIds [ ESM : : Class : : Stealth ] , " " ) ;
s pecialization0- > setCaption ( combat ) ;
mS pecialization0- > setCaption ( combat ) ;
s pecialization0- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
mS pecialization0- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
s pecialization1- > setCaption ( magic ) ;
mS pecialization1- > setCaption ( magic ) ;
s pecialization1- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
mS pecialization1- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
s pecialization2- > setCaption ( stealth ) ;
mS pecialization2- > setCaption ( stealth ) ;
s pecialization2- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
mS pecialization2- > eventMouseButtonClick + = MyGUI : : newDelegate ( this , & SelectSpecializationDialog : : onSpecializationClicked ) ;
s pecializationId = ESM : : Class : : Combat ;
mS pecializationId = ESM : : Class : : Combat ;
ToolTips : : createSpecializationToolTip ( s pecialization0, combat , ESM : : Class : : Combat ) ;
ToolTips : : createSpecializationToolTip ( mS pecialization0, combat , ESM : : Class : : Combat ) ;
ToolTips : : createSpecializationToolTip ( s pecialization1, magic , ESM : : Class : : Magic ) ;
ToolTips : : createSpecializationToolTip ( mS pecialization1, magic , ESM : : Class : : Magic ) ;
ToolTips : : createSpecializationToolTip ( s pecialization2, stealth , ESM : : Class : : Stealth ) ;
ToolTips : : createSpecializationToolTip ( mS pecialization2, stealth , ESM : : Class : : Stealth ) ;
MyGUI : : ButtonPtr cancelButton ;
MyGUI : : ButtonPtr cancelButton ;
getWidget ( cancelButton , " CancelButton " ) ;
getWidget ( cancelButton , " CancelButton " ) ;
@ -748,12 +747,12 @@ SelectSpecializationDialog::~SelectSpecializationDialog()
void SelectSpecializationDialog : : onSpecializationClicked ( MyGUI : : WidgetPtr _sender ) void SelectSpecializationDialog : : onSpecializationClicked ( MyGUI : : WidgetPtr _sender )
{ {
if ( _sender = = s pecialization0)
if ( _sender = = mS pecialization0)
s pecializationId = ESM : : Class : : Combat ;
mS pecializationId = ESM : : Class : : Combat ;
else if ( _sender = = s pecialization1)
else if ( _sender = = mS pecialization1)
s pecializationId = ESM : : Class : : Magic ;
mS pecializationId = ESM : : Class : : Magic ;
else if ( _sender = = s pecialization2)
else if ( _sender = = mS pecialization2)
s pecializationId = ESM : : Class : : Stealth ;
mS pecializationId = ESM : : Class : : Stealth ;
else
else
return ;
return ;
@ -807,7 +806,7 @@ SelectAttributeDialog::~SelectAttributeDialog()
void SelectAttributeDialog : : onAttributeClicked ( Widgets : : MWAttributePtr _sender ) void SelectAttributeDialog : : onAttributeClicked ( Widgets : : MWAttributePtr _sender )
{ {
// TODO: Change MWAttribute to set and get AttributeID enum instead of int
// TODO: Change MWAttribute to set and get AttributeID enum instead of int
a ttributeId = static_cast < ESM : : Attribute : : AttributeID > ( _sender - > getAttributeId ( ) ) ;
mA ttributeId = static_cast < ESM : : Attribute : : AttributeID > ( _sender - > getAttributeId ( ) ) ;
eventItemSelected ( ) ;
eventItemSelected ( ) ;
} }
@ -833,44 +832,44 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
for ( int i = 0 ; i < 9 ; i + + )
for ( int i = 0 ; i < 9 ; i + + )
{
{
char theIndex = ' 0 ' + i ;
char theIndex = ' 0 ' + i ;
getWidget ( c ombatSkill[ i ] , std : : string ( " CombatSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( mC ombatSkill[ i ] , std : : string ( " CombatSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m agicSkill[ i ] , std : : string ( " MagicSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( m M agicSkill[ i ] , std : : string ( " MagicSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( s tealthSkill[ i ] , std : : string ( " StealthSkill " ) . append ( 1 , theIndex ) ) ;
getWidget ( mS tealthSkill[ i ] , std : : string ( " StealthSkill " ) . append ( 1 , theIndex ) ) ;
}
}
struct { Widgets : : MWSkillPtr widget ; ESM : : Skill : : SkillEnum skillId ; } s kills[ 3 ] [ 9 ] = {
struct { Widgets : : MWSkillPtr widget ; ESM : : Skill : : SkillEnum skillId ; } mS kills[ 3 ] [ 9 ] = {
{
{
{ c ombatSkill[ 0 ] , ESM : : Skill : : Block } ,
{ mC ombatSkill[ 0 ] , ESM : : Skill : : Block } ,
{ c ombatSkill[ 1 ] , ESM : : Skill : : Armorer } ,
{ mC ombatSkill[ 1 ] , ESM : : Skill : : Armorer } ,
{ c ombatSkill[ 2 ] , ESM : : Skill : : MediumArmor } ,
{ mC ombatSkill[ 2 ] , ESM : : Skill : : MediumArmor } ,
{ c ombatSkill[ 3 ] , ESM : : Skill : : HeavyArmor } ,
{ mC ombatSkill[ 3 ] , ESM : : Skill : : HeavyArmor } ,
{ c ombatSkill[ 4 ] , ESM : : Skill : : BluntWeapon } ,
{ mC ombatSkill[ 4 ] , ESM : : Skill : : BluntWeapon } ,
{ c ombatSkill[ 5 ] , ESM : : Skill : : LongBlade } ,
{ mC ombatSkill[ 5 ] , ESM : : Skill : : LongBlade } ,
{ c ombatSkill[ 6 ] , ESM : : Skill : : Axe } ,
{ mC ombatSkill[ 6 ] , ESM : : Skill : : Axe } ,
{ c ombatSkill[ 7 ] , ESM : : Skill : : Spear } ,
{ mC ombatSkill[ 7 ] , ESM : : Skill : : Spear } ,
{ c ombatSkill[ 8 ] , ESM : : Skill : : Athletics }
{ mC ombatSkill[ 8 ] , ESM : : Skill : : Athletics }
} ,
} ,
{
{
{ m agicSkill[ 0 ] , ESM : : Skill : : Enchant } ,
{ m M agicSkill[ 0 ] , ESM : : Skill : : Enchant } ,
{ m agicSkill[ 1 ] , ESM : : Skill : : Destruction } ,
{ m M agicSkill[ 1 ] , ESM : : Skill : : Destruction } ,
{ m agicSkill[ 2 ] , ESM : : Skill : : Alteration } ,
{ m M agicSkill[ 2 ] , ESM : : Skill : : Alteration } ,
{ m agicSkill[ 3 ] , ESM : : Skill : : Illusion } ,
{ m M agicSkill[ 3 ] , ESM : : Skill : : Illusion } ,
{ m agicSkill[ 4 ] , ESM : : Skill : : Conjuration } ,
{ m M agicSkill[ 4 ] , ESM : : Skill : : Conjuration } ,
{ m agicSkill[ 5 ] , ESM : : Skill : : Mysticism } ,
{ m M agicSkill[ 5 ] , ESM : : Skill : : Mysticism } ,
{ m agicSkill[ 6 ] , ESM : : Skill : : Restoration } ,
{ m M agicSkill[ 6 ] , ESM : : Skill : : Restoration } ,
{ m agicSkill[ 7 ] , ESM : : Skill : : Alchemy } ,
{ m M agicSkill[ 7 ] , ESM : : Skill : : Alchemy } ,
{ m agicSkill[ 8 ] , ESM : : Skill : : Unarmored }
{ m M agicSkill[ 8 ] , ESM : : Skill : : Unarmored }
} ,
} ,
{
{
{ s tealthSkill[ 0 ] , ESM : : Skill : : Security } ,
{ mS tealthSkill[ 0 ] , ESM : : Skill : : Security } ,
{ s tealthSkill[ 1 ] , ESM : : Skill : : Sneak } ,
{ mS tealthSkill[ 1 ] , ESM : : Skill : : Sneak } ,
{ s tealthSkill[ 2 ] , ESM : : Skill : : Acrobatics } ,
{ mS tealthSkill[ 2 ] , ESM : : Skill : : Acrobatics } ,
{ s tealthSkill[ 3 ] , ESM : : Skill : : LightArmor } ,
{ mS tealthSkill[ 3 ] , ESM : : Skill : : LightArmor } ,
{ s tealthSkill[ 4 ] , ESM : : Skill : : ShortBlade } ,
{ mS tealthSkill[ 4 ] , ESM : : Skill : : ShortBlade } ,
{ s tealthSkill[ 5 ] , ESM : : Skill : : Marksman } ,
{ mS tealthSkill[ 5 ] , ESM : : Skill : : Marksman } ,
{ s tealthSkill[ 6 ] , ESM : : Skill : : Mercantile } ,
{ mS tealthSkill[ 6 ] , ESM : : Skill : : Mercantile } ,
{ s tealthSkill[ 7 ] , ESM : : Skill : : Speechcraft } ,
{ mS tealthSkill[ 7 ] , ESM : : Skill : : Speechcraft } ,
{ s tealthSkill[ 8 ] , ESM : : Skill : : HandToHand }
{ mS tealthSkill[ 8 ] , ESM : : Skill : : HandToHand }
}
}
} ;
} ;
@ -878,10 +877,10 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
{
{
for ( int i = 0 ; i < 9 ; + + i )
for ( int i = 0 ; i < 9 ; + + i )
{
{
s kills[ spec ] [ i ] . widget - > setWindowManager ( & mWindowManager ) ;
mS kills[ spec ] [ i ] . widget - > setWindowManager ( & mWindowManager ) ;
s kills[ spec ] [ i ] . widget - > setSkillId ( s kills[ spec ] [ i ] . skillId ) ;
mS kills[ spec ] [ i ] . widget - > setSkillId ( mS kills[ spec ] [ i ] . skillId ) ;
s kills[ spec ] [ i ] . widget - > eventClicked + = MyGUI : : newDelegate ( this , & SelectSkillDialog : : onSkillClicked ) ;
mS kills[ spec ] [ i ] . widget - > eventClicked + = MyGUI : : newDelegate ( this , & SelectSkillDialog : : onSkillClicked ) ;
ToolTips : : createSkillToolTip ( s kills[ spec ] [ i ] . widget , s kills[ spec ] [ i ] . widget - > getSkillId ( ) ) ;
ToolTips : : createSkillToolTip ( mS kills[ spec ] [ i ] . widget , mS kills[ spec ] [ i ] . widget - > getSkillId ( ) ) ;
}
}
}
}
@ -904,7 +903,7 @@ SelectSkillDialog::~SelectSkillDialog()
void SelectSkillDialog : : onSkillClicked ( Widgets : : MWSkillPtr _sender ) void SelectSkillDialog : : onSkillClicked ( Widgets : : MWSkillPtr _sender )
{ {
s killId = _sender - > getSkillId ( ) ;
mS killId = _sender - > getSkillId ( ) ;
eventItemSelected ( ) ;
eventItemSelected ( ) ;
} }
@ -921,7 +920,7 @@ DescriptionDialog::DescriptionDialog(WindowManager& parWindowManager)
// Centre dialog
// Centre dialog
center ( ) ;
center ( ) ;
getWidget ( t extEdit, " TextEdit " ) ;
getWidget ( mT extEdit, " TextEdit " ) ;
MyGUI : : ButtonPtr okButton ;
MyGUI : : ButtonPtr okButton ;
getWidget ( okButton , " OKButton " ) ;
getWidget ( okButton , " OKButton " ) ;
@ -931,7 +930,7 @@ DescriptionDialog::DescriptionDialog(WindowManager& parWindowManager)
okButton - > setCoord ( 234 - buttonWidth , 214 , buttonWidth , 24 ) ;
okButton - > setCoord ( 234 - buttonWidth , 214 , buttonWidth , 24 ) ;
// Make sure the edit box has focus
// Make sure the edit box has focus
MyGUI : : InputManager : : getInstance ( ) . setKeyFocusWidget ( t extEdit) ;
MyGUI : : InputManager : : getInstance ( ) . setKeyFocusWidget ( mT extEdit) ;
MyGUI : : InputManager : : getInstance ( ) . addWidgetModal ( mMainWidget ) ;
MyGUI : : InputManager : : getInstance ( ) . addWidgetModal ( mMainWidget ) ;
} }
Jason Hooks
13 years ago