1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: If SMALL_SIZE_PB = TRUE (ja2_options.ini), in 640x480 and 1024x768 the mall progress bar (rect*thin.sti) was not loaded and displayed

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-12-15 10:30:37 +00:00
parent 1601a370ae
commit 7c028b4a68
1 changed files with 104 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface.cpp
+84 -218
View File
@@ -4202,185 +4202,121 @@ BOOLEAN AddTopMessage( UINT8 ubType, STR16 pzString )
void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString ) void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
{ {
UINT32 uiBAR, uiPLAYERBAR = 0, uiINTBAR = 0; UINT32 uiBAR, uiPLAYERBAR = 0, uiINTBAR = 0;
VOBJECT_DESC VObjectDesc; VOBJECT_DESC VObjectDesc;
INT16 sX, sY; INT16 sX, sY;
INT32 cnt2; INT32 cnt2;
INT16 sBarX = 0; INT16 sBarX = 0;
UINT32 uiBarToUseInUpDate=0; UINT32 uiBarToUseInUpDate=0;
BOOLEAN fDoLimitBar = FALSE; BOOLEAN fDoLimitBar = FALSE;
FLOAT dNumStepsPerEnemy, dLength, dCurSize; FLOAT dNumStepsPerEnemy, dLength, dCurSize;
INT16 iProgBarLength = SCREEN_WIDTH - 13;
INT16 iProgBarLength = SCREEN_WIDTH - 13;
//*ddd{
STR fn; STR fn;
//*ddd}
memset( &VObjectDesc, 0, sizeof( VObjectDesc ) ); memset( &VObjectDesc, 0, sizeof( VObjectDesc ) );
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE; VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
//* ddd {
switch (iResolution) switch (iResolution)
{ {
case 0: //640 case 0: //640
fn = "INTERFACE\\rect.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\rect_Thin.sti";
case 1: //800 else
fn = "INTERFACE\\rect.sti";
break;
case 1: //800
if (gGameExternalOptions.fSmallSizeProgressbar) if (gGameExternalOptions.fSmallSizeProgressbar)
fn = "INTERFACE\\rect_800x600Thin.sti"; fn = "INTERFACE\\rect_800x600Thin.sti";
else else
fn = "INTERFACE\\rect_800x600.sti"; fn = "INTERFACE\\rect_800x600.sti";
break; break;
case 2: case 2:
fn = "INTERFACE\\rect_1024x768.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\rect_1024x768Thin.sti";
default: else
fn = "INTERFACE\\rect_1024x768.sti";
break;
default:
AssertMsg( 0, "Invalid resolution"); AssertMsg( 0, "Invalid resolution");
return; return;
break; break;
}//switch }
FilenameForBPP(fn, VObjectDesc.ImageFile); FilenameForBPP(fn, VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiBAR ) ) { sprintf(fn, "Missing %s", fn);
AssertMsg(0, fn ); }
//*ddd }
//* crappy code commented ddd
/*
if (iResolution == 0)
{
FilenameForBPP("INTERFACE\\rect.sti", VObjectDesc.ImageFile);
}
else if (iResolution == 1)
{
FilenameForBPP("INTERFACE\\rect_800x600.sti", VObjectDesc.ImageFile);
}
else if (iResolution == 2)
{
FilenameForBPP("INTERFACE\\rect_1024x768.sti", VObjectDesc.ImageFile);
}
if( !AddVideoObject( &VObjectDesc, &uiBAR ) ) if( !AddVideoObject( &VObjectDesc, &uiBAR ) )
AssertMsg(0, "Missing INTERFACE\\rect.sti" ); {
*/ sprintf(fn, "Missing %s", fn);
AssertMsg(0, fn );
}
//if ( gGameOptions.fTurnTimeLimit )
//{
//* ddd {
switch (iResolution) switch (iResolution)
{ {
case 0: //640 case 0: //640
fn = "INTERFACE\\timebargreen.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\timebargreen_Thin.sti";
case 1: //800 else
if (gGameExternalOptions.fSmallSizeProgressbar) fn = "INTERFACE\\timebargreen.sti";
fn = "INTERFACE\\timebargreen_800x600Thin.sti"; break;
else case 1: //800
fn = "INTERFACE\\timebargreen_800x600.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\timebargreen_800x600Thin.sti";
case 2: else
fn = "INTERFACE\\timebargreen_1024x768.sti"; fn = "INTERFACE\\timebargreen_800x600.sti";
break; break;
default: case 2:
if (gGameExternalOptions.fSmallSizeProgressbar)
fn = "INTERFACE\\timebargreen_1024x768Thin.sti";
else
fn = "INTERFACE\\timebargreen_1024x768.sti";
break;
default:
AssertMsg( 0, "Invalid resolution"); AssertMsg( 0, "Invalid resolution");
return; return;
break; break;
}//switch }
FilenameForBPP(fn, VObjectDesc.ImageFile); FilenameForBPP(fn, VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiPLAYERBAR ) ){ sprintf(fn, "Missing %s", fn); if( !AddVideoObject( &VObjectDesc, &uiPLAYERBAR ) )
AssertMsg(0, fn ); }
//*ddd }
/* commented
if (iResolution == 0)
{ {
FilenameForBPP("INTERFACE\\timebargreen.sti", VObjectDesc.ImageFile); sprintf(fn, "Missing %s", fn);
if( !AddVideoObject( &VObjectDesc, &uiPLAYERBAR ) ) AssertMsg(0, fn );
AssertMsg(0, "Missing INTERFACE\\timebargreen.sti" );
}
else if (iResolution == 1)
{
FilenameForBPP("INTERFACE\\timebargreen_800x600.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiPLAYERBAR ) )
AssertMsg(0, "Missing INTERFACE\\timebargreen_800x600.sti" );
if (SMALL_SIZE_PROGRESSBAR)
fn = "INTERFACE\\timebargreen_800x600Thin.sti";
else
fn = "INTERFACE\\timebargreen_800x600.sti";
}
else if (iResolution == 2)
{
FilenameForBPP("INTERFACE\\timebargreen_1024x768.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiPLAYERBAR ) )
AssertMsg(0, "Missing INTERFACE\\timebargreen_1024x768.sti" );
}
else
{
AssertMsg( 0, "Invalid resolution");
return;
} }
*/
//* ddd {
switch (iResolution) switch (iResolution)
{ {
case 0: //640 case 0: //640
fn = "INTERFACE\\timebaryellow.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\timebaryellow_Thin.sti";
case 1: //800 else
if (gGameExternalOptions.fSmallSizeProgressbar) fn = "INTERFACE\\timebaryellow.sti";
fn = "INTERFACE\\timebaryellow_800x600Thin.sti"; break;
else case 1: //800
fn = "INTERFACE\\timebaryellow_800x600.sti"; if (gGameExternalOptions.fSmallSizeProgressbar)
break; fn = "INTERFACE\\timebaryellow_800x600Thin.sti";
case 2: else
fn = "INTERFACE\\timebaryellow_1024x768.sti"; fn = "INTERFACE\\timebaryellow_800x600.sti";
break; break;
default: case 2:
if (gGameExternalOptions.fSmallSizeProgressbar)
fn = "INTERFACE\\timebaryellow_1024x768Thin.sti";
else
fn = "INTERFACE\\timebaryellow_1024x768.sti";
break;
default:
AssertMsg( 0, "Invalid resolution"); AssertMsg( 0, "Invalid resolution");
return; return;
break; break;
}//switch
FilenameForBPP(fn, VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) ){ sprintf(fn, "Missing %s", fn);
AssertMsg(0, fn ); }
//*ddd }
/*
if (iResolution == 0)
{
FilenameForBPP("INTERFACE\\timebaryellow.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) )
AssertMsg(0, "Missing INTERFACE\\timebaryellow.sti" );
}
else if (iResolution == 1)
{
FilenameForBPP("INTERFACE\\timebaryellow_800x600.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) )
AssertMsg(0, "Missing INTERFACE\\timebaryellow_800x600.sti" );
}
else if (iResolution == 2)
{
//*ddd FilenameForBPP("INTERFACE\\timebaryellow_1024x768.sti", VObjectDesc.ImageFile);
//*ddd if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) )
//*ddd AssertMsg(0, "Missing INTERFACE\\timebaryellow_1024x768.sti" );
fn = "INTERFACE\\timebaryellow_1024x768.sti";
}
else
{
AssertMsg( 0, "Invalid resolution");
return;
} }
FilenameForBPP(fn, VObjectDesc.ImageFile); FilenameForBPP(fn, VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) )
AssertMsg(0, String( "Missing %s", VObjectDesc.ImageFile) );
*/
// Change dest buffer if( !AddVideoObject( &VObjectDesc, &uiINTBAR ) )
//*ddd {
//SetFontDestBuffer( uiSurface , 0, 0, SCREEN_WIDTH , 20, FALSE ); sprintf(fn, "Missing %s", fn);
AssertMsg(0, fn );
}
SetFontDestBuffer( uiSurface , 0, 0, SCREEN_WIDTH , HEIGHT_PROGRESSBAR, FALSE ); SetFontDestBuffer( uiSurface , 0, 0, SCREEN_WIDTH , HEIGHT_PROGRESSBAR, FALSE );
SetFont( TINYFONT1 ); SetFont( TINYFONT1 );
@@ -4413,15 +4349,8 @@ void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
case PLAYER_TURN_MESSAGE: case PLAYER_TURN_MESSAGE:
// Render rect into surface BltVideoObjectFromIndex( uiSurface, uiPLAYERBAR, 0, 0, 0, VO_BLT_SRCTRANSPARENCY, NULL );
//if ( gGameOptions.fTurnTimeLimit )
{
BltVideoObjectFromIndex( uiSurface, uiPLAYERBAR, 0, 0, 0, VO_BLT_SRCTRANSPARENCY, NULL );
}
//else
//{
// BltVideoObjectFromIndex( uiSurface, uiPLAYERBAR, 13, 0, 0, VO_BLT_SRCTRANSPARENCY, NULL );
//}
SetFontBackground( FONT_MCOLOR_BLACK ); SetFontBackground( FONT_MCOLOR_BLACK );
SetFontForeground( FONT_MCOLOR_WHITE ); SetFontForeground( FONT_MCOLOR_WHITE );
SetFontShadow( NO_SHADOW ); SetFontShadow( NO_SHADOW );
@@ -4429,58 +4358,6 @@ void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
break; break;
} }
// Update progress bar!
#if 0
if ( ubType == COMPUTER_TURN_MESSAGE )
{
INT32 cnt1, iLength;
INT16 usNumStepsPerEnemy;
if ( gfProgBarActive )
{
//usNumStepsPerEnemy = ( PROG_BAR_LENGTH / gubProgNumEnemies );
// Alrighty, do some fun stuff!
// Render end peice
sBarX = PROG_BAR_START_X;
BltVideoObjectFromIndex( uiSurface, uiBAR, 3, sBarX, PROG_BAR_START_Y, VO_BLT_SRCTRANSPARENCY, NULL );
// Determine Length
// iLength = (gubProgCurEnemy ) * usNumStepsPerEnemy;
cnt1 = 0;
cnt2 = 0;
while( cnt1 < iLength )
{
sBarX++;
// Check sBarX, ( just as a precaution )
if ( sBarX > SCREEN_WIDTH )
{
break;
}
BltVideoObjectFromIndex( uiSurface, uiBAR, (INT16)( 4 + cnt2 ), sBarX, PROG_BAR_START_Y, VO_BLT_SRCTRANSPARENCY, NULL );
cnt1++;
cnt2++;
if ( cnt2 == 10 )
{
cnt2 = 0;
}
}
//gubProgNumEnemies = ubNum;
//gubProgCurEnemy = 0;
}
}
#endif
if ( gGameOptions.fTurnTimeLimit ) if ( gGameOptions.fTurnTimeLimit )
{ {
if ( ubType == PLAYER_TURN_MESSAGE || ubType == PLAYER_INTERRUPT_MESSAGE ) if ( ubType == PLAYER_TURN_MESSAGE || ubType == PLAYER_INTERRUPT_MESSAGE )
@@ -4493,10 +4370,6 @@ void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
{ {
dNumStepsPerEnemy = (FLOAT)( (FLOAT)iProgBarLength / (FLOAT)gTacticalStatus.usTactialTurnLimitMax ); dNumStepsPerEnemy = (FLOAT)( (FLOAT)iProgBarLength / (FLOAT)gTacticalStatus.usTactialTurnLimitMax );
//dNumStepsPerEnemy = (FLOAT)( (FLOAT)PROG_BAR_LENGTH / (FLOAT)gTacticalStatus.usTactialTurnLimitMax );
// Alrighty, do some fun stuff!
// Render end peice // Render end peice
sBarX = PROG_BAR_START_X; sBarX = PROG_BAR_START_X;
BltVideoObjectFromIndex( uiSurface, uiBarToUseInUpDate, 1, sBarX, PROG_BAR_START_Y, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObjectFromIndex( uiSurface, uiBarToUseInUpDate, 1, sBarX, PROG_BAR_START_Y, VO_BLT_SRCTRANSPARENCY, NULL );
@@ -4541,14 +4414,9 @@ void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
// Delete rect // Delete rect
DeleteVideoObjectFromIndex( uiBAR ); DeleteVideoObjectFromIndex( uiBAR );
DeleteVideoObjectFromIndex( uiINTBAR ); DeleteVideoObjectFromIndex( uiINTBAR );
DeleteVideoObjectFromIndex( uiPLAYERBAR );
//if ( gGameOptions.fTurnTimeLimit )
{
DeleteVideoObjectFromIndex( uiPLAYERBAR );
}
// Draw text.... // Draw text....
//*ddd FindFontCenterCoordinates( SCREEN_WIDTH/2, 7, 1, 1, psString, TINYFONT1, &sX, &sY );
if(gGameExternalOptions.fSmallSizeProgressbar) if(gGameExternalOptions.fSmallSizeProgressbar)
FindFontCenterCoordinates( SCREEN_WIDTH/2, 2, 1, 1, psString, TINYFONT1, &sX, &sY ); FindFontCenterCoordinates( SCREEN_WIDTH/2, 2, 1, 1, psString, TINYFONT1, &sX, &sY );
else else
@@ -4562,9 +4430,7 @@ void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString )
// Done! // Done!
SetFontShadow( DEFAULT_SHADOW ); SetFontShadow( DEFAULT_SHADOW );
gfTopMessageDirty = TRUE; gfTopMessageDirty = TRUE;
} }
void TurnExpiredCallBack( UINT8 bExitValue ) void TurnExpiredCallBack( UINT8 bExitValue )