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:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+26 -26
View File
@@ -30,29 +30,29 @@ void BtnIMPPersonalityEntranceDoneCallback(GUI_BUTTON *btn,INT32 reason);
void EnterIMPPersonalityEntrance( void )
{
// create buttons needed
// create buttons needed
CreateIMPPersonalityEntranceButtons( );
return;
return;
}
void RenderIMPPersonalityEntrance( void )
{
// the background
// the background
RenderProfileBackGround( );
// the IMP symbol
//RenderIMPSymbol( 112, 30 );
// indent
RenderAvgMercIndentFrame(90, 40 );
RenderAvgMercIndentFrame(90, 40 );
return;
}
void ExitIMPPersonalityEntrance( void )
{
// destroy buttons needed
// destroy buttons needed
DestroyIMPPersonalityEntranceButtons( );
@@ -64,30 +64,30 @@ void ExitIMPPersonalityEntrance( void )
void HandleIMPPersonalityEntrance( void )
{
return;
return;
}
void CreateIMPPersonalityEntranceButtons( void )
{
// this function will create the buttons needed for the IMP personality Page
// this function will create the buttons needed for the IMP personality Page
// ths begin button
giIMPPersonalityEntranceButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
/*giIMPPersonalityEntranceButton[0] = QuickCreateButton( giIMPPersonalityEntranceButtonImage[0], LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ),
giIMPPersonalityEntranceButtonImage[0]= LoadButtonImage( "LAPTOP\\button_2.sti" ,-1,0,-1,1,-1 );
/*giIMPPersonalityEntranceButton[0] = QuickCreateButton( giIMPPersonalityEntranceButtonImage[0], LAPTOP_SCREEN_UL_X + ( 136 ), LAPTOP_SCREEN_WEB_UL_Y + ( 314 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityEntranceDoneCallback);
*/
giIMPPersonalityEntranceButton[0] = CreateIconAndTextButton( giIMPPersonalityEntranceButtonImage[0], pImpButtonText[ 1 ], 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)BtnIMPPersonalityEntranceDoneCallback);
giIMPPersonalityEntranceButton[0] = CreateIconAndTextButton( giIMPPersonalityEntranceButtonImage[0], pImpButtonText[ 1 ], 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)BtnIMPPersonalityEntranceDoneCallback);
SetButtonCursor(giIMPPersonalityEntranceButton[0], CURSOR_WWW);
return;
@@ -96,10 +96,10 @@ void CreateIMPPersonalityEntranceButtons( void )
void DestroyIMPPersonalityEntranceButtons( void )
{
// this function will destroy the buttons needed for the IMP personality page
// the begin button
RemoveButton(giIMPPersonalityEntranceButton[0] );
UnloadButtonImage(giIMPPersonalityEntranceButtonImage[0] );
RemoveButton(giIMPPersonalityEntranceButton[0] );
UnloadButtonImage(giIMPPersonalityEntranceButtonImage[0] );
return;
}
@@ -114,17 +114,17 @@ void BtnIMPPersonalityEntranceDoneCallback(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);
// done with begin screen, next screen
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// done with begin screen, next screen
iCurrentImpPage = IMP_PERSONALITY_QUIZ;
fButtonPendingFlag = TRUE;
fButtonPendingFlag = TRUE;
}
}
}
}