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
+319 -318
View File
@@ -48,7 +48,7 @@ INT32 iHealth = 55;
// skills
INT32 iMarksmanship = 55;
INT32 iMedical = 55;
INT32 iMedical = 55;
INT32 iExplosives = 55;
INT32 iMechanical = 55;
@@ -74,7 +74,7 @@ INT32 iAttitude = 0;
INT32 iAddStrength = 0;
INT32 iAddDexterity = 0;
INT32 iAddAgility= 0;
INT32 iAddWisdom= 0;
INT32 iAddWisdom= 0;
INT32 iAddHealth = 0;
INT32 iAddLeadership = 0;
@@ -99,7 +99,7 @@ void ExitOldIMPMode( void );
void EnterNewIMPMode( void );
void LoadImpGraphics( void );
void RemoveImpGraphics( void );
void CreateIMPButtons( void );
void CreateIMPButtons( void );
void DestroyIMPButtons( void );
void BtnIMPCancelCallback(GUI_BUTTON *btn,INT32 reason);
BOOLEAN HasTheCurrentIMPPageBeenVisited( void );
@@ -119,7 +119,7 @@ void GameInitCharProfile()
void EnterCharProfile()
{
// reset previous page
iPreviousImpPage = -1;
iPreviousImpPage = -1;
// grab the graphics
LoadImpGraphics( );
@@ -127,7 +127,7 @@ void EnterCharProfile()
void ExitCharProfile()
{
// get rid of graphics
// get rid of graphics
RemoveImpGraphics( );
// clean up past mode
@@ -135,11 +135,11 @@ void ExitCharProfile()
}
void HandleCharProfile()
{
{
if( fReDrawCharProfile )
{
{
// re draw
RenderCharProfile( );
RenderCharProfile( );
fReDrawCharProfile = FALSE;
}
@@ -158,7 +158,7 @@ void HandleCharProfile()
//make sure we are not hosing memory
Assert( iCurrentImpPage <= IMP_NUM_PAGES );
fFastLoadFlag = HasTheCurrentIMPPageBeenVisited( );
fVisitedIMPSubPages[ iCurrentImpPage ] = TRUE;
fConnectingToSubPage = TRUE;
@@ -174,227 +174,227 @@ void HandleCharProfile()
fDoneLoadPending = TRUE;
}
}
fVisitedIMPSubPages[ iCurrentImpPage ] = TRUE;
if( fButtonPendingFlag == TRUE )
{
// render screen
RenderCharProfile( );
return;
// render screen
RenderCharProfile( );
return;
}
// exity old mode
ExitOldIMPMode( );
ExitOldIMPMode( );
// set previous page
iPreviousImpPage = iCurrentImpPage;
// enter new
EnterNewIMPMode( );
EnterNewIMPMode( );
// render screen
RenderCharProfile( );
// render title bar
RenderCharProfile( );
// render title bar
}
// handle
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
HandleImpHomePage( );
break;
case( IMP_BEGIN ):
HandleIMPBeginScreen( );
break;
case( IMP_PERSONALITY ):
HandleIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
HandleIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
HandleIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
HandleIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
HandleIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
HandleIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
HandleIMPPortraits( );
break;
case( IMP_VOICE ):
HandleIMPVoices( );
break;
case( IMP_FINISH ):
HandleIMPFinish( );
break;
case( IMP_ABOUT_US ):
HandleIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
HandleIMPMainPage( );
break;
case( IMP_CONFIRM ):
HandleIMPConfirm( );
break;
}
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
HandleImpHomePage( );
break;
case( IMP_BEGIN ):
HandleIMPBeginScreen( );
break;
case( IMP_PERSONALITY ):
HandleIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
HandleIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
HandleIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
HandleIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
HandleIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
HandleIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
HandleIMPPortraits( );
break;
case( IMP_VOICE ):
HandleIMPVoices( );
break;
case( IMP_FINISH ):
HandleIMPFinish( );
break;
case( IMP_ABOUT_US ):
HandleIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
HandleIMPMainPage( );
break;
case( IMP_CONFIRM ):
HandleIMPConfirm( );
break;
}
return;
}
void RenderCharProfile()
{
// button is waiting to go up?...do nothing,
// button is waiting to go up?...do nothing,
if( fButtonPendingFlag )
{
fPausedReDrawScreenFlag = TRUE;
fButtonPendingFlag = FALSE;
return;
}
if( fButtonPendingFlag )
{
fPausedReDrawScreenFlag = TRUE;
fButtonPendingFlag = FALSE;
return;
}
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
RenderImpHomePage( );
break;
case( IMP_BEGIN ):
RenderIMPBeginScreen( );
break;
case( IMP_PERSONALITY ):
RenderIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
RenderIMPSkillTrait( );
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
RenderImpHomePage( );
break;
case( IMP_PERSONALITY_FINISH ):
RenderIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
RenderIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
RenderIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
RenderIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
RenderIMPPortraits( );
break;
case( IMP_VOICE ):
RenderIMPVoices( );
break;
case( IMP_FINISH ):
RenderIMPFinish( );
break;
case( IMP_ABOUT_US ):
RenderIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
RenderIMPMainPage( );
break;
case( IMP_CONFIRM ):
RenderIMPConfirm( );
break;
}
case( IMP_BEGIN ):
RenderIMPBeginScreen( );
break;
case( IMP_PERSONALITY ):
RenderIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
RenderIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
RenderIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
RenderIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
RenderIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
RenderIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
RenderIMPPortraits( );
break;
case( IMP_VOICE ):
RenderIMPVoices( );
break;
case( IMP_FINISH ):
RenderIMPFinish( );
break;
case( IMP_ABOUT_US ):
RenderIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
RenderIMPMainPage( );
break;
case( IMP_CONFIRM ):
RenderIMPConfirm( );
break;
}
// render title bar
//RenderWWWProgramTitleBar( );
// render title bar
//RenderWWWProgramTitleBar( );
// render the text
PrintImpText( );
RenderWWWProgramTitleBar( );
// render the text
PrintImpText( );
DisplayProgramBoundingBox( TRUE );
RenderWWWProgramTitleBar( );
//InvalidateRegion( 0, 0, 640, 480 );
return;
DisplayProgramBoundingBox( TRUE );
//InvalidateRegion( 0, 0, 640, 480 );
return;
}
void ExitOldIMPMode( void )
{
// exit old mode
// exit old mode
if( iPreviousImpPage == -1 )
{
// don't both, leave
return;
return;
}
// remove old mode
switch( iPreviousImpPage )
{
case( IMP_HOME_PAGE ):
ExitImpHomePage( );
break;
case( IMP_BEGIN ):
DestroyIMPButtons( );
ExitIMPBeginScreen( );
break;
case( IMP_FINISH ):
DestroyIMPButtons( );
ExitIMPFinish( );
break;
case( IMP_PERSONALITY ):
switch( iPreviousImpPage )
{
case( IMP_HOME_PAGE ):
ExitImpHomePage( );
break;
case( IMP_BEGIN ):
DestroyIMPButtons( );
ExitIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
ExitIMPBeginScreen( );
break;
case( IMP_FINISH ):
DestroyIMPButtons( );
// ExitIMPPersonalityQuiz( );
ExitIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
DestroyIMPButtons( );
ExitIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
DestroyIMPButtons( );
ExitIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
DestroyIMPButtons( );
ExitIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
DestroyIMPButtons( );
ExitIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
DestroyIMPButtons( );
ExitIMPPortraits( );
break;
case( IMP_VOICE ):
DestroyIMPButtons( );
ExitIMPVoices( );
break;
case( IMP_ABOUT_US ):
ExitIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
ExitIMPMainPage( );
break;
case( IMP_CONFIRM ):
ExitIMPConfirm( );
break;
}
ExitIMPFinish( );
break;
case( IMP_PERSONALITY ):
DestroyIMPButtons( );
ExitIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
DestroyIMPButtons( );
// ExitIMPPersonalityQuiz( );
ExitIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
DestroyIMPButtons( );
ExitIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
DestroyIMPButtons( );
ExitIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
DestroyIMPButtons( );
ExitIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
DestroyIMPButtons( );
ExitIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
DestroyIMPButtons( );
ExitIMPPortraits( );
break;
case( IMP_VOICE ):
DestroyIMPButtons( );
ExitIMPVoices( );
break;
case( IMP_ABOUT_US ):
ExitIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
ExitIMPMainPage( );
break;
case( IMP_CONFIRM ):
ExitIMPConfirm( );
break;
}
return;
}
@@ -403,66 +403,66 @@ void ExitOldIMPMode( void )
void EnterNewIMPMode( void )
{
// enter new mode
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
EnterImpHomePage( );
break;
case( IMP_BEGIN ):
CreateIMPButtons( );
EnterIMPBeginScreen( );
break;
case( IMP_FINISH ):
CreateIMPButtons( );
EnterIMPFinish( );
break;
case( IMP_PERSONALITY ):
CreateIMPButtons( );
EnterIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
CreateIMPButtons( );
// EnterIMPPersonalityQuiz( );
EnterIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
CreateIMPButtons( );
EnterIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
CreateIMPButtons( );
EnterIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
CreateIMPButtons( );
EnterIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
CreateIMPButtons( );
EnterIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
CreateIMPButtons( );
EnterIMPPortraits( );
break;
case( IMP_VOICE ):
CreateIMPButtons( );
EnterIMPVoices( );
break;
case( IMP_ABOUT_US ):
EnterIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
EnterIMPMainPage( );
break;
case( IMP_CONFIRM ):
EnterIMPConfirm( );
break;
}
// enter new mode
switch( iCurrentImpPage )
{
case( IMP_HOME_PAGE ):
EnterImpHomePage( );
break;
case( IMP_BEGIN ):
CreateIMPButtons( );
EnterIMPBeginScreen( );
break;
case( IMP_FINISH ):
CreateIMPButtons( );
EnterIMPFinish( );
break;
case( IMP_PERSONALITY ):
CreateIMPButtons( );
EnterIMPPersonalityEntrance( );
break;
case( IMP_PERSONALITY_QUIZ ):
CreateIMPButtons( );
// EnterIMPPersonalityQuiz( );
EnterIMPSkillTrait( );
break;
case( IMP_PERSONALITY_FINISH ):
CreateIMPButtons( );
EnterIMPPersonalityFinish( );
break;
case( IMP_ATTRIBUTE_ENTRANCE ):
CreateIMPButtons( );
EnterIMPAttributeEntrance( );
break;
case( IMP_ATTRIBUTE_PAGE ):
CreateIMPButtons( );
EnterIMPAttributeSelection( );
break;
case( IMP_ATTRIBUTE_FINISH ):
CreateIMPButtons( );
EnterIMPAttributeFinish( );
break;
case( IMP_PORTRAIT ):
CreateIMPButtons( );
EnterIMPPortraits( );
break;
case( IMP_VOICE ):
CreateIMPButtons( );
EnterIMPVoices( );
break;
case( IMP_ABOUT_US ):
EnterIMPAboutUs( );
break;
case( IMP_MAIN_PAGE ):
EnterIMPMainPage( );
break;
case( IMP_CONFIRM ):
EnterIMPConfirm( );
break;
}
return;
}
@@ -470,29 +470,29 @@ void EnterNewIMPMode( void )
void ResetCharacterStats( void )
{
// attributes
iStrength = 55;
iDexterity = 55;
iAgility = 55;
iWisdom = 55;
iLeadership =55;
iHealth = 55;
// skills
iMarksmanship = 55;
iMedical = 55;
iExplosives = 55;
iMechanical = 55;
// attributes
iStrength = 55;
iDexterity = 55;
iAgility = 55;
iWisdom = 55;
iLeadership =55;
iHealth = 55;
// skills
iSkillA = 0;
iSkillB = 0;
iMarksmanship = 55;
iMedical = 55;
iExplosives = 55;
iMechanical = 55;
// personality
iPersonality = 0;
// skills
iSkillA = 0;
iSkillB = 0;
// attitude
iAttitude = 0;
// personality
iPersonality = 0;
// attitude
iAttitude = 0;
// names
memset( &pFullName, 0 , sizeof( pFullName) );
@@ -506,7 +506,7 @@ void ResetCharacterStats( void )
void LoadImpGraphics( void )
{
// load all graphics needed for IMP
LoadProfileBackGround( );
LoadIMPSymbol( );
LoadBeginIndent( );
@@ -517,40 +517,40 @@ void LoadImpGraphics( void )
LoadAttributeGraphBar( );
LoadFullNameIndent( );
LoadNameIndent( );
LoadNameIndent( );
LoadGenderIndent( );
LoadNickNameIndent( );
//LoadSmallFrame( );
LoadSmallSilhouette( );
LoadLargeSilhouette( );
LoadAttributeFrame( );
LoadSliderBar( );
LoadButton2Image( );
LoadButton4Image( );
LoadButton1Image( );
LoadButton1Image( );
LoadPortraitFrame( );
LoadMainIndentFrame( );
LoadQtnLongIndentFrame( );
LoadQtnShortIndentFrame( );
LoadQtnLongIndentHighFrame( );
LoadQtnShortIndentHighFrame( );
LoadQtnShort2IndentFrame( );
LoadQtnShort2IndentFrame( );
LoadQtnShort2IndentHighFrame( );
LoadQtnIndentFrame( );
LoadAttrib1IndentFrame( );
LoadAttrib1IndentFrame( );
LoadAttrib2IndentFrame( );
LoadAvgMercIndentFrame( );
LoadAvgMercIndentFrame( );
LoadAboutUsIndentFrame( );
return;
return;
}
@@ -558,7 +558,7 @@ void RemoveImpGraphics( void )
{
// remove all graphics needed for IMP
RemoveProfileBackGround( );
RemoveProfileBackGround( );
DeleteIMPSymbol( );
DeleteBeginIndent( );
DeleteActivationIndent( );
@@ -568,57 +568,57 @@ void RemoveImpGraphics( void )
DeleteAttributeBarGraph( );
DeleteFullNameIndent( );
DeleteNameIndent( );
DeleteNameIndent( );
DeleteGenderIndent( );
DeleteNickNameIndent( );
//DeleteSmallFrame( );
DeleteSmallSilhouette( );
DeleteLargeSilhouette( );
DeleteAttributeFrame( );
DeleteSliderBar( );
DeleteButton2Image( );
DeleteButton4Image( );
DeleteButton1Image( );
DeleteButton1Image( );
DeletePortraitFrame( );
DeleteMainIndentFrame( );
DeleteQtnLongIndentFrame( );
DeleteQtnShortIndentFrame( );
DeleteQtnLongIndentHighFrame( );
DeleteQtnShortIndentHighFrame( );
DeleteQtnShort2IndentFrame( );
DeleteQtnShort2IndentFrame( );
DeleteQtnShort2IndentHighFrame( );
DeleteQtnIndentFrame( );
DeleteAttrib1IndentFrame( );
DeleteAttrib1IndentFrame( );
DeleteAttrib2IndentFrame( );
DeleteAvgMercIndentFrame( );
DeleteAvgMercIndentFrame( );
DeleteAboutUsIndentFrame( );
return;
}
void CreateIMPButtons( void )
{
// create all the buttons global to the IMP system
// create all the buttons global to the IMP system
giIMPButtonImage[ 0 ] = LoadButtonImage( "LAPTOP\\button_3.sti" ,-1,0,-1,1,-1 );
giIMPButtonImage[ 0 ] = LoadButtonImage( "LAPTOP\\button_3.sti" ,-1,0,-1,1,-1 );
// cancel
giIMPButton[0] = CreateIconAndTextButton( giIMPButtonImage[0], pImpButtonText[ 19 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + 15, LAPTOP_SCREEN_WEB_UL_Y + ( 360 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPCancelCallback);
giIMPButton[0] = CreateIconAndTextButton( giIMPButtonImage[0], pImpButtonText[ 19 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + 15, LAPTOP_SCREEN_WEB_UL_Y + ( 360 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPCancelCallback);
SpecifyButtonTextSubOffsets( giIMPButton[0], 0, -1, FALSE );
// set up generic www cursor
SetButtonCursor(giIMPButton[ 0 ], CURSOR_WWW);
@@ -627,72 +627,72 @@ void CreateIMPButtons( void )
void DestroyIMPButtons( void )
{
// destroy the buttons we created
// destroy the buttons we created
RemoveButton(giIMPButton[0] );
UnloadButtonImage(giIMPButtonImage[0] );
UnloadButtonImage(giIMPButtonImage[0] );
return;
}
void BtnIMPCancelCallback(GUI_BUTTON *btn,INT32 reason)
{
// btn callback for IMP cancel button
// btn callback for IMP cancel button
if (!(btn->uiFlags & BUTTON_ENABLED))
return;
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);
// back to the main page, otherwise, back to home page
if( iCurrentImpPage == IMP_MAIN_PAGE )
{
iCurrentImpPage = IMP_HOME_PAGE;
fButtonPendingFlag = TRUE;
iCurrentProfileMode = 0;
fFinishedCharGeneration = FALSE;
ResetCharacterStats( );
iCurrentImpPage = IMP_HOME_PAGE;
fButtonPendingFlag = TRUE;
iCurrentProfileMode = 0;
fFinishedCharGeneration = FALSE;
ResetCharacterStats( );
}
else if( iCurrentImpPage == IMP_FINISH )
{
{
iCurrentImpPage = IMP_MAIN_PAGE;
iCurrentProfileMode = 4;
fFinishedCharGeneration = FALSE;
fButtonPendingFlag = TRUE;
//iCurrentProfileMode = 0;
//fFinishedCharGeneration = FALSE;
//ResetCharacterStats( );
fButtonPendingFlag = TRUE;
//iCurrentProfileMode = 0;
//fFinishedCharGeneration = FALSE;
//ResetCharacterStats( );
}
else if( iCurrentImpPage == IMP_PERSONALITY_QUIZ || iCurrentImpPage == IMP_PERSONALITY_FINISH)
{
giMaxPersonalityQuizQuestion = 0;
fStartOverFlag = TRUE;
fStartOverFlag = TRUE;
iCurrentAnswer = -1;
iCurrentImpPage = IMP_PERSONALITY;
fButtonPendingFlag = TRUE;
}
else
else
{
if( iCurrentImpPage == IMP_ATTRIBUTE_PAGE )
{
SetAttributes( );
fFirstIMPAttribTime = TRUE;
}
iCurrentImpPage = IMP_MAIN_PAGE;
iCurrentImpPage = IMP_MAIN_PAGE;
iCurrentAnswer = -1;
}
}
}
}
@@ -725,6 +725,7 @@ BOOLEAN HasTheCurrentIMPPageBeenVisited( void )