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:
lalien
+52
-52
@@ -58,7 +58,7 @@
|
||||
#define MERC_FACE_HEIGHT 122
|
||||
|
||||
#define MERC_FILES_STATS_BOX_X LAPTOP_SCREEN_UL_X + 164
|
||||
#define MERC_FILES_STATS_BOX_Y MERC_FILES_PORTRAIT_BOX_Y
|
||||
#define MERC_FILES_STATS_BOX_Y MERC_FILES_PORTRAIT_BOX_Y
|
||||
|
||||
|
||||
#define MERC_FILES_BIO_BOX_X MERC_FILES_PORTRAIT_BOX_X
|
||||
@@ -87,7 +87,7 @@
|
||||
#define MERC_ADD_BIO_TITLE_X MERC_BIO_TEXT_X
|
||||
#define MERC_ADD_BIO_TITLE_Y MERC_BIO_TEXT_Y + 100
|
||||
|
||||
#define MERC_ADD_BIO_TEXT_X MERC_BIO_TEXT_X
|
||||
#define MERC_ADD_BIO_TEXT_X MERC_BIO_TEXT_X
|
||||
#define MERC_ADD_BIO_TEXT_Y MERC_ADD_BIO_TITLE_Y + 20
|
||||
|
||||
#define MERC_BIO_WIDTH 460 - 10
|
||||
@@ -136,7 +136,7 @@ UINT32 guiMercBackButton;
|
||||
|
||||
//****************************
|
||||
//
|
||||
// Function Prototypes
|
||||
// Function Prototypes
|
||||
//
|
||||
//****************************
|
||||
|
||||
@@ -157,7 +157,7 @@ void GameInitMercsFiles()
|
||||
|
||||
BOOLEAN EnterMercsFiles()
|
||||
{
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
|
||||
InitMercBackGround();
|
||||
|
||||
@@ -178,50 +178,50 @@ BOOLEAN EnterMercsFiles()
|
||||
|
||||
|
||||
// Prev Box button
|
||||
guiButtonImage = LoadButtonImage("LAPTOP\\BigButtons.sti", -1,0,-1,1,-1 );
|
||||
guiButtonImage = LoadButtonImage("LAPTOP\\BigButtons.sti", -1,0,-1,1,-1 );
|
||||
|
||||
guiPrevButton = CreateIconAndTextButton( guiButtonImage, MercInfo[MERC_FILES_PREVIOUS],
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_PREV_BUTTON_X, MERC_FILES_PREV_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercPrevButtonCallback);
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_PREV_BUTTON_X, MERC_FILES_PREV_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercPrevButtonCallback);
|
||||
|
||||
SetButtonCursor(guiPrevButton, CURSOR_LAPTOP_SCREEN);
|
||||
SpecifyDisabledButtonStyle( guiPrevButton, DISABLED_STYLE_SHADED);
|
||||
|
||||
//Next Button
|
||||
guiNextButton = CreateIconAndTextButton( guiButtonImage, MercInfo[MERC_FILES_NEXT],
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_NEXT_BUTTON_X, MERC_FILES_NEXT_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercNextButtonCallback);
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_NEXT_BUTTON_X, MERC_FILES_NEXT_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercNextButtonCallback);
|
||||
|
||||
SetButtonCursor(guiNextButton, CURSOR_LAPTOP_SCREEN);
|
||||
SpecifyDisabledButtonStyle( guiNextButton, DISABLED_STYLE_SHADED);
|
||||
|
||||
//Hire button
|
||||
guiHireButton = CreateIconAndTextButton( guiButtonImage, MercInfo[MERC_FILES_HIRE],
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_HIRE_BUTTON_X, MERC_FILES_HIRE_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercHireButtonCallback);
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_HIRE_BUTTON_X, MERC_FILES_HIRE_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercHireButtonCallback);
|
||||
SetButtonCursor(guiHireButton, CURSOR_LAPTOP_SCREEN);
|
||||
SpecifyDisabledButtonStyle( guiHireButton, DISABLED_STYLE_SHADED);
|
||||
|
||||
//Back button
|
||||
guiMercBackButton = CreateIconAndTextButton( guiButtonImage, MercInfo[MERC_FILES_HOME],
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_BACK_BUTTON_X, MERC_FILES_BACK_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercFilesBackButtonCallback);
|
||||
FONT12ARIAL,
|
||||
MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW,
|
||||
MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW,
|
||||
TEXT_CJUSTIFIED,
|
||||
MERC_FILES_BACK_BUTTON_X, MERC_FILES_BACK_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
DEFAULT_MOVE_CALLBACK, BtnMercFilesBackButtonCallback);
|
||||
SetButtonCursor(guiMercBackButton, CURSOR_LAPTOP_SCREEN);
|
||||
SpecifyDisabledButtonStyle( guiMercBackButton, DISABLED_STYLE_SHADED);
|
||||
|
||||
@@ -251,7 +251,7 @@ void HandleMercsFiles()
|
||||
|
||||
void RenderMercsFiles()
|
||||
{
|
||||
HVOBJECT hPixHandle;
|
||||
HVOBJECT hPixHandle;
|
||||
|
||||
DrawMecBackGround();
|
||||
|
||||
@@ -299,9 +299,9 @@ void RenderMercsFiles()
|
||||
//Enable or disable the buttons
|
||||
EnableDisableMercFilesNextPreviousButton( );
|
||||
|
||||
MarkButtonsDirty( );
|
||||
MarkButtonsDirty( );
|
||||
RenderWWWProgramTitleBar( );
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
|
||||
}
|
||||
|
||||
|
||||
@@ -340,7 +340,7 @@ void BtnMercPrevButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnMercNextButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -377,7 +377,7 @@ void BtnMercNextButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnMercHireButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -426,22 +426,22 @@ void BtnMercHireButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
BOOLEAN DisplayMercFace( UINT8 ubMercID)
|
||||
{
|
||||
HVOBJECT hFaceHandle;
|
||||
HVOBJECT hPortraitHandle;
|
||||
HVOBJECT hFaceHandle;
|
||||
HVOBJECT hPortraitHandle;
|
||||
STR sFaceLoc = "FACES\\BIGFACES\\";
|
||||
char sTemp[100];
|
||||
MERCPROFILESTRUCT *pMerc;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
SOLDIERTYPE *pSoldier=NULL;
|
||||
|
||||
// Portrait Frame
|
||||
GetVideoObject(&hPortraitHandle, guiPortraitBox);
|
||||
BltVideoObject(FRAME_BUFFER, hPortraitHandle, 0,MERC_FILES_PORTRAIT_BOX_X, MERC_FILES_PORTRAIT_BOX_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
BltVideoObject(FRAME_BUFFER, hPortraitHandle, 0,MERC_FILES_PORTRAIT_BOX_X, MERC_FILES_PORTRAIT_BOX_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
|
||||
pMerc = &gMercProfiles[ ubMercID ];
|
||||
|
||||
@@ -449,14 +449,14 @@ BOOLEAN DisplayMercFace( UINT8 ubMercID)
|
||||
pSoldier = FindSoldierByProfileID( ubMercID, TRUE );
|
||||
|
||||
// load the Face graphic and add it
|
||||
sprintf(sTemp, "%s%02d.sti", sFaceLoc, ubMercID);
|
||||
sprintf(sTemp, "%s%02d.sti", sFaceLoc, ubMercID);
|
||||
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
|
||||
FilenameForBPP(sTemp, VObjectDesc.ImageFile);
|
||||
CHECKF(AddVideoObject(&VObjectDesc, &guiMercFace));
|
||||
|
||||
//Blt face to screen
|
||||
//Blt face to screen
|
||||
GetVideoObject(&hFaceHandle, guiMercFace);
|
||||
BltVideoObject(FRAME_BUFFER, hFaceHandle, 0,MERC_FACE_X, MERC_FACE_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
BltVideoObject(FRAME_BUFFER, hFaceHandle, 0,MERC_FACE_X, MERC_FACE_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
|
||||
//if the merc is dead, shadow the face red and put text over top saying the merc is dead
|
||||
if( IsMercDead( ubMercID ) )
|
||||
@@ -470,8 +470,8 @@ BOOLEAN DisplayMercFace( UINT8 ubMercID)
|
||||
//set the red pallete to the face
|
||||
SetObjectHandleShade( guiMercFace, 0 );
|
||||
|
||||
//Blt face to screen
|
||||
BltVideoObject(FRAME_BUFFER, hFaceHandle, 0,MERC_FACE_X, MERC_FACE_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
//Blt face to screen
|
||||
BltVideoObject(FRAME_BUFFER, hFaceHandle, 0,MERC_FACE_X, MERC_FACE_Y, VO_BLT_SRCTRANSPARENCY,NULL);
|
||||
|
||||
DisplayWrappedString(MERC_FACE_X, MERC_FACE_Y+MERC_PORTRAIT_TEXT_OFFSET_Y, MERC_FACE_WIDTH, 2, FONT14ARIAL, 145, MercInfo[MERC_FILES_MERC_IS_DEAD], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
|
||||
}
|
||||
@@ -483,7 +483,7 @@ BOOLEAN DisplayMercFace( UINT8 ubMercID)
|
||||
}
|
||||
|
||||
//else if the merc is currently a POW or, the merc was fired as a pow
|
||||
else if( pMerc->bMercStatus == MERC_FIRED_AS_A_POW || ( pSoldier && pSoldier->bAssignment == ASSIGNMENT_POW ) )
|
||||
else if( pMerc->bMercStatus == MERC_FIRED_AS_A_POW || ( pSoldier && pSoldier->bAssignment == ASSIGNMENT_POW ) )
|
||||
{
|
||||
ShadowVideoSurfaceRect( FRAME_BUFFER, MERC_FACE_X, MERC_FACE_Y, MERC_FACE_X + MERC_FACE_WIDTH, MERC_FACE_Y + MERC_FACE_HEIGHT);
|
||||
DisplayWrappedString(MERC_FACE_X, MERC_FACE_Y+MERC_PORTRAIT_TEXT_OFFSET_Y, MERC_FACE_WIDTH, 2, FONT14ARIAL, 145, pPOWStrings[0], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
|
||||
@@ -518,7 +518,7 @@ void LoadAndDisplayMercBio( UINT8 ubMercID )
|
||||
uiStartLoc = MERC_BIO_SIZE * ubMercID;
|
||||
LoadEncryptedDataFromFile(MERCBIOFILE, sText, uiStartLoc, MERC_BIO_INFO_TEXT_SIZE);
|
||||
DisplayWrappedString(MERC_BIO_TEXT_X, MERC_BIO_TEXT_Y, MERC_BIO_WIDTH, 2, MERC_BIO_FONT, MERC_BIO_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
|
||||
|
||||
|
||||
//load and display the merc's additioanl info (if any)
|
||||
uiStartLoc = MERC_BIO_SIZE * ubMercID + MERC_BIO_INFO_TEXT_SIZE;
|
||||
LoadEncryptedDataFromFile(MERCBIOFILE, sText, uiStartLoc, MERC_BIO_ADD_INFO_TEXT_SIZE);
|
||||
@@ -526,7 +526,7 @@ void LoadAndDisplayMercBio( UINT8 ubMercID )
|
||||
{
|
||||
DrawTextToScreen( MercInfo[ MERC_FILES_ADDITIONAL_INFO ], MERC_ADD_BIO_TITLE_X, MERC_ADD_BIO_TITLE_Y, 0, MERC_TITLE_FONT, MERC_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
|
||||
DisplayWrappedString( MERC_ADD_BIO_TEXT_X, MERC_ADD_BIO_TEXT_Y, MERC_BIO_WIDTH, 2, MERC_BIO_FONT, MERC_BIO_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -627,7 +627,7 @@ BOOLEAN MercFilesHireMerc(UINT8 ubMercID)
|
||||
gusMercVideoSpeckSpeech = SPECK_QUOTE_PLAYER_TRIES_TO_HIRE_ALREADY_HIRED_MERC;
|
||||
gubArrivedFromMercSubSite = MERC_CAME_FROM_HIRE_PAGE;
|
||||
}
|
||||
|
||||
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
@@ -698,17 +698,17 @@ void BtnMercFilesBackButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnableDisableMercFilesNextPreviousButton( )
|
||||
{
|
||||
if( gubCurMercIndex <= LaptopSaveInfo.gubLastMercIndex-1 )
|
||||
EnableButton( guiNextButton );
|
||||
EnableButton( guiNextButton );
|
||||
else
|
||||
DisableButton( guiNextButton );
|
||||
DisableButton( guiNextButton );
|
||||
|
||||
if( gubCurMercIndex > 0 )
|
||||
EnableButton( guiPrevButton );
|
||||
else
|
||||
DisableButton( guiPrevButton );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user