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

bug fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimArchives.cpp
+3 -3
View File
@@ -284,7 +284,7 @@ void RenderAimArchives()
UINT16 usPosX, usPosY,x,y,i=0;
UINT8 ubNumRows=0;
UINT32 uiStartLoc=0;
wchar_t sText[400];
CHAR16 sText[400];
DrawAimDefaults();
@@ -486,8 +486,8 @@ void DisplayAlumniOldMercPopUp()
HVOBJECT hFaceHandle;
// WRAPPED_STRING *pFirstWrappedString, *pTempWrappedString;
UINT16 usHeight = GetFontHeight(AIM_ALUMNI_POPUP_FONT);
wchar_t sName[AIM_ALUMNI_NAME_SIZE];
wchar_t sDesc[AIM_ALUMNI_DECRIPTION_SIZE];
CHAR16 sName[AIM_ALUMNI_NAME_SIZE];
CHAR16 sDesc[AIM_ALUMNI_DECRIPTION_SIZE];
UINT32 uiStartLoc;
UINT16 usStringPixLength;
Laptop/AimFacialIndex.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ void HandleAimFacialIndex()
BOOLEAN RenderAimFacialIndex()
{
UINT16 usPosX, usPosY, x,y;
wchar_t sString[150];
CHAR16 sString[150];
UINT8 i;
DrawAimDefaults();
Laptop/AimHistory.cpp
+3 -3
View File
@@ -170,7 +170,7 @@ void HandleAimHistory()
void RenderAimHistory()
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc=0;
UINT16 usPosY;
@@ -359,7 +359,7 @@ void SelectHistoryMenuButtonsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReaso
BOOLEAN DisplayAimHistoryParagraph(UINT8 ubPageNum, UINT8 ubNumParagraphs)
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc=0;
UINT16 usPosY=0;
UINT16 usNumPixels=0;
@@ -408,7 +408,7 @@ BOOLEAN InitTocMenu()
UINT16 usHeight;
UINT16 usWidth=0;
UINT32 uiStartLoc=0;
wchar_t sText[400];
CHAR16 sText[400];
UINT8 ubLocInFile[]=
{IN_THE_BEGINNING,
THE_ISLAND_METAVIRA,
Laptop/AimMembers.cpp
+15 -15
View File
@@ -382,7 +382,7 @@ extern UINT8 gubContractLength; // symbol already declared globally in Merc Cont
BOOLEAN gfBuyEquipment;
INT32 giContractAmount=0;
INT32 giMercFaceIndex;
wchar_t gsTalkingMercText[ TEXT_POPUP_STRING_SIZE ];
CHAR16 gsTalkingMercText[ TEXT_POPUP_STRING_SIZE ];
UINT32 guiTimeThatMercStartedTalking;
UINT32 guiLastHandleMercTime;
BOOLEAN gfFirstTimeInContactScreen;
@@ -881,7 +881,7 @@ BOOLEAN RenderAIMMembers()
HVOBJECT hPriceHandle;
HVOBJECT hWeaponBoxHandle;
UINT16 x, uiPosX;
wchar_t wTemp[50];
CHAR16 wTemp[50];
DrawAimDefaults();
@@ -979,7 +979,7 @@ BOOLEAN RenderAIMMembers()
BOOLEAN DrawNumeralsToScreen(INT32 iNumber, INT8 bWidth, UINT16 usLocX, UINT16 usLocY, UINT32 ulFont, UINT8 ubColor)
{
wchar_t sStr[10];
CHAR16 sStr[10];
swprintf(sStr, L"%d", iNumber);
@@ -990,7 +990,7 @@ BOOLEAN DrawNumeralsToScreen(INT32 iNumber, INT8 bWidth, UINT16 usLocX, UINT16 u
BOOLEAN DrawMoneyToScreen(INT32 iNumber, INT8 bWidth, UINT16 usLocX, UINT16 usLocY, UINT32 ulFont, UINT8 ubColor)
{
wchar_t sStr[10];
CHAR16 sStr[10];
swprintf(sStr, L"%d",iNumber);
InsertCommasForDollarFigure( sStr );
@@ -1045,8 +1045,8 @@ void SelectFaceMovementRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
BOOLEAN UpdateMercInfo(void)
{
//UINT16 PosY = 300;
wchar_t MercInfoString[ SIZE_MERC_BIO_INFO ];
wchar_t AdditionalInfoString[ SIZE_MERC_BIO_INFO ];
CHAR16 MercInfoString[ SIZE_MERC_BIO_INFO ];
CHAR16 AdditionalInfoString[ SIZE_MERC_BIO_INFO ];
//Display the salaries
DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].sSalary, FEE_WIDTH, FEE_X, HEALTH_Y, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT );
@@ -1056,8 +1056,8 @@ BOOLEAN UpdateMercInfo(void)
//if medical deposit is required
if( gMercProfiles[gbCurrentSoldier].bMedicalDeposit )
{
wchar_t zTemp[40];
wchar_t sMedicalString[40];
CHAR16 zTemp[40];
CHAR16 sMedicalString[40];
// Display the medical cost
swprintf( zTemp, L"%d", gMercProfiles[ gbCurrentSoldier ].sMedicalDepositAmount );
@@ -1210,7 +1210,7 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
HVOBJECT hVObject;
UINT32 usHeight, usWidth;
ETRLEObject *pTrav;
wchar_t gzItemName[ SIZE_ITEM_NAME ];
CHAR16 gzItemName[ SIZE_ITEM_NAME ];
UINT8 ubItemCount=0;
// UINT16 gzTempItemName[ SIZE_ITEM_INFO ];
@@ -1250,7 +1250,7 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
//if there are more then 1 piece of equipment in the current slot, display how many there are
if( gMercProfiles[ubMercID].bInvNumber[ i ] > 1 )
{
wchar_t zTempStr[ 32 ];
CHAR16 zTempStr[ 32 ];
// UINT16 usWidthOfNumber;
swprintf( zTempStr, L"x%d", gMercProfiles[ ubMercID ].bInvNumber[ i ] );
@@ -1818,7 +1818,7 @@ INT8 AimMemberHireMerc()
BOOLEAN DisplayVideoConferencingDisplay()
{
wchar_t sMercName[128];
CHAR16 sMercName[128];
if( ( gubVideoConferencingMode == AIM_VIDEO_NOT_DISPLAYED_MODE ) || ( gubVideoConferencingMode == AIM_VIDEO_POPUP_MODE ) )
return(FALSE);
@@ -1955,8 +1955,8 @@ void DisplaySelectLights(BOOLEAN fContractDown, BOOLEAN fBuyEquipDown)
UINT32 DisplayMercChargeAmount()
{
wchar_t wTemp[50];
wchar_t wDollarTemp[50];
CHAR16 wTemp[50];
CHAR16 wDollarTemp[50];
HVOBJECT hImageHandle;
@@ -2021,7 +2021,7 @@ BOOLEAN InitCreateDeleteAimPopUpBox(UINT8 ubFlag, STR16 sString1, STR16 sString2
VOBJECT_DESC VObjectDesc;
HVOBJECT hPopupBoxHandle;
static UINT16 usPopUpBoxPosX, usPopUpBoxPosY;
static wchar_t sPopUpString1[400], sPopUpString2[400];
static CHAR16 sPopUpString1[400], sPopUpString2[400];
static BOOLEAN fPopUpBoxActive = FALSE;;
switch( ubFlag )
@@ -2432,7 +2432,7 @@ BOOLEAN DisplayTalkingMercFaceForVideoPopUp(INT32 iFaceIndex)
return(fIsTheMercTalking);
}
void DisplayTextForMercFaceVideoPopUp(wchar_t * pString)
void DisplayTextForMercFaceVideoPopUp(STR16 pString)
{
#ifdef TAIWANESE
Laptop/AimMembers.h
+1 -1
View File
@@ -11,7 +11,7 @@ BOOLEAN RenderAIMMembers();
BOOLEAN DrawNumeralsToScreen(INT32 iNumber, INT8 bWidth, UINT16 usLocX, UINT16 usLocY, UINT32 ulFont, UINT8 ubColor);
BOOLEAN DrawMoneyToScreen(INT32 iNumber, INT8 bWidth, UINT16 usLocX, UINT16 usLocY, UINT32 ulFont, UINT8 ubColor);
void DisplayTextForMercFaceVideoPopUp(wchar_t * pString);
void DisplayTextForMercFaceVideoPopUp(STR16 pString);
BOOLEAN DisplayTalkingMercFaceForVideoPopUp(INT32 iFaceIndex);
void EnterInitAimMembers();
Laptop/AimPolicies.cpp
+8 -8
View File
@@ -459,7 +459,7 @@ BOOLEAN DrawAimPolicyMenu()
UINT16 i, usPosY;
UINT16 usHeight;
UINT32 uiStartLoc=0;
wchar_t sText[400];
CHAR16 sText[400];
HVOBJECT hContentButtonHandle;
UINT8 ubLocInFile[]=
{ DEFINITIONS,
@@ -558,7 +558,7 @@ void SelectPolicyTocMenuRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
BOOLEAN DisplayAimPolicyTitleText(void)
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc = 0;
//Load anfd display title
@@ -576,7 +576,7 @@ BOOLEAN DisplayAimPolicyTitleText(void)
BOOLEAN DisplayAimPolicyStatement(void)
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc = 0;
UINT16 usNumPixels;
@@ -651,7 +651,7 @@ BOOLEAN ExitAgreementButton(void)
BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc = 0;
//Load and display title
@@ -665,8 +665,8 @@ BOOLEAN DisplayAimPolicyTitle(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
UINT16 DisplayAimPolicyParagraph(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
{
wchar_t sText[400];
wchar_t sTemp[20];
CHAR16 sText[400];
CHAR16 sTemp[20];
UINT32 uiStartLoc=0;
UINT16 usNumPixels;
@@ -688,8 +688,8 @@ UINT16 DisplayAimPolicyParagraph(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
UINT16 DisplayAimPolicySubParagraph(UINT16 usPosY, UINT8 ubPageNum, FLOAT fNumber)
{
wchar_t sText[400];
wchar_t sTemp[20];
CHAR16 sText[400];
CHAR16 sTemp[20];
UINT32 uiStartLoc=0;
UINT16 usNumPixels;
Laptop/BobbyRGuns.cpp
+28 -28
View File
@@ -1312,8 +1312,8 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
UINT16 PosY, usTextPosY;
UINT16 ubFirstIndex=0;
UINT16 usItemIndex;
wchar_t sDollarTemp[60];
wchar_t sTemp[60];
CHAR16 sDollarTemp[60];
CHAR16 sTemp[60];
INT16 pItemNumbers[ BOBBYR_NUM_WEAPONS_ON_PAGE ];
BOOLEAN bAddItem = FALSE;
@@ -1809,7 +1809,7 @@ BOOLEAN DisplayMiscInfo(UINT16 usIndex, UINT16 usTextPosY, BOOLEAN fUsed, UINT16
UINT16 DisplayCostAndQty(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight, UINT16 usBobbyIndex, BOOLEAN fUsed)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
// UINT8 ubPurchaseNumber;
//
@@ -1871,7 +1871,7 @@ UINT16 DisplayCostAndQty(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight, UIN
UINT16 DisplayRof(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
DrawTextToScreen(BobbyRText[BOBBYR_GUNS_ROF], BOBBYR_ITEM_WEIGHT_TEXT_X, (UINT16)usPosY, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_STATIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
@@ -1888,7 +1888,7 @@ UINT16 DisplayRof(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
UINT16 DisplayDamage(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
UINT16 gunDamage = 0;
if ( Item[ usIndex ].usItemClass == IC_GUN || Item[ usIndex ].usItemClass == IC_LAUNCHER )
@@ -1910,7 +1910,7 @@ UINT16 DisplayDamage(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
UINT16 DisplayRange(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
DrawTextToScreen(BobbyRText[BOBBYR_GUNS_RANGE], BOBBYR_ITEM_WEIGHT_TEXT_X, (UINT16)usPosY, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_STATIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
swprintf(sTemp, L"%3d %s", Weapon[ usIndex ].usRange, pMessageStrings[ MSG_METER_ABBREVIATION ] );
@@ -1921,7 +1921,7 @@ UINT16 DisplayRange(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
UINT16 DisplayMagazine(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
DrawTextToScreen(BobbyRText[BOBBYR_GUNS_MAGAZINE], BOBBYR_ITEM_WEIGHT_TEXT_X, (UINT16)usPosY, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_STATIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
swprintf(sTemp, L"%3d %s", Weapon[usIndex].ubMagSize, pMessageStrings[ MSG_ROUNDS_ABBREVIATION ] );
@@ -1963,7 +1963,7 @@ UINT16 DisplayCaliber(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
UINT16 DisplayWeight(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
//display the 'weight' string
DrawTextToScreen(BobbyRText[BOBBYR_GUNS_WEIGHT], BOBBYR_ITEM_WEIGHT_TEXT_X, (UINT16)usPosY, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_STATIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
@@ -1977,8 +1977,8 @@ UINT16 DisplayWeight(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex, BOOLEAN fUsed)
{
wchar_t sText[400];
wchar_t sTemp[20];
CHAR16 sText[400];
CHAR16 sTemp[20];
UINT32 uiStartLoc=0;
UINT8 ubPurchaseNumber;
@@ -2280,7 +2280,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
UINT8 i;
CHAR16 zItemName[ SIZE_ITEM_NAME ];
UINT8 ubItemCount=0;
wchar_t pStr[ 250 ];
CHAR16 pStr[ 250 ];
if( gfBigImageMouseRegionCreated )
return;
@@ -2308,11 +2308,11 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
// INT16 apStr2[20];
// UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
// swprintf( (wchar_t *)apStr, L"%d", ubAttackAPs );
// swprintf( apStr, L"%d", ubAttackAPs );
// if (GetShotsPerBurst(pObject) > 0)
// {
// swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
// swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
// wcscat( apStr, apStr2 );
// }
// else
@@ -2322,7 +2322,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
// if (GetAutofireShotsPerFiveAPs(pObject) > 0)
// {
// swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
// swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
// wcscat( apStr, apStr2 );
// }
// else
@@ -2332,7 +2332,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
//}
//else
//{
// swprintf( (wchar_t *)apStr, L"" );
// swprintf( apStr, L"" );
//}
//Info for weapons
@@ -2340,7 +2340,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
{
UINT16 gunDamage = (UINT16)( Weapon[ pItemNumbers[ i ] ].ubImpact + ( (double) Weapon[ pItemNumbers[ i ] ].ubImpact / 100) * gGameExternalOptions.ubGunDamageMultiplier );
swprintf( (wchar_t *)pStr, L"%s (%s)\n%s %d\n%s %d\n%s %d\n%s %s\n%s %1.1f %s",
swprintf( pStr, L"%s (%s)\n%s %d\n%s %d\n%s %d\n%s %s\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ],
AmmoCaliber[ Weapon[ pItemNumbers[ i ] ].ubCalibre ],
gWeaponStatsDesc[ 9 ], //Accuracy String
@@ -2370,11 +2370,11 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
// INT16 apStr2[20];
// UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
// swprintf( (wchar_t *)apStr, L"%d", ubAttackAPs );
// swprintf( apStr, L"%d", ubAttackAPs );
// if (GetShotsPerBurst(pObject) > 0)
// {
// swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
// swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
// wcscat( apStr, apStr2 );
// }
// else
@@ -2384,7 +2384,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
// if (GetAutofireShotsPerFiveAPs(pObject) > 0)
// {
// swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
// swprintf( apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
// wcscat( apStr, apStr2 );
// }
// else
@@ -2394,7 +2394,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
//}
//else
//{
// swprintf( (wchar_t *)apStr, L"" );
// swprintf( apStr, L"" );
//}
//Info for weapons
@@ -2402,7 +2402,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
{
UINT16 gunDamage = (UINT16)( Weapon[ pItemNumbers[ i ] ].ubImpact + ( (double) Weapon[ pItemNumbers[ i ] ].ubImpact / 100) * gGameExternalOptions.ubGunDamageMultiplier );
swprintf( (wchar_t *)pStr, L"%s\n%s %d\n%s %d\n%s %d\n%s %s\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %d\n%s %d\n%s %d\n%s %s\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ],
gWeaponStatsDesc[ 9 ], //Accuracy String
Weapon[ pItemNumbers[ i ] ].bAccuracy, //Accuracy
@@ -2426,7 +2426,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
{
UINT16 meleeDamage = (UINT16)( Weapon[ pItemNumbers[ i ] ].ubImpact + ( (double) Weapon[ pItemNumbers[ i ] ].ubImpact / 100) * gGameExternalOptions.ubMeleeDamageMultiplier );
swprintf( (wchar_t *)pStr, L"%s\n%s %d\n%s %s\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %d\n%s %s\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ],
gWeaponStatsDesc[ 11 ], //Damage String
meleeDamage, //Melee damage
@@ -2442,7 +2442,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
case IC_AMMO:
{
swprintf( (wchar_t *)pStr, L"%s\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ], //Item long name
gWeaponStatsDesc[ 12 ], //Weight String
fWeight, //Weight
@@ -2450,7 +2450,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
);
//Lal: do not delete, commented out for next version
//swprintf( (wchar_t *)pStr, L"%s %s %s %d [%d rnds]\n%s %1.1f %s",
//swprintf( pStr, L"%s %s %s %d [%d rnds]\n%s %1.1f %s",
// AmmoCaliber[ Magazine[ Item[usItem].ubClassIndex ].ubCalibre ], //Ammo calibre
// AmmoTypes[Magazine[ Item[usItem].ubClassIndex ].ubAmmoType].ammoName, //Ammo type
// MagNames[Magazine[ Item[usItem].ubClassIndex ].ubMagType], //Magazine type
@@ -2467,7 +2467,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
if( ubItemCount != 0 )
{
swprintf( zItemName, L"\n%s %d %s",BobbyRText[BOBBYR_GUNS_NUM_GUNS_THAT_USE_AMMO_1], ubItemCount, BobbyRText[BOBBYR_GUNS_NUM_GUNS_THAT_USE_AMMO_2] );
wcscat( (wchar_t *) pStr, zItemName );
wcscat( pStr, zItemName );
}
}
break;
@@ -2480,7 +2480,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
UINT16 explDamage = (UINT16)( Explosive[Item[ pItemNumbers[ i ] ].ubClassIndex].ubDamage + ( (double) Explosive[Item[ pItemNumbers[ i ] ].ubClassIndex].ubDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
UINT16 explStunDamage = (UINT16)( Explosive[Item[ pItemNumbers[ i ] ].ubClassIndex].ubStunDamage + ( (double) Explosive[Item[ pItemNumbers[ i ] ].ubClassIndex].ubStunDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
swprintf( (wchar_t *)pStr, L"%s\n%s %d\n%s %d\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %d\n%s %d\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ],
gWeaponStatsDesc[ 11 ], //Damage String
explDamage, //Expl damage
@@ -2518,7 +2518,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
break;
}
swprintf( (wchar_t *)pStr, L"%s\n%s %d%% (%d)\n%s %d%%\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %d%% (%d)\n%s %d%%\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ], //Item long name
pInvPanelTitleStrings[ 4 ], //Protection string
iProtection, //Protection rating in % based on best armor
@@ -2539,7 +2539,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
default:
// The final, and typical case, is that of an item with a percent status
{
swprintf( (wchar_t *)pStr, L"%s\n%s %1.1f %s",
swprintf( pStr, L"%s\n%s %1.1f %s",
ItemNames[ pItemNumbers[ i ] ], //Item long name
gWeaponStatsDesc[ 12 ], //Weight String
fWeight, //Weight
Laptop/BobbyRMailOrder.cpp
+7 -7
View File
@@ -774,7 +774,7 @@ void BtnBobbyRAcceptOrderCallback(GUI_BUTTON *btn,INT32 reason)
}
else
{
wchar_t zTemp[ 128 ];
CHAR16 zTemp[ 128 ];
//if the city is Drassen, and the airport sector is player controlled
if( gbSelectedCity == BR_DRASSEN && !StrategicMap[ SECTOR_INFO_TO_STRATEGIC_INDEX( SEC_B13 ) ].fEnemyControlled )
@@ -902,15 +902,15 @@ void BtnBobbyRAcceptOrderCallback(GUI_BUTTON *btn,INT32 reason)
void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16 usGridY, BobbyRayPurchaseStruct *pBobbyRayPurchase, BOOLEAN fJustDisplayTitles, INT32 iOrderNum )
{
UINT16 i,j;
wchar_t sText[400];
wchar_t sBack[400];
wchar_t sTemp[20];
CHAR16 sText[400];
CHAR16 sBack[400];
CHAR16 sTemp[20];
UINT16 usPosY;
UINT32 uiStartLoc=0;
UINT32 uiTotal;
UINT16 usStringLength;
UINT16 usPixLength;
wchar_t OneChar[2];
CHAR16 OneChar[2];
INT32 iGrandTotal;
INT32 iSubTotal;
@@ -1056,7 +1056,7 @@ void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16
void DisplayShippingCosts( BOOLEAN fCalledFromOrderPage, INT32 iSubTotal, UINT16 usGridX, UINT16 usGridY, INT32 iOrderNum )
{
wchar_t sTemp[20];
CHAR16 sTemp[20];
HVOBJECT hPixHandle;
INT32 iShippingCost = 0;
// INT32 iTotal;
@@ -1584,7 +1584,7 @@ void DrawSelectedCity( UINT8 ubCityNumber )
void DisplayShippingLocationCity()
{
wchar_t sTemp[40];
CHAR16 sTemp[40];
UINT16 usPosY;
//display the name on the title bar
Laptop/IMP Confirm.cpp
+1 -1
View File
@@ -741,7 +741,7 @@ BOOLEAN ImpExists ( STR nickName )
strcpy(zFileName,nickName);
strcat(zFileName,IMP_FILENAME_SUFFIX);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("ImpExists: %s", (STR) zFileName));
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("ImpExists: %s", zFileName));
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("ImpExists: %d", FileExistsNoDB(zFileName) ));
return FileExistsNoDB(zFileName);
Laptop/aim.cpp
+3 -3
View File
@@ -540,7 +540,7 @@ void SelectAimLogoRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
BOOLEAN DisplayAimSlogan()
{
wchar_t sSlogan[400];
CHAR16 sSlogan[400];
LoadEncryptedDataFromFile(AIMHISTORYFILE, sSlogan, 0, AIM_HISTORY_LINE_SIZE);
//Display Aim Text under the logo
@@ -553,7 +553,7 @@ BOOLEAN DisplayAimSlogan()
BOOLEAN DisplayAimCopyright()
{
wchar_t sSlogan[400];
CHAR16 sSlogan[400];
UINT32 uiStartLoc=0;
//Load and Display the copyright notice
@@ -854,7 +854,7 @@ BOOLEAN DrawWarningBox( BOOLEAN fInit, BOOLEAN fRedraw )
if( fInit || fRedraw)
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc=0;
UINT16 usLocY = AIM_WARNING_TEXT_Y + (GetFontHeight(AIM_WARNING_FONT) + 2) * 2;
HVOBJECT hWarningHandle;
Laptop/email.cpp
+21 -21
View File
@@ -657,10 +657,10 @@ void RenderEmail( void )
void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iFirstData, UINT32 uiSecondData )
{
wchar_t pSubject[320];
CHAR16 pSubject[320];
//MessagePtr pMessageList;
//MessagePtr pMessage;
//wchar_t pMessageString[320];
//CHAR16 pMessageString[320];
INT32 iPosition=0;
INT32 iCounter=1;
Email FakeEmail;
@@ -692,10 +692,10 @@ void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u
void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition)
{
wchar_t pSubject[320];
CHAR16 pSubject[320];
//MessagePtr pMessageList;
//MessagePtr pMessage;
//wchar_t pMessageString[320];
//CHAR16 pMessageString[320];
INT32 iPosition=0;
INT32 iCounter=1;
@@ -719,10 +719,10 @@ void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32
void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate)
{
wchar_t pSubject[320];
CHAR16 pSubject[320];
//MessagePtr pMessageList;
//MessagePtr pMessage;
//wchar_t pMessageString[320];
//CHAR16 pMessageString[320];
INT32 iPosition=0;
INT32 iCounter=1;
@@ -786,7 +786,7 @@ void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject,
//pTempEmail->pText[iCounter]=NULL;
// copy subject
pTempEmail->pSubject = (STR16) MemAlloc( 128 * 2 );
pTempEmail->pSubject = (STR16) MemAlloc( 128 * sizeof(CHAR16) );
memset( pTempEmail->pSubject, 0, sizeof( CHAR16 ) * 128 );
wcscpy(pTempEmail->pSubject,pSubject);
@@ -1224,7 +1224,7 @@ void SwapMessages(INT32 iIdA, INT32 iIdB)
EmailPtr pA=pEmailList;
EmailPtr pB=pEmailList;
EmailPtr pTemp= (EmailPtr) MemAlloc(sizeof(Email) );
pTemp->pSubject = (STR16) MemAlloc( 128 * 2 );
pTemp->pSubject = (STR16) MemAlloc( 128 * sizeof(CHAR16) );
memset( pTemp->pSubject, 0, sizeof( CHAR16 ) * 128 );
@@ -1347,7 +1347,7 @@ void DrawLetterIcon(INT32 iCounter, BOOLEAN fRead)
void DrawSubject(INT32 iCounter, STR16 pSubject, BOOLEAN fRead)
{
wchar_t pTempSubject[320];
CHAR16 pTempSubject[320];
// draw subject line of mail being viewed in viewer
@@ -1419,7 +1419,7 @@ void DrawSender(INT32 iCounter, UINT8 ubSender, BOOLEAN fRead)
void DrawDate(INT32 iCounter, INT32 iDate, BOOLEAN fRead)
{
wchar_t sString[20];
CHAR16 sString[20];
SetFontShadow(NO_SHADOW);
SetFontForeground( FONT_BLACK );
@@ -1711,8 +1711,8 @@ INT32 DisplayEmailMessage(EmailPtr pMail)
INT32 iCnt=0;
INT32 iHeight=0;
INT32 iCounter=1;
// wchar_t pString[MAIL_STRING_SIZE/2 + 1];
wchar_t pString[MAIL_STRING_SIZE];
// CHAR16 pString[MAIL_STRING_SIZE/2 + 1];
CHAR16 pString[MAIL_STRING_SIZE];
INT32 iOffSet=0;
INT32 iHeightTemp=0;
INT32 iHeightSoFar = 0;
@@ -2938,8 +2938,8 @@ void DisplayEmailMessageSubjectDateFromLines( EmailPtr pMail , INT32 iViewerY)
{
// this procedure will draw the title/headers to From, Subject, Date fields in the display
// message box
UINT16 usX, usY;
wchar_t sString[100];
INT16 usX, usY;
CHAR16 sString[100];
// font stuff
SetFont(MESSAGE_FONT);
@@ -3333,8 +3333,8 @@ void HandleIMPCharProfileResultsMessage( void)
INT32 iCnt=0;
INT32 iHeight=0;
INT32 iCounter=0;
// wchar_t pString[MAIL_STRING_SIZE/2 + 1];
wchar_t pString[MAIL_STRING_SIZE];
// CHAR16 pString[MAIL_STRING_SIZE/2 + 1];
CHAR16 pString[MAIL_STRING_SIZE];
INT32 iOffSet=0;
INT32 iViewerY=0;
INT32 iHeightTemp=0;
@@ -3370,7 +3370,7 @@ void HandleIMPCharProfileResultsMessage( void)
// have to place players name into string for first record
if( iCounter == 0)
{
wchar_t zTemp[512];
CHAR16 zTemp[512];
iCurrentIMPSlot = giCurrentIMPSlot;
@@ -4995,8 +4995,8 @@ void ModifyInsuranceEmails( UINT16 usMessageId, INT32 *iResults, EmailPtr pMail,
{
INT32 iHeight=0;
RecordPtr pTempRecord;
// wchar_t pString[MAIL_STRING_SIZE/2 + 1];
wchar_t pString[MAIL_STRING_SIZE];
// CHAR16 pString[MAIL_STRING_SIZE/2 + 1];
CHAR16 pString[MAIL_STRING_SIZE];
UINT8 ubCnt;
@@ -5030,8 +5030,8 @@ void ModifyInsuranceEmails( UINT16 usMessageId, INT32 *iResults, EmailPtr pMail,
BOOLEAN ReplaceMercNameAndAmountWithProperData( CHAR16 *pFinishedString, EmailPtr pMail )
{
// wchar_t pTempString[MAIL_STRING_SIZE/2 + 1];
wchar_t pTempString[MAIL_STRING_SIZE];
// CHAR16 pTempString[MAIL_STRING_SIZE/2 + 1];
CHAR16 pTempString[MAIL_STRING_SIZE];
INT32 iLength=0;
INT32 iCurLocInSourceString=0;
INT32 iLengthOfSourceString = wcslen( pFinishedString ); //Get the length of the source string
Laptop/files.cpp
+3 -3
View File
@@ -816,7 +816,7 @@ BOOLEAN DisplayFormattedText( void )
INT32 iHeight=0;
INT32 iOffSet=0;
INT32 iMessageCode;
wchar_t sString[2048];
CHAR16 sString[2048];
HVOBJECT hHandle;
UINT32 uiFirstTempPicture;
UINT32 uiSecondTempPicture;
@@ -1013,7 +1013,7 @@ BOOLEAN DisplayFormattedText( void )
BOOLEAN HandleSpecialFiles( UINT8 ubFormat )
{
INT32 iCounter = 0;
wchar_t sString[2048];
CHAR16 sString[2048];
FileStringPtr pTempString = NULL ;
FileStringPtr pLocatorString = NULL;
INT32 iTotalYPosition = 0;
@@ -1640,7 +1640,7 @@ BOOLEAN HandleSpecialTerroristFile( INT32 iFileNumber, STR sPictureName )
{
INT32 iCounter = 0;
wchar_t sString[2048];
CHAR16 sString[2048];
FileStringPtr pTempString = NULL ;
FileStringPtr pLocatorString = NULL;
INT32 iTotalYPosition = 0;
Laptop/finances.cpp
+8 -12
View File
@@ -691,7 +691,7 @@ void DrawRecordsBackGround( void )
void DrawRecordsColumnHeadersText( void )
{
// write the headers text for each column
UINT16 usX, usY;
INT16 usX, usY;
// font stuff
SetFont(FINANCE_TEXT_FONT);
@@ -728,9 +728,9 @@ void DrawRecordsText( void )
// draws the text of the records
FinanceUnitPtr pCurFinance=pCurrentFinance;
FinanceUnitPtr pTempFinance=pFinanceListHead;
wchar_t sString[512];
CHAR16 sString[512];
INT32 iCounter=0;
UINT16 usX, usY;
INT16 usX, usY;
INT32 iBalance=0;
// setup the font stuff
@@ -885,7 +885,7 @@ void InvalidateLapTopScreen( void )
void DrawSummaryText( void )
{
INT16 usX, usY;
wchar_t pString[100];
CHAR16 pString[100];
INT32 iBalance = 0;
@@ -1514,7 +1514,7 @@ void ProcessTransactionString(STR16 pString, FinanceUnitPtr pFinance)
break;
case( TRAIN_TOWN_MILITIA ):
{
wchar_t str[ 128 ];
CHAR16 str[ 128 ];
UINT8 ubSectorX;
UINT8 ubSectorY;
ubSectorX = (UINT8)SECTORX( pFinance->ubSecondCode );
@@ -1550,7 +1550,7 @@ void DisplayFinancePageNumberAndDateRange( void )
INT32 iCounter=0;
UINT32 uiLastDate;
FinanceUnitPtr pTempFinance=pFinanceListHead;
wchar_t sString[50];
CHAR16 sString[50];
// setup the font stuff
@@ -1916,9 +1916,7 @@ BOOLEAN LoadInRecords( UINT32 uiPage )
return( TRUE );
}
template void InsertCommasForDollarFigure<short *>(short *);
template <typename string1>
void InsertCommasForDollarFigure( string1 pString )
void InsertCommasForDollarFigure( STR16 pString )
{
INT16 sCounter =0;
INT16 sZeroCount =0;
@@ -1984,9 +1982,7 @@ void InsertCommasForDollarFigure( string1 pString )
}
template void InsertDollarSignInToString<short *>(short *);
template <typename string1>
void InsertDollarSignInToString( string1 pString )
void InsertDollarSignInToString( STR16 pString )
{
// run to end of string, copy everything in string 2 places right, insert a space at pString[ 1 ] and a L'$' at pString[ 0 ]
Laptop/finances.h
+2 -4
View File
@@ -60,10 +60,8 @@ typedef struct finance *FinanceUnitPtr;
extern FinanceUnitPtr pFinanceListHead;
//extern INT32 iCurrentBalance;
UINT32 AddTransactionToPlayersBook(UINT8 ubCode, UINT8 ubSecondCode, UINT32 uiDate, INT32 iAmount);
template <typename string1>
void InsertDollarSignInToString( string1 pString );
template <typename string1>
void InsertCommasForDollarFigure( string1 pString );
void InsertDollarSignInToString( STR16 pString );
void InsertCommasForDollarFigure( STR16 pString );
INT32 GetTodaysDaysIncome( void );
INT32 GetProjectedTotalDailyIncome( void );
Laptop/florist Cards.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ void RenderFloristCards()
{
UINT8 i,j, ubCount;
UINT16 usPosX, usPosY;
wchar_t sTemp[ 640 ];
CHAR16 sTemp[ 640 ];
UINT32 uiStartLoc=0;
HVOBJECT hPixHandle;
UINT16 usHeightOffset;
Laptop/florist Gallery.cpp
+1 -1
View File
@@ -359,7 +359,7 @@ void DeleteFlowerButtons()
BOOLEAN DisplayFloralDescriptions()
{
wchar_t sTemp[ 640 ];
CHAR16 sTemp[ 640 ];
UINT32 uiStartLoc=0, i;
UINT16 usPosY, usPrice;
Laptop/florist Order Form.cpp
+7 -7
View File
@@ -199,8 +199,8 @@ UINT8 gubFlowerDestDropDownMode;
UINT8 gubCurrentlySelectedFlowerLocation;
wchar_t gsSentimentTextField[ FLOWER_ORDER_PERSONEL_SENTIMENT_NUM_CHARS ] = {0} ;
wchar_t gsNameTextField[ FLOWER_ORDER_NAME_FIELD_NUM_CHARS ] = {0};
CHAR16 gsSentimentTextField[ FLOWER_ORDER_PERSONEL_SENTIMENT_NUM_CHARS ] = {0} ;
CHAR16 gsNameTextField[ FLOWER_ORDER_NAME_FIELD_NUM_CHARS ] = {0};
//buttons
@@ -508,7 +508,7 @@ void RenderFloristOrderForm()
{
HVOBJECT hPixHandle;
UINT16 usPosX;
wchar_t sTemp[ 640 ];
CHAR16 sTemp[ 640 ];
UINT32 uiStartLoc=0;
DisplayFloristDefaults();
@@ -874,8 +874,8 @@ void DisplayFlowerDynamicItems()
{
UINT32 uiStartLoc=0;
UINT16 usPosX;
wchar_t sTemp[ 640 ];
// wchar_t sText[ 640 ];
CHAR16 sTemp[ 640 ];
// CHAR16 sText[ 640 ];
UINT16 usPrice;
/*
//display the card saying
@@ -1200,8 +1200,8 @@ void FlowerOrderDisplayShippingLocationCity()
void InitFlowerOrderTextInputBoxes()
{
UINT32 uiStartLoc=0;
wchar_t sTemp[ 640 ];
wchar_t sText[ 640 ];
CHAR16 sTemp[ 640 ];
CHAR16 sText[ 640 ];
InitTextInputMode();
Laptop/history.cpp
+4 -4
View File
@@ -768,7 +768,7 @@ void ClearHistoryList( void )
void DisplayHistoryListHeaders( void )
{
// this procedure will display the headers to each column in History
UINT16 usX, usY;
INT16 usX, usY;
// font stuff
SetFont(HISTORY_TEXT_FONT);
@@ -823,9 +823,9 @@ void DrawHistoryRecordsText( void )
// draws the text of the records
HistoryUnitPtr pCurHistory=pHistoryListHead;
HistoryUnitPtr pTempHistory=pHistoryListHead;
wchar_t sString[512];
CHAR16 sString[512];
INT32 iCounter=0;
UINT16 usX, usY;
INT16 usX, usY;
INT32 iBalance=0;
INT16 sX =0, sY =0;
@@ -945,7 +945,7 @@ void DisplayPageNumberAndDateRange( void )
INT32 iCounter=0;
UINT32 uiLastDate;
HistoryUnitPtr pTempHistory=pHistoryListHead;
wchar_t sString[50];
CHAR16 sString[50];
Laptop/insurance Comments.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ void HandleInsuranceComments()
void RenderInsuranceComments()
{
// HVOBJECT hPixHandle;
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usPosX, usPosY;
SetFontShadow( INS_FONT_SHADOW );
@@ -190,7 +190,7 @@ void SelectInsuranceCommentLinkRegionCallBack(MOUSE_REGION * pRegion, INT32 iRea
BOOLEAN DisplayComment( UINT8 ubCommentorsName, UINT8 ubComment, UINT16 usPosY )
{
wchar_t sText[800];
CHAR16 sText[800];
HVOBJECT hPixHandle;
UINT16 sNumPixels=0;
Laptop/insurance Contract.cpp
+4 -4
View File
@@ -189,7 +189,7 @@ void GameInitInsuranceContract()
void EnterLaptopInitInsuranceContract()
{
wchar_t zTextField[14];
CHAR16 zTextField[14];
swprintf( zTextField, L"%d", 0 );
SetInputFieldStringWith16BitString( 1, zTextField );
@@ -328,7 +328,7 @@ void HandleInsuranceContract()
void RenderInsuranceContract()
{
HVOBJECT hPixHandle;
wchar_t sText[800];
CHAR16 sText[800];
UINT8 ubCount=0;
INT16 sMercID;
INT16 sNextMercID;
@@ -501,7 +501,7 @@ BOOLEAN DisplayOrderGrid( UINT8 ubGridNumber, UINT8 ubMercID )
UINT32 uiInsMercFaceImage;
INT32 iCostOfContract=0;
char sTemp[100];
wchar_t sText[800];
CHAR16 sText[800];
BOOLEAN fDisplayMercContractStateTextColorInRed = FALSE;
SOLDIERTYPE *pSoldier;
@@ -1619,7 +1619,7 @@ void PurchaseOrExtendInsuranceForSoldier( SOLDIERTYPE *pSoldier, UINT32 uiInsura
//if the player doesnt have enough money, tell him
if( LaptopSaveInfo.iCurrentBalance < iAmountOfMoneyTransfer )
{
wchar_t sText[800];
CHAR16 sText[800];
GetInsuranceText( INS_MLTI_NOT_ENOUGH_FUNDS, sText );
if( guiCurrentScreen == LAPTOP_SCREEN )
Laptop/insurance Info.cpp
+6 -6
View File
@@ -182,7 +182,7 @@ void HandleInsuranceInfo()
void RenderInsuranceInfo()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
UINT16 usPosX;
@@ -332,7 +332,7 @@ void SelectInsuranceInfoHomeLinkRegionCallBack(MOUSE_REGION * pRegion, INT32 iRe
void DisplaySubmitClaimPage()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
UINT16 usPosX;
@@ -371,7 +371,7 @@ void DisplaySubmitClaimPage()
void DisplayPremiumPage()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
HVOBJECT hPixHandle;
@@ -417,7 +417,7 @@ void DisplayPremiumPage()
void DisplayRenewingPremiumPage()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
// HVOBJECT hPixHandle;
@@ -456,7 +456,7 @@ void DisplayRenewingPremiumPage()
void DisplayCancelationPagePage()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
usNewLineOffset = INS_INFO_FIRST_PARAGRAPH_Y;
@@ -513,7 +513,7 @@ void ChangingInsuranceInfoSubPage( UINT8 ubSubPageNumber )
void DisplayInfoTocPage()
{
wchar_t sText[800];
CHAR16 sText[800];
UINT16 usNewLineOffset = 0;
HVOBJECT hPixHandle;
UINT16 usPosY;
Laptop/insurance.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ void HandleInsurance()
void RenderInsurance()
{
wchar_t sText[800];
CHAR16 sText[800];
HVOBJECT hPixHandle;
DisplayInsuranceDefaults();
Laptop/laptop.cpp
+3 -8
View File
@@ -4439,12 +4439,7 @@ void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason )
return;
}
template BOOLEAN DoLapTopMessageBox<wchar_t *>(UINT8, wchar_t *, UINT32, UINT8, MSGBOX_CALLBACK);
template BOOLEAN DoLapTopMessageBox<wchar_t const *>(UINT8, wchar_t const *, UINT32, UINT8, MSGBOX_CALLBACK);
template BOOLEAN DoLapTopMessageBox<unsigned short *>(UINT8, unsigned short *, UINT32, UINT8, MSGBOX_CALLBACK);
template BOOLEAN DoLapTopMessageBox<unsigned short const *>(UINT8, unsigned short const *, UINT32, UINT8, MSGBOX_CALLBACK);
template <typename string2>
BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback )
BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback )
{
SGPRect pCenteringRect= {LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_UL_Y, LAPTOP_SCREEN_LR_X, LAPTOP_SCREEN_LR_Y };
@@ -4464,7 +4459,7 @@ BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen
}
BOOLEAN DoLapTopSystemMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect )
BOOLEAN DoLapTopSystemMessageBoxWithRect( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect )
{
// reset exit mode
fExitDueToMessageBox = TRUE;
@@ -4476,7 +4471,7 @@ BOOLEAN DoLapTopSystemMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT3
return( ( iLaptopMessageBox != -1 ) );
}
BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback )
BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback )
{
SGPRect CenteringRect= {iScreenWidthOffset, iScreenHeightOffset,
iScreenWidthOffset + 640, INV_INTERFACE_START_Y };
Laptop/laptop.h
+2 -3
View File
@@ -29,15 +29,14 @@ UINT32 DrawLapTopIcons( );
void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason );
void HandleRightButtonUpEvent( void );
template <typename string2>
BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback );
BOOLEAN DoLapTopMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback );
void GoToWebPage(INT32 iPageId);
BOOLEAN WebPageTileBackground(UINT8 ubNumX, UINT8 ubNumY, UINT16 usWidth, UINT16 usHeight, UINT32 uiBackGround);
void BlitTitleBarIcons( void );
void HandleKeyBoardShortCutsForLapTop( UINT16 usEvent, UINT32 usParam, UINT16 usKeyState );
BOOLEAN RenderWWWProgramTitleBar( void );
void DisplayProgramBoundingBox( BOOLEAN fMarkButtons );
BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback );
BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback );
BOOLEAN RemoveBookMark( INT32 iBookId );
void CreateFileAndNewEmailIconFastHelpText( UINT32 uiHelpTextID, BOOLEAN fClearHelpText );
BOOLEAN InitLaptopAndLaptopScreens();
Laptop/mercs Account.cpp
+2 -2
View File
@@ -351,7 +351,7 @@ void HandleMercsAccount()
void RenderMercsAccount()
{
wchar_t sText[100];
CHAR16 sText[100];
HVOBJECT hPixHandle;
DrawMecBackGround();
@@ -470,7 +470,7 @@ void DisplayHiredMercs()
{
UINT16 usPosY;
UINT32 uiContractCharge;
wchar_t sTemp[20];
CHAR16 sTemp[20];
UINT8 i, usMercID;
UINT8 ubFontColor;
UINT8 usMercIDStart;
Laptop/mercs Files.cpp
+2 -2
View File
@@ -506,7 +506,7 @@ BOOLEAN DisplayMercFace( UINT8 ubMercID)
void LoadAndDisplayMercBio( UINT8 ubMercID )
{
wchar_t sText[400];
CHAR16 sText[400];
UINT32 uiStartLoc = 0;
//load and display the merc bio
@@ -528,7 +528,7 @@ void LoadAndDisplayMercBio( UINT8 ubMercID )
void DisplayMercsStats( UINT8 ubMercID )
{
UINT16 usPosY, usPosX;
wchar_t sString[128];
CHAR16 sString[128];
usPosY = MERC_HEALTH_Y;
Laptop/mercs.cpp
+2 -2
View File
@@ -182,7 +182,7 @@ UINT8 gubCurMercIndex;
INT32 iMercPopUpBox = -1;
UINT16 gusPositionOfSpecksDialogBox_X;
wchar_t gsSpeckDialogueTextPopUp[ 900 ];
CHAR16 gsSpeckDialogueTextPopUp[ 900 ];
UINT16 gusSpeckDialogueX;
UINT16 gusSpeckDialogueActualWidth;
@@ -1537,7 +1537,7 @@ void HandleTalkingSpeck()
}
}
void DisplayTextForSpeckVideoPopUp(wchar_t * pString)
void DisplayTextForSpeckVideoPopUp(STR16 pString)
{
UINT16 usActualHeight;
INT32 iOldMercPopUpBoxId = iMercPopUpBox;
Laptop/mercs.h
+1 -1
View File
@@ -64,7 +64,7 @@ BOOLEAN RemoveMercBackGround();
void DailyUpdateOfMercSite( UINT16 usDate);
UINT8 GetMercIDFromMERCArray(UINT8 ubMercID);
void DisplayTextForSpeckVideoPopUp(wchar_t * pString);
void DisplayTextForSpeckVideoPopUp(STR16 pString);
BOOLEAN IsMercMercAvailable( UINT8 ubMercID );
Laptop/personnel.cpp
+6 -6
View File
@@ -1501,8 +1501,8 @@ Moved so the name of the town will be in the same line as the name
void DisplayCharStats(INT32 iId, INT32 iSlot)
{
INT32 iCounter=0;
wchar_t sString[50];
// wchar_t sStringA[ 50 ];
CHAR16 sString[50];
// CHAR16 sStringA[ 50 ];
INT16 sX, sY;
UINT32 uiHits = 0;
SOLDIERTYPE *pSoldier = &Menptr[iId];
@@ -1967,7 +1967,7 @@ void DrawPageNumber( void )
{
// draws the page number
wchar_t sString[10];
CHAR16 sString[10];
INT16 sX, sY;
INT32 iPageNumber, iLastPage;
@@ -5124,7 +5124,7 @@ BOOLEAN DisplayPortraitOfPastMerc( INT32 iId , INT32 iCounter, BOOLEAN fDead, BO
void DisplayDepartedCharStats(INT32 iId, INT32 iSlot, INT32 iState)
{
INT32 iCounter=0;
wchar_t sString[50];
CHAR16 sString[50];
INT16 sX, sY;
UINT32 uiHits = 0;
@@ -6877,8 +6877,8 @@ BOOLEAN IsPastMercOther( INT32 iId )
void DisplayEmploymentinformation( INT32 iId, INT32 iSlot )
{
INT32 iCounter=0;
wchar_t sString[50];
wchar_t sStringA[ 50 ];
CHAR16 sString[50];
CHAR16 sStringA[ 50 ];
INT16 sX, sY;
UINT32 uiHits = 0;