Various fixes (by Buggler):

- Fixed IMP Background hardcoded text: Prev, Next & None.
- Fixed unable to proceed to IMP Attribute screen when Merc Background feature is off
- Changed 'Ore Type' text to 'Resource'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-11-14 18:35:16 +00:00
parent 6ec2a96173
commit cbbcbf48c0
11 changed files with 31 additions and 22 deletions
+10 -10
View File
@@ -494,26 +494,26 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
{
btn->uiFlags|=(BUTTON_CLICKED_ON);
//if we are just reviewing the page
if( iCurrentProfileMode == IMP__FINISH )
{
//go back tot he done screen
iCurrentImpPage = IMP_FINISH;
}
// Flugente: setting determines wether we see the background page
else if ( gGameOptions.fBackGround )
// Flugente: setting determines whether we see the background page
if ( gGameOptions.fBackGround )
{
iCurrentImpPage = IMP_BACKGROUND;
fButtonPendingFlag = TRUE;
}
//if we are just reviewing the page
else if( iCurrentProfileMode == IMP__FINISH )
{
//go back to the done screen
iCurrentImpPage = IMP_FINISH;
}
else
{
iCurrentImpPage = IMP_MAIN_PAGE;
fButtonPendingFlag = TRUE;
/*i´f( CameBackToMinorTraitPageButNotFinished() )
if( CameBackToMinorTraitPageButNotFinished() )
{
}
@@ -521,7 +521,7 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
{
//We are finished on this page
iCurrentProfileMode = IMP__ATTRIBUTES;
}*/
}
}
}
}