Merged from revision: 7230

Fixes (by Buggler)
- Added first page and last page buttons to history log
- Fixed pick up backpack on the same grid to cost the same as manually picking it up instead of no cost
- Display message when dropping and picking backpacks for all mercs in sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-05-23 19:07:05 +00:00
parent b5aa779b1b
commit 262b1ea128
14 changed files with 116 additions and 32 deletions
+5 -6
View File
@@ -1308,11 +1308,10 @@ void CreateFinanceButtons( void )
giFinanceButton[LAST_PAGE_BUTTON] = QuickCreateButton( giFinanceButtonImage[LAST_PAGE_BUTTON], LAST_PAGE_X, BTN_Y,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnFinanceFirstLastPageCallBack);
MSYS_SetBtnUserData( giFinanceButton[LAST_PAGE_BUTTON], 0, 1 );
// set buttons
SetButtonCursor(giFinanceButton[0], CURSOR_LAPTOP_SCREEN);
SetButtonCursor(giFinanceButton[1], CURSOR_LAPTOP_SCREEN);
SetButtonCursor(giFinanceButton[2], CURSOR_LAPTOP_SCREEN);
@@ -2502,7 +2501,7 @@ void SetFinanceButtonStates( void )
if( LoadNextPage( ) )
{
// decrement page
LoadPreviousPage( );
LoadPreviousPage( );
// enable buttons
@@ -2512,8 +2511,8 @@ void SetFinanceButtonStates( void )
}
else
{
DisableButton( giFinanceButton[ NEXT_PAGE_BUTTON ] );
DisableButton( giFinanceButton[ LAST_PAGE_BUTTON ] );
DisableButton( giFinanceButton[ NEXT_PAGE_BUTTON ] );
DisableButton( giFinanceButton[ LAST_PAGE_BUTTON ] );
}
}