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
+106 -106
View File
@@ -51,10 +51,10 @@ void BtnIMPPortraitDoneCallback(GUI_BUTTON *btn,INT32 reason);
void EnterIMPPortraits( void )
{
// create buttons
CreateIMPPortraitButtons( );
// render background
RenderIMPPortraits( );
@@ -65,9 +65,9 @@ void EnterIMPPortraits( void )
void RenderIMPPortraits( void )
{
// render background
// render background
RenderProfileBackGround( );
// the Voices frame
@@ -77,8 +77,8 @@ void RenderIMPPortraits( void )
RenderPortrait( 200, 176 );
// indent for the text
RenderAttrib1IndentFrame( 128, 65);
RenderAttrib1IndentFrame( 128, 65);
// text
PrintImpText( );
@@ -89,7 +89,7 @@ void RenderIMPPortraits( void )
void ExitIMPPortraits( void )
{
// destroy buttons for IMP portrait page
DestroyIMPPortraitButtons( );
DestroyIMPPortraitButtons( );
return;
}
@@ -98,10 +98,10 @@ void HandleIMPPortraits( void )
{
// do we need to re write screen
if ( fReDrawPortraitScreenFlag == TRUE )
if ( fReDrawPortraitScreenFlag == TRUE )
{
RenderIMPPortraits( );
RenderIMPPortraits( );
// reset redraw flag
fReDrawPortraitScreenFlag = FALSE;
}
@@ -111,43 +111,43 @@ void HandleIMPPortraits( void )
BOOLEAN RenderPortrait( INT16 sX, INT16 sY )
{
// render the portrait of the current picture
VOBJECT_DESC VObjectDesc;
// render the portrait of the current picture
VOBJECT_DESC VObjectDesc;
HVOBJECT hHandle;
UINT32 uiGraphicHandle;
if( fCharacterIsMale )
if( fCharacterIsMale )
{
// load it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
FilenameForBPP( pPlayerSelectedBigFaceFileNames[ iCurrentPortrait ] , VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &uiGraphicHandle));
// show it
GetVideoObject(&hHandle, uiGraphicHandle);
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + sX, LAPTOP_SCREEN_WEB_UL_Y + sY , VO_BLT_SRCTRANSPARENCY,NULL);
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
FilenameForBPP( pPlayerSelectedBigFaceFileNames[ iCurrentPortrait ] , VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &uiGraphicHandle));
// show it
GetVideoObject(&hHandle, uiGraphicHandle);
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + sX, LAPTOP_SCREEN_WEB_UL_Y + sY , VO_BLT_SRCTRANSPARENCY,NULL);
// and kick it's sorry ..umm never mind, outta here
DeleteVideoObjectFromIndex( uiGraphicHandle );
// and kick it's sorry ..umm never mind, outta here
DeleteVideoObjectFromIndex( uiGraphicHandle );
}
else
{
// load it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
FilenameForBPP( pPlayerSelectedBigFaceFileNames[ iCurrentPortrait + 8 ] , VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &uiGraphicHandle));
// show it
GetVideoObject(&hHandle, uiGraphicHandle);
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + sX, LAPTOP_SCREEN_WEB_UL_Y + sY , VO_BLT_SRCTRANSPARENCY,NULL);
// load it
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
FilenameForBPP( pPlayerSelectedBigFaceFileNames[ iCurrentPortrait + 8 ] , VObjectDesc.ImageFile);
CHECKF(AddVideoObject(&VObjectDesc, &uiGraphicHandle));
// show it
GetVideoObject(&hHandle, uiGraphicHandle);
BltVideoObject(FRAME_BUFFER, hHandle, 0, LAPTOP_SCREEN_UL_X + sX, LAPTOP_SCREEN_WEB_UL_Y + sY , VO_BLT_SRCTRANSPARENCY,NULL);
// and kick it's sorry ..umm never mind, outta here
DeleteVideoObjectFromIndex( uiGraphicHandle );
// and kick it's sorry ..umm never mind, outta here
DeleteVideoObjectFromIndex( uiGraphicHandle );
}
@@ -159,7 +159,7 @@ BOOLEAN RenderPortrait( INT16 sX, INT16 sY )
void IncrementPictureIndex( void )
{
// cycle to next picture
iCurrentPortrait++;
// gone too far?
@@ -169,20 +169,20 @@ void IncrementPictureIndex( void )
}
return;
return;
}
void DecrementPicture( void )
{
// cycle to previous picture
// cycle to previous picture
iCurrentPortrait--;
// gone too far?
if( iCurrentPortrait < 0 )
if( iCurrentPortrait < 0 )
{
iCurrentPortrait = iLastPicture;
iCurrentPortrait = iLastPicture;
}
return;
@@ -191,54 +191,54 @@ void DecrementPicture( void )
void CreateIMPPortraitButtons( void )
{
// will create buttons need for the IMP portrait screen
// will create buttons need for the IMP portrait screen
// next button
giIMPPortraitButtonImage[0]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,1,-1,3,-1 );
/*giIMPPortraitButton[0] = QuickCreateButton( giIMPPortraitButtonImage[0], LAPTOP_SCREEN_UL_X + ( 18 ), LAPTOP_SCREEN_WEB_UL_Y + ( 184 ),
giIMPPortraitButtonImage[0]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,1,-1,3,-1 );
/*giIMPPortraitButton[0] = QuickCreateButton( giIMPPortraitButtonImage[0], LAPTOP_SCREEN_UL_X + ( 18 ), LAPTOP_SCREEN_WEB_UL_Y + ( 184 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitNextCallback );
*/
giIMPPortraitButton[0] = CreateIconAndTextButton( giIMPPortraitButtonImage[0], pImpButtonText[ 13 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 343 ), LAPTOP_SCREEN_WEB_UL_Y + ( 205 ),BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitNextCallback);
*/
giIMPPortraitButton[0] = CreateIconAndTextButton( giIMPPortraitButtonImage[0], pImpButtonText[ 13 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 343 ), LAPTOP_SCREEN_WEB_UL_Y + ( 205 ),BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitNextCallback);
// previous button
giIMPPortraitButtonImage[ 1 ]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,0,-1,2,-1 );
/* giIMPPortraitButton[ 1 ] = QuickCreateButton( giIMPPortraitButtonImage[ 1 ], LAPTOP_SCREEN_UL_X + ( 18 ), LAPTOP_SCREEN_WEB_UL_Y + ( 254 ),
giIMPPortraitButtonImage[ 1 ]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,0,-1,2,-1 );
/* giIMPPortraitButton[ 1 ] = QuickCreateButton( giIMPPortraitButtonImage[ 1 ], LAPTOP_SCREEN_UL_X + ( 18 ), LAPTOP_SCREEN_WEB_UL_Y + ( 254 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitPreviousCallback );
*/
giIMPPortraitButton[ 1 ] = CreateIconAndTextButton( giIMPPortraitButtonImage[ 1 ], pImpButtonText[ 12 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 93), LAPTOP_SCREEN_WEB_UL_Y + ( 205 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitPreviousCallback);
*/
giIMPPortraitButton[ 1 ] = CreateIconAndTextButton( giIMPPortraitButtonImage[ 1 ], pImpButtonText[ 12 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 93), LAPTOP_SCREEN_WEB_UL_Y + ( 205 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitPreviousCallback);
// done button
giIMPPortraitButtonImage[ 2 ]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPortraitButton[ 2 ] = QuickCreateButton( giIMPPortraitButtonImage[ 1 ], LAPTOP_SCREEN_UL_X + ( 349 ), LAPTOP_SCREEN_WEB_UL_Y + ( 220 ),
giIMPPortraitButtonImage[ 2 ]= LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
/* giIMPPortraitButton[ 2 ] = QuickCreateButton( giIMPPortraitButtonImage[ 1 ], LAPTOP_SCREEN_UL_X + ( 349 ), LAPTOP_SCREEN_WEB_UL_Y + ( 220 ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitDoneCallback );
*/
giIMPPortraitButton[ 2 ] = CreateIconAndTextButton( giIMPPortraitButtonImage[ 2 ], pImpButtonText[ 11 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 187 ), LAPTOP_SCREEN_WEB_UL_Y + ( 330 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitDoneCallback);
*/
giIMPPortraitButton[ 2 ] = CreateIconAndTextButton( giIMPPortraitButtonImage[ 2 ], pImpButtonText[ 11 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
TEXT_CJUSTIFIED,
LAPTOP_SCREEN_UL_X + ( 187 ), LAPTOP_SCREEN_WEB_UL_Y + ( 330 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPPortraitDoneCallback);
SetButtonCursor(giIMPPortraitButton[0], CURSOR_WWW);
SetButtonCursor(giIMPPortraitButton[1], CURSOR_WWW);
SetButtonCursor(giIMPPortraitButton[2], CURSOR_WWW);
SetButtonCursor(giIMPPortraitButton[0], CURSOR_WWW);
SetButtonCursor(giIMPPortraitButton[1], CURSOR_WWW);
SetButtonCursor(giIMPPortraitButton[2], CURSOR_WWW);
}
@@ -247,18 +247,18 @@ void DestroyIMPPortraitButtons( void )
{
// will destroy buttons created for IMP Portrait screen
// the next button
RemoveButton(giIMPPortraitButton[ 0 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 0 ] );
RemoveButton(giIMPPortraitButton[ 0 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 0 ] );
// the previous button
RemoveButton(giIMPPortraitButton[ 1 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 1 ] );
RemoveButton(giIMPPortraitButton[ 1 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 1 ] );
// the done button
RemoveButton(giIMPPortraitButton[ 2 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 2 ] );
RemoveButton(giIMPPortraitButton[ 2 ] );
UnloadButtonImage(giIMPPortraitButtonImage[ 2 ] );
return;
}
@@ -273,21 +273,21 @@ void BtnIMPPortraitNextCallback(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);
// next picture!!
IncrementPictureIndex( );
fReDrawPortraitScreenFlag = TRUE;
}
}
}
}
}
void BtnIMPPortraitPreviousCallback(GUI_BUTTON *btn,INT32 reason)
{
@@ -298,21 +298,21 @@ void BtnIMPPortraitPreviousCallback(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);
// previous picture, please!!!
DecrementPicture( );
fReDrawPortraitScreenFlag = TRUE;
}
}
}
}
}
void BtnIMPPortraitDoneCallback(GUI_BUTTON *btn,INT32 reason)
{
@@ -323,58 +323,58 @@ void BtnIMPPortraitDoneCallback(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);
// go to main page
iCurrentImpPage = IMP_MAIN_PAGE;
/*
// current mode now is voice
if( iCurrentProfileMode < IMP__VOICE )
if( iCurrentProfileMode < IMP__VOICE )
{
iCurrentProfileMode = IMP__VOICE;
iCurrentProfileMode = IMP__VOICE;
}
*/
*/
// if we are already done, leave
if( iCurrentProfileMode == IMP__FINISH )
if( iCurrentProfileMode == IMP__FINISH )
{
iCurrentImpPage = IMP_FINISH;
}
iCurrentImpPage = IMP_FINISH;
}
else
{
if( CameBackToPortraitsPageButNotFinished() )
{
// iCurrentProfileMode = IMP__VOICE;
iCurrentImpPage = IMP_MAIN_PAGE;
iCurrentImpPage = IMP_MAIN_PAGE;
}
else
{
iCurrentProfileMode = IMP__VOICE;
}
}
}
// grab picture number
if( fCharacterIsMale )
if( fCharacterIsMale )
{
// male
// male
iPortraitNumber = iCurrentPortrait;
}
else
{
// female
// female
iPortraitNumber = iCurrentPortrait + ( 8 );
}
fButtonPendingFlag = TRUE;
}
}
}
}
}
BOOLEAN CameBackToPortraitsPageButNotFinished()