mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +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:
@@ -35,14 +35,14 @@ BOOLEAN CameBackToAttributesPageButNotFinished();
|
||||
void BtnIMPAttributeFinishYesCallback(GUI_BUTTON *btn,INT32 reason);
|
||||
void BtnIMPAttributeFinishNoCallback(GUI_BUTTON *btn,INT32 reason);
|
||||
|
||||
|
||||
|
||||
void EnterIMPAttributeFinish( void )
|
||||
{
|
||||
// create the needed buttons
|
||||
// create the needed buttons
|
||||
CreateAttributeFinishButtons( );
|
||||
|
||||
// render screen
|
||||
RenderIMPAttributeFinish( );
|
||||
RenderIMPAttributeFinish( );
|
||||
|
||||
|
||||
return;
|
||||
@@ -51,11 +51,11 @@ void EnterIMPAttributeFinish( void )
|
||||
|
||||
void RenderIMPAttributeFinish( void )
|
||||
{
|
||||
// render background
|
||||
// render background
|
||||
RenderProfileBackGround( );
|
||||
|
||||
|
||||
// indent for text
|
||||
RenderBeginIndent( 110, 93 );
|
||||
RenderBeginIndent( 110, 93 );
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -63,7 +63,7 @@ void RenderIMPAttributeFinish( void )
|
||||
|
||||
void ExitIMPAttributeFinish( void )
|
||||
{
|
||||
// destroy the buttons for this screen
|
||||
// destroy the buttons for this screen
|
||||
DestroyAttributeFinishButtons( );
|
||||
|
||||
return;
|
||||
@@ -81,40 +81,40 @@ void CreateAttributeFinishButtons( void )
|
||||
{
|
||||
|
||||
// this procedure will create the buttons needed for the attribute finish screen
|
||||
|
||||
|
||||
// the yes button
|
||||
giIMPAttributeFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
/* giIMPAttributeFinishButton[0] = QuickCreateButton( giIMPAttributeFinishButtonImage[0], LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
|
||||
giIMPAttributeFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
/* giIMPAttributeFinishButton[0] = QuickCreateButton( giIMPAttributeFinishButtonImage[0], LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishYesCallback );
|
||||
|
||||
*/
|
||||
giIMPAttributeFinishButton[0] = CreateIconAndTextButton( giIMPAttributeFinishButtonImage[0], pImpButtonText[ 20 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 130 ), LAPTOP_SCREEN_WEB_UL_Y + ( 180 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishYesCallback );
|
||||
giIMPAttributeFinishButton[0] = CreateIconAndTextButton( giIMPAttributeFinishButtonImage[0], pImpButtonText[ 20 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 130 ), LAPTOP_SCREEN_WEB_UL_Y + ( 180 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishYesCallback );
|
||||
|
||||
// the no button
|
||||
giIMPAttributeFinishButtonImage[1]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
/* giIMPAttributeFinishButton[1] = QuickCreateButton( giIMPAttributeFinishButtonImage[1], LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
|
||||
giIMPAttributeFinishButtonImage[1]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
|
||||
/* giIMPAttributeFinishButton[1] = QuickCreateButton( giIMPAttributeFinishButtonImage[1], LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishNoCallback );
|
||||
*/
|
||||
giIMPAttributeFinishButton[1] = CreateIconAndTextButton( giIMPAttributeFinishButtonImage[1], pImpButtonText[ 21 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 130 ), LAPTOP_SCREEN_WEB_UL_Y + ( 264 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishNoCallback);
|
||||
giIMPAttributeFinishButton[1] = CreateIconAndTextButton( giIMPAttributeFinishButtonImage[1], pImpButtonText[ 21 ], FONT12ARIAL,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
FONT_WHITE, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
LAPTOP_SCREEN_UL_X + ( 130 ), LAPTOP_SCREEN_WEB_UL_Y + ( 264 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPAttributeFinishNoCallback);
|
||||
|
||||
SetButtonCursor(giIMPAttributeFinishButton[0], CURSOR_WWW);
|
||||
SetButtonCursor(giIMPAttributeFinishButton[0], CURSOR_WWW);
|
||||
SetButtonCursor(giIMPAttributeFinishButton[1], CURSOR_WWW);
|
||||
|
||||
|
||||
|
||||
return;
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
@@ -124,13 +124,13 @@ void DestroyAttributeFinishButtons( void )
|
||||
|
||||
// this procedure will destroy the buttons for the attribute finish screen
|
||||
|
||||
// the yes button
|
||||
RemoveButton(giIMPAttributeFinishButton[ 0 ] );
|
||||
UnloadButtonImage(giIMPAttributeFinishButtonImage[ 0 ] );
|
||||
// the yes button
|
||||
RemoveButton(giIMPAttributeFinishButton[ 0 ] );
|
||||
UnloadButtonImage(giIMPAttributeFinishButtonImage[ 0 ] );
|
||||
|
||||
// the no button
|
||||
RemoveButton(giIMPAttributeFinishButton[ 1 ] );
|
||||
UnloadButtonImage(giIMPAttributeFinishButtonImage[ 1 ] );
|
||||
// the no button
|
||||
RemoveButton(giIMPAttributeFinishButton[ 1 ] );
|
||||
UnloadButtonImage(giIMPAttributeFinishButtonImage[ 1 ] );
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -143,28 +143,28 @@ void BtnIMPAttributeFinishYesCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
if (!(btn->uiFlags & BUTTON_ENABLED))
|
||||
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);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
// gone far enough
|
||||
iCurrentImpPage = IMP_MAIN_PAGE;
|
||||
// if( iCurrentProfileMode < IMP__PORTRAIT )
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
// gone far enough
|
||||
iCurrentImpPage = IMP_MAIN_PAGE;
|
||||
// if( iCurrentProfileMode < IMP__PORTRAIT )
|
||||
if( !CameBackToAttributesPageButNotFinished() )
|
||||
{
|
||||
iCurrentProfileMode = IMP__FINISH;//IMP__PORTRAIT;
|
||||
iCurrentProfileMode = IMP__FINISH;//IMP__PORTRAIT;
|
||||
}
|
||||
// if we are already done, leave
|
||||
if( iCurrentProfileMode == IMP__FINISH)
|
||||
// if we are already done, leave
|
||||
if( iCurrentProfileMode == IMP__FINISH)
|
||||
{
|
||||
iCurrentImpPage = IMP_FINISH;
|
||||
iCurrentImpPage = IMP_FINISH;
|
||||
}
|
||||
|
||||
|
||||
// SET ATTRIBUTES NOW
|
||||
SetGeneratedCharacterAttributes( );
|
||||
fButtonPendingFlag = TRUE;
|
||||
@@ -195,13 +195,13 @@ void BtnIMPAttributeFinishNoCallback(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);
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
// if no, return to attribute
|
||||
iCurrentImpPage = IMP_ATTRIBUTE_PAGE;
|
||||
fReturnStatus = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user