- added VS2005 compability fix from Space Viking

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
+3 -3
View File
@@ -128,7 +128,7 @@ void DefineProgressBarPanel( UINT32 ubID, UINT8 r, UINT8 g, UINT8 b,
//Assigning a title for the panel will automatically position the text horizontally centered on the
//panel and vertically centered from the top of the panel, to the top of the progress bar.
void SetProgressBarTitle( UINT32 ubID, UINT16 *pString, UINT32 usFont, UINT8 ubForeColor, UINT8 ubShadowColor )
void SetProgressBarTitle( UINT32 ubID, wchar_t *pString, UINT32 usFont, UINT8 ubForeColor, UINT8 ubShadowColor )
{
PROGRESSBAR *pCurr;
Assert( ubID < MAX_PROGRESSBARS );
@@ -142,7 +142,7 @@ void SetProgressBarTitle( UINT32 ubID, UINT16 *pString, UINT32 usFont, UINT8 ubF
}
if( pString && wcslen( pString ) )
{
pCurr->swzTitle = (UINT16*)MemAlloc( sizeof( UINT16 ) * ( wcslen( pString ) + 1 ) );
pCurr->swzTitle = (wchar_t*)MemAlloc( sizeof( wchar_t ) * ( wcslen( pString ) + 1 ) );
swprintf( pCurr->swzTitle, pString );
}
pCurr->usTitleFont = (UINT16)usFont;
@@ -186,7 +186,7 @@ void RemoveProgressBar( UINT8 ubID )
//As the process animates using UpdateProgressBar( 0 to 100 ), the total progress bar will only reach 30%
//at the 100% mark within UpdateProgressBar. At that time, you would go onto the next step, resetting the
//relative start and end percentage from 30 to whatever, until your done.
void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, UINT16 *str)
void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, wchar_t *str)
{
PROGRESSBAR *pCurr;
UINT16 usStartX, usStartY;
+2 -2
View File
@@ -12,7 +12,7 @@ typedef struct PROGRESSBAR
BOOLEAN fPanel;
UINT16 usPanelLeft, usPanelTop, usPanelRight, usPanelBottom;
UINT16 usColor, usLtColor, usDkColor;
UINT16 *swzTitle;
wchar_t *swzTitle;
UINT16 usTitleFont;
UINT8 ubTitleFontForeColor, ubTitleFontShadowColor;
UINT16 usMsgFont;
@@ -61,7 +61,7 @@ void RemoveProgressBar( UINT8 ubID );
//As the process animates using UpdateProgressBar( 0 to 100 ), the total progress bar will only reach 30%
//at the 100% mark within UpdateProgressBar. At that time, you would go onto the next step, resetting the
//relative start and end percentage from 30 to whatever, until your done.
void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, UINT16 *str);
void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, wchar_t *str);
//This part renders the progress bar at the percentage level that you specify. If you have set relative
//percentage values in the above function, then the uiPercentage will be reflected based off of the relative
+1 -1
View File
@@ -354,7 +354,7 @@ UINT16 WFGetFontHeight( INT32 FontNum )
}
INT16 WFStringPixLength( UINT16 *string,INT32 UseFont )
INT16 WFStringPixLength( wchar_t *string,INT32 UseFont )
{
if ( USE_WINFONTS( ) )
{
+1 -1
View File
@@ -22,7 +22,7 @@ extern INT32 giCurWinFont;
// ATE: A few winfont wrappers..
UINT16 WFGetFontHeight( INT32 FontNum );
INT16 WFStringPixLength( UINT16 *string,INT32 UseFont );
INT16 WFStringPixLength( wchar_t *string,INT32 UseFont );
+1 -1
View File
@@ -392,7 +392,7 @@ INT32 PrepareMercPopupBox( INT32 iBoxId, UINT8 ubBackgroundIndex, UINT8 ubBorde
// reset flags
guiFlags = 0;
usStringPixLength = WFStringPixLength( (UINT16 *) pString, TEXT_POPUP_FONT);
usStringPixLength = WFStringPixLength( pString, TEXT_POPUP_FONT);
if( usStringPixLength < ( usWidth - ( MERC_TEXT_POPUP_WINDOW_TEXT_OFFSET_X ) * 2 ) )
{
+12 -12
View File
@@ -32,7 +32,7 @@ void AddChar( UINT32 uiKey );
void RemoveChar( UINT8 ubArrayIndex );
void DeleteHilitedText();
void DoublePercentileCharacterFromStringIntoString( UINT16 *pSrcString, UINT16 *pDstString );
void DoublePercentileCharacterFromStringIntoString( wchar_t *pSrcString, wchar_t *pDstString );
//All exclusive input types are handled in this function.
void HandleExclusiveInput( UINT32 uiKey );
@@ -63,7 +63,7 @@ typedef struct TEXTINPUTNODE{
UINT8 ubID;
UINT16 usInputType;
UINT8 ubMaxChars;
UINT16 *szString;
wchar_t *szString;
UINT8 ubStrLen;
BOOLEAN fEnabled;
BOOLEAN fUserField;
@@ -238,7 +238,7 @@ void KillAllTextInputModes()
//of calls to this function dictate the TAB order from traversing from one field to the next. This
//function adds mouse regions and processes them for you, as well as deleting them when you are done.
void AddTextInputField( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT8 bPriority,
UINT16 *szInitText, UINT8 ubMaxChars, UINT16 usInputType )
wchar_t *szInitText, UINT8 ubMaxChars, UINT16 usInputType )
{
TEXTINPUTNODE *pNode;
pNode = (TEXTINPUTNODE*)MemAlloc(sizeof(TEXTINPUTNODE));
@@ -266,7 +266,7 @@ void AddTextInputField( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, IN
if( usInputType == INPUTTYPE_EXCLUSIVE_24HOURCLOCK )
ubMaxChars = 6;
//Allocate and copy the string.
pNode->szString = (UINT16*)MemAlloc( (ubMaxChars+1)*sizeof(UINT16) );
pNode->szString = (wchar_t*)MemAlloc( (ubMaxChars+1)*sizeof(wchar_t) );
Assert( pNode->szString );
if( szInitText )
{
@@ -383,7 +383,7 @@ INT16 GetActiveFieldID()
//This is a useful call made from an external user input field. Using the previous file dialog example, this
//call would be made when the user selected a different filename in the list via clicking or scrolling with
//the arrows, or even using alpha chars to jump to the appropriate filename.
void SetInputFieldStringWith16BitString( UINT8 ubField, UINT16 *szNewText )
void SetInputFieldStringWith16BitString( UINT8 ubField, wchar_t *szNewText )
{
TEXTINPUTNODE *curr;
curr = gpTextInputHead;
@@ -458,7 +458,7 @@ void Get8BitStringFromField( UINT8 ubField, UINT8 *szString )
szString[0] = '\0';
}
void Get16BitStringFromField( UINT8 ubField, UINT16 *szString )
void Get16BitStringFromField( UINT8 ubField, wchar_t *szString )
{
TEXTINPUTNODE *curr;
curr = gpTextInputHead;
@@ -478,8 +478,8 @@ void Get16BitStringFromField( UINT8 ubField, UINT16 *szString )
//returns -1 if blank or invalid. Only works for positive numbers.
INT32 GetNumericStrictValueFromField( UINT8 ubField )
{
UINT16 *ptr;
UINT16 str[20];
wchar_t *ptr;
wchar_t str[20];
INT32 total;
Get16BitStringFromField( ubField, str );
//Blank string, so return -1
@@ -1242,7 +1242,7 @@ void RenderActiveTextField()
{
UINT32 uiCursorXPos;
UINT16 usOffset;
UINT16 str[ 256 ];
wchar_t str[ 256 ];
if( !gpActive || !gpActive->szString )
return;
@@ -1320,7 +1320,7 @@ void RenderInactiveTextField( UINT8 ubID )
{
UINT16 usOffset;
TEXTINPUTNODE* pNode, *curr;
UINT16 str[ 256 ];
wchar_t str[ 256 ];
curr = gpTextInputHead;
pNode = NULL;
while( curr )
@@ -1348,7 +1348,7 @@ void RenderInactiveTextField( UINT8 ubID )
void RenderInactiveTextFieldNode( TEXTINPUTNODE *pNode )
{
UINT16 usOffset;
UINT16 str[ 256 ];
wchar_t str[ 256 ];
if( !pNode || !pNode->szString )
return;
SaveFontSettings();
@@ -1747,7 +1747,7 @@ void SetExclusive24HourTimeValue( UINT8 ubField, UINT16 usTime )
}
}
void DoublePercentileCharacterFromStringIntoString( UINT16 *pSrcString, UINT16 *pDstString )
void DoublePercentileCharacterFromStringIntoString( wchar_t *pSrcString, wchar_t *pDstString )
{
INT32 iSrcIndex = 0, iDstIndex = 0;
while( pSrcString[ iSrcIndex ] != 0 )
+3 -3
View File
@@ -90,7 +90,7 @@ UINT16 GetTextInputCursor();
//of calls to this function dictate the TAB order from traversing from one field to the next. This
//function adds mouse regions and processes them for you, as well as deleting them when you are done.
void AddTextInputField( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT8 bPriority,
UINT16 *szInitText, UINT8 ubMaxChars, UINT16 usInputType );
wchar_t *szInitText, UINT8 ubMaxChars, UINT16 usInputType );
//This allows you to insert special processing functions and modes that can't be determined here. An example
//would be a file dialog where there would be a file list. This file list would be accessed using the Win95
@@ -113,13 +113,13 @@ void RemoveTextInputField( UINT8 ubField );
//This is a useful call made from an external user input field. Using the previous file dialog example, this
//call would be made when the user selected a different filename in the list via clicking or scrolling with
//the arrows, or even using alpha chars to jump to the appropriate filename.
void SetInputFieldStringWith16BitString( UINT8 ubField, UINT16 *szNewText );
void SetInputFieldStringWith16BitString( UINT8 ubField, wchar_t *szNewText );
void SetInputFieldStringWith8BitString( UINT8 ubField, UINT8 * szNewText );
//Allows external functions to access the strings within the fields at anytime.
void Get8BitStringFromField( UINT8 ubField, UINT8 *szString );
void Get16BitStringFromField( UINT8 ubField, UINT16 *szString );
void Get16BitStringFromField( UINT8 ubField, wchar_t *szString );
//Utility functions for the INPUTTYPE_EXCLUSIVE_24HOURCLOCK input type.
UINT16 GetExclusive24HourTimeValueFromField( UINT8 ubField );
+3 -3
View File
@@ -504,15 +504,15 @@ void LoadAllExternalText( void )
LoadAllItemNames();
}
INT16* GetWeightUnitString( void )
wchar_t* GetWeightUnitString( void )
{
if ( gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] ) // metric
{
return(INT16 *)( pMessageStrings[ MSG_KILOGRAM_ABBREVIATION ] );
return( pMessageStrings[ MSG_KILOGRAM_ABBREVIATION ] );
}
else
{
return(INT16 *)( pMessageStrings[ MSG_POUND_ABBREVIATION ] );
return( pMessageStrings[ MSG_POUND_ABBREVIATION ] );
}
}
+19 -19
View File
@@ -8,14 +8,14 @@
#define STRING_LENGTH 255
extern STR16 pCreditsJA2113[];
extern UINT16 ShortItemNames[MAXITEMS][80];
extern UINT16 ItemNames[MAXITEMS][80];
extern UINT16 AmmoCaliber[MAXITEMS][20];
extern UINT16 BobbyRayAmmoCaliber[MAXITEMS][20];
extern UINT16 WeaponType[MAXITEMS][30];
extern wchar_t ShortItemNames[MAXITEMS][80];
extern wchar_t ItemNames[MAXITEMS][80];
extern wchar_t AmmoCaliber[MAXITEMS][20];
extern wchar_t BobbyRayAmmoCaliber[MAXITEMS][20];
extern wchar_t WeaponType[MAXITEMS][30];
extern UINT16 Message[][STRING_LENGTH];
extern UINT16 TeamTurnString[][STRING_LENGTH];
extern wchar_t Message[][STRING_LENGTH];
extern wchar_t TeamTurnString[][STRING_LENGTH];
extern STR16 pMilitiaControlMenuStrings[]; //lal
//extern STR16 pTalkToAllMenuStrings[];
extern STR16 pAssignMenuStrings[];
@@ -261,7 +261,7 @@ enum
};
extern STR16 pMessageStrings[];
extern UINT16 ItemPickupHelpPopup[][40];
extern wchar_t ItemPickupHelpPopup[][40];
enum
{
@@ -383,20 +383,20 @@ enum
#define MED_STRING_LENGTH 80
#define SMALL_STRING_LENGTH 20
extern UINT16 TacticalStr[][MED_STRING_LENGTH];
extern UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ];
extern wchar_t TacticalStr[][MED_STRING_LENGTH];
extern wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ];
extern UINT16 zDialogActions[][ SMALL_STRING_LENGTH ];
extern UINT16 zDealerStrings[][ SMALL_STRING_LENGTH ];
extern UINT16 zTalkMenuStrings[][ SMALL_STRING_LENGTH ];
extern wchar_t zDialogActions[][ SMALL_STRING_LENGTH ];
extern wchar_t zDealerStrings[][ SMALL_STRING_LENGTH ];
extern wchar_t zTalkMenuStrings[][ SMALL_STRING_LENGTH ];
extern STR16 gzMoneyAmounts[6];
extern INT16 gzProsLabel[10];
extern INT16 gzConsLabel[10];
extern INT16 gMoneyStatsDesc[][ 13 ];
extern INT16 gWeaponStatsDesc[][ 14 ];
extern wchar_t gzProsLabel[10];
extern wchar_t gzConsLabel[10];
extern wchar_t gMoneyStatsDesc[][ 13 ];
extern wchar_t gWeaponStatsDesc[][ 14 ];
extern STR16 sKeyDescriptionStrings[2];
extern UINT16 zHealthStr[][13];
extern wchar_t zHealthStr[][13];
extern STR16 zVehicleName[ 6 ];
enum
@@ -1522,7 +1522,7 @@ STR16 gzCreditNameTitle[];
STR16 gzCreditNameFunny[];
extern INT16 * GetWeightUnitString( void );
extern wchar_t * GetWeightUnitString( void );
FLOAT GetWeightBasedOnMetricOption( UINT32 uiObjectWeight );
+3 -3
View File
@@ -197,17 +197,17 @@ BOOLEAN DisplayPaletteRep( PaletteRepID aPalRep, UINT8 ubXPos, UINT8 ubYPos, UIN
}
BOOLEAN WrapString( INT16 *pStr, INT16 *pStr2, UINT16 usWidth, INT32 uiFont )
BOOLEAN WrapString( wchar_t *pStr, wchar_t *pStr2, UINT16 usWidth, INT32 uiFont )
{
UINT32 Cur, uiLet, uiNewLet, uiHyphenLet;
UINT16 *curletter,transletter;
wchar_t *curletter,transletter;
BOOLEAN fLineSplit = FALSE;
HVOBJECT hFont;
// CHECK FOR WRAP
Cur=0;
uiLet = 0;
curletter = (UINT16 *)pStr;
curletter = pStr;
// GET FONT
hFont = GetFontObject( uiFont );
+1 -1
View File
@@ -15,7 +15,7 @@ BOOLEAN DisplayPaletteRep( PaletteRepID aPalRep, UINT8 ubXPos, UINT8 ubYPos, UIN
void FilenameForBPP(STR pFilename, STR pDestination);
BOOLEAN WrapString( INT16 *pStr, INT16 *pStr2, UINT16 usWidth, INT32 uiFont );
BOOLEAN WrapString( wchar_t *pStr, wchar_t *pStr2, UINT16 usWidth, INT32 uiFont );
BOOLEAN IfWinNT(void);
BOOLEAN IfWin95(void);
+1 -1
View File
@@ -1973,7 +1973,7 @@ BOOLEAN ReduceStringLength( STR16 pString, UINT32 uiWidthToFitIn, UINT32 uiFont
UINT32 uiSrcStringCntr = 0;
UINT32 uiOneCharWidth = 0;
uiStringPixWidth = WFStringPixLength( (UINT16 *)pString, uiFont );
uiStringPixWidth = WFStringPixLength( pString, uiFont );
OneChar[1] = L'\0';
zTemp[0] = L'\0';
+8 -8
View File
@@ -1076,8 +1076,8 @@ BOOLEAN WriteItemStats()
{
UINT32 cnt;
UINT16 str[100];
UINT16 strDesc[500];
wchar_t str[100];
wchar_t strDesc[500];
FilePrintf(hFile,"<ITEMLIST>\r\n");
for(cnt = 0;cnt < 351;cnt++)//just do the old limit for now
@@ -1085,7 +1085,7 @@ BOOLEAN WriteItemStats()
LoadShortNameItemInfo( (UINT16)cnt, str );
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writeitemstats: itemname");
UINT16 * szRemainder = str; //the remaining string to be output (for making valid XML)
wchar_t * szRemainder = str; //the remaining string to be output (for making valid XML)
FilePrintf(hFile,"\t<ITEM>\r\n");
FilePrintf(hFile,"\t\t<uiIndex>%d</uiIndex>\r\n", cnt);
@@ -1094,7 +1094,7 @@ BOOLEAN WriteItemStats()
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
wchar_t invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
@@ -1146,7 +1146,7 @@ BOOLEAN WriteItemStats()
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
wchar_t invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
@@ -1197,7 +1197,7 @@ BOOLEAN WriteItemStats()
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
wchar_t invChar = szRemainder[uiCharLoc];
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writeitemstats: characters set");
@@ -1268,7 +1268,7 @@ BOOLEAN WriteItemStats()
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
wchar_t invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
@@ -1324,7 +1324,7 @@ BOOLEAN WriteItemStats()
while(szRemainder[0] != '\0')
{
UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0");
UINT16 invChar = szRemainder[uiCharLoc];
wchar_t invChar = szRemainder[uiCharLoc];
if(uiCharLoc)
{
+1 -1
View File
@@ -207,7 +207,7 @@ BOOLEAN WriteStringArray()
{
FilePrintf(hFile,"\t<STRING>");
UINT16 * szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML)
wchar_t * szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML)
while(szRemainder[0] != '\0')
{
+18 -18
View File
@@ -118,13 +118,13 @@ STR16 pCreditsJA2113[] =
L"@};(All other community members who contributed input and feedback!)",
};
UINT16 ItemNames[MAXITEMS][80] =
wchar_t ItemNames[MAXITEMS][80] =
{
L"",
};
UINT16 ShortItemNames[MAXITEMS][80] =
wchar_t ShortItemNames[MAXITEMS][80] =
{
L"",
};
@@ -134,7 +134,7 @@ UINT16 ShortItemNames[MAXITEMS][80] =
// NATO is the North Atlantic Treaty Organization
// WP is Warsaw Pact
// cal is an abbreviation for calibre
UINT16 AmmoCaliber[MAXITEMS][20];// =
wchar_t AmmoCaliber[MAXITEMS][20];// =
//{
// L"0",
// L".38 cal",
@@ -164,7 +164,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// =
// NATO is the North Atlantic Treaty Organization
// WP is Warsaw Pact
// cal is an abbreviation for calibre
UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
//{
// L"0",
// L".38 cal",
@@ -188,7 +188,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
//};
UINT16 WeaponType[MAXITEMS][30] =
wchar_t WeaponType[MAXITEMS][30] =
{
L"Other",
L"Pistol",
@@ -201,7 +201,7 @@ UINT16 WeaponType[MAXITEMS][30] =
L"Shotgun",
};
UINT16 TeamTurnString[][STRING_LENGTH] =
wchar_t TeamTurnString[][STRING_LENGTH] =
{
L"Player's Turn", // player's turn
L"Opponents' Turn",
@@ -211,7 +211,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] =
// planning turn
};
UINT16 Message[][STRING_LENGTH] =
wchar_t Message[][STRING_LENGTH] =
{
L"",
@@ -1079,7 +1079,7 @@ STR16 sKeyDescriptionStrings[2] =
//The headers used to describe various weapon statistics.
INT16 gWeaponStatsDesc[][ 14 ] =
wchar_t gWeaponStatsDesc[][ 14 ] =
{
L"Weight (%s):",
L"Status:",
@@ -1102,7 +1102,7 @@ INT16 gWeaponStatsDesc[][ 14 ] =
//The headers used for the merc's money.
INT16 gMoneyStatsDesc[][ 13 ] =
wchar_t gMoneyStatsDesc[][ 13 ] =
{
L"Amount",
L"Remaining:", //this is the overall balance
@@ -1118,7 +1118,7 @@ INT16 gMoneyStatsDesc[][ 13 ] =
//The health of various creatures, enemies, characters in the game. The numbers following each are for comment
//only, but represent the precentage of points remaining.
UINT16 zHealthStr[][13] =
wchar_t zHealthStr[][13] =
{
L"DYING", // >= 0
L"CRITICAL", // >= 15
@@ -1140,18 +1140,18 @@ STR16 gzMoneyAmounts[6] =
};
// short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons."
INT16 gzProsLabel[10] =
wchar_t gzProsLabel[10] =
{
L"Pros:",
};
INT16 gzConsLabel[10] =
wchar_t gzConsLabel[10] =
{
L"Cons:",
};
//Conversation options a player has when encountering an NPC
UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
{
L"Come Again?", //meaning "Repeat yourself"
L"Friendly", //approach in a friendly
@@ -1162,7 +1162,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
};
//Some NPCs buy, sell or repair items. These different options are available for those NPCs as well.
UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]=
wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]=
{
L"Buy/Sell",
L"Buy",
@@ -1170,7 +1170,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]=
L"Repair",
};
UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] =
wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] =
{
L"Done",
};
@@ -1211,7 +1211,7 @@ STR16 zVehicleName[] =
//These are messages Used in the Tactical Screen
UINT16 TacticalStr[][ MED_STRING_LENGTH ] =
wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
{
L"Air Raid",
L"Apply first aid automatically?",
@@ -2550,7 +2550,7 @@ STR16 pUpdatePanelButtons[] =
// Text which appears when everyone on your team is incapacitated and incapable of battle
UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] =
wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] =
{
L"You have been defeated in this sector!",
L"The enemy, having no mercy for the team's soul, devours each and every one of you!",
@@ -3792,7 +3792,7 @@ STR16 pMessageStrings[] =
};
UINT16 ItemPickupHelpPopup[][40] =
wchar_t ItemPickupHelpPopup[][40] =
{
L"OK",
L"Scroll Up",