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

Merged revision(s) 6894 from branches/ja2_source_official_2014:

Browse Source 
Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-10 00:28:04 +00:00
parent 8d07ebccc0
commit cb3304e93f
17 changed files with 151 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Disability Trait.cpp
+8 -7
View File
@@ -412,12 +412,13 @@ void BtnIMPDisabilityTraitFinishCallback(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;
}
else
//if( iCurrentProfileMode == IMP__FINISH )
//{
//go back to the done screen
iCurrentImpPage = IMP_PREJUDICE;
fButtonPendingFlag = TRUE;
//}
/*else
{
iCurrentImpPage = IMP_PREJUDICE;
@@ -431,7 +432,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
else
iCurrentProfileMode = IMP__FINISH;
}
}
}*/
}
}
Laptop/IMP Minor Trait.cpp
+8 -15
View File
@@ -303,9 +303,14 @@ void BtnIMPMinorTraitAnswerCallback(GUI_BUTTON *btn,INT32 reason)
{
// btn->uiFlags|=(BUTTON_CLICKED_ON);
INT32 iMinorTrait = MSYS_GetBtnUserData( btn, 0 );
if( NumAvailableMinorTraits() > 0 )
{
INT32 iMinorTrait = MSYS_GetBtnUserData( btn, 0 );
HandleIMPMinorTraitAnswers( iMinorTrait );
HandleIMPMinorTraitAnswers( iMinorTrait );
}
else
DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 12 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
}
}
@@ -568,19 +573,7 @@ INT8 NumAvailableMinorTraits()
bNumMinorTraits = gSkillTraitValues.ubMaxNumberOfTraitsForIMP - bNumMajorTraits;
bNumMinorTraits = max( 1, bNumMinorTraits );
//if ( bNumMajorTraits == 0 )
// bNumMinorTraits = 3;
//else if ( bNumMajorTraits == 1 )
// bNumMinorTraits = 2;
//else if ( bNumMajorTraits == 2 )
// bNumMinorTraits = 1;
//else
//{
// Assert( 0 );
// bNumMinorTraits = 0;
//}
bNumMinorTraits = max( 0, bNumMinorTraits );
return(bNumMinorTraits);
}
Laptop/IMP Prejudice.cpp
+2 -2
View File
@@ -375,7 +375,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
//go back tot he done screen
iCurrentImpPage = IMP_FINISH;
}
// Flugente: setting determines wether we see the background page
// Flugente: setting determines whether we see the background page
else
{
// we finished this -> write down our choices
@@ -409,7 +409,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
BOOLEAN CameBackToPrejudicePageButNotFinished()
{
//if we are in a page that comes after this one
if( iCurrentProfileMode == IMP__ATTRIBUTES )
if( iCurrentProfileMode == IMP__ATTRIBUTES || iCurrentProfileMode == IMP__PERSONALITY )
{
return( TRUE );
}