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

- added VS2005 compability fix from Space Viking

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-03-10 18:46:57 +00:00
parent 9971b56b0e
commit 3f37673034
110 changed files with 477 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/PreBattle Interface.cpp
+6 -6
View File
@@ -89,7 +89,7 @@ void AutoResolveBattleCallback( GUI_BUTTON *btn, INT32 reason );
void GoToSectorCallback( GUI_BUTTON *btn, INT32 reason );
void RetreatMercsCallback( GUI_BUTTON *btn, INT32 reason );
void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, UINT16 *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent );
void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, wchar_t *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent );
void CheckForRobotAndIfItsControlled( void );
@@ -213,7 +213,7 @@ void ValidateAndCorrectInBattleCounters( GROUP *pLocGroup )
if( ubInvalidGroups || pSector->ubAdminsInBattle || pSector->ubTroopsInBattle || pSector->ubElitesInBattle || pSector->ubCreaturesInBattle )
{
UINT16 str[ 512 ];
wchar_t str[ 512 ];
swprintf( str, L"Strategic info warning: Sector 'in battle' counters are not clear when they should be. "
L"If you can provide information on how a previous battle was resolved here or nearby patrol "
L"(auto resolve, tactical battle, cheat keys, or retreat),"
@@ -904,7 +904,7 @@ void KillPreBattleInterface()
void RenderPBHeader( INT32 *piX, INT32 *piWidth)
{
UINT16 str[100];
wchar_t str[100];
INT32 x, width;
SetFont( FONT10ARIALBOLD );
if( gfBlinkHeader )
@@ -967,8 +967,8 @@ void RenderPreBattleInterface()
GROUP *pGroup;
HVOBJECT hVObject;
INT32 i, x, y, line, width;
UINT16 str[100];
UINT16 pSectorName[ 128 ];
wchar_t str[100];
wchar_t pSectorName[ 128 ];
UINT8 ubHPPercent, ubBPPercent;
BOOLEAN fMouseInRetreatButtonArea;
UINT8 ubJunk;
@@ -1417,7 +1417,7 @@ enum
COND_DEAD
};
void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, UINT16 *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent )
void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, wchar_t *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent )
{
Assert( pSoldier );
*pubHPPercent = (UINT8)(pSoldier->bLife * 100 / pSoldier->bLifeMax);