1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- moved IMP prejudice page to personality, which it fits better than skills

Browse Source 
- DropDown: Create() calls Destroy()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-10-22 19:39:22 +00:00
parent ff26555370
commit 68add1a794
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/DropDown.cpp
+2 -8
View File
@@ -119,10 +119,7 @@ void * gDropObj;
void void
DropDownBase::Create(UINT16 sX, UINT16 sY) DropDownBase::Create(UINT16 sX, UINT16 sY)
{ {
if( mfMouseRegionsCreated ) Destroy();
{
return Destroy();
}
Init(sX, sY); Init(sX, sY);
@@ -156,10 +153,7 @@ DropDownBase::Create(UINT16 sX, UINT16 sY)
void void
DropDownBase::Create_Drop() DropDownBase::Create_Drop()
{ {
if( mfMouseRegionsCreated_Drop ) Destroy_Drop();
{
return Destroy_Drop();
}
Init_Drop(); Init_Drop();
Laptop/IMP Disability Trait.cpp
+2 -2
View File
@@ -414,7 +414,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
if (!(btn->uiFlags & BUTTON_ENABLED)) if (!(btn->uiFlags & BUTTON_ENABLED))
return; return;
if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{ {
btn->uiFlags|=(BUTTON_CLICKED_ON); btn->uiFlags|=(BUTTON_CLICKED_ON);
@@ -427,7 +427,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
} }
else else
{ {
iCurrentImpPage = IMP_MAIN_PAGE; iCurrentImpPage = IMP_PREJUDICE;
if( CameBackToDisabilityTraitPageButNotFinished() ) if( CameBackToDisabilityTraitPageButNotFinished() )
{ {
Laptop/IMP Minor Trait.cpp
+10 -5
View File
@@ -501,19 +501,24 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
//go back tot he done screen //go back tot he done screen
iCurrentImpPage = IMP_FINISH; iCurrentImpPage = IMP_FINISH;
} }
// Flugente: setting determines wether we see the background page
else if ( gGameOptions.fBackGround )
{
iCurrentImpPage = IMP_BACKGROUND;
fButtonPendingFlag = TRUE;
}
else else
{ {
iCurrentImpPage = IMP_PREJUDICE; iCurrentImpPage = IMP_MAIN_PAGE;
if( CameBackToMinorTraitPageButNotFinished() ) if( CameBackToMinorTraitPageButNotFinished() )
{ {
} }
else else
{ {
if ( iCurrentProfileMode != IMP__FINISH ) //We are finished on this page
iCurrentProfileMode = IMP__PERSONALITY; iCurrentProfileMode = IMP__ATTRIBUTES;
else
iCurrentProfileMode = IMP__FINISH;
} }
} }
} }
Laptop/IMP Prejudice.cpp
+7 -14
View File
@@ -361,7 +361,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
// btn callback for IMP personality quiz answer button // btn callback for IMP personality quiz answer button
if (!(btn->uiFlags & BUTTON_ENABLED)) if (!(btn->uiFlags & BUTTON_ENABLED))
return; return;
if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{ {
btn->uiFlags|=(BUTTON_CLICKED_ON); btn->uiFlags|=(BUTTON_CLICKED_ON);
@@ -387,24 +387,17 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
bRacist = ( INT8)DropDownTemplate<DROPDOWNNR_RACIST>::getInstance().GetSelectedEntryKey(); bRacist = ( INT8)DropDownTemplate<DROPDOWNNR_RACIST>::getInstance().GetSelectedEntryKey();
bSexist = (UINT8)DropDownTemplate<DROPDOWNNR_SEXIST>::getInstance().GetSelectedEntryKey(); bSexist = (UINT8)DropDownTemplate<DROPDOWNNR_SEXIST>::getInstance().GetSelectedEntryKey();
if ( gGameOptions.fBackGround ) iCurrentImpPage = IMP_MAIN_PAGE;
{
iCurrentImpPage = IMP_BACKGROUND;
fButtonPendingFlag = TRUE; if( CameBackToPrejudicePageButNotFinished() )
{
} }
else else
{ {
iCurrentImpPage = IMP_MAIN_PAGE; if ( iCurrentProfileMode != IMP__FINISH )
iCurrentProfileMode = IMP__PERSONALITY;
if( CameBackToPrejudicePageButNotFinished() )
{
}
else else
{ iCurrentProfileMode = IMP__FINISH;
//We are finished on this page
iCurrentProfileMode = IMP__ATTRIBUTES;
}
} }
} }
} }