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
+81 -81
View File
@@ -26,7 +26,7 @@ UINT8 bPersonalityEndState = 0;
#define PERSONALITY_CONFIRM_FINISH_DELAY 2500
// flag set when player hits YES/NO button
// flag set when player hits YES/NO button
BOOLEAN fConfirmHasBeenSelectedFlag = FALSE;
BOOLEAN fConfirmIsYesFlag = FALSE;
BOOLEAN fOkToReturnIMPMainPageFromPersonalityFlag = FALSE;
@@ -74,11 +74,11 @@ void EnterIMPPersonalityFinish( void )
void RenderIMPPersonalityFinish( void )
{
// the background
// the background
RenderProfileBackGround( );
// indent for text
RenderBeginIndent( 110, 93 );
RenderBeginIndent( 110, 93 );
// check confirm flag to decide if we have to display appropriate response to button action
if( fConfirmHasBeenSelectedFlag )
@@ -86,13 +86,13 @@ void RenderIMPPersonalityFinish( void )
// confirm was yes, display yes string
if(fConfirmIsYesFlag == TRUE)
{
// display yes string
// display yes string
PrintImpText( );
}
else
{
// display no string
PrintImpText( );
PrintImpText( );
}
}
return;
@@ -100,12 +100,12 @@ void RenderIMPPersonalityFinish( void )
void ExitIMPPersonalityFinish( void )
{
// exit at IMP Ok button
if( fExitIMPPerFinAtOk )
{
// destroy the finish ok buttons
DestroyPersonalityFinishOkButton( );
DestroyPersonalityFinishOkButton( );
}
@@ -126,12 +126,12 @@ void ExitIMPPersonalityFinish( void )
void HandleIMPPersonalityFinish( void )
{
// check if confirm and delay
CheckIfConfirmHasBeenSelectedAndTimeDelayHasPassed( );
return;
return;
}
@@ -139,7 +139,7 @@ void CheckIfConfirmHasBeenSelectedAndTimeDelayHasPassed( void )
{
// this function will check to see if player has in fact confirmed selection and delay to
// read text has occurred
// if not confirm selected, return
@@ -172,43 +172,43 @@ void CheckIfConfirmHasBeenSelectedAndTimeDelayHasPassed( void )
fConfirmHasBeenSelectedFlag = FALSE;
fExitDueFrIMPPerFinToOkButton = TRUE;
}
return;
}
void CreateIMPPersonalityFinishButtons( void )
{
// this function will create the buttons needed for the IMP personality Finish Page
// this function will create the buttons needed for the IMP personality Finish Page
// ths Yes button
giIMPPersonalityFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPersonalityFinishButton[0] = QuickCreateButton( giIMPPersonalityFinishButtonImage[0], LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
giIMPPersonalityFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPersonalityFinishButton[0] = QuickCreateButton( giIMPPersonalityFinishButtonImage[0], LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishYesCallback);
*/
giIMPPersonalityFinishButton[0] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[0], pImpButtonText[ 9 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishYesCallback);
giIMPPersonalityFinishButton[0] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[0], pImpButtonText[ 9 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 90 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishYesCallback);
// the no Button
giIMPPersonalityFinishButtonImage[ 1 ]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPersonalityFinishButton[ 1 ] = QuickCreateButton( giIMPPersonalityFinishButtonImage[1], LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
// the no Button
giIMPPersonalityFinishButtonImage[ 1 ]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPersonalityFinishButton[ 1 ] = QuickCreateButton( giIMPPersonalityFinishButtonImage[1], LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishNoCallback);
*/
giIMPPersonalityFinishButton[ 1 ] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[ 1 ], pImpButtonText[ 10 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishNoCallback);
*/
giIMPPersonalityFinishButton[ 1 ] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[ 1 ], pImpButtonText[ 10 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 276 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishNoCallback);
SetButtonCursor(giIMPPersonalityFinishButton[0], CURSOR_WWW);
SetButtonCursor(giIMPPersonalityFinishButton[1], CURSOR_WWW);
SetButtonCursor(giIMPPersonalityFinishButton[0], CURSOR_WWW);
SetButtonCursor(giIMPPersonalityFinishButton[1], CURSOR_WWW);
return;
@@ -218,14 +218,14 @@ void CreateIMPPersonalityFinishButtons( void )
void DestroyIMPersonalityFinishButtons( void )
{
// this function will destroy the buttons needed for the IMP personality Finish page
// the yes button
RemoveButton(giIMPPersonalityFinishButton[ 0 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 0 ] );
// the no button
// the yes button
RemoveButton(giIMPPersonalityFinishButton[ 0 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 0 ] );
// the no button
RemoveButton(giIMPPersonalityFinishButton[ 1 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 1 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 1 ] );
return;
}
@@ -241,35 +241,35 @@ void BtnIMPPersonalityFinishYesCallback(GUI_BUTTON *btn,INT32 reason)
if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{
// confirm flag set, get out of HERE!
if( fConfirmHasBeenSelectedFlag )
{
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
if( fConfirmHasBeenSelectedFlag )
{
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
return;
}
return;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);
btn->uiFlags|=(BUTTON_CLICKED_ON);
}
else if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
if (btn->uiFlags & BUTTON_CLICKED_ON)
{
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// set fact yes was selected
fConfirmIsYesFlag = TRUE;
fConfirmIsYesFlag = TRUE;
// set fact that confirmation has been done
fConfirmHasBeenSelectedFlag = TRUE;
// now make skill, personality and attitude
CreatePlayersPersonalitySkillsAndAttitude( );
fButtonPendingFlag = TRUE;
bPersonalityEndState = 1;
bPersonalityEndState = 1;
}
}
}
@@ -285,34 +285,34 @@ void BtnIMPPersonalityFinishNoCallback(GUI_BUTTON *btn,INT32 reason)
if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{
// confirm flag set, get out of HERE!
if( fConfirmHasBeenSelectedFlag )
{
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// confirm flag set, get out of HERE!
if( fConfirmHasBeenSelectedFlag )
{
// now set this button off
btn->uiFlags&=~(BUTTON_CLICKED_ON);
return;
}
return;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);
btn->uiFlags|=(BUTTON_CLICKED_ON);
}
else if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
if (btn->uiFlags & BUTTON_CLICKED_ON)
{
// now set this button on
btn->uiFlags&=~(BUTTON_CLICKED_ON);
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// set fact yes was selected
fConfirmIsYesFlag = FALSE;
fConfirmIsYesFlag = FALSE;
// set fact that confirmation has been done
fConfirmHasBeenSelectedFlag = TRUE;
CreatePlayersPersonalitySkillsAndAttitude( );
bPersonalityEndState = 2;
bPersonalityEndState = 2;
fButtonPendingFlag = TRUE;
}
}
@@ -324,17 +324,17 @@ void CreatePersonalityFinishOkButton( void )
{
// create personality button finish button
giIMPPersonalityFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPPersonalityFinishButton[0] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[0], pImpButtonText[ 24 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 186 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishOkCallback);
giIMPPersonalityFinishButtonImage[0]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
giIMPPersonalityFinishButton[0] = CreateIconAndTextButton( giIMPPersonalityFinishButtonImage[0], pImpButtonText[ 24 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 186 ), LAPTOP_SCREEN_WEB_UL_Y + ( 224 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPersonalityFinishOkCallback);
SetButtonCursor(giIMPPersonalityFinishButton[0], CURSOR_WWW);
return;
}
@@ -342,8 +342,8 @@ void CreatePersonalityFinishOkButton( void )
void DestroyPersonalityFinishOkButton( void )
{
// the ok button
RemoveButton(giIMPPersonalityFinishButton[ 0 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 0 ] );
RemoveButton(giIMPPersonalityFinishButton[ 0 ] );
UnloadButtonImage(giIMPPersonalityFinishButtonImage[ 0 ] );
}
@@ -357,16 +357,16 @@ void BtnIMPPersonalityFinishOkCallback(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)
{
// now set this button on
btn->uiFlags&=~(BUTTON_CLICKED_ON);
btn->uiFlags&=~(BUTTON_CLICKED_ON);
// Testing UB stuff
// if( iCurrentProfileMode < 2 )
@@ -389,4 +389,4 @@ void BtnIMPPersonalityFinishOkCallback(GUI_BUTTON *btn,INT32 reason)
}
}
}
}
}