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

Merged from revision: 6764

Browse Source 
Fixes (by Buggler)
- fixed hotkey switch weapons AP cost and empty hand swap
- adjusted colors for militia equipment item shading
- fixed IMP background button states and previous button array list

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-15 13:20:31 +00:00
parent 8d5ed89e14
commit 5f92048f5a
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Background.cpp
+13 -9
View File
@@ -72,8 +72,8 @@ INT32 giIMPBackgroundAnswerButton[ IMP_BACKGROUND_DISPLAYED_CHOICES ];
INT32 giIMPBackgroundAnswerButtonImage[ IMP_BACKGROUND_DISPLAYED_CHOICES ];
// this is the Done buttons
INT32 giIMPBackgroundFinsihButton;
INT32 giIMPBackgroundFinsihButtonImage;
INT32 giIMPBackgroundFinishButton;
INT32 giIMPBackgroundFinishButtonImage;
INT8 gbLastSelectedBackground[ 10 ];
@@ -135,15 +135,15 @@ void EnterIMPBackground( void )
return;
}
giIMPBackgroundFinsihButtonImage = LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPBackgroundFinsihButton = CreateIconAndTextButton( giIMPBackgroundFinsihButtonImage, pImpButtonText[ 24 ], FONT12ARIAL,
giIMPBackgroundFinishButtonImage = LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPBackgroundFinishButton = CreateIconAndTextButton( giIMPBackgroundFinishButtonImage, pImpButtonText[ 24 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 350 ), LAPTOP_SCREEN_WEB_UL_Y + ( 340 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPBackgroundFinishCallback );
SetButtonCursor( giIMPBackgroundFinsihButton, CURSOR_WWW);
SetButtonCursor( giIMPBackgroundFinishButton, CURSOR_WWW);
//if we are not DONE and are just reviewing
if( iCurrentProfileMode != IMP__FINISH )
@@ -205,8 +205,8 @@ void ExitIMPBackground( void )
MSYS_RemoveRegion( &gMR_BackgroundHelpTextRegions[iCnt] );
}
RemoveButton( giIMPBackgroundFinsihButton );
UnloadButtonImage( giIMPBackgroundFinsihButtonImage );
RemoveButton( giIMPBackgroundFinishButton );
UnloadButtonImage( giIMPBackgroundFinishButtonImage );
}
@@ -542,8 +542,8 @@ void UpdateDisplaySkills( BOOLEAN fIncrease )
// select previous items
else
{
// the last item of our new selection
firstitem = max(0, gBackgroundFirstItem - IMP_BACKGROUND_DISPLAYED_CHOICES);
// the first item of our new selection
firstitem = max(0, gBackgroundFirstItem - IMP_BACKGROUND_DISPLAYED_CHOICES + 1);
lastitem = min(found , firstitem + IMP_BACKGROUND_DISPLAYED_CHOICES - 1);
}
@@ -746,9 +746,11 @@ void BtnIMPBackgroundNextCallback(GUI_BUTTON *btn,INT32 reason)
for( UINT16 uiCnt=0; uiCnt<IMP_BACKGROUND_DISPLAYED_CHOICES; ++uiCnt )
{
gfBackgroundQuestions[ uiCnt ] = FALSE;
ButtonList[ giIMPBackgroundAnswerButton[ uiCnt ] ]->uiFlags &= ~BUTTON_CLICKED_ON;
}
//Have the NONE trait initially selected
gfBackgroundQuestions[ IMP_BACKGROUND_NONE ] = TRUE;
ButtonList[ giIMPBackgroundAnswerButton[ IMP_BACKGROUND_NONE ] ]->uiFlags |= BUTTON_CLICKED_ON;
//reset choice
usBackground = 0;
@@ -781,9 +783,11 @@ void BtnIMPBackgroundPreviousCallback(GUI_BUTTON *btn,INT32 reason)
for( UINT16 uiCnt=0; uiCnt<IMP_BACKGROUND_DISPLAYED_CHOICES; ++uiCnt )
{
gfBackgroundQuestions[ uiCnt ] = FALSE;
ButtonList[ giIMPBackgroundAnswerButton[ uiCnt ] ]->uiFlags &= ~BUTTON_CLICKED_ON;
}
//Have the NONE trait initially selected
gfBackgroundQuestions[ IMP_BACKGROUND_NONE ] = TRUE;
ButtonList[ giIMPBackgroundAnswerButton[ IMP_BACKGROUND_NONE ] ]->uiFlags |= BUTTON_CLICKED_ON;
//reset choice
usBackground = 0;