mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
#include "IMP Text System.h"
|
||||
#endif
|
||||
|
||||
// the buttons
|
||||
// the buttons
|
||||
UINT32 giIMPAttributeEntranceButtonImage[ 1 ];
|
||||
UINT32 giIMPAttributeEntranceButton[ 1 ];
|
||||
|
||||
@@ -41,18 +41,18 @@ void EnterIMPAttributeEntrance( void )
|
||||
|
||||
void RenderIMPAttributeEntrance( void )
|
||||
{
|
||||
// the background
|
||||
// the background
|
||||
RenderProfileBackGround( );
|
||||
|
||||
// avg merc indent
|
||||
RenderAvgMercIndentFrame(90, 40 );
|
||||
|
||||
RenderAvgMercIndentFrame(90, 40 );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void ExitIMPAttributeEntrance( void )
|
||||
{
|
||||
// destroy the finish buttons
|
||||
// destroy the finish buttons
|
||||
DestroyIMPAttributeEntranceButtons( );
|
||||
|
||||
return;
|
||||
@@ -61,10 +61,10 @@ void ExitIMPAttributeEntrance( void )
|
||||
|
||||
void HandleIMPAttributeEntrance( void )
|
||||
{
|
||||
|
||||
|
||||
|
||||
return;
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -72,18 +72,18 @@ void CreateIMPAttributeEntranceButtons( void )
|
||||
{
|
||||
|
||||
// the begin button
|
||||
giIMPAttributeEntranceButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
giIMPAttributeEntranceButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
/*
|
||||
giIMPAttributeEntranceButton[0] = QuickCreateButton( giIMPAttributeEntranceButtonImage[0], LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ),
|
||||
giIMPAttributeEntranceButton[0] = QuickCreateButton( giIMPAttributeEntranceButtonImage[0], LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ),
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeBeginCallback ); */
|
||||
|
||||
giIMPAttributeEntranceButton[0] = CreateIconAndTextButton( giIMPAttributeEntranceButtonImage[ 0 ], pImpButtonText[ 13 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeBeginCallback);
|
||||
giIMPAttributeEntranceButton[0] = CreateIconAndTextButton( giIMPAttributeEntranceButtonImage[ 0 ], pImpButtonText[ 13 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeBeginCallback);
|
||||
|
||||
SetButtonCursor(giIMPAttributeEntranceButton[0], CURSOR_WWW);
|
||||
return;
|
||||
@@ -93,12 +93,12 @@ void CreateIMPAttributeEntranceButtons( void )
|
||||
void DestroyIMPAttributeEntranceButtons( void )
|
||||
{
|
||||
// this function will destroy the buttons needed for the IMP attrib enter page
|
||||
|
||||
// the begin button
|
||||
RemoveButton(giIMPAttributeEntranceButton[ 0 ] );
|
||||
UnloadButtonImage(giIMPAttributeEntranceButtonImage[ 0 ] );
|
||||
|
||||
|
||||
// the begin button
|
||||
RemoveButton(giIMPAttributeEntranceButton[ 0 ] );
|
||||
UnloadButtonImage(giIMPAttributeEntranceButtonImage[ 0 ] );
|
||||
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -113,15 +113,15 @@ void BtnIMPAttributeBeginCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
iCurrentImpPage = IMP_ATTRIBUTE_PAGE;
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
iCurrentImpPage = IMP_ATTRIBUTE_PAGE;
|
||||
fButtonPendingFlag = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user