diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp index 458fd91f..bd360d94 100644 --- a/Editor/Cursor Modes.cpp +++ b/Editor/Cursor Modes.cpp @@ -37,7 +37,7 @@ extern INT16 sGridX; // symbol already declared globally in editscreen.cpp (jona extern INT16 sGridY; // symbol already declared globally in editscreen.cpp (jonathanl) INT16 sBadMarker = -1; -UINT16 *wszSelType[6]= { L"Small", L"Medium", L"Large", L"XLarge", L"Width: xx", L"Area" }; +STR16 wszSelType[6]= { L"Small", L"Medium", L"Large", L"XLarge", L"Width: xx", L"Area" }; BOOLEAN gfAllowRightButtonSelections = FALSE; BOOLEAN gfCurrentSelectionWithRightButton = FALSE; diff --git a/Editor/Cursor Modes.h b/Editor/Cursor Modes.h index 13c57bbc..d0e6f4f1 100644 --- a/Editor/Cursor Modes.h +++ b/Editor/Cursor Modes.h @@ -29,7 +29,7 @@ void IncreaseSelectionDensity(); void DecreaseSelectionDensity(); void RemoveCursors(); -extern UINT16 *wszSelType[6]; +extern STR16 wszSelType[6]; extern BOOLEAN gfCurrentSelectionWithRightButton; diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp index a2fd2193..0ca189b8 100644 --- a/Editor/Editor Taskbar Creation.cpp +++ b/Editor/Editor Taskbar Creation.cpp @@ -48,8 +48,8 @@ void InitEditorItemStatsButtons() void InitEditorMercsToolbar() { - INT16 TempString[30]; - UINT16 *FaceDirs[8] = {L"north",L"northeast",L"east",L"southeast",L"south",L"southwest",L"west",L"northwest"}; + CHAR16 TempString[30]; + STR16 FaceDirs[8] = {L"north",L"northeast",L"east",L"southeast",L"south",L"southwest",L"west",L"northwest"}; INT32 x; iEditorButton[ MERCS_PLAYERTOGGLE ] = @@ -256,8 +256,8 @@ void InitEditorMercsToolbar() iScreenWidthOffset + 360, 2 * iScreenHeightOffset + 395, 30, 30, BUTTON_TOGGLE, MSYS_PRIORITY_NORMAL + 1, DEFAULT_MOVE_CALLBACK, MercsDirectionSetCallback ); for ( x = 0; x < 8; x++ ) { - swprintf( (wchar_t *)TempString, (wchar_t *)L"Set merc to face %s", FaceDirs[x] ); - SetButtonFastHelpText( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], (UINT16 *) TempString ); + swprintf( TempString, L"Set merc to face %s", FaceDirs[x] ); + SetButtonFastHelpText( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], TempString ); MSYS_SetBtnUserData( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], 0, x); } diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index bef31186..0317c543 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -428,10 +428,10 @@ void EnableEditorTaskbar(void) //A specialized mprint function that'll restore the editor panel underneath the //string before rendering the string. This is obviously only useful for drawing text //in the editor taskbar. -void mprintfEditor(INT16 x, INT16 y, UINT16 *pFontString, ...) +void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...) { va_list argptr; - wchar_t string[512]; + CHAR16 string[512]; UINT16 uiStringLength, uiStringHeight; Assert( pFontString != NULL ); @@ -475,7 +475,7 @@ void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom ) //This is a new function which duplicates the older "yellow info boxes" that //are common throughout the editor. This draws the yellow box with the indentation //look. -void DrawEditorInfoBox( wchar_t *str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h ) +void DrawEditorInfoBox( STR16 str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h ) { UINT16 usFillColorDark, usFillColorLight, usFillColorBack; UINT16 x2, y2; @@ -694,7 +694,7 @@ void RenderMapEntryPointsAndLights() } } -void BuildTriggerName( OBJECTTYPE *pItem, UINT16 *szItemName ) +void BuildTriggerName( OBJECTTYPE *pItem, STR16 szItemName ) { if( pItem->usItem == SWITCH ) { @@ -727,7 +727,7 @@ void RenderDoorLockInfo() { INT16 i, xp, yp; INT16 sScreenX, sScreenY; - wchar_t str[ 50 ]; + CHAR16 str[ 50 ]; for( i = 0; i < gubNumDoors; i++ ) { GetGridNoScreenPos( DoorTable[ i ].sGridNo, 0, &sScreenX, &sScreenY ); @@ -781,7 +781,7 @@ void RenderSelectedItemBlownUp() HVOBJECT hVObject; INT16 sScreenX, sScreenY, xp, yp; ITEM_POOL *pItemPool; - UINT16 szItemName[ SIZE_ITEM_NAME ]; + CHAR16 szItemName[ SIZE_ITEM_NAME ]; INT32 i; INT16 sWidth, sHeight, sOffsetX, sOffsetY; @@ -826,7 +826,7 @@ void RenderSelectedItemBlownUp() if( gpItem->usItem == ACTION_ITEM ) { - UINT16 *pStr; + STR16 pStr; pStr = GetActionItemName( gpItem ); xp = sScreenX - (StringPixLength( pStr, FONT10ARIALBOLD ) - 40) / 2; yp += 10; @@ -865,7 +865,7 @@ void RenderSelectedItemBlownUp() void RenderEditorInfo( ) { - wchar_t FPSText[ 50 ]; + CHAR16 FPSText[ 50 ]; static INT32 iSpewWarning = 0; INT16 iMapIndex; diff --git a/Editor/Editor Taskbar Utils.h b/Editor/Editor Taskbar Utils.h index 06fe4da0..8a7ee6c9 100644 --- a/Editor/Editor Taskbar Utils.h +++ b/Editor/Editor Taskbar Utils.h @@ -53,9 +53,9 @@ void DisableEditorRegion( INT8 bRegionID ); //Rendering Utils -void mprintfEditor(INT16 x, INT16 y, wchar_t *pFontString, ...); +void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...); void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom ); -void DrawEditorInfoBox( wchar_t *str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h ); +void DrawEditorInfoBox( STR16 str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h ); extern INT32 giEditMercDirectionIcons[2]; extern UINT32 guiMercInventoryPanel; diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp index 63385d41..fb7db825 100644 --- a/Editor/EditorBuildings.cpp +++ b/Editor/EditorBuildings.cpp @@ -729,7 +729,7 @@ void RemoveLockedDoorCursors() void SetupTextInputForBuildings() { - wchar_t str[4]; + CHAR16 str[4]; InitTextInputModeWithScheme( DEFAULT_SCHEME ); AddUserInputField( NULL ); //just so we can use short cut keys while not typing. swprintf( str, L"%d", gubMaxRoomNumber ); @@ -738,7 +738,7 @@ void SetupTextInputForBuildings() void ExtractAndUpdateBuildingInfo() { - wchar_t str[4]; + CHAR16 str[4]; INT32 temp; //extract light1 colors temp = min( GetNumericStrictValueFromField( 1 ), 255 ); diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index 8ea4fcd3..d102c816 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -221,8 +221,8 @@ void InitEditorItemsInfo(UINT32 uiItemType) INT16 sWidth, sOffset, sStart; INT16 i, x, y; UINT16 usCounter; - INT16 pStr[ 100 ];//, pStr2[ 100 ]; - UINT16 pItemName[SIZE_ITEM_NAME]; + CHAR16 pStr[ 100 ];//, pStr2[ 100 ]; + CHAR16 pItemName[SIZE_ITEM_NAME]; UINT8 ubBitDepth; BOOLEAN fTypeMatch; INT32 iEquipCount = 0; @@ -366,8 +366,8 @@ void InitEditorItemsInfo(UINT32 uiItemType) SetFontForeground( FONT_MCOLOR_WHITE ); SetFontDestBuffer( eInfo.uiBuffer, 0, 0, eInfo.sWidth, eInfo.sHeight, FALSE ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%S", LockTable[ i ].ubEditorName ); - DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16) pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED ); + swprintf( pStr, L"%S", LockTable[ i ].ubEditorName ); + DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED ); //Calculate the center position of the graphic in a 60 pixel wide area. sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth; @@ -474,46 +474,46 @@ void InitEditorItemsInfo(UINT32 uiItemType) if( eInfo.uiItemType != TBAR_MODE_ITEM_TRIGGERS ) { LoadItemInfo( usCounter, pItemName, NULL ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", pItemName ); + swprintf( pStr, L"%s", pItemName ); } else { if( i == PRESSURE_ACTION_ID ) { - swprintf( (wchar_t *)pStr, (wchar_t *)L"Pressure Action" ); + swprintf( pStr, L"Pressure Action" ); } else if( i < 2 ) { if( usCounter == SWITCH ) - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger1" ); + swprintf( pStr, L"Panic Trigger1" ); else - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action1" ); + swprintf( pStr, L"Panic Action1" ); } else if( i < 4 ) { if( usCounter == SWITCH ) - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger2" ); + swprintf( pStr, L"Panic Trigger2" ); else - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action2" ); + swprintf( pStr, L"Panic Action2" ); } else if( i < 6 ) { if( usCounter == SWITCH ) - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger3" ); + swprintf( pStr, L"Panic Trigger3" ); else - swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action3" ); + swprintf( pStr, L"Panic Action3" ); } else { if( usCounter == SWITCH ) - swprintf( (wchar_t *)pStr, (wchar_t *)L"Trigger%d", (i-4)/2 ); + swprintf( pStr, L"Trigger%d", (i-4)/2 ); else - swprintf( (wchar_t *)pStr, (wchar_t *)L"Action%d", (i-4)/2 ); + swprintf( pStr, L"Action%d", (i-4)/2 ); } } // WANNE: EDITOR? - DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16)pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED ); + DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED ); //Calculate the center position of the graphic in a 60 pixel wide area. sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth; @@ -1616,7 +1616,7 @@ void DisplayItemStatistics() { BOOLEAN fUseSelectedItem; INT16 usItemIndex; - UINT16 pItemName[SIZE_ITEM_NAME]; + CHAR16 pItemName[SIZE_ITEM_NAME]; INVTYPE *pItem; if( !eInfo.fActive ) diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp index b7dd56ec..289da52d 100644 --- a/Editor/EditorMapInfo.cpp +++ b/Editor/EditorMapInfo.cpp @@ -68,7 +68,7 @@ BOOLEAN gfEditorForceShadeTableRebuild = FALSE; void SetupTextInputForMapInfo() { - wchar_t str[10]; + CHAR16 str[10]; InitTextInputModeWithScheme( DEFAULT_SCHEME ); @@ -149,7 +149,7 @@ void UpdateMapInfo() void UpdateMapInfoFields() { - wchar_t str[10]; + CHAR16 str[10]; //Update the text fields to reflect the validated values. //light rgb fields swprintf( str, L"%d", gEditorLightColor.peRed ); @@ -175,7 +175,7 @@ void UpdateMapInfoFields() void ExtractAndUpdateMapInfo() { - wchar_t str[10]; + CHAR16 str[10]; INT32 temp; BOOLEAN fUpdateLight1 = FALSE; //extract light1 colors @@ -246,7 +246,7 @@ void ExtractAndUpdateMapInfo() BOOLEAN ApplyNewExitGridValuesToTextFields() { - wchar_t str[10]; + CHAR16 str[10]; //exit grid input fields if( iCurrentTaskbar != TASK_MAPINFO ) return FALSE; diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp index 2d2dd257..a70513ec 100644 --- a/Editor/EditorMercs.cpp +++ b/Editor/EditorMercs.cpp @@ -74,7 +74,7 @@ extern void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT1 // SANMONA_ARMS_GROUP, // ANGELS_GROUP, // NUM_CIV_GROUPS -UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] = +CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] = { L"NONE", L"REBEL", @@ -112,7 +112,7 @@ UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] = // SCHEDULE_ACTION_ENTERSECTOR, // SCHEDULE_ACTION_STAYINSECTOR, // SCHEDULE_ACTION_SLEEP, -UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20] = +CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20] = { L"No action", L"Lock door", @@ -185,7 +185,7 @@ void SetupTextInputForMercSchedule(); void ExtractAndUpdateMercAttributes(); void ExtractAndUpdateMercProfile(); void ExtractAndUpdateMercSchedule(); -void CalcStringForValue( wchar_t *str, INT32 iValue, UINT32 uiMax ); +void CalcStringForValue( STR16 str, INT32 iValue, UINT32 uiMax ); void ChangeBodyType( INT8 bOffset ); //+1 or -1 only //internal merc variables @@ -264,21 +264,21 @@ BOOLEAN gfShowCivilians = TRUE; INT16 sCurBaseDiff = DEFAULT_DIFF; BOOLEAN fAskForBaseDifficulty = TRUE; -UINT16 *zDiffNames[NUM_DIFF_LVLS] = { L"Wimp", L"Easy", L"Average", L"Tough", L"Steroid Users Only" }; +STR16 zDiffNames[NUM_DIFF_LVLS] = { L"Wimp", L"Easy", L"Average", L"Tough", L"Steroid Users Only" }; INT16 sBaseStat[NUM_DIFF_LVLS] = { 50, 60, 70, 80, 90 }; INT16 sBaseExpLvl[NUM_DIFF_LVLS] = { 1, 3, 5, 7, 9 }; -UINT16 *EditMercStat[12] = { L"Max Health",L"Cur Health",L"Strength", +STR16 EditMercStat[12] = { L"Max Health",L"Cur Health",L"Strength", L"Agility",L"Dexterity",L"Charisma", L"Wisdom",L"Marksmanship",L"Explosives", L"Medical",L"Scientific",L"Exp Level" }; #define NUM_MERC_ORDERS 8 -UINT16 *EditMercOrders[8] = { L"Stationary",L"On Guard",L"Close Patrol", +STR16 EditMercOrders[8] = { L"Stationary",L"On Guard",L"Close Patrol", L"Far Patrol",L"Point Patrol",L"On Call", L"Seek Enemy", L"Random Point Patrol"}; -UINT16 *EditMercAttitudes[6] = { L"Defensive",L"Brave Loner",L"Brave Buddy", +STR16 EditMercAttitudes[6] = { L"Defensive",L"Brave Loner",L"Brave Buddy", L"Cunning Loner",L"Cunning Buddy", L"Aggressive" }; @@ -772,7 +772,7 @@ void DisplayEditMercWindow( void ) INT32 iXPos, iYPos, iHeight, iWidth; UINT16 usFillColorBack, usFillColorDark, usFillColorLight, usFillColorTextBk; INT32 x, iXOff; - INT16 TempString[30]; + CHAR16 TempString[30]; SOLDIERTYPE *pSoldier; INT8 iEditStat[12]; @@ -852,7 +852,7 @@ void DisplayEditMercWindow( void ) ColorFillVideoSurfaceArea(FRAME_BUFFER, iXPos + 117, iYPos + 111 + (20 * x), iXPos + 116 + 30, iYPos + 111 + (20 * x) + 19, usFillColorLight ); ColorFillVideoSurfaceArea(FRAME_BUFFER, iXPos + 117, iYPos + 111 + (20 * x), iXPos + 116 + 29, iYPos + 111 + (20 * x) + 18, usFillColorTextBk ); - swprintf( (wchar_t *)TempString, (wchar_t *)L"%d", iEditStat[x] ); + swprintf( TempString, L"%d", iEditStat[x] ); iXOff = (30 - StringPixLength( TempString, FONT12POINT1 )) / 2; gprintf( iXPos + 118 + iXOff, iYPos + 114 + (20 * x), L"%s", TempString ); } @@ -1719,7 +1719,7 @@ void DeleteSelectedMerc() void SetupTextInputForMercProfile() { - wchar_t str[4]; + CHAR16 str[4]; INT16 sNum; InitTextInputModeWithScheme( DEFAULT_SCHEME ); @@ -1735,7 +1735,7 @@ void SetupTextInputForMercProfile() void SetupTextInputForMercAttributes() { - wchar_t str[4]; + CHAR16 str[4]; InitTextInputModeWithScheme( DEFAULT_SCHEME ); @@ -1773,7 +1773,7 @@ void SetupTextInputForMercAttributes() //In the merc editing, all detailed placement values for generated attributes are set to -1. //When making a generated attribute static, we then set the value to its applicable value. //This function is similar to the itoa function except that -1 is converted to a null string. -void CalcStringForValue( wchar_t *str, INT32 iValue, UINT32 uiMax ) +void CalcStringForValue( STR16 str, INT32 iValue, UINT32 uiMax ) { if( iValue < 0 ) //a blank string is determined by a negative value. str[0] = '\0'; @@ -2388,7 +2388,7 @@ void SetMercEditingMode( UINT8 ubNewMode ) void DisplayBodyTypeInfo() { - wchar_t str[20]; + CHAR16 str[20]; switch( gpSelected->pBasicPlacement->bBodyType ) { case RANDOM: swprintf( str, L"Random" ); break; @@ -2534,7 +2534,7 @@ void UpdateMercsInfo() SetFontForeground( FONT_YELLOW ); SetFontShadow( FONT_NEARBLACK ); { //scope trick - UINT16 tempStr[500]; + CHAR16 tempStr[500]; swprintf( tempStr, L"%s%s%s%s%s%d.", L"By specifying a profile index, all of the information will be extracted from the profile ", L"and override any values that you have edited. It will also disable the editing features ", @@ -2583,8 +2583,8 @@ void UpdateMercsInfo() mprintf( iScreenWidthOffset + 172, 2 * iScreenHeightOffset + 439, L"4)" ); if( gubScheduleInstructions ) { - wchar_t str[255]; - UINT16 keyword[10] = L""; + CHAR16 str[255]; + CHAR16 keyword[10] = L""; ColorFillVideoSurfaceArea( FRAME_BUFFER, iScreenWidthOffset + 431, 2 * iScreenHeightOffset + 388, iScreenWidthOffset + 590, 2 * iScreenHeightOffset + 450, Get16BPPColor( FROMRGB( 32, 45, 72 ) ) ); switch( gCurrSchedule.ubAction[ gubCurrentScheduleActionIndex ] ) { @@ -2657,7 +2657,7 @@ void RenderSelectedMercsInventory() UINT8 *pSrc, *pDst; INT32 xp, yp; UINT32 uiSrcPitchBYTES, uiDstPitchBYTES; - UINT16 pItemName[100]; + CHAR16 pItemName[100]; UINT8 ubFontColor; if( gsSelectedMercID == -1 ) return; @@ -3110,9 +3110,9 @@ void RenderMercStrings() SOLDIERTYPE *pSoldier; INT16 sXPos, sYPos; INT16 sX, sY; - UINT16 *pStr; + STR16 pStr; SOLDIERINITNODE *curr; - wchar_t str[50]; + CHAR16 str[50]; curr = gSoldierInitHead; while( curr ) @@ -3306,7 +3306,7 @@ void CancelCurrentScheduleAction() void RegisterCurrentScheduleAction( INT32 iMapIndex ) { - wchar_t str[6]; + CHAR16 str[6]; MarkWorldDirty(); swprintf( str, L"%d", iMapIndex ); if( gfUseScheduleData2 ) @@ -3498,7 +3498,7 @@ void RenderCurrentSchedule() INT16 sXMapPos, sYMapPos; INT16 sScreenX, sScreenY; INT16 sX, sY; - wchar_t str[ 3 ]; + CHAR16 str[ 3 ]; for( i = 0; i < 8; i++ ) { if( i % 2 ) @@ -3542,7 +3542,7 @@ void UpdateScheduleInfo() { INT32 i; SCHEDULENODE *pSchedule; - wchar_t str[6]; + CHAR16 str[6]; if( gpSelected->pSoldier->ubScheduleID ) { pSchedule = GetSchedule( gpSelected->pSoldier->ubScheduleID ); diff --git a/Editor/EditorMercs.h b/Editor/EditorMercs.h index 323b1dc0..df806252 100644 --- a/Editor/EditorMercs.h +++ b/Editor/EditorMercs.h @@ -49,7 +49,7 @@ extern UINT8 gubCurrMercMode, gubPrevMercMode; #define NUM_DIFF_LVLS 5 -extern wchar_t *zDiffNames[NUM_DIFF_LVLS]; +extern STR16 zDiffNames[NUM_DIFF_LVLS]; extern INT16 sCurBaseDiff; extern INT16 gsSelectedMercID; extern INT16 gsSelectedMercGridNo; diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index 4caeee76..ee11a02d 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -40,7 +40,7 @@ INT32 giSciFiCheckboxButton = -1; INT32 giAlarmTriggerButton = -1; INT32 giOwnershipGroupButton = -1; -UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] = +CHAR16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] = { L"Klaxon Mine", L"Flare Mine", @@ -78,7 +78,7 @@ UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] = L"Big teargas", }; -UINT16* GetActionItemName( OBJECTTYPE *pItem ) +const STR16 GetActionItemName( OBJECTTYPE *pItem ) { if( !pItem || pItem->usItem != ACTION_ITEM ) return NULL; @@ -642,7 +642,7 @@ void RemoveGameTypeFlags() void SetupGunGUI() { - wchar_t str[20]; + CHAR16 str[20]; INT16 yp; memset( gfAttachment, 0, NUM_ATTACHMENT_BUTTONS ); swprintf( str, L"%d", gpItem->bGunStatus ); @@ -788,7 +788,7 @@ void ExtractAndUpdateGunGUI() void SetupAmmoGUI() { - wchar_t str[20]; + CHAR16 str[20]; swprintf( str, L"%d", gpItem->ubNumberOfObjects ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 1, INPUTTYPE_NUMERICSTRICT ); swprintf( str, L"%d", gpItem->bTrap ); @@ -833,7 +833,7 @@ void ExtractAndUpdateAmmoGUI() void SetupArmourGUI() { - wchar_t str[20]; + CHAR16 str[20]; swprintf( str, L"%d", gpItem->bStatus[0] ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); swprintf( str, L"%d", gpItem->bTrap ); @@ -894,7 +894,7 @@ void ExtractAndUpdateArmourGUI() void SetupEquipGUI() { - wchar_t str[20]; + CHAR16 str[20]; swprintf( str, L"%d", gpItem->bStatus[0] ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); swprintf( str, L"%d", gpItem->bTrap ); @@ -938,7 +938,7 @@ void ExtractAndUpdateEquipGUI() void SetupExplosivesGUI() { - wchar_t str[20]; + CHAR16 str[20]; INT16 yp; swprintf( str, L"%d", gpItem->bStatus[0] ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); @@ -1020,7 +1020,7 @@ void ExtractAndUpdateExplosivesGUI() void SetupMoneyGUI() { - wchar_t str[20]; + CHAR16 str[20]; swprintf( str, L"%d", gpItem->uiMoneyAmount ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 45, 15, MSYS_PRIORITY_NORMAL, str, 5, INPUTTYPE_NUMERICSTRICT ); if( gpEditingItemPool ) @@ -1058,7 +1058,7 @@ void RemoveMoneyGUI() void SetupOwnershipGUI() { - wchar_t str[20]; + CHAR16 str[20]; swprintf( str, L"%d", gpItem->ubOwnerProfile ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); giOwnershipGroupButton = @@ -1104,7 +1104,7 @@ void RemoveOwnershipGUI() void SetupKeysGUI() { - wchar_t str[20]; + CHAR16 str[20]; if( gpEditingItemPool ) { swprintf( str, L"%d", 100 - gWorldItems[ gpEditingItemPool->iItemIndex ].ubNonExistChance ); @@ -1130,8 +1130,8 @@ void RemoveKeysGUI() void SetupActionItemsGUI() { - wchar_t str[4]; - UINT16 *pStr; + CHAR16 str[4]; + STR16 pStr; swprintf( str, L"%d", gpItem->bStatus[0] ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 365, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); swprintf( str, L"%d", gpItem->bTrap ); @@ -1197,7 +1197,7 @@ void AlarmTriggerCheckboxCallback( GUI_BUTTON *btn, INT32 reason ) void SetupTriggersGUI() { - wchar_t str[4]; + CHAR16 str[4]; swprintf( str, L"%d", gpItem->bTrap ); AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 365, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT ); swprintf( str, L"%d", gpItem->ubTolerance ); diff --git a/Editor/Item Statistics.h b/Editor/Item Statistics.h index ee987289..609cd08a 100644 --- a/Editor/Item Statistics.h +++ b/Editor/Item Statistics.h @@ -81,9 +81,9 @@ enum ACTIONITEM_BIG_TEAR_GAS, NUM_ACTIONITEMS }; -extern UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ]; +extern CHAR16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ]; //Returns a pointer to one of the above string array. -extern UINT16* GetActionItemName( OBJECTTYPE *pItem ); +extern const STR16 GetActionItemName( OBJECTTYPE *pItem ); //Called by the popup menu, when a selection is made. extern void UpdateActionItem( INT8 bActionItemIndex ); //Changes an action item into the type specified by the ACTIONITEM enumeration. diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp index 1769da0d..d3403c05 100644 --- a/Editor/LoadScreen.cpp +++ b/Editor/LoadScreen.cpp @@ -48,7 +48,7 @@ //=========================================================================== BOOLEAN gfErrorCatch = FALSE; -UINT16 gzErrorCatchString[ 256 ] = L""; +CHAR16 gzErrorCatchString[ 256 ] = L""; INT32 giErrorCatchMessageBox = 0; extern void RemoveMercsInSector(); @@ -86,7 +86,7 @@ INT32 iCurrFileShown; INT32 iLastFileClicked; INT32 iLastClickTime; -UINT16 gzFilename[31]; +CHAR16 gzFilename[31]; FDLG_LIST *FileList = NULL; @@ -101,7 +101,7 @@ BOOLEAN gfIllegalName; BOOLEAN gfDeleteFile; BOOLEAN gfNoFiles; -UINT16 zOrigName[60]; +CHAR16 zOrigName[60]; GETFILESTRUCT FileInfo; BOOLEAN fEnteringLoadSaveScreen = TRUE; @@ -371,7 +371,7 @@ UINT32 LoadSaveScreenHandle(void) sprintf( gszCurrFilename, "MAPS\\%S", gzFilename ); if( GetFileFirst(gszCurrFilename, &FileInfo) ) { - wchar_t str[40]; + CHAR16 str[40]; if( FileInfo.uiFileAttribs & (FILE_IS_READONLY|FILE_IS_HIDDEN|FILE_IS_SYSTEM) ) { swprintf( str, L" Delete READ-ONLY file %s? ", gzFilename ); @@ -434,7 +434,7 @@ UINT32 LoadSaveScreenHandle(void) } -void CreateFileDialog( UINT16 *zTitle ) +void CreateFileDialog( STR16 zTitle ) { iFDlgState = DIALOG_NONE; @@ -511,7 +511,7 @@ void FileDialogModeCallback( UINT8 ubID, BOOLEAN fEntering ) if( iCurrFileShown == (x-iTopFileShown) ) { FListNode->FileInfo.zFileName[30] = 0; - SetInputFieldStringWith8BitString( 0, (UINT8 *)FListNode->FileInfo.zFileName ); + SetInputFieldStringWith8BitString( 0, FListNode->FileInfo.zFileName ); return; } FListNode = FListNode->pNext; @@ -721,7 +721,7 @@ void SetTopFileToLetter( UINT16 usLetter ) iTopFileShown = x; if( iTopFileShown > iTotalFiles - 7 ) iTopFileShown = iTotalFiles - 7; - SetInputFieldStringWith8BitString( 0, (UINT8 *)prev->FileInfo.zFileName ); + SetInputFieldStringWith8BitString( 0, prev->FileInfo.zFileName ); } } @@ -814,16 +814,16 @@ void HandleMainKeyEvents( InputAtom *pEvent ) } if( curr ) { - SetInputFieldStringWith8BitString( 0, (UINT8 *)curr->FileInfo.zFileName ); + SetInputFieldStringWith8BitString( 0, curr->FileInfo.zFileName ); swprintf( gzFilename, L"%S", curr->FileInfo.zFileName ); } } } //editor doesn't care about the z value. It uses it's own methods. -void SetGlobalSectorValues( UINT16 *szFilename ) +void SetGlobalSectorValues( STR16 szFilename ) { - UINT16 *pStr; + STR16 pStr; if( ValidCoordinate() ) { //convert the coordinate string into into the actual global sector coordinates. @@ -869,7 +869,7 @@ void InitErrorCatchDialog() UINT32 ProcessFileIO() { INT16 usStartX, usStartY; - UINT8 ubNewFilename[50]; + CHAR8 ubNewFilename[50]; switch( gbCurrentFileIOStatus ) { case INITIATE_MAP_SAVE: //draw save message @@ -889,7 +889,7 @@ UINT32 ProcessFileIO() gbCurrentFileIOStatus = SAVING_MAP; return LOADSAVE_SCREEN; case SAVING_MAP: //save map - sprintf( (char *)ubNewFilename, "%S", gzFilename ); + sprintf( ubNewFilename, "%S", gzFilename ); RaiseWorldLand(); if( gfShowPits ) RemoveAllPits(); @@ -934,7 +934,7 @@ UINT32 ProcessFileIO() return LOADSAVE_SCREEN; case LOADING_MAP: //load map DisableUndo(); - sprintf( (char *)ubNewFilename, "%S", gzFilename ); + sprintf( ubNewFilename, "%S", gzFilename ); RemoveMercsInSector( ); @@ -1097,7 +1097,7 @@ BOOLEAN ValidCoordinate() BOOLEAN ValidFilename() { - UINT16 *pDest; + STR16 pDest; if( gzFilename[0] != '\0' )// ; <----- I really think they didn't mean this!! (jonathanl) { pDest = wcsstr( gzFilename, L".dat" ); @@ -1109,7 +1109,7 @@ BOOLEAN ValidFilename() return FALSE; } -BOOLEAN ExternalLoadMap( UINT16 *szFilename ) +BOOLEAN ExternalLoadMap( STR16 szFilename ) { Assert( szFilename ); if( !wcslen( szFilename ) ) @@ -1127,7 +1127,7 @@ BOOLEAN ExternalLoadMap( UINT16 *szFilename ) return FALSE; } -BOOLEAN ExternalSaveMap( UINT16 *szFilename ) +BOOLEAN ExternalSaveMap( STR16 szFilename ) { Assert( szFilename ); if( !wcslen( szFilename ) ) diff --git a/Editor/LoadScreen.h b/Editor/LoadScreen.h index 101ed48c..c2d7272e 100644 --- a/Editor/LoadScreen.h +++ b/Editor/LoadScreen.h @@ -26,7 +26,7 @@ extern BOOLEAN gfDestroyFDlg; UINT32 WaitForFileName( void ); void RemoveFileDialog(void); -void CreateFileDialog( wchar_t *zTitle ); +void CreateFileDialog( STR16 zTitle ); void SelectFileDialogYPos( UINT16 usRelativeYPos ); @@ -37,11 +37,11 @@ BOOLEAN ExtractFilenameFromFields(); BOOLEAN ValidCoordinate(); BOOLEAN ValidFilename(); -BOOLEAN ExternalLoadMap( wchar_t *szFilename ); -BOOLEAN ExternalSaveMap( wchar_t *szFilename ); +BOOLEAN ExternalLoadMap( STR16 szFilename ); +BOOLEAN ExternalSaveMap( STR16 szFilename ); extern BOOLEAN gfErrorCatch; -extern UINT16 gzErrorCatchString[ 256 ]; +extern CHAR16 gzErrorCatchString[ 256 ]; #endif #endif diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp index 5986c979..ae06c73d 100644 --- a/Editor/Sector Summary.cpp +++ b/Editor/Sector Summary.cpp @@ -54,7 +54,7 @@ enum{ BETA, RELEASE }; -UINT16 gszVersionType[5][10] = { L"Pre-Alpha", L"Alpha", L"Demo", L"Beta", L"Release" }; +CHAR16 gszVersionType[5][10] = { L"Pre-Alpha", L"Alpha", L"Demo", L"Beta", L"Release" }; #define GLOBAL_SUMMARY_STATE RELEASE //Regular masks @@ -85,7 +85,7 @@ BOOLEAN gfMustForceUpdateAllMaps = FALSE; UINT16 gusNumberOfMapsToBeForceUpdated = 0; BOOLEAN gfMajorUpdate = FALSE; -void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion ); +void LoadSummary( STR8 pSector, UINT8 ubLevel, FLOAT dMajorMapVersion ); void RegenerateSummaryInfoForAllOutdatedMaps(); void SetupItemDetailsMode( BOOLEAN fAllowRecursion ); @@ -214,9 +214,9 @@ extern INT16 gsSelSectorY; // symbol already declared globally in AI Viewer.cpp //summary is going to be persistant or not. UINT32 giInitTimer; -UINT16 gszFilename[40]; -UINT16 gszTempFilename[21]; -UINT16 gszDisplayName[21]; +CHAR16 gszFilename[40]; +CHAR16 gszTempFilename[21]; +CHAR16 gszDisplayName[21]; void CalculateOverrideStatus(); @@ -499,7 +499,7 @@ void DestroySummaryWindow() void RenderSectorInformation() { - //wchar_t str[ 100 ]; + //CHAR16 str[ 100 ]; MAPCREATE_STRUCT *m; SUMMARYFILE *s; UINT8 ePoints = 0; @@ -677,7 +677,7 @@ void RenderItemDetails() FLOAT dAvgExistChance, dAvgStatus; OBJECTTYPE *pItem; INT32 index, i; - wchar_t str[100]; + CHAR16 str[100]; UINT32 uiQuantity, uiExistChance, uiStatus; UINT32 uiTriggerQuantity[8], uiActionQuantity[8], uiTriggerExistChance[8], uiActionExistChance[8]; UINT32 xp, yp; @@ -1025,7 +1025,7 @@ void RenderSummaryWindow() SetFontShadow( FONT_NEARBLACK ); if( gfGlobalSummaryExists ) { - wchar_t str[100]; + CHAR16 str[100]; BOOLEAN fSectorSummaryExists = FALSE; if( gusNumEntriesWithOutdatedOrNoSummaryInfo && !gfOutdatedDenied ) { @@ -1379,7 +1379,7 @@ void RenderSummaryWindow() } for( x = 1; x <= 16; x++ ) { - wchar_t str[3]; + CHAR16 str[3]; swprintf( str, L"%d", x ); mprintf( MAP_LEFT+x*13-(13+StringPixLength( str, SMALLCOMPFONT ))/2, MAP_TOP-8, str ); } @@ -1402,7 +1402,7 @@ void RenderSummaryWindow() if( gfRenderProgress ) { UINT8 ubNumUndergroundLevels; - wchar_t str[2]; + CHAR16 str[2]; for( y = 0; y < 16; y++ ) { ClipRect.iTop = MAP_TOP + y*13; @@ -1526,11 +1526,11 @@ void RenderSummaryWindow() } } -void UpdateSectorSummary( UINT16 *gszFilename, BOOLEAN fUpdate ) +void UpdateSectorSummary( STR16 gszFilename, BOOLEAN fUpdate ) { - wchar_t str[50]; - UINT8 szCoord[40]; - UINT16 *ptr; + CHAR16 str[50]; + CHAR8 szCoord[40]; + STR16 ptr; INT16 x, y; gfRenderSummary = TRUE; @@ -1637,7 +1637,7 @@ void UpdateSectorSummary( UINT16 *gszFilename, BOOLEAN fUpdate ) CreateProgressBar( 0, iScreenWidthOffset + 250, iScreenHeightOffset + 200, iScreenWidthOffset + 390, iScreenHeightOffset + 210 ); } - sprintf( (char *)szCoord, "%S", gszFilename ); + sprintf( szCoord, "%S", gszFilename ); if( gsSectorX > 9 ) szCoord[3] = '\0'; else @@ -2088,8 +2088,8 @@ void SummaryLoadMapCallback( GUI_BUTTON *btn, INT32 reason ) { if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) { - UINT16 *ptr; - wchar_t str[ 50 ]; + STR16 ptr; + CHAR16 str[ 50 ]; gfRenderSummary = TRUE; SetFont( FONT10ARIAL ); @@ -2145,9 +2145,9 @@ void SummarySaveMapCallback( GUI_BUTTON *btn, INT32 reason ) { if( gubOverrideStatus == READONLY ) { - UINT8 filename[40]; - sprintf( (char *)filename, "MAPS\\%S", gszDisplayName ); - FileClearAttributes( (STR)filename ); + CHAR8 filename[40]; + sprintf( filename, "MAPS\\%S", gszDisplayName ); + FileClearAttributes( filename ); } if( ExternalSaveMap( gszDisplayName ) ) { @@ -2232,8 +2232,8 @@ void LoadGlobalSummary() UINT32 uiNumBytesRead; FLOAT dMajorVersion; INT32 x,y; - UINT8 szFilename[40]; - UINT8 szSector[6]; + CHAR8 szFilename[40]; + CHAR8 szSector[6]; OutputDebugString( "Executing LoadGlobalSummary()...\n" ); @@ -2269,12 +2269,12 @@ void LoadGlobalSummary() for( x = 0; x < 16; x++ ) { gbSectorLevels[x][y] = 0; - sprintf( (char *)szSector, "%c%d", 'A' + y, x + 1 ); + sprintf( szSector, "%c%d", 'A' + y, x + 1 ); //main ground level - sprintf( (char *)szFilename, "%c%d.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2285,13 +2285,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s.sum", szSector ); + FileDelete( szFilename ); } //main B1 level - sprintf( (char *)szFilename, "%c%d_b1.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b1.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2302,13 +2302,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b1.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b1.sum", szSector ); + FileDelete( szFilename ); } //main B2 level - sprintf( (char *)szFilename, "%c%d_b2.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b2.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2319,13 +2319,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b2.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b2.sum", szSector ); + FileDelete( szFilename ); } //main B3 level - sprintf( (char *)szFilename, "%c%d_b3.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b3.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2336,13 +2336,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b3.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b3.sum", szSector ); + FileDelete( szFilename ); } //alternate ground level - sprintf( (char *)szFilename, "%c%d_a.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_a.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2353,13 +2353,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_a.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_a.sum", szSector ); + FileDelete( szFilename ); } //alternate B1 level - sprintf( (char *)szFilename, "%c%d_b1_a.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b1_a.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2370,13 +2370,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b1_a.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b1_a.sum", szSector ); + FileDelete( szFilename ); } //alternate B2 level - sprintf( (char *)szFilename, "%c%d_b2_a.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b2_a.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2387,13 +2387,13 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b2_a.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b2_a.sum", szSector ); + FileDelete( szFilename ); } //alternate B3 level - sprintf( (char *)szFilename, "%c%d_b3_a.dat", 'A' + y, x + 1 ); + sprintf( szFilename, "%c%d_b3_a.dat", 'A' + y, x + 1 ); SetFileManCurrentDirectory( MapsDir ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); SetFileManCurrentDirectory( DevInfoDir ); if( hfile ) { @@ -2404,8 +2404,8 @@ void LoadGlobalSummary() } else { - sprintf( (char *)szFilename, "%s_b3_a.sum", szSector ); - FileDelete( (STR)szFilename ); + sprintf( szFilename, "%s_b3_a.sum", szSector ); + FileDelete( szFilename ); } } OutputDebugString( (LPCSTR)String("Sector Row %c complete... \n", y + 'A') ); @@ -2462,7 +2462,7 @@ void GenerateSummaryList() //SetFileManCurrentDirectory( Dir ); } -void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo ) +void WriteSectorSummaryUpdate( STR8 puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo ) { FILE *fp; STRING512 DataDir; @@ -2486,7 +2486,7 @@ void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *p sprintf( ptr, ".sum" ); //write the summary information - fp = fopen( (const char *)puiFilename, "wb" ); + fp = fopen( puiFilename, "wb" ); Assert( fp ); fwrite( pSummaryFileInfo, 1, sizeof( SUMMARYFILE ), fp ); fclose( fp ); @@ -2546,17 +2546,17 @@ void SummaryNewCaveLevelCallback( GUI_BUTTON *btn, INT32 reason ) } } -void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion ) +void LoadSummary( STR8 pSector, UINT8 ubLevel, FLOAT dMajorMapVersion ) { - UINT8 filename[40]; + CHAR8 filename[40]; SUMMARYFILE temp; INT32 x, y; FILE *fp; - sprintf( (char *)filename, (const char *)pSector ); + sprintf( filename, pSector ); if( ubLevel % 4 ) { - UINT8 str[4]; - sprintf( (char *)str, "_b%d", ubLevel % 4 ); + CHAR8 str[4]; + sprintf( str, "_b%d", ubLevel % 4 ); strcat( filename, str ); } if( ubLevel >= 4 ) @@ -2565,7 +2565,7 @@ void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion ) } strcat( filename, ".sum" ); - fp = fopen( (const char *)filename, "rb" ); + fp = fopen( filename, "rb" ); if( !fp ) { gusNumEntriesWithOutdatedOrNoSummaryInfo++; @@ -2620,11 +2620,11 @@ void UpdateMasterProgress() } } -void ReportError( UINT8 *pSector, UINT8 ubLevel ) +void ReportError( STR8 pSector, UINT8 ubLevel ) { static INT32 yp = iScreenHeightOffset + 180; - wchar_t str[40]; - UINT16 temp[10]; + CHAR16 str[40]; + CHAR16 temp[10]; //Make sure the file exists... if not, then return false swprintf( str, L"%S", pSector ); @@ -2642,7 +2642,7 @@ void ReportError( UINT8 *pSector, UINT8 ubLevel ) void RegenerateSummaryInfoForAllOutdatedMaps() { INT32 x, y; - UINT8 str[40]; + CHAR8 str[40]; SUMMARYFILE *pSF; //CreateProgressBar( 0, 20, 120, 300, 132 ); //slave (individual) //CreateProgressBar( 1, 20, 100, 300, 112 ); //master (total) @@ -2659,7 +2659,7 @@ void RegenerateSummaryInfoForAllOutdatedMaps() for( y = 0; y < 16; y++ ) for( x = 0; x < 16; x++ ) { - sprintf( (char *)str, "%c%d", y + 'A', x + 1 ); + sprintf( str, "%c%d", y + 'A', x + 1 ); if( gbSectorLevels[x][y] & GROUND_LEVEL_MASK ) { pSF = gpSectorSummary[x][y][0]; @@ -2726,7 +2726,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason ) { if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) { - UINT8 str[40]; + CHAR8 str[40]; CreateProgressBar( 0, iScreenWidthOffset + 20, iScreenHeightOffset + 100, iScreenWidthOffset + 300, iScreenHeightOffset + 112 ); //slave (individual) DefineProgressBarPanel( 0, 65, 79, 94, iScreenWidthOffset + 10, iScreenHeightOffset + 80, iScreenWidthOffset + 310, iScreenHeightOffset + 132 ); SetProgressBarTitle( 0, L"Generating map summary", BLOCKFONT2, FONT_RED, FONT_NEARBLACK ); @@ -2738,7 +2738,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason ) gpCurrentSectorSummary = NULL; } - sprintf( (char *)str, "%c%d", gsSelSectorY + 'A' - 1, gsSelSectorX ); + sprintf( str, "%c%d", gsSelSectorY + 'A' - 1, gsSelSectorX ); EvaluateWorld( str, (UINT8)giCurrLevel ); gpSectorSummary[ gsSelSectorX ][ gsSelSectorY ][ giCurrLevel ] = gpCurrentSectorSummary; @@ -2751,7 +2751,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason ) void ExtractTempFilename() { - wchar_t str[40]; + CHAR16 str[40]; Get16BitStringFromField( 1, str ); if( wcscmp( gszTempFilename, str ) ) { @@ -2766,8 +2766,8 @@ void ExtractTempFilename() void ApologizeOverrideAndForceUpdateEverything() { INT32 x, y; - wchar_t str[ 50 ]; - UINT8 name[50]; + CHAR16 str[ 50 ]; + CHAR8 name[50]; SUMMARYFILE *pSF; //Create one huge assed button gfMajorUpdate = TRUE; @@ -2801,7 +2801,7 @@ void ApologizeOverrideAndForceUpdateEverything() for( y = 0; y < 16; y++ ) for( x = 0; x < 16; x++ ) { - sprintf( (char *)name, "%c%d", y + 'A', x + 1 ); + sprintf( name, "%c%d", y + 'A', x + 1 ); if( gbSectorLevels[x][y] & GROUND_LEVEL_MASK ) { pSF = gpSectorSummary[x][y][0]; @@ -2884,7 +2884,7 @@ void ApologizeOverrideAndForceUpdateEverything() } } - EvaluateWorld( (UINT8 *)"p3_m.dat", 0 ); + EvaluateWorld( "p3_m.dat", 0 ); RemoveProgressBar( 2 ); gfUpdatingNow = FALSE; @@ -2901,7 +2901,7 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion ) HWFILE hfile; UINT32 uiNumBytesRead; UINT32 uiNumItems; - UINT8 szFilename[40]; + CHAR8 szFilename[40]; BASIC_SOLDIERCREATE_STRUCT basic; SOLDIERCREATE_STRUCT priority; INT32 i, j; @@ -2937,8 +2937,8 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion ) gpCurrentSectorSummary = gpSectorSummary[ gsSelSectorX - 1 ][ gsSelSectorY - 1 ][ giCurrLevel ]; } //Open the original map for the sector - sprintf( (char *)szFilename, "MAPS\\%S", gszFilename ); - hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + sprintf( szFilename, "MAPS\\%S", gszFilename ); + hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); if( !hfile ) { //The file couldn't be found! return; diff --git a/Editor/Sector Summary.h b/Editor/Sector Summary.h index 21edc63f..b4130e01 100644 --- a/Editor/Sector Summary.h +++ b/Editor/Sector Summary.h @@ -14,7 +14,7 @@ void DestroySummaryWindow(); void RenderSummaryWindow(); void LoadWorldInfo(); -void UpdateSectorSummary( wchar_t *gszFilename, BOOLEAN fUpdate ); +void UpdateSectorSummary( STR16 gszFilename, BOOLEAN fUpdate ); void SaveGlobalSummary(); void LoadGlobalSummary(); diff --git a/Editor/Summary Info.h b/Editor/Summary Info.h index fa85744b..2009c1ec 100644 --- a/Editor/Summary Info.h +++ b/Editor/Summary Info.h @@ -97,9 +97,9 @@ typedef struct SUMMARYFILE extern BOOLEAN gfAutoLoadA9; -extern BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel ); +extern BOOLEAN EvaluateWorld( STR8 pSector, UINT8 ubLevel ); -extern void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo ); +extern void WriteSectorSummaryUpdate( STR8 puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo ); extern BOOLEAN gfMustForceUpdateAllMaps; extern BOOLEAN gfMajorUpdate; diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 8ae1b184..df46184a 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -119,7 +119,7 @@ BOOLEAN gfConfirmExitPending = FALSE; BOOLEAN gfIntendOnEnteringEditor = FALSE; //original -extern UINT8 gubFilename[ 200 ]; +extern CHAR8 gubFilename[ 200 ]; INT16 gsBanksSubIndex = 0; INT16 gsOldBanksSubIndex = 1; INT16 gsCliffsSubIndex = 0; @@ -3540,7 +3540,7 @@ void ProcessAreaSelection( BOOLEAN fWithLeftButton ) gubMaxRoomNumber++; if( iCurrentTaskbar == TASK_BUILDINGS && TextInputMode() ) { - wchar_t str[4]; + CHAR16 str[4]; swprintf( str, L"%d", gubCurrRoomNumber ); SetInputFieldStringWith16BitString( 1, str ); SetActiveField( 0 ); @@ -3816,7 +3816,7 @@ void UpdateLastActionBeforeLeaving() void ReloadMap() { - UINT16 szFilename[30]; + CHAR16 szFilename[30]; swprintf( szFilename, L"%S", gubFilename ); ExternalLoadMap( szFilename ); } diff --git a/Editor/messagebox.cpp b/Editor/messagebox.cpp index 10cfaf00..ab8d8b3b 100644 --- a/Editor/messagebox.cpp +++ b/Editor/messagebox.cpp @@ -29,7 +29,7 @@ UINT8 gubMessageBoxStatus = MESSAGEBOX_NONE; void MsgBoxOkClkCallback( GUI_BUTTON *butn, INT32 reason ); void MsgBoxCnclClkCallback( GUI_BUTTON *butn, INT32 reason ); -void CreateMessageBox( UINT16 *wzString ) +void CreateMessageBox( STR16 wzString ) { INT16 sPixLen; INT16 sStartX, sStartY; diff --git a/Editor/messagebox.h b/Editor/messagebox.h index d13bfec0..02715683 100644 --- a/Editor/messagebox.h +++ b/Editor/messagebox.h @@ -14,7 +14,7 @@ enum extern UINT8 gubMessageBoxStatus; extern BOOLEAN gfMessageBoxResult; -void CreateMessageBox( wchar_t *wzString ); +void CreateMessageBox( STR16 wzString ); BOOLEAN MessageBoxHandled(); void RemoveMessageBox(); diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index ac84d70a..30cad810 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -46,11 +46,11 @@ MOUSE_REGION popupRegion; UINT16 gusEntryHeight; BOOLEAN fWaitingForLButtonRelease = FALSE; -extern UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20]; +extern CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20]; //Finds the string for any popup menu in JA2 -- the strings are stored //in different ways in each instance. -INT16* GetPopupMenuString( UINT8 ubIndex ) +STR16 GetPopupMenuString( UINT8 ubIndex ) { switch( gPopup.ubPopupMenuID ) { @@ -58,11 +58,11 @@ INT16* GetPopupMenuString( UINT8 ubIndex ) return gTilesets[ ubIndex ].zName; case OWNERSHIPGROUP_POPUP: //civilian groups case CHANGECIVGROUP_POPUP: //civilian groups - return (INT16 *)gszCivGroupNames[ ubIndex ]; + return gszCivGroupNames[ ubIndex ]; case SCHEDULEACTION_POPUP: //setting scheduling actions - return (INT16 *)gszScheduleActions[ ubIndex ]; + return gszScheduleActions[ ubIndex ]; case ACTIONITEM_POPUP: - return (INT16 *)gszActionItemDesc[ ubIndex ]; + return gszActionItemDesc[ ubIndex ]; default: return 0; } diff --git a/Editor/popupmenu.h b/Editor/popupmenu.h index 3b4fde55..57baca0d 100644 --- a/Editor/popupmenu.h +++ b/Editor/popupmenu.h @@ -85,7 +85,7 @@ typedef struct currentPopupMenuInformation{ //A global var that keeps the popup menu information. extern CurrentPopupMenuInformation gPopup; -extern wchar_t *popupMenuStrings[5]; +extern STR16 popupMenuStrings[5]; //These are the two main functions that outside users would call. void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection ); diff --git a/Editor/selectwin.h b/Editor/selectwin.h index 4eb9cd21..ac010940 100644 --- a/Editor/selectwin.h +++ b/Editor/selectwin.h @@ -86,7 +86,7 @@ typedef struct }; struct { - wchar_t * pString; + STR16 pString; }; }; } diff --git a/GameInitOptionsScreen.cpp b/GameInitOptionsScreen.cpp index 8392ac64..7f6f5323 100644 --- a/GameInitOptionsScreen.cpp +++ b/GameInitOptionsScreen.cpp @@ -240,7 +240,7 @@ void DoneFadeOutForExitGameInitOptionScreen( void ); void DoneFadeInForExitGameInitOptionScreen( void ); // JA2Gold: no more timed turns setting //UINT8 GetCurrentTimedTurnsButtonSetting(); -BOOLEAN DoGioMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +BOOLEAN DoGioMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); void DisplayMessageToUserAboutGameDifficulty(); void ConfirmGioDifSettingMessageBoxCallBack( UINT8 bExitValue ); BOOLEAN DisplayMessageToUserAboutIronManMode(); @@ -1276,7 +1276,7 @@ void DoneFadeInForExitGameInitOptionScreen( void ) } -BOOLEAN DoGioMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +BOOLEAN DoGioMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1 }; diff --git a/GameVersion.cpp b/GameVersion.cpp index 5f17dfa8..86fb57de 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,23 +13,23 @@ #ifdef JA2BETAVERSION //BETA/TEST BUILD VERSION -wchar_t zVersionLabel[256] = { L"Map Editor v1.13.857" }; +CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.857" }; #elif defined CRIPPLED_VERSION //RELEASE BUILD VERSION -wchar_t zVersionLabel[256] = { L"Beta v. 0.98" }; +CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - wchar_t zVersionLabel[256] = { L"Release v1.13.870" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.871" }; #endif -INT8 czVersionNumber[16] = { "Build 07.04.19" }; //YY.MM.DD -wchar_t zTrackingNumber[16] = { L"Z" }; +CHAR8 czVersionNumber[16] = { "Build 07.04.19" }; //YY.MM.DD +CHAR16 zTrackingNumber[16] = { L"Z" }; // diff --git a/GameVersion.h b/GameVersion.h index a8e789aa..8b2b9508 100644 --- a/GameVersion.h +++ b/GameVersion.h @@ -11,9 +11,9 @@ extern "C" { // Keeps track of the game version // -extern wchar_t zVersionLabel[256]; -extern INT8 czVersionNumber[16]; -extern wchar_t zTrackingNumber[16]; +extern CHAR16 zVersionLabel[256]; +extern CHAR8 czVersionNumber[16]; +extern CHAR16 zTrackingNumber[16]; diff --git a/Init.cpp b/Init.cpp index 4fd872f2..5538f6bd 100644 --- a/Init.cpp +++ b/Init.cpp @@ -509,7 +509,7 @@ UINT32 InitializeJA2(void) #endif #ifdef JA2BETAVERSION - if( ProcessIfMultilingualCmdLineArgDetected( (UINT8 *)gzCommandLine ) ) + if( ProcessIfMultilingualCmdLineArgDetected( gzCommandLine ) ) { //If the multilingual text code generator has activated, quit now. gfProgramIsRunning = FALSE; return( INIT_SCREEN ); @@ -539,7 +539,7 @@ UINT32 InitializeJA2(void) { OutputDebugString( "Beginning JA2 using -EDITORAUTO commandline argument...\n" ); //For editor purposes, need to know the default map file. - sprintf( (char *)gubFilename, "none"); + sprintf( gubFilename, "none"); //also set the sector gWorldSectorX = 0; gWorldSectorY = 0; @@ -553,7 +553,7 @@ UINT32 InitializeJA2(void) { OutputDebugString( "Beginning JA2 using -EDITOR commandline argument...\n" ); //For editor purposes, need to know the default map file. - sprintf( (char *)gubFilename, "none"); + sprintf( gubFilename, "none"); //also set the sector gWorldSectorX = 0; gWorldSectorY = 0; diff --git a/JA2.suo b/JA2.suo index b1c4d602..c800e673 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/JA2.vcproj b/JA2.vcproj index 73561fab..ed8c5752 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -546,7 +546,7 @@ 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 diff --git a/Laptop/AimMembers.h b/Laptop/AimMembers.h index 8944d4bd..eb8d9670 100644 --- a/Laptop/AimMembers.h +++ b/Laptop/AimMembers.h @@ -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(); diff --git a/Laptop/AimPolicies.cpp b/Laptop/AimPolicies.cpp index 53dbd65f..64b03e4f 100644 --- a/Laptop/AimPolicies.cpp +++ b/Laptop/AimPolicies.cpp @@ -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; diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index 04cf8366..e396a94c 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -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 diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index 1fb918da..19808d00 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -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 diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index b52dc8b0..39fb9bda 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -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); diff --git a/Laptop/aim.cpp b/Laptop/aim.cpp index 2806b8f6..73743ae3 100644 --- a/Laptop/aim.cpp +++ b/Laptop/aim.cpp @@ -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; diff --git a/Laptop/email.cpp b/Laptop/email.cpp index c7254ba5..d6b951e9 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -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 diff --git a/Laptop/files.cpp b/Laptop/files.cpp index e4d934e6..e1efb2c1 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -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; diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index 62cfb582..457960a5 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -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 *); -template -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 *); -template -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 ] diff --git a/Laptop/finances.h b/Laptop/finances.h index 29246b9f..b6559a57 100644 --- a/Laptop/finances.h +++ b/Laptop/finances.h @@ -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 -void InsertDollarSignInToString( string1 pString ); -template -void InsertCommasForDollarFigure( string1 pString ); +void InsertDollarSignInToString( STR16 pString ); +void InsertCommasForDollarFigure( STR16 pString ); INT32 GetTodaysDaysIncome( void ); INT32 GetProjectedTotalDailyIncome( void ); diff --git a/Laptop/florist Cards.cpp b/Laptop/florist Cards.cpp index f9ce12d3..c7fe46fa 100644 --- a/Laptop/florist Cards.cpp +++ b/Laptop/florist Cards.cpp @@ -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; diff --git a/Laptop/florist Gallery.cpp b/Laptop/florist Gallery.cpp index 92863711..6a22fd2e 100644 --- a/Laptop/florist Gallery.cpp +++ b/Laptop/florist Gallery.cpp @@ -359,7 +359,7 @@ void DeleteFlowerButtons() BOOLEAN DisplayFloralDescriptions() { - wchar_t sTemp[ 640 ]; + CHAR16 sTemp[ 640 ]; UINT32 uiStartLoc=0, i; UINT16 usPosY, usPrice; diff --git a/Laptop/florist Order Form.cpp b/Laptop/florist Order Form.cpp index e938f79b..1bb7dbcd 100644 --- a/Laptop/florist Order Form.cpp +++ b/Laptop/florist Order Form.cpp @@ -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(); diff --git a/Laptop/history.cpp b/Laptop/history.cpp index 9bc274ed..e0bb949f 100644 --- a/Laptop/history.cpp +++ b/Laptop/history.cpp @@ -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]; diff --git a/Laptop/insurance Comments.cpp b/Laptop/insurance Comments.cpp index db0211ea..9dd6431c 100644 --- a/Laptop/insurance Comments.cpp +++ b/Laptop/insurance Comments.cpp @@ -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; diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp index dd7659c2..d931f633 100644 --- a/Laptop/insurance Contract.cpp +++ b/Laptop/insurance Contract.cpp @@ -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 ) diff --git a/Laptop/insurance Info.cpp b/Laptop/insurance Info.cpp index 1f61393e..5a3d00a0 100644 --- a/Laptop/insurance Info.cpp +++ b/Laptop/insurance Info.cpp @@ -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; diff --git a/Laptop/insurance.cpp b/Laptop/insurance.cpp index 91124717..cc22f122 100644 --- a/Laptop/insurance.cpp +++ b/Laptop/insurance.cpp @@ -148,7 +148,7 @@ void HandleInsurance() void RenderInsurance() { - wchar_t sText[800]; + CHAR16 sText[800]; HVOBJECT hPixHandle; DisplayInsuranceDefaults(); diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index 23d8d8c0..808535c6 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -4439,12 +4439,7 @@ void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason ) return; } -template BOOLEAN DoLapTopMessageBox(UINT8, wchar_t *, UINT32, UINT8, MSGBOX_CALLBACK); -template BOOLEAN DoLapTopMessageBox(UINT8, wchar_t const *, UINT32, UINT8, MSGBOX_CALLBACK); -template BOOLEAN DoLapTopMessageBox(UINT8, unsigned short *, UINT32, UINT8, MSGBOX_CALLBACK); -template BOOLEAN DoLapTopMessageBox(UINT8, unsigned short const *, UINT32, UINT8, MSGBOX_CALLBACK); -template -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 }; diff --git a/Laptop/laptop.h b/Laptop/laptop.h index 482c10ba..95abffcd 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -29,15 +29,14 @@ UINT32 DrawLapTopIcons( ); void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason ); void HandleRightButtonUpEvent( void ); -template -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(); diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index 066de720..8fb8085b 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -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; diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index 89cd1d20..b3c55757 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -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; diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index 603f6dee..faafec04 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -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; diff --git a/Laptop/mercs.h b/Laptop/mercs.h index a13bc457..b19a2748 100644 --- a/Laptop/mercs.h +++ b/Laptop/mercs.h @@ -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 ); diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index a221035c..9cd1ce13 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -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; diff --git a/MessageBoxScreen.cpp b/MessageBoxScreen.cpp index 3b20d4c3..5fd35538 100644 --- a/MessageBoxScreen.cpp +++ b/MessageBoxScreen.cpp @@ -74,12 +74,7 @@ extern STR16 pUpdatePanelButtons[]; CHAR16 gzUserDefinedButton1[ 128 ]; CHAR16 gzUserDefinedButton2[ 128 ]; -template INT32 DoMessageBox(UINT8, unsigned short *, UINT32, UINT16, MSGBOX_CALLBACK, SGPRect *); -template INT32 DoMessageBox(UINT8, unsigned short const*, UINT32, UINT16, MSGBOX_CALLBACK, SGPRect *); -template INT32 DoMessageBox(UINT8, wchar_t *, UINT32, UINT16, MSGBOX_CALLBACK, SGPRect *); -template INT32 DoMessageBox(UINT8, wchar_t const*, UINT32, UINT16, MSGBOX_CALLBACK, SGPRect *); -template -INT32 DoMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) +INT32 DoMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) { VSURFACE_DESC vs_desc; UINT16 usTextBoxWidth; @@ -217,7 +212,7 @@ INT32 DoMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 gMsgBox.bHandled = 0; // Init message box - gMsgBox.iBoxId = PrepareMercPopupBox( iId, ubMercBoxBackground, ubMercBoxBorder, (STR16)zString, MSGBOX_DEFAULT_WIDTH, 40, 10, 30, &usTextBoxWidth, &usTextBoxHeight ); + gMsgBox.iBoxId = PrepareMercPopupBox( iId, ubMercBoxBackground, ubMercBoxBorder, zString, MSGBOX_DEFAULT_WIDTH, 40, 10, 30, &usTextBoxWidth, &usTextBoxHeight ); if( gMsgBox.iBoxId == -1 ) { @@ -1198,33 +1193,28 @@ UINT32 MessageBoxScreenShutdown( ) // a basic box that don't care what screen we came from -template void DoScreenIndependantMessageBox(wchar_t *, UINT16, MSGBOX_CALLBACK); -template void DoScreenIndependantMessageBox(wchar_t const *, UINT16, MSGBOX_CALLBACK); -template void DoScreenIndependantMessageBox(unsigned short *, UINT16, MSGBOX_CALLBACK); -template void DoScreenIndependantMessageBox(unsigned short const *, UINT16, MSGBOX_CALLBACK); -template -void DoScreenIndependantMessageBox( string1 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +void DoScreenIndependantMessageBox( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, 0, SCREEN_WIDTH, INV_INTERFACE_START_Y }; - DoScreenIndependantMessageBoxWithRect( (wchar_t *) zString, usFlags, ReturnCallback, &CenteringRect ); + DoScreenIndependantMessageBoxWithRect( zString, usFlags, ReturnCallback, &CenteringRect ); } // a basic box that don't care what screen we came from -void DoUpperScreenIndependantMessageBox( wchar_t *zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +void DoUpperScreenIndependantMessageBox( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, 0, SCREEN_WIDTH, INV_INTERFACE_START_Y / 2 }; DoScreenIndependantMessageBoxWithRect( zString, usFlags, ReturnCallback, &CenteringRect ); } // a basic box that don't care what screen we came from -void DoLowerScreenIndependantMessageBox( wchar_t * zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +void DoLowerScreenIndependantMessageBox( STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, INV_INTERFACE_START_Y / 2, SCREEN_WIDTH, INV_INTERFACE_START_Y }; DoScreenIndependantMessageBoxWithRect( zString, usFlags, ReturnCallback, &CenteringRect ); } -void DoScreenIndependantMessageBoxWithRect( wchar_t *zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) +void DoScreenIndependantMessageBoxWithRect( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) { /// which screen are we in? diff --git a/MessageBoxScreen.h b/MessageBoxScreen.h index cec4dfd1..acd91cc9 100644 --- a/MessageBoxScreen.h +++ b/MessageBoxScreen.h @@ -89,20 +89,18 @@ extern BOOLEAN gfDontOverRideSaveBuffer; // pCenteringRect Rect to send if MSG_BOX_FLAG_USE_CENTERING_RECT set. Can be NULL //////////////////////////////// -template -INT32 DoMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); -template -void DoScreenIndependantMessageBox( string1 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); -void DoUpperScreenIndependantMessageBox( wchar_t *zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +INT32 DoMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +void DoScreenIndependantMessageBox( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +void DoUpperScreenIndependantMessageBox( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); -void DoLowerScreenIndependantMessageBox( wchar_t * zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); -void DoScreenIndependantMessageBoxWithRect( wchar_t *zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +void DoLowerScreenIndependantMessageBox( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +void DoScreenIndependantMessageBoxWithRect( const STR16 zString, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); //wrappers for other screens -BOOLEAN DoLapTopSystemMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); -INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); -BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); -BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +BOOLEAN DoLapTopSystemMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); +BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ); #endif \ No newline at end of file diff --git a/Options Screen.cpp b/Options Screen.cpp index 9ff43cbb..652a0548 100644 --- a/Options Screen.cpp +++ b/Options Screen.cpp @@ -221,7 +221,7 @@ void SetOptionsExitScreen( UINT32 uiExitScreen ); void SoundFXSliderChangeCallBack( INT32 iNewValue ); void SpeechSliderChangeCallBack( INT32 iNewValue ); void MusicSliderChangeCallBack( INT32 iNewValue ); -//BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ); +//BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, STR16zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ); void ConfirmQuitToMainMenuMessageBoxCallBack( UINT8 bExitValue ); void HandleSliderBarMovementSounds(); void HandleOptionToggle( UINT8 ubButton, BOOLEAN fState, BOOLEAN fDown, BOOLEAN fPlaySound ); @@ -1136,7 +1136,7 @@ void MusicSliderChangeCallBack( INT32 iNewValue ) MusicSetVolume( iNewValue ); } -BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) +BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) { // reset exit mode gfExitOptionsDueToMessageBox = TRUE; @@ -1148,7 +1148,7 @@ BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiE return( ( giOptionsMessageBox != -1 ) ); } -BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1 }; diff --git a/Options Screen.h b/Options Screen.h index 0bed4b48..521cc8b3 100644 --- a/Options Screen.h +++ b/Options Screen.h @@ -23,7 +23,7 @@ void SetOptionsScreenToggleBoxes(); void GetOptionsScreenToggleBoxes(); -BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +BOOLEAN DoOptionsMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); #endif diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp index 487d80b9..66d68f61 100644 --- a/SaveLoadGame.cpp +++ b/SaveLoadGame.cpp @@ -477,7 +477,7 @@ BOOLEAN InitSaveDir() // The locale-specific save dir location is of the form L"..\\SavedGames" // This has not changed; instead, we strip the ".." at the beginning - sprintf( (char *) gSaveDir, "%s%S", dataDir.c_str(), pMessageStrings[ MSG_SAVEDIRECTORY ] + 2 ); + sprintf( gSaveDir, "%s%S", dataDir.c_str(), pMessageStrings[ MSG_SAVEDIRECTORY ] + 2 ); // This was moved here from SaveGame //Check to see if the save directory exists @@ -509,7 +509,7 @@ BOOLEAN SaveGame( UINT8 ubSaveGameID, STR16 pGameDesc ) BOOLEAN fWePausedIt = FALSE; - //sprintf( (char *) saveDir, "%S", pMessageStrings[ MSG_SAVEDIRECTORY ] ); + //sprintf( saveDir, "%S", pMessageStrings[ MSG_SAVEDIRECTORY ] ); #ifdef JA2BETAVERSION #ifndef CRIPPLED_VERSION @@ -3632,10 +3632,10 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile ) } //allocate space for the subject - pData = (UINT8 *) MemAlloc( EMAIL_SUBJECT_LENGTH * sizeof( wchar_t ) ); + pData = (UINT8 *) MemAlloc( EMAIL_SUBJECT_LENGTH * sizeof( CHAR16 ) ); if( pData == NULL ) return( FALSE ); - memset( pData, 0, EMAIL_SUBJECT_LENGTH * sizeof( wchar_t ) ); + memset( pData, 0, EMAIL_SUBJECT_LENGTH * sizeof( CHAR16 ) ); //Get the subject FileRead( hFile, pData, uiSizeOfSubject, &uiNumBytesRead ); diff --git a/SaveLoadGame.h b/SaveLoadGame.h index c4ad6593..9836fba6 100644 --- a/SaveLoadGame.h +++ b/SaveLoadGame.h @@ -16,7 +16,7 @@ typedef struct { UINT32 uiSavedGameVersion; - INT8 zGameVersionNumber[ GAME_VERSION_LENGTH ]; + CHAR8 zGameVersionNumber[ GAME_VERSION_LENGTH ]; CHAR16 sSavedGameDesc[ SIZE_OF_SAVE_GAME_DESC ]; diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp index baaaaa82..8b328fe4 100644 --- a/SaveLoadScreen.cpp +++ b/SaveLoadScreen.cpp @@ -175,7 +175,7 @@ UINT32 guiBackGroundAddOns; // The string that will contain the game desc text -wchar_t gzGameDescTextField[ SIZE_OF_SAVE_GAME_DESC ] = {0} ; +CHAR16 gzGameDescTextField[ SIZE_OF_SAVE_GAME_DESC ] = {0} ; BOOLEAN gfUserInTextInputMode = FALSE; @@ -1114,7 +1114,7 @@ void SaveLoadGameNumber( INT8 bSaveGameID ) } -BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) +BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) { // do message box and return giSaveLoadMessageBox = DoMessageBox( ubStyle, zString, uiExitScreen, ( UINT8 ) ( usFlags| MSG_BOX_FLAG_USE_CENTERING_RECT ), ReturnCallback, pCenteringRect ); @@ -1123,8 +1123,7 @@ BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 ui return( ( giSaveLoadMessageBox != -1 ) ); } -template -BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect CenteringRect= {0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1 }; @@ -2051,7 +2050,7 @@ void DeleteSaveGameNumber( UINT8 ubSaveGameSlotID ) void DisplayOnScreenNumber( BOOLEAN fErase ) { - wchar_t zTempString[16]; + CHAR16 zTempString[16]; UINT16 usPosX = 6; UINT16 usPosY; INT8 bLoopNum; diff --git a/SaveLoadScreen.h b/SaveLoadScreen.h index 3e23f77b..53609b42 100644 --- a/SaveLoadScreen.h +++ b/SaveLoadScreen.h @@ -23,9 +23,8 @@ UINT32 SaveLoadScreenShutdown( void ); UINT32 SaveLoadScreenHandle( void ); UINT32 SaveLoadScreenInit( void ); -template //Kaiden : Trying to get Editor to work -extern BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +extern BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); BOOLEAN InitSaveGameArray(); diff --git a/Standard Gaming Platform/Button System.cpp b/Standard Gaming Platform/Button System.cpp index 861977c9..b20e2dbe 100644 --- a/Standard Gaming Platform/Button System.cpp +++ b/Standard Gaming Platform/Button System.cpp @@ -70,7 +70,7 @@ #define GUI_BTN_EXTERNAL_VOBJ 2 -UINT8 str[128]; +CHAR8 str[128]; //Kris: December 2, 1997 //Special internal debugging utilities that will ensure that you don't attempt to delete @@ -108,7 +108,7 @@ void AssertFailIfIdenticalButtonAttributesFound( GUI_BUTTON *b ) //if we get this far, it is reasonably safe to assume that the newly created //button already exists. Placing a break point on the following assert will //allow the coder to easily isolate the case! - sprintf( (char *)str, "Attempting to create a button that has already been created (existing buttonID %d).", c->IDNum ); + sprintf( str, "Attempting to create a button that has already been created (existing buttonID %d).", c->IDNum ); AssertMsg( 0, str ); } } @@ -203,10 +203,7 @@ INT32 FindFreeButtonSlot(void) // // Load images for use with QuickButtons. // -template INT32 LoadButtonImage(unsigned char *, INT32, INT32, INT32, INT32, INT32); -template INT32 LoadButtonImage(char *, INT32, INT32, INT32, INT32, INT32); -template -INT32 LoadButtonImage(type1 filename, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite) +INT32 LoadButtonImage(const STR8 filename, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite) { VOBJECT_DESC vo_desc; UINT32 UseSlot; @@ -594,7 +591,7 @@ void UnloadButtonImage(INT32 Index) if( Index < 0 || Index >= MAX_BUTTON_PICS ) { - sprintf( (char *)str, "Attempting to UnloadButtonImage with out of range index %d.", Index ); + sprintf( str, "Attempting to UnloadButtonImage with out of range index %d.", Index ); AssertMsg( 0, str ); } @@ -662,7 +659,7 @@ BOOLEAN EnableButton( INT32 iButtonID ) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to EnableButton with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to EnableButton with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); } @@ -700,7 +697,7 @@ BOOLEAN DisableButton(INT32 iButtonID ) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to DisableButton with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to DisableButton with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); } @@ -876,10 +873,7 @@ INT16 FindFreeIconSlot(void) // // Loads an image file for use as a button icon. // -template INT16 LoadGenericButtonIcon(char *); -template INT16 LoadGenericButtonIcon(char const *); -template -INT16 LoadGenericButtonIcon(string1 filename) +INT16 LoadGenericButtonIcon(const STR8 filename) { INT16 ImgSlot; VOBJECT_DESC vo_desc; @@ -916,7 +910,7 @@ BOOLEAN UnloadGenericButtonIcon(INT16 GenImg) { if( GenImg < 0 || GenImg >= MAX_BUTTON_ICONS ) { - sprintf( (char *)str, "Attempting to UnloadGenericButtonIcon with out of range index %d.", GenImg ); + sprintf( str, "Attempting to UnloadGenericButtonIcon with out of range index %d.", GenImg ); AssertMsg( 0, str ); } @@ -947,7 +941,7 @@ BOOLEAN UnloadGenericButtonImage(INT16 GenImg) BOOLEAN fDeletedSomething = FALSE; if( GenImg < 0 || GenImg >= MAX_GENERIC_PICS ) { - sprintf( (char *)str, "Attempting to UnloadGenericButtonImage with out of range index %d.", GenImg ); + sprintf( str, "Attempting to UnloadGenericButtonImage with out of range index %d.", GenImg ); AssertMsg( 0, str ); } @@ -1016,7 +1010,7 @@ BOOLEAN UnloadGenericButtonImage(INT16 GenImg) // // Loads the image files required for displaying a generic button. // -INT16 LoadGenericButtonImages(UINT8 *GrayName,UINT8 *OffNormName,UINT8 *OffHiliteName,UINT8 *OnNormName,UINT8 *OnHiliteName,UINT8 *BkGrndName,INT16 Index,INT16 OffsetX, INT16 OffsetY) +INT16 LoadGenericButtonImages(STR8 GrayName,STR8 OffNormName,STR8 OffHiliteName,STR8 OnNormName,STR8 OnHiliteName, STR8 BkGrndName,INT16 Index,INT16 OffsetX, INT16 OffsetY) { INT16 ImgSlot; VOBJECT_DESC vo_desc; @@ -1294,7 +1288,7 @@ void RemoveButton(INT32 iButtonID) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to RemoveButton with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to RemoveButton with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); } @@ -1390,7 +1384,7 @@ void ResizeButton(INT32 iButtonID,INT16 w, INT16 h) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to resize button with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to resize button with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); } @@ -1404,7 +1398,7 @@ void ResizeButton(INT32 iButtonID,INT16 w, INT16 h) if( !b ) { - sprintf( (char *)str, "Attempting to resize deleted button with buttonID %d", iButtonID ); + sprintf( str, "Attempting to resize deleted button with buttonID %d", iButtonID ); AssertMsg( 0, str ); } @@ -1449,7 +1443,7 @@ void SetButtonPosition( INT32 iButtonID ,INT16 x, INT16 y) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to set button position with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to set button position with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); } @@ -1457,7 +1451,7 @@ void SetButtonPosition( INT32 iButtonID ,INT16 x, INT16 y) if( !b ) { - sprintf( (char *)str, "Attempting to set button position with buttonID %d", iButtonID ); + sprintf( str, "Attempting to set button position with buttonID %d", iButtonID ); AssertMsg( 0, str ); } @@ -1502,13 +1496,13 @@ INT32 SetButtonIcon( INT32 iButtonID, INT16 Icon, INT16 IconIndex ) if( iButtonID < 0 || iButtonID >= MAX_BUTTONS ) { - sprintf( (char *)str, "Attempting to set button icon with out of range buttonID %d.", iButtonID ); + sprintf( str, "Attempting to set button icon with out of range buttonID %d.", iButtonID ); AssertMsg( 0, str ); return -1; } if( Icon < 0 || Icon >= MAX_BUTTON_ICONS ) { - sprintf( (char *)str, "Attempting to set button[%d] icon with out of range icon index %d.", iButtonID, Icon ); + sprintf( str, "Attempting to set button[%d] icon with out of range icon index %d.", iButtonID, Icon ); AssertMsg( 0, str ); return -1; } @@ -1517,7 +1511,7 @@ INT32 SetButtonIcon( INT32 iButtonID, INT16 Icon, INT16 IconIndex ) if( !b ) { - sprintf( (char *)str, "Attempting to set deleted button icon with buttonID %d", iButtonID ); + sprintf( str, "Attempting to set deleted button icon with buttonID %d", iButtonID ); AssertMsg( 0, str ); return -1; } @@ -1552,12 +1546,12 @@ INT32 CreateIconButton(INT16 Icon,INT16 IconIndex,INT16 GenImg,INT16 xloc,INT16 if( xloc < 0 || yloc < 0 ) { - sprintf( (char *)str, "Attempting to CreateIconButton with invalid position of %d,%d", xloc, yloc ); + sprintf( str, "Attempting to CreateIconButton with invalid position of %d,%d", xloc, yloc ); AssertMsg( 0, str ); } if( GenImg < -1 || GenImg >= MAX_GENERIC_PICS ) { - sprintf( (char *)str, "Attempting to CreateIconButton with out of range iconID %d.", GenImg ); + sprintf( str, "Attempting to CreateIconButton with out of range iconID %d.", GenImg ); AssertMsg( 0, str ); } @@ -1672,7 +1666,7 @@ INT32 CreateIconButton(INT16 Icon,INT16 IconIndex,INT16 GenImg,INT16 xloc,INT16 } //Creates a generic button with text on it. -INT32 CreateTextButton(wchar_t *string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 GenImg, INT16 xloc, INT16 yloc, INT16 w, INT16 h, INT32 Type, INT16 Priority,GUI_CALLBACK MoveCallback, GUI_CALLBACK ClickCallback) +INT32 CreateTextButton(STR16 string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 GenImg, INT16 xloc, INT16 yloc, INT16 w, INT16 h, INT32 Type, INT16 Priority,GUI_CALLBACK MoveCallback, GUI_CALLBACK ClickCallback) { GUI_BUTTON *b; INT32 ButtonNum; @@ -1680,12 +1674,12 @@ INT32 CreateTextButton(wchar_t *string, UINT32 uiFont, INT16 sForeColor, INT16 s if( xloc < 0 || yloc < 0 ) { - sprintf( (char *)str, "Attempting to CreateTextButton with invalid position of %d,%d", xloc, yloc ); + sprintf( str, "Attempting to CreateTextButton with invalid position of %d,%d", xloc, yloc ); AssertMsg( 0, str ); } if( GenImg < -1 || GenImg >= MAX_GENERIC_PICS ) { - sprintf( (char *)str, "Attempting to CreateTextButton with out of range iconID %d.", GenImg ); + sprintf( str, "Attempting to CreateTextButton with out of range iconID %d.", GenImg ); AssertMsg( 0, str ); } @@ -1716,7 +1710,7 @@ INT32 CreateTextButton(wchar_t *string, UINT32 uiFont, INT16 sForeColor, INT16 s b->string = NULL; if ( string && wcslen( string ) ) { - b->string = (wchar_t*)MemAlloc( (wcslen(string)+1)*sizeof(wchar_t) ); + b->string = (STR16) MemAlloc( (wcslen(string)+1)*sizeof(CHAR16) ); AssertMsg( b->string, "Out of memory error: Couldn't allocate string in CreateTextButton." ); wcscpy( b->string, string ); } @@ -1821,7 +1815,7 @@ INT32 CreateHotSpot(INT16 xloc, INT16 yloc, INT16 Width, INT16 Height,INT16 Prio if( xloc < 0 || yloc < 0 || Width < 0 || Height < 0 ) { - sprintf( (char *)str, "Attempting to CreateHotSpot with invalid coordinates: %d,%d, width: %d, and height: %d.", + sprintf( str, "Attempting to CreateHotSpot with invalid coordinates: %d,%d, width: %d, and height: %d.", xloc, yloc, Width, Height ); AssertMsg( 0, str ); } @@ -1928,12 +1922,12 @@ INT32 QuickCreateButton(UINT32 Image,INT16 xloc,INT16 yloc,INT32 Type,INT16 Prio if( xloc < 0 || yloc < 0 ) { - sprintf( (char *)str, "Attempting to QuickCreateButton with invalid position of %d,%d", xloc, yloc ); + sprintf( str, "Attempting to QuickCreateButton with invalid position of %d,%d", xloc, yloc ); AssertMsg( 0, str ); } if( Image < 0 || Image >= MAX_BUTTON_PICS ) { - sprintf( (char *)str, "Attempting to QuickCreateButton with out of range ImageID %d.", Image ); + sprintf( str, "Attempting to QuickCreateButton with out of range ImageID %d.", Image ); AssertMsg( 0, str ); } @@ -2063,43 +2057,29 @@ INT32 QuickCreateButton(UINT32 Image,INT16 xloc,INT16 yloc,INT32 Type,INT16 Prio //loading, and deleting of the image. The size of the image determines the size of the button. It also uses //the default move callback which emulates Win95. Finally, it sets the priority to normal. The function you //choose also determines the type of button (toggle, notoggle, or newtoggle) -template INT32 CreateEasyNoToggleButton(INT32, INT32, char *, GUI_CALLBACK); -template INT32 CreateEasyNoToggleButton(INT32, INT32, char const *, GUI_CALLBACK); -template -INT32 CreateEasyNoToggleButton ( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ) +INT32 CreateEasyNoToggleButton ( INT32 x, INT32 y, const STR8 filename, GUI_CALLBACK ClickCallback ) { return CreateSimpleButton( x, y, filename, BUTTON_NO_TOGGLE, MSYS_PRIORITY_NORMAL, ClickCallback ); } -template INT32 CreateEasyToggleButton(INT32, INT32, char *, GUI_CALLBACK); -template INT32 CreateEasyToggleButton(INT32, INT32, char const *, GUI_CALLBACK); -template -INT32 CreateEasyToggleButton ( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ) +INT32 CreateEasyToggleButton ( INT32 x, INT32 y, const STR8 filename, GUI_CALLBACK ClickCallback ) { return CreateSimpleButton( x, y, filename, BUTTON_TOGGLE, MSYS_PRIORITY_NORMAL, ClickCallback ); } -template INT32 CreateEasyNewToggleButton(INT32, INT32, char const *, GUI_CALLBACK); -template INT32 CreateEasyNewToggleButton(INT32, INT32, short *, GUI_CALLBACK); -template -INT32 CreateEasyNewToggleButton( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ) +INT32 CreateEasyNewToggleButton( INT32 x, INT32 y, const STR8 filename, GUI_CALLBACK ClickCallback ) { return CreateSimpleButton( x, y, filename, BUTTON_NEWTOGGLE, MSYS_PRIORITY_NORMAL, ClickCallback ); } //Same as above, but accepts specify toggle type -template INT32 CreateEasyButton(INT32, INT32, short *, INT32, GUI_CALLBACK); -template -INT32 CreateEasyButton( INT32 x, INT32 y, string3 filename, INT32 Type, GUI_CALLBACK ClickCallback) +INT32 CreateEasyButton( INT32 x, INT32 y, const STR8 filename, INT32 Type, GUI_CALLBACK ClickCallback) { return CreateSimpleButton( x, y, filename, Type, MSYS_PRIORITY_NORMAL, ClickCallback ); } //Same as above, but accepts priority specification. -template INT32 CreateSimpleButton(INT32, INT32, char *, INT32, INT16, GUI_CALLBACK); -template INT32 CreateSimpleButton(INT32, INT32, char const *, INT32, INT16, GUI_CALLBACK); -template -INT32 CreateSimpleButton( INT32 x, INT32 y, string3 filename, INT32 Type, INT16 Priority, GUI_CALLBACK ClickCallback ) +INT32 CreateSimpleButton( INT32 x, INT32 y, const STR8 filename, INT32 Type, INT16 Priority, GUI_CALLBACK ClickCallback ) { INT32 ButPic,ButNum; @@ -2123,13 +2103,7 @@ INT32 CreateSimpleButton( INT32 x, INT32 y, string3 filename, INT32 Type, INT16 return( ButNum ); } -template INT32 CreateIconAndTextButton(INT32, wchar_t const *, UINT32, INT16, INT16, INT16, INT16, INT8, INT16, INT16, INT32, INT16, GUI_CALLBACK, GUI_CALLBACK); -template INT32 CreateIconAndTextButton(INT32, wchar_t *, UINT32, INT16, INT16, INT16, INT16, INT8, INT16, INT16, INT32, INT16, GUI_CALLBACK, GUI_CALLBACK); -template INT32 CreateIconAndTextButton(INT32, unsigned short const *, UINT32, INT16, INT16, INT16, INT16, INT8, INT16, INT16, INT32, INT16, GUI_CALLBACK, GUI_CALLBACK); -template INT32 CreateIconAndTextButton(INT32, unsigned short *, UINT32, INT16, INT16, INT16, INT16, INT8, INT16, INT16, INT32, INT16, GUI_CALLBACK, GUI_CALLBACK); -template INT32 CreateIconAndTextButton(INT32, short *, UINT32, INT16, INT16, INT16, INT16, INT8, INT16, INT16, INT32, INT16, GUI_CALLBACK, GUI_CALLBACK); -template -INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, +INT32 CreateIconAndTextButton( INT32 Image, const STR16 string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 sForeColorDown, INT16 sShadowColorDown, INT8 bJustification, @@ -2142,12 +2116,12 @@ INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, if( xloc < 0 || yloc < 0 ) { - sprintf( (char *)str, "Attempting to CreateIconAndTextButton with invalid position of %d,%d", xloc, yloc ); + sprintf( str, "Attempting to CreateIconAndTextButton with invalid position of %d,%d", xloc, yloc ); AssertMsg( 0, str ); } if( Image < 0 || Image >= MAX_BUTTON_PICS ) { - sprintf( (char *)str, "Attemting to CreateIconAndTextButton with out of range ImageID %d.", Image ); + sprintf( str, "Attemting to CreateIconAndTextButton with out of range ImageID %d.", Image ); AssertMsg( 0, str ); } @@ -2192,7 +2166,7 @@ INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, b->string = NULL; if ( string ) { - b->string = (wchar_t*)MemAlloc( (wcslen((wchar_t *)string)+1)*sizeof(wchar_t) ); + b->string = (STR16) MemAlloc( (wcslen(string)+1)*sizeof(CHAR16) ); AssertMsg( b->string, "Out of memory error: Couldn't allocate string in CreateIconAndTextButton." ); wcscpy( b->string, string ); } @@ -2265,7 +2239,7 @@ INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, } //New functions -void SpecifyButtonText( INT32 iButtonID, wchar_t * string ) +void SpecifyButtonText( INT32 iButtonID, STR16 string ) { GUI_BUTTON *b; @@ -2282,7 +2256,7 @@ void SpecifyButtonText( INT32 iButtonID, wchar_t * string ) if( string && wcslen( string ) ) { //allocate memory for the new string - b->string = (wchar_t*)MemAlloc( (wcslen(string)+1)*sizeof(wchar_t) ); + b->string = (STR16) MemAlloc( (wcslen(string)+1)*sizeof(CHAR16) ); Assert( b->string ); //copy the string to the button wcscpy( b->string, string ); @@ -2362,7 +2336,7 @@ void SpecifyButtonTextJustification( INT32 iButtonID, INT8 bJustification ) b->uiFlags |= BUTTON_DIRTY ; } -void SpecifyFullButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 uiFont, +void SpecifyFullButtonTextAttributes( INT32 iButtonID, STR16 string, INT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 sForeColorDown, INT16 sShadowColorDown, INT8 bJustification ) { @@ -2385,7 +2359,7 @@ void SpecifyFullButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 ui b->uiFlags |= BUTTON_DIRTY ; } -void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 uiFont, +void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, STR16 string, INT32 uiFont, INT16 sForeColor, INT16 sShadowColor ) { GUI_BUTTON *b; @@ -2542,7 +2516,7 @@ void AllowDisabledButtonFastHelp( INT32 iButtonID, BOOLEAN fAllow ) // // Set the text that will be displayed as the FastHelp // -void SetButtonFastHelpText(INT32 iButton, wchar_t * Text) +void SetButtonFastHelpText(INT32 iButton, STR16 Text) { GUI_BUTTON *b; if(iButton<0 || iButton>MAX_BUTTONS) @@ -2579,7 +2553,7 @@ void QuickButtonCallbackMMove(MOUSE_REGION *reg,INT32 reason) iButtonID = MSYS_GetRegionUserData(reg,0); - sprintf( (char *)str, "QuickButtonCallbackMMove: Mouse Region #%d (%d,%d to %d,%d) has invalid buttonID %d", + sprintf( str, "QuickButtonCallbackMMove: Mouse Region #%d (%d,%d to %d,%d) has invalid buttonID %d", reg->IDNumber, reg->RegionTopLeftX, reg->RegionTopLeftY, reg->RegionBottomRightX, reg->RegionBottomRightY, iButtonID ); AssertMsg( iButtonID >= 0, str ); @@ -2684,7 +2658,7 @@ void QuickButtonCallbackMButn( MOUSE_REGION *reg, INT32 reason ) iButtonID = MSYS_GetRegionUserData(reg,0); - sprintf( (char *)str, "QuickButtonCallbackMButn: Mouse Region #%d (%d,%d to %d,%d) has invalid buttonID %d", + sprintf( str, "QuickButtonCallbackMButn: Mouse Region #%d (%d,%d to %d,%d) has invalid buttonID %d", reg->IDNumber, reg->RegionTopLeftX, reg->RegionTopLeftY, reg->RegionBottomRightX, reg->RegionBottomRightY, iButtonID ); AssertMsg( iButtonID >= 0, str ); @@ -3949,7 +3923,7 @@ BOOLEAN SetDialogAttributes( CreateDlgInfo *pDlgInfo, INT32 iAttrib, ... ) { va_list arg; INT32 iFont,iFontOptions; - wchar_t *zString; + STR16 zString; INT32 iX,iY,iW,iH; INT32 iIndex; HVOBJECT hVObj; @@ -4000,7 +3974,7 @@ BOOLEAN SetDialogAttributes( CreateDlgInfo *pDlgInfo, INT32 iAttrib, ... ) iFont = va_arg( arg, INT32 ); pDlgInfo->iTextFont = iFont; - zString = (wchar_t *)va_arg( arg, UINT32 ); + zString = va_arg( arg, STR16 ); if ( pDlgInfo->zDlgText != NULL ) MemFree( pDlgInfo->zDlgText ); @@ -4096,15 +4070,7 @@ void DrawDialogBox( INT32 iDlgBox ) -// Kaiden: Added for VC6 compatibility - -#if _MSC_VER <= 1200 - template INT32 CreateCheckBoxButton(INT16, INT16, char *, INT16, GUI_CALLBACK); -#endif - -template INT32 CreateCheckBoxButton(INT16, INT16, char const *, INT16, GUI_CALLBACK); -template -INT32 CreateCheckBoxButton( INT16 x, INT16 y, string3 filename, INT16 Priority, GUI_CALLBACK ClickCallback ) +INT32 CreateCheckBoxButton( INT16 x, INT16 y, const STR8 filename, INT16 Priority, GUI_CALLBACK ClickCallback ) { GUI_BUTTON *b; INT32 ButPic, iButtonID; diff --git a/Standard Gaming Platform/Button System.h b/Standard Gaming Platform/Button System.h index af416c02..ebcb77dc 100644 --- a/Standard Gaming Platform/Button System.h +++ b/Standard Gaming Platform/Button System.h @@ -116,7 +116,7 @@ typedef struct _GUI_BUTTON { //Button disabled style INT8 bDisabledStyle; //For buttons with text - wchar_t *string; //the string + CHAR16 *string; //the string UINT16 usFont; //font for text BOOLEAN fMultiColor; //font is a multi-color font INT16 sForeColor; //text colors if there is text @@ -184,7 +184,7 @@ INT16 FindFreeIconSlot(void); INT32 GetNextButtonNumber(void); // Now used by Wizardry -- DB -void SetButtonFastHelpText(INT32 iButton, wchar_t * Text); +void SetButtonFastHelpText(INT32 iButton, STR16 Text); #ifdef _JA2_RENDER_DIRTY void SetBtnHelpEndCallback( INT32 iButton, MOUSE_HELPTEXT_DONE_CALLBACK CallbackFxn ); @@ -198,17 +198,15 @@ void FreeButtonSavedRect( INT32 iButton ); #endif -template -INT16 LoadGenericButtonIcon(string1 filename); +INT16 LoadGenericButtonIcon(STR8 filename); BOOLEAN UnloadGenericButtonIcon(INT16 GenImg); -template -INT32 LoadButtonImage(type1 filename, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite); +INT32 LoadButtonImage(STR8 filename, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite); INT32 UseLoadedButtonImage(INT32 LoadedImg, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite); INT32 UseVObjAsButtonImage(HVOBJECT hVObject, INT32 Grayed, INT32 OffNormal, INT32 OffHilite, INT32 OnNormal, INT32 OnHilite); void UnloadButtonImage(INT32 Index); -INT16 LoadGenericButtonImages(UINT8 *GrayName,UINT8 *OffNormName,UINT8 *OffHiliteName,UINT8 *OnNormName,UINT8 *OnHiliteName,UINT8 *BkGrndName,INT16 Index,INT16 OffsetX, INT16 OffsetY); +INT16 LoadGenericButtonImages(STR8 GrayName,STR8 OffNormName, STR8 OffHiliteName, STR8 OnNormName,STR8 OnHiliteName,STR8 BkGrndName,INT16 Index,INT16 OffsetX, INT16 OffsetY); BOOLEAN UnloadGenericButtonImage(INT16 GenImg); BOOLEAN SetButtonDestBuffer(UINT32 DestBuffer); @@ -243,31 +241,24 @@ INT32 QuickCreateButton(UINT32 Image, INT16 xloc, INT16 yloc, INT32 Type,INT16 P //loading, and deleting of the image. The size of the image determines the size of the button. It also uses //the default move callback which emulates Win95. Finally, it sets the priority to normal. The function you //choose also determines the type of button (toggle, notoggle, or newtoggle) -template -INT32 CreateEasyNoToggleButton ( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ); +INT32 CreateEasyNoToggleButton ( INT32 x, INT32 y, STR8 filename, GUI_CALLBACK ClickCallback ); -template -INT32 CreateEasyToggleButton ( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ); +INT32 CreateEasyToggleButton ( INT32 x, INT32 y, STR8 filename, GUI_CALLBACK ClickCallback ); -template -INT32 CreateEasyNewToggleButton( INT32 x, INT32 y, string3 filename, GUI_CALLBACK ClickCallback ); +INT32 CreateEasyNewToggleButton( INT32 x, INT32 y, STR8 filename, GUI_CALLBACK ClickCallback ); //Same as above, but accepts specify toggle type -template -INT32 CreateEasyButton( INT32 x, INT32 y, string3 filename, INT32 Type, GUI_CALLBACK ClickCallback); +INT32 CreateEasyButton( INT32 x, INT32 y, STR8 filename, INT32 Type, GUI_CALLBACK ClickCallback); //Same as above, but accepts priority specification. -template -INT32 CreateSimpleButton( INT32 x, INT32 y, string3 filename, INT32 Type, INT16 Priority, GUI_CALLBACK ClickCallback ); +INT32 CreateSimpleButton( INT32 x, INT32 y, STR8 filename, INT32 Type, INT16 Priority, GUI_CALLBACK ClickCallback ); -template -INT32 CreateCheckBoxButton( INT16 x, INT16 y, string3 filename, INT16 Priority, GUI_CALLBACK ClickCallback ); +INT32 CreateCheckBoxButton( INT16 x, INT16 y, STR8 filename, INT16 Priority, GUI_CALLBACK ClickCallback ); INT32 CreateIconButton(INT16 Icon,INT16 IconIndex,INT16 GenImg,INT16 xloc,INT16 yloc,INT16 w,INT16 h,INT32 Type,INT16 Priority,GUI_CALLBACK MoveCallback,GUI_CALLBACK ClickCallback); INT32 CreateHotSpot(INT16 xloc, INT16 yloc, INT16 Width, INT16 Height,INT16 Priority,GUI_CALLBACK MoveCallback,GUI_CALLBACK ClickCallback); -INT32 CreateTextButton(wchar_t *string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 GenImg, INT16 xloc, INT16 yloc, INT16 w, INT16 h, INT32 Type, INT16 Priority,GUI_CALLBACK MoveCallback, GUI_CALLBACK ClickCallback); -template -INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, +INT32 CreateTextButton(STR16 string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 GenImg, INT16 xloc, INT16 yloc, INT16 w, INT16 h, INT32 Type, INT16 Priority,GUI_CALLBACK MoveCallback, GUI_CALLBACK ClickCallback); +INT32 CreateIconAndTextButton( INT32 Image, const STR16 string, UINT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 sForeColorDown, INT16 sShadowColorDown, INT8 bJustification, @@ -275,19 +266,19 @@ INT32 CreateIconAndTextButton( INT32 Image, string2 string, UINT32 uiFont, GUI_CALLBACK MoveCallback,GUI_CALLBACK ClickCallback); //New functions -void SpecifyButtonText( INT32 iButtonID, wchar_t * string ); +void SpecifyButtonText( INT32 iButtonID, STR16 string ); void SpecifyButtonFont( INT32 iButtonID, UINT32 uiFont ); void SpecifyButtonMultiColorFont(INT32 iButtonID, BOOLEAN fMultiColor); void SpecifyButtonUpTextColors( INT32 iButtonID, INT16 sForeColor, INT16 sShadowColor ); void SpecifyButtonDownTextColors( INT32 iButtonID, INT16 sForeColorDown, INT16 sShadowColorDown ); void SpecifyButtonHilitedTextColors( INT32 iButtonID, INT16 sForeColorHilited, INT16 sShadowColorHilited ); void SpecifyButtonTextJustification( INT32 iButtonID, INT8 bJustification ); -void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 uiFont, +void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, STR16 string, INT32 uiFont, INT16 sForeColor, INT16 sShadowColor ); -void SpecifyFullButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 uiFont, +void SpecifyFullButtonTextAttributes( INT32 iButtonID, STR16 string, INT32 uiFont, INT16 sForeColor, INT16 sShadowColor, INT16 sForeColorDown, INT16 sShadowColorDown, INT8 bJustification ); -void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, wchar_t *string, INT32 uiFont, +void SpecifyGeneralButtonTextAttributes( INT32 iButtonID, STR16 string, INT32 uiFont, INT16 sForeColor, INT16 sShadowColor ); void SpecifyButtonTextOffsets( INT32 iButtonID, INT8 bTextXOffset, INT8 bTextYOffset, BOOLEAN fShiftText ); void SpecifyButtonTextSubOffsets( INT32 iButtonID, INT8 bTextXOffset, INT8 bTextYOffset, BOOLEAN fShiftText ); diff --git a/Standard Gaming Platform/Container.cpp b/Standard Gaming Platform/Container.cpp index 89dcadba..7e1fd032 100644 --- a/Standard Gaming Platform/Container.cpp +++ b/Standard Gaming Platform/Container.cpp @@ -76,8 +76,8 @@ typedef struct OrdHeaderTag { UINT32 me; long you; - char *k; - char *p; + STR8 k; + STR8 p; } TEST; diff --git a/Standard Gaming Platform/DEBUG.H b/Standard Gaming Platform/DEBUG.H index e701e214..aa583661 100644 --- a/Standard Gaming Platform/DEBUG.H +++ b/Standard Gaming Platform/DEBUG.H @@ -43,7 +43,7 @@ extern INT32 giProfileCount; _RPT3(_CRT_WARN, "*** PROFILE REPORT: %d executions took %dms, average of %.2fms per iteration.\n", guiExecutions, guiProfileTime, (FLOAT)guiProfileTime/guiExecutions); extern void _Null(void); -extern UINT8 *String(const char *String, ...); +extern STR8 String(const STR8 String, ...); @@ -64,13 +64,12 @@ extern UINT8 *String(const char *String, ...); //Assert( pointer, "This pointer is null and you tried to access it in function A "); //It'll make debugging a little simpler. In anal cases, you could build the string first, then assert //with it. -template -extern void _FailMessage(type1 pString, UINT32 uiLineNum, type2 pSourceFile ); +extern void _FailMessage(STR8 pString, UINT32 uiLineNum, STR8 pSourceFile ); #define Assert(a) (a) ? _Null() : _FailMessage( NULL, __LINE__, __FILE__ ) #define AssertMsg(a,b) (a) ? _Null() : _FailMessage( b, __LINE__, __FILE__ ) -extern UINT8 gubAssertString[128]; +extern CHAR8 gubAssertString[128]; #else @@ -84,7 +83,7 @@ extern UINT8 gubAssertString[128]; // Kaiden: Added this for Map Editor #ifdef JA2BETAVERSION - extern UINT8 gubAssertString[128]; + extern CHAR8 gubAssertString[128]; #endif // Moved these out of the defines - debug mgr always initialized @@ -130,11 +129,10 @@ extern BOOLEAN gfDebugTopics[MAX_TOPICS_ALLOTED]; #endif // public interface to debug methods: -template -extern void DbgMessageReal(UINT16 uiTopicId, UINT8 uiCommand, UINT8 uiDebugLevel, type4 strMessage); +extern void DbgMessageReal(UINT16 uiTopicId, UINT8 uiCommand, UINT8 uiDebugLevel, STR8 strMessage); extern BOOLEAN DbgSetDebugLevel(UINT16 TopicId, UINT8 uiDebugLevel); -extern void DbgFailedAssertion( BOOLEAN fExpression, char *szFile, int nLine ); +extern void DbgFailedAssertion( BOOLEAN fExpression, STR8 szFile, int nLine ); #if _MSC_VER <= 1200 extern void _FailMessage(UINT8 *pString, UINT32 uiLineNum, UINT8 *pSourceFile ); #endif diff --git a/Standard Gaming Platform/DEBUG.cpp b/Standard Gaming Platform/DEBUG.cpp index 4e0c9edc..73530c6b 100644 --- a/Standard Gaming Platform/DEBUG.cpp +++ b/Standard Gaming Platform/DEBUG.cpp @@ -68,10 +68,10 @@ INT32 giProfileCount; // they are required for the String() function, which is NOT a // debug-mode only function, it's used in release-mode as well! -- DB -UINT8 gubAssertString[128]; +CHAR8 gubAssertString[128]; #define MAX_MSG_LENGTH2 512 -UINT8 gbTmpDebugString[8][MAX_MSG_LENGTH2]; +CHAR8 gbTmpDebugString[8][MAX_MSG_LENGTH2]; UINT8 gubStringIndex = 0; #ifdef __cplusplus @@ -357,9 +357,7 @@ void DbgClearAllTopics( void ) // xxnov96:HJH -> creation // //************************************************************************** -template void DbgMessageReal(UINT16, UINT8, UINT8, unsigned char *); -template -void DbgMessageReal(UINT16 uiTopicId, UINT8 uiCommand, UINT8 uiDebugLevel, type4 strMessage) +void DbgMessageReal(UINT16 uiTopicId, UINT8 uiCommand, UINT8 uiDebugLevel, STR8 strMessage) { #ifndef _NO_DEBUG_TXT FILE *OutFile; @@ -368,7 +366,7 @@ void DbgMessageReal(UINT16 uiTopicId, UINT8 uiCommand, UINT8 uiDebugLevel, type4 // Check for a registered topic ID if ( uiTopicId < MAX_TOPICS_ALLOTED )//&& gfDebugTopics[uiTopicId] ) { - OutputDebugString ( (LPCSTR) strMessage ); + OutputDebugString ( strMessage ); OutputDebugString ( "\n" ); //add _NO_DEBUG_TXT to your SGP preprocessor definitions to avoid this f**king huge file from @@ -417,7 +415,7 @@ BOOLEAN DbgSetDebugLevel(UINT16 uiTopicId, UINT8 uiDebugLevel) // //************************************************************************** -void DbgFailedAssertion( BOOLEAN fExpression, char *szFile, int nLine ) +void DbgFailedAssertion( BOOLEAN fExpression, STR8 szFile, int nLine ) { #ifndef _NO_DEBUG_TXT FILE *OutFile; @@ -454,7 +452,7 @@ void _DebugRecordToDebugger(BOOLEAN gfState) void _DebugMessage(UINT8 *pString, UINT32 uiLineNum, UINT8 *pSourceFile) { - UINT8 ubOutputString[512]; + CHAR8 ubOutputString[512]; #ifndef _NO_DEBUG_TXT FILE *DebugFile; #endif @@ -463,7 +461,7 @@ void _DebugMessage(UINT8 *pString, UINT32 uiLineNum, UINT8 *pSourceFile) // Build the output string // - sprintf( (char *) ubOutputString, "{ %ld } %s [Line %d in %s]\n", GetTickCount(), pString, uiLineNum, pSourceFile ); + sprintf( ubOutputString, "{ %ld } %s [Line %d in %s]\n", GetTickCount(), pString, uiLineNum, pSourceFile ); // // Output to debugger @@ -483,7 +481,7 @@ void _DebugMessage(UINT8 *pString, UINT32 uiLineNum, UINT8 *pSourceFile) { if ((DebugFile = fopen( gpcDebugLogFileName, "a+t" )) != NULL) { - fputs( (const char *)ubOutputString, DebugFile ); + fputs( ubOutputString, DebugFile ); fclose( DebugFile ); } } @@ -501,34 +499,24 @@ void _Null(void) extern HVOBJECT FontObjs[25]; #ifdef JA2 //JAGGED ALLIANCE 2 VERSION ONLY -template void _FailMessage(char *, unsigned int, char const *); -template void _FailMessage(char const *, unsigned int, char const *); -template void _FailMessage(int, unsigned int, char const *); -template void _FailMessage(int, unsigned int, char *); -template void _FailMessage(char *, unsigned int, char *); -#if _MSC_VER <= 1200 - template void _FailMessage(unsigned char *, unsigned int, char *); -#endif -template void _FailMessage(unsigned char *, unsigned int, char const *); -template -void _FailMessage( type1 pString, UINT32 uiLineNum, type2 pSourceFile ) +void _FailMessage( STR8 pString, UINT32 uiLineNum, STR8 pSourceFile ) { - UINT8 ubOutputString[512]; + CHAR8 ubOutputString[512]; #ifndef _NO_DEBUG_TXT MSG Message; FILE *DebugFile; #endif BOOLEAN fDone = FALSE; //Build the output strings - sprintf( (char *)ubOutputString, "{ %ld } Assertion Failure [Line %d in %s]\n", GetTickCount(), uiLineNum, pSourceFile ); + sprintf( ubOutputString, "{ %ld } Assertion Failure [Line %d in %s]\n", GetTickCount(), uiLineNum, pSourceFile ); if( pString ) - sprintf( (char *)gubAssertString, (const char *)pString ); + sprintf( gubAssertString, pString ); else - sprintf( (char *)gubAssertString, "" ); + sprintf( gubAssertString, "" ); //Output to debugger if (gfRecordToDebugger) - OutputDebugString( (LPCSTR)ubOutputString ); + OutputDebugString( ubOutputString ); //Record to file if required #ifndef _NO_DEBUG_TXT @@ -536,7 +524,7 @@ void _FailMessage( type1 pString, UINT32 uiLineNum, type2 pSourceFile ) { if ((DebugFile = fopen( gpcDebugLogFileName, "a+t" )) != NULL) { - fputs( (const char *)ubOutputString, DebugFile ); + fputs( ubOutputString, DebugFile ); fclose( DebugFile ); } } @@ -555,7 +543,7 @@ void _FailMessage( type1 pString, UINT32 uiLineNum, type2 pSourceFile ) //NASTY HACK, THE GAME IS GOING TO DIE ANYWAY, SO WHO CARES WHAT WE DO. //This will actually bring up a screen that prints out the assert message //until the user hits esc or alt-x. - sprintf( (char *)gubErrorText, "Assertion Failure -- Line %d in %s", uiLineNum, pSourceFile ); + sprintf( gubErrorText, "Assertion Failure -- Line %d in %s", uiLineNum, pSourceFile ); SetPendingNewScreen( ERROR_SCREEN ); SetCurrentScreen( ERROR_SCREEN ); while (gfProgramIsRunning) @@ -582,9 +570,9 @@ void _FailMessage( type1 pString, UINT32 uiLineNum, type2 pSourceFile ) #else //NOT JAGGED ALLIANCE 2 -void _FailMessage(UINT8 *pString, UINT32 uiLineNum, UINT8 *pSourceFile) +void _FailMessage(STR8 pString, UINT32 uiLineNum, STR8 pSourceFile) { - UINT8 ubOutputString[512]; + CHAR8 ubOutputString[512]; BOOLEAN fDone = FALSE; #ifndef _NO_DEBUG_TXT @@ -632,7 +620,7 @@ void DbgShutdown(void) {}; // This is NOT a _DEBUG only function! It is also needed in // release mode builds. -- DB -UINT8 *String(const char *String, ...) +STR8 String(const STR8 String, ...) { va_list ArgPtr; @@ -647,7 +635,7 @@ UINT8 *String(const char *String, ...) } va_start(ArgPtr, String); - vsprintf((char *) gbTmpDebugString[usIndex], String, ArgPtr); + vsprintf( gbTmpDebugString[usIndex], String, ArgPtr); va_end(ArgPtr); return gbTmpDebugString[usIndex]; diff --git a/Standard Gaming Platform/DbMan.cpp b/Standard Gaming Platform/DbMan.cpp index 834770a4..64f9a4f7 100644 --- a/Standard Gaming Platform/DbMan.cpp +++ b/Standard Gaming Platform/DbMan.cpp @@ -975,10 +975,10 @@ BOOLEAN LoadBucket( CHAR cFirstLetter ) CHECKF(uiNumEntries); - gdb.bucket.pstrFilenames = (CHAR *)MemAlloc( uiNumEntries * FILENAME_LENGTH); + gdb.bucket.pstrFilenames = (STR8)MemAlloc( uiNumEntries * FILENAME_LENGTH); CHECKF(gdb.bucket.pstrFilenames); - gdb.bucket.pstrDatabasenames = (CHAR *)MemAlloc( uiNumEntries * FILENAME_LENGTH); + gdb.bucket.pstrDatabasenames = (STR8)MemAlloc( uiNumEntries * FILENAME_LENGTH); if ( !gdb.bucket.pstrDatabasenames ) { MemFree(gdb.bucket.pstrFilenames); diff --git a/Standard Gaming Platform/DirectX Common.cpp b/Standard Gaming Platform/DirectX Common.cpp index a7eb6d67..c5cc2694 100644 --- a/Standard Gaming Platform/DirectX Common.cpp +++ b/Standard Gaming Platform/DirectX Common.cpp @@ -20,7 +20,7 @@ void DirectXZeroMem ( void* pMemory, int nSize ) } -void DirectXAttempt ( INT32 iErrorCode, INT32 nLine, char *szFilename ) +void DirectXAttempt ( INT32 iErrorCode, INT32 nLine, STR8 szFilename ) { #ifdef _DEBUG if ( iErrorCode != DD_OK ) @@ -31,7 +31,7 @@ void DirectXAttempt ( INT32 iErrorCode, INT32 nLine, char *szFilename ) #endif } -char* DirectXErrorDescription ( INT32 iDXReturn ) +STR8 DirectXErrorDescription ( INT32 iDXReturn ) { switch( iDXReturn ) { diff --git a/Standard Gaming Platform/DirectX Common.h b/Standard Gaming Platform/DirectX Common.h index 9aee08d8..e21a5834 100644 --- a/Standard Gaming Platform/DirectX Common.h +++ b/Standard Gaming Platform/DirectX Common.h @@ -8,9 +8,9 @@ extern "C" { #endif // local functions - char* DirectXErrorDescription ( INT32 iDXReturn ); - void DirectXAttempt ( INT32 iErrorCode, INT32 nLine, char *szFilename ); - void DirectXAssert ( BOOLEAN fValue, INT32 nLine, char *szFilename ); + STR8 DirectXErrorDescription ( INT32 iDXReturn ); + void DirectXAttempt ( INT32 iErrorCode, INT32 nLine, STR8 szFilename ); + void DirectXAssert ( BOOLEAN fValue, INT32 nLine, STR8 szFilename ); void DirectXZeroMem ( void* pMemory, int nSize ); #undef ATTEMPT diff --git a/Standard Gaming Platform/ExceptionHandling.cpp b/Standard Gaming Platform/ExceptionHandling.cpp index 1894fddf..2cf7b86c 100644 --- a/Standard Gaming Platform/ExceptionHandling.cpp +++ b/Standard Gaming Platform/ExceptionHandling.cpp @@ -42,13 +42,13 @@ const int StackColumns = 8; // Number of columns in stack dump. //ppp -void ErrorLog(HWFILE LogFile, char* Format, ...); +void ErrorLog(HWFILE LogFile, STR8 Format, ...); STR GetExceptionString( DWORD uiExceptionCode ); void DisplayRegisters( HWFILE hFile, CONTEXT *pContext ); BOOLEAN GetAndDisplayModuleAndSystemInfo( HWFILE hFile, CONTEXT *pContext ); BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ); void RecordModuleList(HWFILE hFile ); -void PrintTime(char *output, FILETIME TimeToPrint); +void PrintTime(STR8 output, FILETIME TimeToPrint); static void ShowModuleInfo(HWFILE hFile, HINSTANCE ModuleHandle); @@ -197,7 +197,7 @@ INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo ) -void ErrorLog( HWFILE hFile, char* Format, ...) +void ErrorLog( HWFILE hFile, STR8 Format, ...) { char buffer[2000]; // wvsprintf never prints more than one K. UINT32 uiNumBytesWritten=0; @@ -359,8 +359,8 @@ BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ) int Count = 0; char buffer[1000] = ""; const int safetyzone = 50; - char* nearend = buffer + sizeof(buffer) - safetyzone; - char* output = buffer; + STR8 nearend = buffer + sizeof(buffer) - safetyzone; + STR8 output = buffer; // Time to print part or all of the stack to the error log. This allows // us to figure out the call stack, parameters, local variables, etc. @@ -391,7 +391,7 @@ BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ) while (pStack + 1 <= pStackTop) { - char *Suffix = " "; + STR8 Suffix = " "; if ((Count % StackColumns) == 0) output += wsprintf(output, "%08x: ", pStack); @@ -428,7 +428,7 @@ BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ) // Print the specified FILETIME to output in a human readable format, // without using the C run time. -void PrintTime(char *output, FILETIME TimeToPrint) +void PrintTime(STR8 output, FILETIME TimeToPrint) { WORD Date, Time; if (FileTimeToLocalFileTime(&TimeToPrint, &TimeToPrint) && @@ -521,7 +521,7 @@ static void ShowModuleInfo(HWFILE hFile, HINSTANCE ModuleHandle) IMAGE_DOS_HEADER *DosHeader = (IMAGE_DOS_HEADER*)ModuleHandle; if (IMAGE_DOS_SIGNATURE != DosHeader->e_magic) return; - IMAGE_NT_HEADERS *NTHeader = (IMAGE_NT_HEADERS*)((char *)DosHeader + IMAGE_NT_HEADERS *NTHeader = (IMAGE_NT_HEADERS*)((STR8 )DosHeader + DosHeader->e_lfanew); if (IMAGE_NT_SIGNATURE != NTHeader->Signature) return; diff --git a/Standard Gaming Platform/FileMan.cpp b/Standard Gaming Platform/FileMan.cpp index 6622d078..7f1e764a 100644 --- a/Standard Gaming Platform/FileMan.cpp +++ b/Standard Gaming Platform/FileMan.cpp @@ -232,7 +232,7 @@ BOOLEAN FileExists( STR strFilename ) { // First check to see if it's in a library (most files should be there) if ( gFileDataBase.fInitialized && - CheckIfFileExistInLibrary( (STR) strFilename ) ) return TRUE; + CheckIfFileExistInLibrary( strFilename ) ) return TRUE; // ... then check if it's in the custom Data directory if ( gCustomDataCat.FindFile(strFilename) ) return TRUE; @@ -427,7 +427,7 @@ HWFILE FileOpen( STR strFilename, UINT32 uiOptions, BOOLEAN fDeleteOnClose ) else { //If the file is in the library, get a handle to it. - hLibFile = OpenFileFromLibrary( (STR) strFilename ); + hLibFile = OpenFileFromLibrary( strFilename ); //tried to open a file that wasnt in the database if( !hLibFile ) @@ -777,9 +777,9 @@ BOOLEAN FileLoad( STR strFilename, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiB // 9 Feb 98 DEF - modified to work with the library system // //************************************************************************** -BOOLEAN _cdecl FilePrintf( HWFILE hFile, char * strFormatted, ... ) +BOOLEAN _cdecl FilePrintf( HWFILE hFile, STR8 strFormatted, ... ) { - UINT8 strToSend[80]; + CHAR8 strToSend[80]; va_list argptr; BOOLEAN fRetVal = FALSE; @@ -792,7 +792,7 @@ BOOLEAN _cdecl FilePrintf( HWFILE hFile, char * strFormatted, ... ) if( sLibraryID == REAL_FILE_LIBRARY_ID ) { va_start(argptr, strFormatted); - vsprintf( (char *)strToSend, (char *)strFormatted, argptr ); + vsprintf( strToSend, strFormatted, argptr ); va_end(argptr); fRetVal = FileWrite( hFile, strToSend, strlen(strToSend), NULL ); @@ -1226,7 +1226,7 @@ void BuildFileDirectory( void ) // gfs.uiNumFilesInDirectory = iNumFiles; - gfs.pcFileNames = (CHAR *)MemAlloc( iNumFiles * FILENAME_LENGTH ); + gfs.pcFileNames = (STR8)MemAlloc( iNumFiles * FILENAME_LENGTH ); if ( gfs.pcFileNames ) { diff --git a/Standard Gaming Platform/FileMan.h b/Standard Gaming Platform/FileMan.h index 6d32abcb..f100e2a3 100644 --- a/Standard Gaming Platform/FileMan.h +++ b/Standard Gaming Platform/FileMan.h @@ -115,7 +115,7 @@ extern BOOLEAN FileRead( HWFILE hFile, PTR pDest, UINT32 uiBytesToRead, UINT32 * extern BOOLEAN FileWrite( HWFILE hFile, PTR pDest, UINT32 uiBytesToWrite, UINT32 *puiBytesWritten ); extern BOOLEAN FileLoad( STR filename, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead ); -extern BOOLEAN _cdecl FilePrintf( HWFILE hFile, char * strFormatted, ... ); +extern BOOLEAN _cdecl FilePrintf( HWFILE hFile, STR8 strFormatted, ... ); extern BOOLEAN FileSeek( HWFILE, UINT32 uiDistance, UINT8 uiHow ); extern INT32 FileGetPos( HWFILE ); diff --git a/Standard Gaming Platform/Font.cpp b/Standard Gaming Platform/Font.cpp index 70099dab..10d82beb 100644 --- a/Standard Gaming Platform/Font.cpp +++ b/Standard Gaming Platform/Font.cpp @@ -333,10 +333,7 @@ int count; // This function returns (-1) if it fails, and debug msgs for a reason. // Otherwise the font number is returned. //***************************************************************************** -template INT32 LoadFontFile(char *); -template INT32 LoadFontFile(char const *); -template -INT32 LoadFontFile(string1 filename) +INT32 LoadFontFile(const STR8 filename) { VOBJECT_DESC vo_desc; UINT32 LoadIndex; @@ -419,10 +416,10 @@ UINT32 GetWidth(HVOBJECT hSrcVObject, INT16 ssIndex) // evaluate to is 512. // 'uiCharCount' specifies how many characters of the string are counted. //***************************************************************************** -INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, wchar_t *pFontString, ...) +INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, STR16 pFontString, ...) { va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; Assert(pFontString!=NULL); @@ -457,12 +454,12 @@ wchar_t string[512]; // 'uiCharCount' specifies how many characters of the string are counted. // YOU HAVE TO PREBUILD THE FAST HELP STRING! //***************************************************************************** -INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, wchar_t *pFontString ) +INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, STR16 pFontString ) { - wchar_t string[512]; + CHAR16 string[512]; UINT32 i, index; INT16 sBoldDiff = 0; - wchar_t str[2]; + CHAR16 str[2]; Assert(pFontString!=NULL); @@ -518,10 +515,11 @@ INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCha // Created on: 12/1/99 // //***************************************************************************************** -INT16 StringNPixLength(wchar_t *string, UINT32 uiMaxCount, INT32 UseFont) +INT16 StringNPixLength(STR16 string, UINT32 uiMaxCount, INT32 UseFont) { UINT32 Cur, uiCharCount; - wchar_t *curletter,transletter; + STR16 curletter; + UINT16 transletter; Cur = 0; uiCharCount = 0; @@ -543,11 +541,7 @@ INT16 StringNPixLength(wchar_t *string, UINT32 uiMaxCount, INT32 UseFont) // Returns the length of a string in pixels, depending on the font given. // //***************************************************************************** -template INT16 StringPixLength(short *, INT32); -template INT16 StringPixLength(unsigned short const *, INT32); -template INT16 StringPixLength(wchar_t const *, INT32); -template -INT16 StringPixLength(type1 string, INT32 UseFont) +INT16 StringPixLength(const STR16 string, INT32 UseFont) { UINT32 Cur; UINT16 *curletter,transletter; @@ -657,7 +651,7 @@ UINT16 GetFontHeight(INT32 FontNum) // CreateEnglishTransTable() // //***************************************************************************** -INT16 GetIndex(UINT16 siChar) +INT16 GetIndex(CHAR16 siChar) { UINT16 *pTrav; UINT16 ssCount=0; @@ -731,25 +725,19 @@ BOOLEAN SetFontDestBuffer(UINT32 DestBuffer, INT32 x1, INT32 y1, INT32 x2, INT32 // the parameters are identical to printf. The resulting string may be no longer // than 512 word-characters. Uses monochrome font color settings //***************************************************************************** -template UINT32 mprintf(INT32, INT32, wchar_t *, ...); -template UINT32 mprintf(INT32, INT32, wchar_t const *, ...); -template UINT32 mprintf(INT32, INT32, short *, ...); -template UINT32 mprintf(INT32, INT32, unsigned short *, ...); -template UINT32 mprintf(INT32, INT32, unsigned short const *, ...); -template -UINT32 mprintf(INT32 x, INT32 y, type3 pFontString, ...) +UINT32 mprintf(INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT32 uiDestPitchBYTES; UINT8 *pDestBuf; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); curletter=string; @@ -788,49 +776,31 @@ UINT8 *pDestBuf; return(0); } -template void VarFindFontRightCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, short *, ...); -template void VarFindFontRightCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short *, ...); -template void VarFindFontRightCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t *, ...); -template void VarFindFontRightCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t const *, ...); -template -void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... ) +void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... ) { - wchar_t string[512]; + CHAR16 string[512]; va_list argptr; va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); FindFontRightCoordinates( sLeft, sTop, sWidth, sHeight, string, iFontIndex, psNewX, psNewY ); } -template void VarFindFontCenterCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t *, ...); -template void VarFindFontCenterCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t const*, ...); -template void VarFindFontCenterCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, short *, ...); -template void VarFindFontCenterCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short *, ...); -template void VarFindFontCenterCoordinates(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short const*, ...); -template -void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... ) +void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... ) { - wchar_t string[512]; + CHAR16 string[512]; va_list argptr; va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, string, iFontIndex, psNewX, psNewY ); } -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, wchar_t *, INT32, unsigned short *, unsigned short *); -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, short *, INT32, unsigned short *, unsigned short *); -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, short *, INT32, short *, unsigned short *); -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, unsigned short *, INT32, short *, short *); -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, unsigned short *, INT32, unsigned short *, unsigned short *); -template void FindFontRightCoordinates(INT16, INT16, INT16, INT16, wchar_t *, INT32, wchar_t *, wchar_t *); -template -void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY ) +void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY ) { INT16 xp,yp; @@ -842,14 +812,7 @@ void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHei *psNewY = yp; } -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, wchar_t *, INT32, unsigned short *, unsigned short *); -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, short *, INT32, unsigned short *, unsigned short *); -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, unsigned short *, INT32, unsigned short *, unsigned short *); -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, unsigned short *, INT32, short *, short *); -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, short *, INT32, short *, short *); -template void FindFontCenterCoordinates(INT16, INT16, INT16, INT16, wchar_t *, INT32, wchar_t *, wchar_t *); -template -void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY ) +void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY ) { INT16 xp,yp; @@ -869,12 +832,12 @@ void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHe // the parameters are identical to printf. The resulting string may be no longer // than 512 word-characters. //***************************************************************************** -UINT32 gprintf(INT32 x, INT32 y, wchar_t *pFontString, ...) +UINT32 gprintf(INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT32 uiDestPitchBYTES; UINT8 *pDestBuf; @@ -920,12 +883,12 @@ UINT8 *pDestBuf; return(0); } -UINT32 gprintfDirty(INT32 x, INT32 y, wchar_t *pFontString, ...) +UINT32 gprintfDirty(INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT32 uiDestPitchBYTES; UINT8 *pDestBuf; @@ -989,12 +952,12 @@ UINT8 *pDestBuf; // the parameters are identical to printf. The resulting string may be no longer // than 512 word-characters. //***************************************************************************** -UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, wchar_t *pFontString, ...) +UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; Assert(pFontString!=NULL); @@ -1033,23 +996,17 @@ wchar_t string[512]; return(0); } -template UINT32 mprintf_buffer(UINT8 *, UINT32, UINT32, INT32, INT32, short *, ...); -template UINT32 mprintf_buffer(UINT8 *, UINT32, UINT32, INT32, INT32, unsigned short *, ...); -template UINT32 mprintf_buffer(UINT8 *, UINT32, UINT32, INT32, INT32, unsigned short const*, ...); -template UINT32 mprintf_buffer(UINT8 *, UINT32, UINT32, INT32, INT32, wchar_t *, ...); -template UINT32 mprintf_buffer(UINT8 *, UINT32, UINT32, INT32, INT32, wchar_t const*, ...); -template -UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...) +UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); curletter=string; @@ -1082,20 +1039,18 @@ wchar_t string[512]; return(0); } -template UINT32 mprintf_buffer_coded(UINT8 *, UINT32, UINT32, INT32, INT32, short *, ...); -template -UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...) +UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT16 usOldForeColor; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); curletter=string; @@ -1144,12 +1099,12 @@ UINT16 usOldForeColor; } -UINT32 mprintf_coded( INT32 x, INT32 y, wchar_t *pFontString, ...) +UINT32 mprintf_coded( INT32 x, INT32 y, const STR16 pFontString, ...) { INT32 destx, desty; -wchar_t *curletter, transletter; +CHAR16 *curletter, transletter; va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT16 usOldForeColor; UINT32 uiDestPitchBYTES; UINT8 *pDestBuf; diff --git a/Standard Gaming Platform/Font.h b/Standard Gaming Platform/Font.h index 6052c079..67731ce2 100644 --- a/Standard Gaming Platform/Font.h +++ b/Standard Gaming Platform/Font.h @@ -123,28 +123,24 @@ UINT16 *GetFontObjectPalette16BPP(INT32 iFont); void DestroyEnglishTransTable( void ); extern HVOBJECT GetFontObject(INT32 iFont); -extern UINT32 gprintf(INT32 x, INT32 y, wchar_t *pFontString, ...); -extern UINT32 gprintfDirty(INT32 x, INT32 y, wchar_t *pFontString, ...); -template -extern UINT32 mprintf(INT32 x, INT32 y, type3 pFontString, ...); -extern UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, wchar_t *pFontString, ...); -template -extern UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...); +extern UINT32 gprintf(INT32 x, INT32 y, const STR16 pFontString, ...); +extern UINT32 gprintfDirty(INT32 x, INT32 y, const STR16 pFontString, ...); +extern UINT32 mprintf(INT32 x, INT32 y, const STR16 pFontString, ...); +extern UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...); +extern UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...); // Function for displaying coded test. Since it's slower to do this, it's separate from the normal fuctions #define FONT_CODE_BEGINCOLOR 180 #define FONT_CODE_RESETCOLOR 181 -template -UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...); -UINT32 mprintf_coded( INT32 x, INT32 y, wchar_t *pFontString, ...); +UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...); +UINT32 mprintf_coded( INT32 x, INT32 y, const STR16 pFontString, ...); extern BOOLEAN SetFontDestBuffer(UINT32 DestBuffer, INT32 x1, INT32 y1, INT32 x2, INT32 y2, BOOLEAN wrap); extern BOOLEAN SetFont(INT32 iFontIndex); -template -extern INT32 LoadFontFile(string1 pFileName); +extern INT32 LoadFontFile(const STR8 pFileName); extern UINT16 GetFontHeight(INT32 FontNum); extern BOOLEAN InitializeFontManager(UINT16 usDefaultPixDepth, FontTranslationTable *pTransTable); extern void ShutdownFontManager(void); @@ -152,37 +148,32 @@ extern void UnloadFont(UINT32 FontIndex); extern FontTranslationTable *CreateEnglishTransTable( ); -extern INT16 GetIndex(UINT16 siChar); +extern INT16 GetIndex(CHAR16 siChar); extern UINT32 GetWidth(HVOBJECT hSrcVObject, INT16 ssIndex); -extern INT16 StringPixLengthArgFastHelp( INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, wchar_t *pFontString ); -extern INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, wchar_t *pFontString, ...); -template -extern INT16 StringPixLength(type1 string,INT32 UseFont); +extern INT16 StringPixLengthArgFastHelp( INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, STR16 pFontString ); +extern INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, STR16 pFontString, ...); +extern INT16 StringPixLength(const STR16 string,INT32 UseFont); -extern INT16 StringNPixLength(wchar_t *string, UINT32 uiMaxCount, INT32 UseFont); +extern INT16 StringNPixLength(STR16 string, UINT32 uiMaxCount, INT32 UseFont); extern void SaveFontSettings(void); extern void RestoreFontSettings(void); -template -void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... ); +void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... ); -template -void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... ); +void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... ); -template -void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY ); +void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY ); -template -void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY ); +void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY ); -//extern FontBase *LoadFontFile(UINT8 *pFileName); -//extern UINT8 *GetFontPalette(UINT8 *pFileName); +//extern FontBase *LoadFontFile(CHAR8 *pFileName); +//extern UINT8 *GetFontPalette(CHAR8 *pFileName); //extern UINT16 GetMaxFontWidth(FontBase *pBase); //extern void UnloadFont(FontBase *pBase); //extern BOOLEAN SetFontPalette(FontBase *pFont, UINT16 siDepthPix, SGPPaletteEntry *pNewPalette); // make sure the pFontString is terminated by 0 -//extern BOOLEAN PrintFontString(UINT16 *pFontString, UINT8 *pDestBuffer, UINT16 siDestWidth, UINT16 siDestPixelDepth, UINT16 siDestPitch, UINT16 siDestHeight, UINT16 siX, UINT16 siY, UINT16 siTotalWidth, UINT16 siTotalHeight, BOOLEAN MultiLine, FontBase *pFontBase); +//extern BOOLEAN PrintFontString(STR16 pFontString, UINT8 *pDestBuffer, UINT16 siDestWidth, UINT16 siDestPixelDepth, UINT16 siDestPitch, UINT16 siDestHeight, UINT16 siX, UINT16 siY, UINT16 siTotalWidth, UINT16 siTotalHeight, BOOLEAN MultiLine, FontBase *pFontBase); //extern BOOLEAN SetFont16BitData(FontBase *pFontBase, UINT16 *pData16); /* diff --git a/Standard Gaming Platform/LibraryDataBase.cpp b/Standard Gaming Platform/LibraryDataBase.cpp index fad7e85d..0f852b35 100644 --- a/Standard Gaming Platform/LibraryDataBase.cpp +++ b/Standard Gaming Platform/LibraryDataBase.cpp @@ -539,7 +539,7 @@ BOOLEAN GetFileHeaderFromLibrary( INT16 sLibraryID, STR pstrFileName, FileHeader gsCurrentLibrary = sLibraryID; /* try to find the filename using a binary search algorithm: */ - ppFileHeader = (FileHeaderStruct **) bsearch( (char *) &sFileNameWithPath, (FileHeaderStruct *) gFileDataBase.pLibraries[ sLibraryID ].pFileHeader, gFileDataBase.pLibraries[ sLibraryID ].usNumberOfEntries, + ppFileHeader = (FileHeaderStruct **) bsearch( &sFileNameWithPath, (FileHeaderStruct *) gFileDataBase.pLibraries[ sLibraryID ].pFileHeader, gFileDataBase.pLibraries[ sLibraryID ].usNumberOfEntries, sizeof( FileHeaderStruct ), (int (*)(const void*, const void*))CompareFileNames ); if( ppFileHeader ) diff --git a/Standard Gaming Platform/MemMan.cpp b/Standard Gaming Platform/MemMan.cpp index 8d15181f..4db39fbc 100644 --- a/Standard Gaming Platform/MemMan.cpp +++ b/Standard Gaming Platform/MemMan.cpp @@ -240,7 +240,7 @@ void ShutdownMemoryManager( void ) #ifdef _DEBUG -PTR MemAllocReal( UINT32 uiSize, const char *pcFile, INT32 iLine ) +PTR MemAllocReal( UINT32 uiSize, const STR8 pcFile, INT32 iLine ) { PTR ptr; @@ -273,7 +273,7 @@ PTR MemAllocReal( UINT32 uiSize, const char *pcFile, INT32 iLine ) } -void MemFreeReal( PTR ptr, const char *pcFile, INT32 iLine ) +void MemFreeReal( PTR ptr, const STR8 pcFile, INT32 iLine ) { UINT32 uiSize; @@ -303,7 +303,7 @@ void MemFreeReal( PTR ptr, const char *pcFile, INT32 iLine ) } -PTR MemReallocReal( PTR ptr, UINT32 uiSize, const char *pcFile, INT32 iLine ) +PTR MemReallocReal( PTR ptr, UINT32 uiSize, const STR8 pcFile, INT32 iLine ) { PTR ptrNew; UINT32 uiOldSize; @@ -491,7 +491,7 @@ BOOLEAN MemCheckPool( void ) #ifdef EXTREME_MEMORY_DEBUGGING -PTR MemAllocXDebug( UINT32 size, const char *szCodeString, INT32 iLineNum, void *pSpecial ) +PTR MemAllocXDebug( UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ) { PTR ptr; UINT16 usLength; @@ -552,7 +552,7 @@ PTR MemAllocXDebug( UINT32 size, const char *szCodeString, INT32 iLineNum, void return( ptr ); } -void MemFreeXDebug( PTR ptr, const char *szCodeString, INT32 iLineNum, void *pSpecial ) +void MemFreeXDebug( PTR ptr, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ) { MEMORY_NODE *curr; @@ -597,7 +597,7 @@ void MemFreeXDebug( PTR ptr, const char *szCodeString, INT32 iLineNum, void *pSp } } -PTR MemReallocXDebug( PTR ptr, UINT32 size, const char *szCodeString, INT32 iLineNum, void *pSpecial ) +PTR MemReallocXDebug( PTR ptr, UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ) { MEMORY_NODE *curr; PTR ptrNew; diff --git a/Standard Gaming Platform/MemMan.h b/Standard Gaming Platform/MemMan.h index 38f1af13..de18d627 100644 --- a/Standard Gaming Platform/MemMan.h +++ b/Standard Gaming Platform/MemMan.h @@ -63,9 +63,9 @@ extern void ShutdownMemoryManager( void ); #define MemAlloc( size ) MemAllocXDebug( (size), __FILE__, __LINE__, NULL ) #define MemFree( ptr ) MemFreeXDebug( (ptr), __FILE__, __LINE__, NULL ) #define MemRealloc( ptr, size ) MemReallocXDebug( (ptr), (size), __FILE__, __LINE__, NULL ) - extern PTR MemAllocXDebug( UINT32 size, const char *szCodeString, INT32 iLineNum, void *pSpecial ); - extern void MemFreeXDebug( PTR ptr, const char *szCodeString, INT32 iLineNum, void *pSpecial ); - extern PTR MemReallocXDebug( PTR ptr, UINT32 size, const char *szCodeString, INT32 iLineNum, void *pSpecial ); + extern PTR MemAllocXDebug( UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ); + extern void MemFreeXDebug( PTR ptr, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ); + extern PTR MemReallocXDebug( PTR ptr, UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *pSpecial ); #else #ifdef _DEBUG //This is another debug feature. Not as sophistocated, but definately not the pig the extreme system is. @@ -73,9 +73,9 @@ extern void ShutdownMemoryManager( void ); #define MemAlloc( size ) MemAllocReal( (size), __FILE__, __LINE__ ) #define MemFree( ptr ) MemFreeReal( (ptr), __FILE__, __LINE__ ) #define MemRealloc( ptr, size ) MemReallocReal( (ptr), (size), __FILE__, __LINE__ ) - extern PTR MemAllocReal( UINT32 size, const char *, INT32 ); - extern void MemFreeReal( PTR ptr, const char *, INT32 ); - extern PTR MemReallocReal( PTR ptr, UINT32 size, const char *, INT32 ); + extern PTR MemAllocReal( UINT32 size, const STR8 , INT32 ); + extern void MemFreeReal( PTR ptr, const STR8 , INT32 ); + extern PTR MemReallocReal( PTR ptr, UINT32 size, const STR8 , INT32 ); #else //Release build verison #include diff --git a/Standard Gaming Platform/Mutex Manager.cpp b/Standard Gaming Platform/Mutex Manager.cpp index 55621c54..1e398d4a 100644 --- a/Standard Gaming Platform/Mutex Manager.cpp +++ b/Standard Gaming Platform/Mutex Manager.cpp @@ -103,7 +103,7 @@ BOOLEAN DeleteMutex(UINT32 uiMutexIndex) return TRUE; } -BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename) +BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename) { switch (WaitForSingleObject(MutexTable[uiMutexIndex], INFINITE)) { @@ -118,7 +118,7 @@ BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename) } } -BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, char *szFilename) +BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, STR8 szFilename) { switch (WaitForSingleObject(MutexTable[uiMutexIndex], uiTimeout)) { @@ -132,7 +132,7 @@ BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine return TRUE; } -BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename) +BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename) { if (ReleaseMutex(MutexTable[uiMutexIndex]) == FALSE) { @@ -201,19 +201,19 @@ BOOLEAN DeleteMutex(UINT32 uiMutexIndex) return TRUE; } -BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename) +BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename) { EnterCriticalSection(&MutexTable[uiMutexIndex]); return TRUE; } -BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, char *szFilename) +BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, STR8 szFilename) { EnterCriticalSection(&MutexTable[uiMutexIndex]); return TRUE; } -BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename) +BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename) { LeaveCriticalSection(&MutexTable[uiMutexIndex]); diff --git a/Standard Gaming Platform/Mutex Manager.h b/Standard Gaming Platform/Mutex Manager.h index d7b74b54..63bdcdfb 100644 --- a/Standard Gaming Platform/Mutex Manager.h +++ b/Standard Gaming Platform/Mutex Manager.h @@ -9,9 +9,9 @@ extern BOOLEAN InitializeMutexManager(void); extern void ShutdownMutexManager(void); extern BOOLEAN InitializeMutex(UINT32 uiMutexIndex, UINT8 *ubMutexName); extern BOOLEAN DeleteMutex(UINT32 uiMutexIndex); -extern BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename); -extern BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, char *szFilename); -extern BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, char *szFilename); +extern BOOLEAN EnterMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename); +extern BOOLEAN EnterMutexWithTimeout(UINT32 uiMutexIndex, UINT32 uiTimeout, INT32 nLine, STR8 szFilename); +extern BOOLEAN LeaveMutex(UINT32 uiMutexIndex, INT32 nLine, STR8 szFilename); // // Use defines to allocate slots in the mutex manager. Put these defines in LOCAL.H diff --git a/Standard Gaming Platform/PCX.cpp b/Standard Gaming Platform/PCX.cpp index 56557ab3..e9774930 100644 --- a/Standard Gaming Platform/PCX.cpp +++ b/Standard Gaming Platform/PCX.cpp @@ -30,7 +30,7 @@ BOOLEAN SetPcxPalette( PcxObject *pCurrentPcxObject, HIMAGE hImage ); BOOLEAN BlitPcxToBuffer( PcxObject *pCurrentPcxObject, UINT8 *pBuffer, UINT16 usBufferWidth, UINT16 usBufferHeight, UINT16 usX, UINT16 usY, BOOLEAN fTransp); -PcxObject *LoadPcx(UINT8 *pFilename); +PcxObject *LoadPcx(STR8 pFilename); BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents ) @@ -38,7 +38,7 @@ BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents ) PcxObject *pPcxObject; // First Load a PCX Image - pPcxObject = LoadPcx( (UINT8 *)hImage->ImageFile ); + pPcxObject = LoadPcx( hImage->ImageFile ); if ( pPcxObject == NULL ) { @@ -81,7 +81,7 @@ BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents ) } -PcxObject *LoadPcx(UINT8 *pFilename) +PcxObject *LoadPcx(STR8 pFilename) { PcxHeader Header; PcxObject *pCurrentPcxObject; @@ -90,7 +90,7 @@ PcxObject *LoadPcx(UINT8 *pFilename) UINT8 *pPcxBuffer; // Open and read in the file - if ((hFileHandle = FileOpen((STR)pFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)) == 0) + if ((hFileHandle = FileOpen(pFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)) == 0) { // damn we failed to open the file return NULL; } diff --git a/Standard Gaming Platform/STCI.cpp b/Standard Gaming Platform/STCI.cpp index 4ef59fd8..4e193b2a 100644 --- a/Standard Gaming Platform/STCI.cpp +++ b/Standard Gaming Platform/STCI.cpp @@ -287,11 +287,11 @@ BOOLEAN STCILoadIndexed( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHead if (FileSeek( hFile, pHeader->uiStoredSize, FILE_SEEK_FROM_CURRENT) == FALSE) { DbgMessage( TOPIC_HIMAGE, DBG_LEVEL_3, "Problem seeking past image data!" ); - FileClose( hFile ); + FileClose( hFile ); return( FALSE ); } } - + if (fContents & IMAGE_APPDATA && pHeader->uiAppDataSize > 0) { // load application-specific data diff --git a/Standard Gaming Platform/Types.h b/Standard Gaming Platform/Types.h index c34b4646..939f6172 100644 --- a/Standard Gaming Platform/Types.h +++ b/Standard Gaming Platform/Types.h @@ -48,11 +48,11 @@ typedef signed short INT16; typedef float FLOAT; typedef double DOUBLE; // strings -typedef char CHAR8; +typedef char CHAR8; typedef wchar_t CHAR16; -typedef char * STR; -typedef char * STR8; -typedef wchar_t * STR16; +typedef CHAR8 * STR; +typedef CHAR8 * STR8; +typedef CHAR16 * STR16; // flags (individual bits used) typedef unsigned char FLAGS8; typedef unsigned short FLAGS16; diff --git a/Standard Gaming Platform/WinFont.cpp b/Standard Gaming Platform/WinFont.cpp index d24857bc..36399900 100644 --- a/Standard Gaming Platform/WinFont.cpp +++ b/Standard Gaming Platform/WinFont.cpp @@ -47,10 +47,10 @@ HWINFONT WinFonts[ MAX_WIN_FONTS ]; void Convert16BitStringTo8BitChineseBig5String( UINT8 *dst, UINT16 *src ) { INT32 i, j; - char *ptr; + STR8 ptr; i = j = 0; - ptr = (char*)src; + ptr = (STR8 )src; while( ptr[j] || ptr[j + 1] ) { if( ptr[j] ) @@ -108,14 +108,14 @@ HWINFONT *GetWinFont( INT32 iFont ) } } -wchar_t gzFontName[32]; +CHAR16 gzFontName[32]; INT32 CreateWinFont( INT32 iHeight, INT32 iWidth, INT32 iEscapement, INT32 iWeight, BOOLEAN fItalic, BOOLEAN fUnderline, BOOLEAN fStrikeOut, STR16 szFontName, INT32 iCharSet ) { INT32 iFont; HFONT hFont; - UINT8 szCharFontName[32]; //32 characters including null terminator (matches max font name length) + CHAR8 szCharFontName[32]; //32 characters including null terminator (matches max font name length) // Find free slot iFont = FindFreeWinFont( ); @@ -128,7 +128,7 @@ INT32 CreateWinFont( INT32 iHeight, INT32 iWidth, INT32 iEscapement, wcscpy( gzFontName, szFontName ); //ATTEMPT TO LOAD THE FONT NOW - sprintf( (char *) szCharFontName, "%S", szFontName ); + sprintf( szCharFontName, "%S", szFontName ); if( DoesWinFontExistOnSystem( szFontName, iCharSet ) ) { gLogFont.lfHeight = iHeight; @@ -191,11 +191,11 @@ void SetWinFontBackColor( INT32 iFont, COLORVAL *pColor ) } -void PrintWinFont( UINT32 uiDestBuf, INT32 iFont, INT32 x, INT32 y, wchar_t *pFontString, ...) +void PrintWinFont( UINT32 uiDestBuf, INT32 iFont, INT32 x, INT32 y, STR16 pFontString, ...) { va_list argptr; - wchar_t string2[512]; - char string[512]; + CHAR16 string2[512]; + CHAR8 string[512]; HVSURFACE hVSurface; LPDIRECTDRAWSURFACE2 pDDSurface; HDC hdc; @@ -240,12 +240,12 @@ void PrintWinFont( UINT32 uiDestBuf, INT32 iFont, INT32 x, INT32 y, wchar_t *pFo } -INT16 WinFontStringPixLength( wchar_t *string2, INT32 iFont ) +INT16 WinFontStringPixLength( STR16 string2, INT32 iFont ) { HWINFONT *pWinFont; HDC hdc; SIZE RectSize; - char string[512]; + CHAR8 string[512]; pWinFont = GetWinFont( iFont ); @@ -269,12 +269,12 @@ INT16 WinFontStringPixLength( wchar_t *string2, INT32 iFont ) } -INT16 GetWinFontHeight( wchar_t *string2, INT32 iFont ) +INT16 GetWinFontHeight( STR16 string2, INT32 iFont ) { HWINFONT *pWinFont; HDC hdc; SIZE RectSize; - char string[512]; + CHAR8 string[512]; pWinFont = GetWinFont( iFont ); @@ -297,10 +297,10 @@ INT16 GetWinFontHeight( wchar_t *string2, INT32 iFont ) return( (INT16)RectSize.cy ); } -UINT32 WinFont_mprintf( INT32 iFont, INT32 x, INT32 y, wchar_t *pFontString, ...) +UINT32 WinFont_mprintf( INT32 iFont, INT32 x, INT32 y, STR16 pFontString, ...) { va_list argptr; - wchar_t string[512]; + CHAR16 string[512]; va_start(argptr, pFontString); // Set up variable argument pointer vswprintf(string, pFontString, argptr); // process gprintf string (get output str) @@ -322,10 +322,10 @@ int CALLBACK EnumFontFamProc( CONST LOGFONT *lplf, CONST TEXTMETRIC *lptm, DWO int CALLBACK EnumFontFamExProc( ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, int FontType, LPARAM lParam ) { - UINT8 szFontName[32]; + CHAR8 szFontName[32]; - sprintf( (char *)szFontName, "%S", gzFontName ); - if( !strcmp( (const char *) szFontName, (const char *)lpelfe->elfFullName ) ) + sprintf( szFontName, "%S", gzFontName ); + if( !strcmp( szFontName, (STR8) lpelfe->elfFullName ) ) { gfEnumSucceed = TRUE; memcpy( &gLogFont, &(lpelfe->elfLogFont), sizeof( LOGFONT ) ); diff --git a/Standard Gaming Platform/WinFont.h b/Standard Gaming Platform/WinFont.h index be2efea8..5643c4e3 100644 --- a/Standard Gaming Platform/WinFont.h +++ b/Standard Gaming Platform/WinFont.h @@ -11,11 +11,11 @@ void DeleteWinFont( INT32 iFont ); void SetWinFontBackColor( INT32 iFont, COLORVAL *pColor ); void SetWinFontForeColor( INT32 iFont, COLORVAL *pColor ); -void PrintWinFont( UINT32 uiDestBuf, INT32 iFont, INT32 x, INT32 y, wchar_t *pFontString, ...); +void PrintWinFont( UINT32 uiDestBuf, INT32 iFont, INT32 x, INT32 y, STR16 pFontString, ...); -INT16 WinFontStringPixLength( wchar_t *string, INT32 iFont ); -INT16 GetWinFontHeight( wchar_t *string, INT32 iFont ); -UINT32 WinFont_mprintf( INT32 iFont, INT32 x, INT32 y, wchar_t *pFontString, ...); +INT16 WinFontStringPixLength( STR16 string, INT32 iFont ); +INT16 GetWinFontHeight( STR16 string, INT32 iFont ); +UINT32 WinFont_mprintf( INT32 iFont, INT32 x, INT32 y, STR16 pFontString, ...); BOOLEAN DoesWinFontExistOnSystem( STR16 pTypeFaceName, INT32 iCharSet ); diff --git a/Standard Gaming Platform/fmod.h b/Standard Gaming Platform/fmod.h index 54d35629..1b85eec9 100644 --- a/Standard Gaming Platform/fmod.h +++ b/Standard Gaming Platform/fmod.h @@ -50,7 +50,7 @@ typedef struct FMUSIC_MODULE FMUSIC_MODULE; /* Callback types */ -typedef void * (F_CALLBACKAPI *FSOUND_OPENCALLBACK) (const char *name); +typedef void * (F_CALLBACKAPI *FSOUND_OPENCALLBACK) (const STR8 name); typedef void (F_CALLBACKAPI *FSOUND_CLOSECALLBACK) (void *handle); typedef int (F_CALLBACKAPI *FSOUND_READCALLBACK) (void *buffer, int size, void *handle); typedef int (F_CALLBACKAPI *FSOUND_SEEKCALLBACK) (void *handle, int pos, signed char mode); @@ -62,7 +62,7 @@ typedef void (F_CALLBACKAPI *FSOUND_FREECALLBACK) (void *ptr); typedef void * (F_CALLBACKAPI *FSOUND_DSPCALLBACK) (void *originalbuffer, void *newbuffer, int length, void *userdata); typedef signed char (F_CALLBACKAPI *FSOUND_STREAMCALLBACK) (FSOUND_STREAM *stream, void *buff, int len, void *userdata); -typedef signed char (F_CALLBACKAPI *FSOUND_METADATACALLBACK)(char *name, char *value, void *userdata); +typedef signed char (F_CALLBACKAPI *FSOUND_METADATACALLBACK)(STR8 name, STR8 value, void *userdata); typedef void (F_CALLBACKAPI *FMUSIC_CALLBACK) (FMUSIC_MODULE *mod, unsigned char param); @@ -831,7 +831,7 @@ DLL_API void * F_API FSOUND_GetOutputHandle(); DLL_API int F_API FSOUND_GetDriver(); DLL_API int F_API FSOUND_GetMixer(); DLL_API int F_API FSOUND_GetNumDrivers(); -DLL_API const char * F_API FSOUND_GetDriverName(int id); +DLL_API const STR8 F_API FSOUND_GetDriverName(int id); DLL_API signed char F_API FSOUND_GetDriverCaps(int id, unsigned int *caps); DLL_API int F_API FSOUND_GetOutputRate(); DLL_API int F_API FSOUND_GetMaxChannels(); @@ -853,7 +853,7 @@ DLL_API void F_API FSOUND_GetMemoryStats(unsigned int *currentalloced Use FSOUND_LOADRAW flag with FSOUND_Sample_Load to treat as as raw pcm data. */ -DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Load(int index, const char *name_or_data, unsigned int mode, int offset, int length); +DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Load(int index, const STR8 name_or_data, unsigned int mode, int offset, int length); DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Alloc(int index, int length, unsigned int mode, int deffreq, int defvol, int defpan, int defpri); DLL_API void F_API FSOUND_Sample_Free(FSOUND_SAMPLE *sptr); DLL_API signed char F_API FSOUND_Sample_Upload(FSOUND_SAMPLE *sptr, void *srcdata, unsigned int mode); @@ -876,7 +876,7 @@ DLL_API signed char F_API FSOUND_Sample_SetMaxPlaybacks(FSOUND_SAMPLE *sptr, */ DLL_API FSOUND_SAMPLE * F_API FSOUND_Sample_Get(int sampno); -DLL_API const char * F_API FSOUND_Sample_GetName(FSOUND_SAMPLE *sptr); +DLL_API const STR8 F_API FSOUND_Sample_GetName(FSOUND_SAMPLE *sptr); DLL_API unsigned int F_API FSOUND_Sample_GetLength(FSOUND_SAMPLE *sptr); DLL_API signed char F_API FSOUND_Sample_GetLoopPoints(FSOUND_SAMPLE *sptr, int *loopstart, int *loopend); DLL_API signed char F_API FSOUND_Sample_GetDefaults(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri); @@ -1000,7 +1000,7 @@ DLL_API signed char F_API FSOUND_FX_SetWavesReverb(int fxid, float InGain, f DLL_API signed char F_API FSOUND_Stream_SetBufferSize(int ms); /* call this before opening streams, not after */ -DLL_API FSOUND_STREAM * F_API FSOUND_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length); +DLL_API FSOUND_STREAM * F_API FSOUND_Stream_Open(const STR8 name_or_data, unsigned int mode, int offset, int length); DLL_API FSOUND_STREAM * F_API FSOUND_Stream_Create(FSOUND_STREAMCALLBACK callback, int length, unsigned int mode, int samplerate, void *userdata); DLL_API signed char F_API FSOUND_Stream_Close(FSOUND_STREAM *stream); @@ -1026,27 +1026,27 @@ DLL_API FSOUND_DSPUNIT * F_API FSOUND_Stream_CreateDSP(FSOUND_STREAM *stream, DLL_API signed char F_API FSOUND_Stream_SetEndCallback(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); DLL_API signed char F_API FSOUND_Stream_SetSyncCallback(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); -DLL_API FSOUND_SYNCPOINT * F_API FSOUND_Stream_AddSyncPoint(FSOUND_STREAM *stream, unsigned int pcmoffset, const char *name); +DLL_API FSOUND_SYNCPOINT * F_API FSOUND_Stream_AddSyncPoint(FSOUND_STREAM *stream, unsigned int pcmoffset, const STR8 name); DLL_API signed char F_API FSOUND_Stream_DeleteSyncPoint(FSOUND_SYNCPOINT *point); DLL_API int F_API FSOUND_Stream_GetNumSyncPoints(FSOUND_STREAM *stream); DLL_API FSOUND_SYNCPOINT * F_API FSOUND_Stream_GetSyncPoint(FSOUND_STREAM *stream, int index); -DLL_API char * F_API FSOUND_Stream_GetSyncPointInfo(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset); +DLL_API STR8 F_API FSOUND_Stream_GetSyncPointInfo(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset); DLL_API signed char F_API FSOUND_Stream_SetSubStream(FSOUND_STREAM *stream, int index); /* For FMOD .FSB bank files. */ DLL_API int F_API FSOUND_Stream_GetNumSubStreams(FSOUND_STREAM *stream); /* For FMOD .FSB bank files. */ DLL_API signed char F_API FSOUND_Stream_SetSubStreamSentence(FSOUND_STREAM *stream, const int *sentencelist, int numitems); DLL_API signed char F_API FSOUND_Stream_GetNumTagFields(FSOUND_STREAM *stream, int *num); -DLL_API signed char F_API FSOUND_Stream_GetTagField(FSOUND_STREAM *stream, int num, int *type, char **name, void **value, int *length); -DLL_API signed char F_API FSOUND_Stream_FindTagField(FSOUND_STREAM *stream, int type, const char *name, void **value, int *length); +DLL_API signed char F_API FSOUND_Stream_GetTagField(FSOUND_STREAM *stream, int num, int *type, STR8 *name, void **value, int *length); +DLL_API signed char F_API FSOUND_Stream_FindTagField(FSOUND_STREAM *stream, int type, const STR8 name, void **value, int *length); /* Internet streaming functions */ -DLL_API signed char F_API FSOUND_Stream_Net_SetProxy(const char *proxy); +DLL_API signed char F_API FSOUND_Stream_Net_SetProxy(const STR8 proxy); DLL_API signed char F_API FSOUND_Stream_Net_SetTimeout(int timeout); -DLL_API char * F_API FSOUND_Stream_Net_GetLastServerStatus(); +DLL_API STR8 F_API FSOUND_Stream_Net_GetLastServerStatus(); DLL_API signed char F_API FSOUND_Stream_Net_SetBufferProperties(int buffersize, int prebuffer_percent, int rebuffer_percent); DLL_API signed char F_API FSOUND_Stream_Net_GetBufferProperties(int *buffersize, int *prebuffer_percent, int *rebuffer_percent); DLL_API signed char F_API FSOUND_Stream_Net_SetMetadataCallback(FSOUND_STREAM *stream, FSOUND_METADATACALLBACK callback, void *userdata); @@ -1137,7 +1137,7 @@ DLL_API signed char F_API FSOUND_Reverb_GetChannelProperties(int channel, FS DLL_API signed char F_API FSOUND_Record_SetDriver(int outputtype); DLL_API int F_API FSOUND_Record_GetNumDrivers(); -DLL_API const char * F_API FSOUND_Record_GetDriverName(int id); +DLL_API const STR8 F_API FSOUND_Record_GetDriverName(int id); DLL_API int F_API FSOUND_Record_GetDriver(); /* @@ -1156,8 +1156,8 @@ DLL_API int F_API FSOUND_Record_GetPosition(); Song management / playback functions. */ -DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSong(const char *name); -DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSongEx(const char *name_or_data, int offset, int length, unsigned int mode, const int *samplelist, int samplelistnum); +DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSong(const STR8 name); +DLL_API FMUSIC_MODULE * F_API FMUSIC_LoadSongEx(const STR8 name_or_data, int offset, int length, unsigned int mode, const int *samplelist, int samplelistnum); DLL_API int F_API FMUSIC_GetOpenState(FMUSIC_MODULE *mod); DLL_API signed char F_API FMUSIC_FreeSong(FMUSIC_MODULE *mod); DLL_API signed char F_API FMUSIC_PlaySong(FMUSIC_MODULE *mod); @@ -1189,7 +1189,7 @@ DLL_API signed char F_API FMUSIC_SetPanSeperation(FMUSIC_MODULE *mod, float Static song information functions. */ -DLL_API const char * F_API FMUSIC_GetName(FMUSIC_MODULE *mod); +DLL_API const STR8 F_API FMUSIC_GetName(FMUSIC_MODULE *mod); DLL_API int F_API FMUSIC_GetType(FMUSIC_MODULE *mod); DLL_API int F_API FMUSIC_GetNumOrders(FMUSIC_MODULE *mod); DLL_API int F_API FMUSIC_GetNumPatterns(FMUSIC_MODULE *mod); diff --git a/Standard Gaming Platform/fmod_errors.h b/Standard Gaming Platform/fmod_errors.h index b28b9c4f..2083abd1 100644 --- a/Standard Gaming Platform/fmod_errors.h +++ b/Standard Gaming Platform/fmod_errors.h @@ -1,7 +1,7 @@ #ifndef _FMOD_ERRORS_H #define _FMOD_ERRORS_H -static char *FMOD_ErrorString(int errcode) +static STR8 FMOD_ErrorString(int errcode) { switch (errcode) { diff --git a/Standard Gaming Platform/himage.cpp b/Standard Gaming Platform/himage.cpp index 149a6b47..562dacc0 100644 --- a/Standard Gaming Platform/himage.cpp +++ b/Standard Gaming Platform/himage.cpp @@ -54,7 +54,7 @@ HIMAGE CreateImage( SGPFILENAME ImageFile, UINT16 fContents ) // Depending on extension of filename, use different image readers // Get extension - StrPtr = strstr( (char *)ImageFile, (const char *)ExtensionSep ); + StrPtr = strstr( ImageFile, ExtensionSep ); if ( StrPtr == NULL ) { diff --git a/Standard Gaming Platform/line.cpp b/Standard Gaming Platform/line.cpp index 30d911d0..3724dccb 100644 --- a/Standard Gaming Platform/line.cpp +++ b/Standard Gaming Platform/line.cpp @@ -31,14 +31,14 @@ int giClipXMax=0; int giClipYMin=0; int giClipYMax=0; -void DrawHorizontalRun(char **ScreenPtr, int XAdvance, int RunLength, +void DrawHorizontalRun(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth); -void DrawVerticalRun(char **ScreenPtr, int XAdvance, int RunLength, +void DrawVerticalRun(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth); -void DrawHorizontalRun8(char **ScreenPtr, int XAdvance, +void DrawHorizontalRun8(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth); -void DrawVerticalRun8(char **ScreenPtr, int XAdvance, +void DrawVerticalRun8(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth); @@ -147,14 +147,7 @@ BOOL Clip2D( int *ix0, int *iy0, int *ix1, int *iy1 ) return( visible ); } -// (jonathanl) to save me having to cast all the previous code void LineDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr) -{ - LineDraw( fClip, XStart, YStart, XEnd, YEnd, Color, (char *)ScreenPtr); -} - -/* Draws a line between the specified endpoints in color Color. */ -void LineDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, char *ScreenPtr) { int Temp, AdjUp, AdjDown, ErrorTerm, XAdvance, XDelta, YDelta; int WholeStep, InitialPixelCount, FinalPixelCount, i, RunLength; @@ -357,7 +350,7 @@ void LineDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Col } //Draws a pixel in the specified color -void PixelDraw( BOOLEAN fClip, INT32 xp, INT32 yp, INT16 sColor, INT8 *pScreen ) +void PixelDraw( BOOLEAN fClip, INT32 xp, INT32 yp, INT16 sColor, UINT8 *pScreen ) { INT8 col2 = sColor >> 8; INT8 col1 = sColor & 0x00ff; @@ -377,13 +370,13 @@ void PixelDraw( BOOLEAN fClip, INT32 xp, INT32 yp, INT16 sColor, INT8 *pScreen ) /* Draws a horizontal run of pixels, then advances the bitmap pointer to the first pixel of the next run. */ -void DrawHorizontalRun(char **ScreenPtr, int XAdvance, +void DrawHorizontalRun(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth) { int i; - char *WorkingScreenPtr = *ScreenPtr; - char col2 = Color>>8; - char col1 = Color & 0x00FF; + UINT8 *WorkingScreenPtr = *ScreenPtr; + UINT8 col2 = Color>>8; + UINT8 col1 = Color & 0x00FF; for (i=0; i>8; - char col1 = Color & 0x00FF; + UINT8 *WorkingScreenPtr = *ScreenPtr; + UINT8 col2 = Color>>8; + UINT8 col1 = Color & 0x00FF; for (i=0; i(BOOL, int, int, int, int, short, unsigned char *); -template -void RectangleDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, string7 ScreenPtr) +void RectangleDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr) { LineDraw( fClip, XStart, YStart, XEnd, YStart, Color, ScreenPtr); LineDraw( fClip, XStart, YEnd, XEnd, YEnd, Color, ScreenPtr); @@ -438,24 +429,22 @@ void RectangleDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, shor ***********************************************************************************/ /* Draws a rectangle between the specified endpoints in color Color. */ -template void RectangleDraw8(BOOL, int, int ,int ,int, short, unsigned char *); -template -void RectangleDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, string7 ScreenPtr) +void RectangleDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr) { - LineDraw8( fClip, XStart, YStart, XEnd, YStart, Color, (char *)ScreenPtr); - LineDraw8( fClip, XStart, YEnd, XEnd, YEnd, Color, (char *)ScreenPtr); - LineDraw8( fClip, XStart, YStart, XStart, YEnd, Color, (char *)ScreenPtr); - LineDraw8( fClip, XEnd, YStart, XEnd, YEnd, Color, (char *)ScreenPtr); + LineDraw8( fClip, XStart, YStart, XEnd, YStart, Color, ScreenPtr); + LineDraw8( fClip, XStart, YEnd, XEnd, YEnd, Color, ScreenPtr); + LineDraw8( fClip, XStart, YStart, XStart, YEnd, Color, ScreenPtr); + LineDraw8( fClip, XEnd, YStart, XEnd, YEnd, Color, ScreenPtr); } /* Draws a line between the specified endpoints in color Color. */ -void LineDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, char *ScreenPtr) +void LineDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr) { int Temp, AdjUp, AdjDown, ErrorTerm, XAdvance, XDelta, YDelta; int WholeStep, InitialPixelCount, FinalPixelCount, i, RunLength; int ScreenWidth = giImageWidth; - char col2 = Color>>8; - char col1 = Color & 0x00FF; + UINT8 col2 = Color>>8; + UINT8 col1 = Color & 0x00FF; if ( fClip ) { @@ -651,13 +640,13 @@ void LineDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Co /* Draws a horizontal run of pixels, then advances the bitmap pointer to the first pixel of the next run. */ -void DrawHorizontalRun8(char **ScreenPtr, int XAdvance, +void DrawHorizontalRun8(UINT8 **ScreenPtr, int XAdvance, int RunLength, int Color, int ScreenWidth) { int i; - char *WorkingScreenPtr = *ScreenPtr; - char col2 = Color>>8; - char col1 = Color & 0x00FF; + UINT8 *WorkingScreenPtr = *ScreenPtr; + UINT8 col2 = Color>>8; + UINT8 col1 = Color & 0x00FF; for (i=0; i>8; - char col1 = Color & 0x00FF; + UINT8 *WorkingScreenPtr = *ScreenPtr; + UINT8 col2 = Color>>8; + UINT8 col1 = Color & 0x00FF; for (i=0; i -void RectangleDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, string7 ScreenPtr); - -template -void RectangleDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, string7 ScreenPtr); +void LineDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr); +void LineDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr); +void RectangleDraw( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr); +void RectangleDraw8( BOOL fClip, int XStart, int YStart, int XEnd, int YEnd, short Color, UINT8 *ScreenPtr); // ***************************************************************************** diff --git a/Standard Gaming Platform/mousesystem.cpp b/Standard Gaming Platform/mousesystem.cpp index 285adada..a71ed10f 100644 --- a/Standard Gaming Platform/mousesystem.cpp +++ b/Standard Gaming Platform/mousesystem.cpp @@ -67,9 +67,9 @@ UINT32 guiRegionLastLButtonDownTime = 0; extern void ReleaseAnchorMode(); //private function used here (implemented in Button System.c) // number of lines in height help text will be -INT16 GetNumberOfLinesInHeight( STR16 pStringA ); -INT16 GetWidthOfString( STR16 pStringA ); -void DisplayHelpTokenizedString( STR16 pStringA, INT16 sX, INT16 sY ); +INT16 GetNumberOfLinesInHeight( const STR16 pStringA ); +INT16 GetWidthOfString( const STR16 pStringA ); +void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY ); @@ -1098,12 +1098,12 @@ void MSYS_SetRegionUserData(MOUSE_REGION *region,INT32 index,INT32 userdata) { if(index < 0 || index > 3) { - UINT8 str[80]; + CHAR8 str[80]; #ifdef MOUSESYSTEM_DEBUGGING if( gfIgnoreShutdownAssertions ) #endif return; - sprintf( (char *)str, "Attempting MSYS_SetRegionUserData() with out of range index %d.", index ); + sprintf( str, "Attempting MSYS_SetRegionUserData() with out of range index %d.", index ); AssertMsg( 0, str ); } region->UserData[index]=userdata; @@ -1120,12 +1120,12 @@ INT32 MSYS_GetRegionUserData(MOUSE_REGION *region,INT32 index) { if(index < 0 || index > 3) { - UINT8 str[80]; + CHAR8 str[80]; #ifdef MOUSESYSTEM_DEBUGGING if( gfIgnoreShutdownAssertions ) #endif return 0; - sprintf( (char *)str, "Attempting MSYS_GetRegionUserData() with out of range index %d", index ); + sprintf( str, "Attempting MSYS_GetRegionUserData() with out of range index %d", index ); AssertMsg( 0, str ); } return(region->UserData[index]); @@ -1234,13 +1234,7 @@ void RefreshMouseRegions( ) } -template void SetRegionFastHelpText(MOUSE_REGION *, wchar_t *); -template void SetRegionFastHelpText(MOUSE_REGION *, wchar_t const*); -template void SetRegionFastHelpText(MOUSE_REGION *, short *); -template void SetRegionFastHelpText(MOUSE_REGION *, unsigned short *); -template void SetRegionFastHelpText(MOUSE_REGION *, unsigned short const*); -template -void SetRegionFastHelpText( MOUSE_REGION *region, type2 szText ) +void SetRegionFastHelpText( MOUSE_REGION *region, const STR16 szText ) { Assert( region ); @@ -1255,11 +1249,11 @@ void SetRegionFastHelpText( MOUSE_REGION *region, type2 szText ) //AssertMsg( 0, String( "Attempting to set fast help text, \"%S\" to an inactive region.", szText ) ); } - if( !szText || !wcslen( (wchar_t *)szText ) ) + if( !szText || !wcslen( szText ) ) return; //blank (or clear) // Allocate memory for the button's FastHelp text string... - region->FastHelpText = (wchar_t*)MemAlloc( (wcslen( (wchar_t *)szText ) + 1) * sizeof(wchar_t) ); + region->FastHelpText = (STR16) MemAlloc( (wcslen( szText ) + 1) * sizeof(CHAR16) ); Assert( region->FastHelpText ); wcscpy( region->FastHelpText, szText ); @@ -1287,7 +1281,7 @@ void SetRegionFastHelpText( MOUSE_REGION *region, type2 szText ) //region->FastHelpTimer = gsFastHelpDelay; } -INT16 GetNumberOfLinesInHeight( STR16 pStringA ) +INT16 GetNumberOfLinesInHeight( const STR16 pStringA ) { STR16 pToken; INT16 sCounter = 0; @@ -1370,7 +1364,7 @@ void DisplayFastHelp( MOUSE_REGION *region ) } -INT16 GetWidthOfString( STR16 pStringA ) +INT16 GetWidthOfString( const STR16 pStringA ) { CHAR16 pString[ 512 ]; STR16 pToken; @@ -1394,7 +1388,7 @@ INT16 GetWidthOfString( STR16 pStringA ) } -void DisplayHelpTokenizedString( STR16 pStringA, INT16 sX, INT16 sY ) +void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY ) { STR16 pToken; INT32 iCounter = 0, i; @@ -1485,7 +1479,7 @@ void RenderFastHelp() // **********Wiz8 Versions************************************************************************** -INT16 GetWidthOfString( STR16 pStringA ) +INT16 GetWidthOfString( const STR16 pStringA ) { CHAR16 pString[ 512 ]; STR16 pToken; @@ -1539,7 +1533,7 @@ void DisplayFastHelp( MOUSE_REGION *region ) } } -void DisplayHelpTokenizedString( STR16 pStringA, INT16 sX, INT16 sY ) +void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY ) { STR16 pToken; INT32 iCounter = 0, i; diff --git a/Standard Gaming Platform/mousesystem.h b/Standard Gaming Platform/mousesystem.h index c6254450..f0793857 100644 --- a/Standard Gaming Platform/mousesystem.h +++ b/Standard Gaming Platform/mousesystem.h @@ -54,7 +54,7 @@ typedef struct _MOUSE_REGION { //Fast help vars. INT16 FastHelpTimer; // Countdown timer for FastHelp text - wchar_t *FastHelpText; // Text string for the FastHelp (describes buttons if left there a while) + CHAR16 *FastHelpText; // Text string for the FastHelp (describes buttons if left there a while) INT32 FastHelpRect; MOUSE_HELPTEXT_DONE_CALLBACK HelpDoneCallback; @@ -199,8 +199,7 @@ void MSYS_AllowDisabledRegionFastHelp( MOUSE_REGION *region, BOOLEAN fAllow ); // Usually used to force change of mouse cursor if panels switch, etc void RefreshMouseRegions( ); -template -void SetRegionFastHelpText( MOUSE_REGION *region, type2 szText ); +void SetRegionFastHelpText( MOUSE_REGION *region, const STR16 szText ); void SetRegionHelpEndCallback( MOUSE_REGION *region, MOUSE_HELPTEXT_DONE_CALLBACK CallbackFxn ); diff --git a/Standard Gaming Platform/pcx.h b/Standard Gaming Platform/pcx.h index b943133a..9b42358f 100644 --- a/Standard Gaming Platform/pcx.h +++ b/Standard Gaming Platform/pcx.h @@ -34,7 +34,7 @@ typedef struct } PcxObject; BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents ); -PcxObject *LoadPcx(UINT8 *pFilename); +PcxObject *LoadPcx(STR8 pFilename); BOOLEAN BlitPcxToBuffer( PcxObject *pCurrentPcxObject, UINT8 *pBuffer, UINT16 usBufferWidth, UINT16 usBufferHeight, UINT16 usX, UINT16 usY, BOOLEAN fTransp); #endif \ No newline at end of file diff --git a/Standard Gaming Platform/soundman.cpp b/Standard Gaming Platform/soundman.cpp index 2b179c26..1bb5adc6 100644 --- a/Standard Gaming Platform/soundman.cpp +++ b/Standard Gaming Platform/soundman.cpp @@ -106,7 +106,7 @@ UINT32 SoundGetFreeChannel(void); UINT32 SoundGetUniqueID(void); // Callbacks -void * F_CALLBACKAPI SoundFileOpen (const CHAR8 *pName); +void * F_CALLBACKAPI SoundFileOpen (const STR8 pName); void F_CALLBACKAPI SoundFileClose(void *uiHandle); INT F_CALLBACKAPI SoundFileRead (void *pBuffer, INT iSize, void *uiHandle); INT F_CALLBACKAPI SoundFileSeek (void *uiHandle, INT iPos, signed char cMode); @@ -1459,7 +1459,7 @@ UINT32 uiSoundID; FSOUND_Stream_SetBufferSize(STREAM_BUFFER_LEN); // Creating stream - pSoundList[uiChannel].hStream=FSOUND_Stream_Open((char *)pSampleList[uiSample].pData, FSOUND_LOADMEMORY|FSOUND_LOOP_NORMAL|FSOUND_2D, 0, pSampleList[uiSample].uiSize); + pSoundList[uiChannel].hStream=FSOUND_Stream_Open((STR8) pSampleList[uiSample].pData, FSOUND_LOADMEMORY|FSOUND_LOOP_NORMAL|FSOUND_2D, 0, pSampleList[uiSample].uiSize); if(pSoundList[uiChannel].hStream==NULL) { SoundLog((CHAR8 *)String(" ERROR in SoundStartSample(): %s", FMOD_ErrorString(FSOUND_GetError()) )); @@ -1630,9 +1630,9 @@ UINT32 uiSoundID; // ------------------------ // Callbacks implementation // ======================== -static void * F_CALLBACKAPI SoundFileOpen(const CHAR8 *pName) +static void * F_CALLBACKAPI SoundFileOpen(const STR8 pName) { - return((void*)FileOpen((STR)pName, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)); + return((void*)FileOpen(pName, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)); } static void F_CALLBACKAPI SoundFileClose(void *uiHandle) diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp index 059d83ae..d1499461 100644 --- a/Standard Gaming Platform/video.cpp +++ b/Standard Gaming Platform/video.cpp @@ -1777,7 +1777,7 @@ void RefreshScreen(void *DummyVariable) LPDIRECTDRAWSURFACE2 pTmpBuffer; DDSURFACEDESC SurfaceDescription; FILE *OutputFile; - UINT8 FileName[64]; + CHAR8 FileName[64]; INT32 iIndex; STRING512 DataDir; STRING512 ExecDir; @@ -1835,11 +1835,11 @@ void RefreshScreen(void *DummyVariable) do { - sprintf((char *) FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++); + sprintf( FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++); } - while( (_access( (const char *)FileName, 0 )) != -1 ); + while( (_access( FileName, 0 )) != -1 ); - if ((OutputFile = fopen((const char *) FileName, "wb")) != NULL) + if ((OutputFile = fopen( FileName, "wb")) != NULL) { fprintf(OutputFile, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, LOBYTE(SCREEN_WIDTH), HIBYTE(SCREEN_WIDTH), LOBYTE(SCREEN_HEIGHT), HIBYTE(SCREEN_HEIGHT), 0x10, 0); @@ -2789,7 +2789,7 @@ BOOLEAN HideMouseCursor(void) /////////////////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN LoadCursorFile(PTR pFilename) +BOOLEAN LoadCursorFile(STR8 pFilename) { VOBJECT_DESC VideoObjectDescription; @@ -2944,14 +2944,7 @@ HRESULT ReturnCode; } -//Kaiden - Added for VC6 Compatibility -#if _MSC_VER <= 1200 - template void FatalError(char *, ...); -#endif - -template void FatalError(char const *, ...); -template -void FatalError( string1 pError, ...) +void FatalError( const STR8 pError, ...) { va_list argptr; diff --git a/Standard Gaming Platform/video.h b/Standard Gaming Platform/video.h index c7cd4e00..eef0d38a 100644 --- a/Standard Gaming Platform/video.h +++ b/Standard Gaming Platform/video.h @@ -60,7 +60,7 @@ extern BOOLEAN GetRGBDistribution(void); extern BOOLEAN GetPrimaryRGBDistributionMasks(UINT32 *RedBitMask, UINT32 *GreenBitMask, UINT32 *BblueBitMask); extern BOOLEAN SetMouseCursorFromObject(UINT32 uiVideoObjectHandle, UINT16 usVideoObjectSubIndex, UINT16 usOffsetX, UINT16 usOffsetY ); extern BOOLEAN HideMouseCursor(void); -extern BOOLEAN LoadCursorFile(PTR pFilename); +extern BOOLEAN LoadCursorFile(STR8 pFilename); extern BOOLEAN SetCurrentCursor(UINT16 usVideoObjectSubIndex, UINT16 usOffsetX, UINT16 usOffsetY ); extern void StartFrameBufferRender(void); extern void EndFrameBufferRender(void); @@ -85,8 +85,7 @@ void InvalidateRegionEx(INT32 iLeft, INT32 iTop, INT32 iRight, INT32 iBottom, UI void RefreshScreen(void *DummyVariable); -template -void FatalError( string1 pError, ...); +void FatalError( const STR8 pError, ...); extern SGPPaletteEntry gSgpPalette[256]; diff --git a/Standard Gaming Platform/vobject.cpp b/Standard Gaming Platform/vobject.cpp index 8dc3d326..3a600b95 100644 --- a/Standard Gaming Platform/vobject.cpp +++ b/Standard Gaming Platform/vobject.cpp @@ -71,8 +71,8 @@ typedef struct VOBJECT_NODE struct VOBJECT_NODE *next, *prev; #ifdef SGP_VIDEO_DEBUGGING - UINT8 *pName; - UINT8 *pCode; + STR8 pName; + STR8 pCode; #endif }VOBJECT_NODE; @@ -1436,45 +1436,45 @@ void CheckValidVObjectIndex( UINT32 uiIndex ) if( fAssertError ) { - UINT8 str[60]; + CHAR8 str[60]; switch( gubVODebugCode ) { case DEBUGSTR_SETVIDEOOBJECTTRANSPARENCY: - sprintf( (char *)str, "SetVideoObjectTransparency" ); + sprintf( str, "SetVideoObjectTransparency" ); break; case DEBUGSTR_BLTVIDEOOBJECTFROMINDEX: - sprintf( (char *)str, "BltVideoObjectFromIndex" ); + sprintf( str, "BltVideoObjectFromIndex" ); break; case DEBUGSTR_SETOBJECTHANDLESHADE: - sprintf( (char *)str, "SetObjectHandleShade" ); + sprintf( str, "SetObjectHandleShade" ); break; case DEBUGSTR_GETVIDEOOBJECTETRLESUBREGIONPROPERTIES: - sprintf( (char *)str, "GetVideoObjectETRLESubRegionProperties" ); + sprintf( str, "GetVideoObjectETRLESubRegionProperties" ); break; case DEBUGSTR_GETVIDEOOBJECTETRLEPROPERTIESFROMINDEX: - sprintf( (char *)str, "GetVideoObjectETRLEPropertiesFromIndex" ); + sprintf( str, "GetVideoObjectETRLEPropertiesFromIndex" ); break; case DEBUGSTR_SETVIDEOOBJECTPALETTE8BPP: - sprintf( (char *)str, "SetVideoObjectPalette8BPP" ); + sprintf( str, "SetVideoObjectPalette8BPP" ); break; case DEBUGSTR_GETVIDEOOBJECTPALETTE16BPP: - sprintf( (char *)str, "GetVideoObjectPalette16BPP" ); + sprintf( str, "GetVideoObjectPalette16BPP" ); break; case DEBUGSTR_COPYVIDEOOBJECTPALETTE16BPP: - sprintf( (char *)str, "CopyVideoObjectPalette16BPP" ); + sprintf( str, "CopyVideoObjectPalette16BPP" ); break; case DEBUGSTR_BLTVIDEOOBJECTOUTLINEFROMINDEX: - sprintf( (char *)str, "BltVideoObjectOutlineFromIndex" ); + sprintf( str, "BltVideoObjectOutlineFromIndex" ); break; case DEBUGSTR_BLTVIDEOOBJECTOUTLINESHADOWFROMINDEX: - sprintf( (char *)str, "BltVideoObjectOutlineShadowFromIndex" ); + sprintf( str, "BltVideoObjectOutlineShadowFromIndex" ); break; case DEBUGSTR_DELETEVIDEOOBJECTFROMINDEX: - sprintf( (char *)str, "DeleteVideoObjectFromIndex" ); + sprintf( str, "DeleteVideoObjectFromIndex" ); break; case DEBUGSTR_NONE: default: - sprintf( (char *)str, "GetVideoObject" ); + sprintf( str, "GetVideoObject" ); break; } } @@ -1485,17 +1485,17 @@ void CheckValidVObjectIndex( UINT32 uiIndex ) typedef struct DUMPFILENAME { - UINT8 str[256]; + CHAR8 str[256]; }DUMPFILENAME; -void DumpVObjectInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) +void DumpVObjectInfoIntoFile( const STR8 filename, BOOLEAN fAppend ) { VOBJECT_NODE *curr; FILE *fp; DUMPFILENAME *pName, *pCode; UINT32 *puiCounter; - UINT8 tempName[ 256 ]; - UINT8 tempCode[ 256 ]; + CHAR8 tempName[ 256 ]; + CHAR8 tempCode[ 256 ]; UINT32 i, uiUniqueID; BOOLEAN fFound; if( !guiVObjectSize ) @@ -1505,11 +1505,11 @@ void DumpVObjectInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) if( fAppend ) { - fp = fopen( (const char *)filename, "a" ); + fp = fopen( filename, "a" ); } else { - fp = fopen( (const char *)filename, "w" ); + fp = fopen( filename, "w" ); } Assert( fp ); @@ -1567,13 +1567,10 @@ void DumpVObjectInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) } //Debug wrapper for adding vObjects -template BOOLEAN _AddAndRecordVObject(VOBJECT_DESC *, UINT32 *, UINT32, char const *); -template BOOLEAN _AddAndRecordVObject(VOBJECT_DESC *, UINT32 *, UINT32, char *); -template -BOOLEAN _AddAndRecordVObject( VOBJECT_DESC *VObjectDesc, UINT32 *uiIndex, UINT32 uiLineNum, type4 pSourceFile ) +BOOLEAN _AddAndRecordVObject( VOBJECT_DESC *VObjectDesc, UINT32 *uiIndex, UINT32 uiLineNum, const STR8 pSourceFile ) { UINT16 usLength; - UINT8 str[256]; + CHAR8 str[256]; if( !AddStandardVideoObject( VObjectDesc, uiIndex ) ) { return FALSE; @@ -1581,27 +1578,24 @@ BOOLEAN _AddAndRecordVObject( VOBJECT_DESC *VObjectDesc, UINT32 *uiIndex, UINT32 //record the filename of the vObject (some are created via memory though) usLength = strlen( VObjectDesc->ImageFile ) + 1; - gpVObjectTail->pName = (UINT8*)MemAlloc( usLength ); + gpVObjectTail->pName = (STR8)MemAlloc( usLength ); memset( gpVObjectTail->pName, 0, usLength ); strcpy( gpVObjectTail->pName, VObjectDesc->ImageFile ); //record the code location of the calling creating function. - sprintf( (char *)str, "%s -- line(%d)", pSourceFile, uiLineNum ); + sprintf( str, "%s -- line(%d)", pSourceFile, uiLineNum ); usLength = strlen( str ) + 1; - gpVObjectTail->pCode = (UINT8*)MemAlloc( usLength ); + gpVObjectTail->pCode = (STR8)MemAlloc( usLength ); memset( gpVObjectTail->pCode, 0, usLength ); strcpy( gpVObjectTail->pCode, str ); return TRUE; } -template void PerformVideoInfoDumpIntoFile(char *, BOOLEAN); -template void PerformVideoInfoDumpIntoFile(char const *, BOOLEAN); -template -void PerformVideoInfoDumpIntoFile( string1 filename, BOOLEAN fAppend ) +void PerformVideoInfoDumpIntoFile( const STR8 filename, BOOLEAN fAppend ) { - DumpVObjectInfoIntoFile( (UINT8 *)filename, fAppend ); - DumpVSurfaceInfoIntoFile( (UINT8 *)filename, TRUE ); + DumpVObjectInfoIntoFile( filename, fAppend ); + DumpVSurfaceInfoIntoFile( filename, TRUE ); } #endif diff --git a/Standard Gaming Platform/vobject.h b/Standard Gaming Platform/vobject.h index 8bf02b8f..3713f55c 100644 --- a/Standard Gaming Platform/vobject.h +++ b/Standard Gaming Platform/vobject.h @@ -145,11 +145,9 @@ BOOLEAN ShutdownVideoObjectManager( ); // Creates and adds a video object to list #ifdef SGP_VIDEO_DEBUGGING - template - void PerformVideoInfoDumpIntoFile( string1 filename, BOOLEAN fAppend ); - void DumpVObjectInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ); - template - BOOLEAN _AddAndRecordVObject( VOBJECT_DESC *VObjectDesc, UINT32 *uiIndex, UINT32 uiLineNum, type4 pSourceFile ); + void PerformVideoInfoDumpIntoFile( const STR8 filename, BOOLEAN fAppend ); + void DumpVObjectInfoIntoFile( const STR8 filename, BOOLEAN fAppend ); + BOOLEAN _AddAndRecordVObject( VOBJECT_DESC *VObjectDesc, UINT32 *uiIndex, UINT32 uiLineNum, const STR8 pSourceFile ); #define AddVideoObject( a, b ) _AddAndRecordVObject( a, b, __LINE__, __FILE__ ) #else #define AddVideoObject( a, b ) AddStandardVideoObject( a, b ) diff --git a/Standard Gaming Platform/vsurface.cpp b/Standard Gaming Platform/vsurface.cpp index a0d8aea3..9d35e6ed 100644 --- a/Standard Gaming Platform/vsurface.cpp +++ b/Standard Gaming Platform/vsurface.cpp @@ -74,8 +74,8 @@ typedef struct VSURFACE_NODE struct VSURFACE_NODE *next, *prev; #ifdef SGP_VIDEO_DEBUGGING - UINT8 *pName; - UINT8 *pCode; + STR8 pName; + STR8 pCode; #endif }VSURFACE_NODE; @@ -2506,42 +2506,42 @@ void CheckValidVSurfaceIndex( UINT32 uiIndex ) if( fAssertError ) { - UINT8 str[60]; + CHAR8 str[60]; switch( gubVSDebugCode ) { case DEBUGSTR_SETVIDEOSURFACETRANSPARENCY: - sprintf( (char *)str, "SetVideoSurfaceTransparency" ); + sprintf( str, "SetVideoSurfaceTransparency" ); break; case DEBUGSTR_ADDVIDEOSURFACEREGION: - sprintf( (char *)str, "AddVideoSurfaceRegion" ); + sprintf( str, "AddVideoSurfaceRegion" ); break; case DEBUGSTR_GETVIDEOSURFACEDESCRIPTION: - sprintf( (char *)str, "GetVideoSurfaceDescription" ); + sprintf( str, "GetVideoSurfaceDescription" ); break; case DEBUGSTR_BLTVIDEOSURFACE_DST: - sprintf( (char *)str, "BltVideoSurface (dest)" ); + sprintf( str, "BltVideoSurface (dest)" ); break; case DEBUGSTR_BLTVIDEOSURFACE_SRC: - sprintf( (char *)str, "BltVideoSurface (src)" ); + sprintf( str, "BltVideoSurface (src)" ); break; case DEBUGSTR_COLORFILLVIDEOSURFACEAREA: - sprintf( (char *)str, "ColorFillVideoSurfaceArea" ); + sprintf( str, "ColorFillVideoSurfaceArea" ); break; case DEBUGSTR_SHADOWVIDEOSURFACERECT: - sprintf( (char *)str, "ShadowVideoSurfaceRect" ); + sprintf( str, "ShadowVideoSurfaceRect" ); break; case DEBUGSTR_BLTSTRETCHVIDEOSURFACE_DST: - sprintf( (char *)str, "BltStretchVideoSurface (dest)" ); + sprintf( str, "BltStretchVideoSurface (dest)" ); break; case DEBUGSTR_BLTSTRETCHVIDEOSURFACE_SRC: - sprintf( (char *)str, "BltStretchVideoSurface (src)" ); + sprintf( str, "BltStretchVideoSurface (src)" ); break; case DEBUGSTR_DELETEVIDEOSURFACEFROMINDEX: - sprintf( (char *)str, "DeleteVideoSurfaceFromIndex" ); + sprintf( str, "DeleteVideoSurfaceFromIndex" ); break; case DEBUGSTR_NONE: default: - sprintf( (char *)str, "GetVideoSurface" ); + sprintf( str, "GetVideoSurface" ); break; } if( uiIndex == 0xffffffff ) @@ -2559,16 +2559,16 @@ void CheckValidVSurfaceIndex( UINT32 uiIndex ) #ifdef SGP_VIDEO_DEBUGGING typedef struct DUMPFILENAME { - UINT8 str[256]; + CHAR8 str[256]; }DUMPFILENAME; -void DumpVSurfaceInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) +void DumpVSurfaceInfoIntoFile( const STR8 filename, BOOLEAN fAppend ) { VSURFACE_NODE *curr; FILE *fp; DUMPFILENAME *pName, *pCode; UINT32 *puiCounter; - UINT8 tempName[ 256 ]; - UINT8 tempCode[ 256 ]; + CHAR8 tempName[ 256 ]; + CHAR8 tempCode[ 256 ]; UINT32 i, uiUniqueID; BOOLEAN fFound; if( !guiVSurfaceSize ) @@ -2578,11 +2578,11 @@ void DumpVSurfaceInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) if( fAppend ) { - fp = fopen( (const char *)filename, "a" ); + fp = fopen( filename, "a" ); } else { - fp = fopen( (const char *)filename, "w" ); + fp = fopen( filename, "w" ); } Assert( fp ); @@ -2640,11 +2640,10 @@ void DumpVSurfaceInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ) } //Debug wrapper for adding vsurfaces -template -BOOLEAN _AddAndRecordVSurface( VSURFACE_DESC *VSurfaceDesc, UINT32 *uiIndex, UINT32 uiLineNum, type4 pSourceFile ) +BOOLEAN _AddAndRecordVSurface( VSURFACE_DESC *VSurfaceDesc, UINT32 *uiIndex, UINT32 uiLineNum, const STR8 pSourceFile ) { UINT16 usLength; - UINT8 str[256]; + CHAR8 str[256]; if( !AddStandardVideoSurface( VSurfaceDesc, uiIndex ) ) { return FALSE; @@ -2652,14 +2651,14 @@ BOOLEAN _AddAndRecordVSurface( VSURFACE_DESC *VSurfaceDesc, UINT32 *uiIndex, UIN //record the filename of the vsurface (some are created via memory though) usLength = strlen( VSurfaceDesc->ImageFile ) + 1; - gpVSurfaceTail->pName = (UINT8*)MemAlloc( usLength ); + gpVSurfaceTail->pName = (STR8)MemAlloc( usLength ); memset( gpVSurfaceTail->pName, 0, usLength ); strcpy( gpVSurfaceTail->pName, VSurfaceDesc->ImageFile ); //record the code location of the calling creating function. - sprintf( (char *) str, "%s -- line(%d)", pSourceFile, uiLineNum ); + sprintf( str, "%s -- line(%d)", pSourceFile, uiLineNum ); usLength = strlen( str ) + 1; - gpVSurfaceTail->pCode = (UINT8*)MemAlloc( usLength ); + gpVSurfaceTail->pCode = (STR8)MemAlloc( usLength ); memset( gpVSurfaceTail->pCode, 0, usLength ); strcpy( gpVSurfaceTail->pCode, str ); diff --git a/Standard Gaming Platform/vsurface.h b/Standard Gaming Platform/vsurface.h index 70ec8eb4..6b852845 100644 --- a/Standard Gaming Platform/vsurface.h +++ b/Standard Gaming Platform/vsurface.h @@ -141,9 +141,8 @@ BOOLEAN RestoreVideoSurfaces( ); // Creates and adds a video Surface to list #ifdef SGP_VIDEO_DEBUGGING - void DumpVSurfaceInfoIntoFile( UINT8 *filename, BOOLEAN fAppend ); - template - extern BOOLEAN _AddAndRecordVSurface( VSURFACE_DESC *VSurfaceDesc, UINT32 *uiIndex, UINT32 uiLineNum, type4 pSourceFile ); + void DumpVSurfaceInfoIntoFile( const STR8 filename, BOOLEAN fAppend ); + extern BOOLEAN _AddAndRecordVSurface( VSURFACE_DESC *VSurfaceDesc, UINT32 *uiIndex, UINT32 uiLineNum, const STR8 pSourceFile ); #define AddVideoSurface( a, b ) _AddAndRecordVSurface( a, b, __LINE__, __FILE__ ) #else #define AddVideoSurface( a, b ) AddStandardVideoSurface( a, b ) diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index faf57648..e2bb1c6e 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -213,7 +213,7 @@ extern void Ensure_RepairedGarrisonGroup( GARRISON_GROUP **ppGarrison, INT32 *pG -UINT16 gwGroupTypeString[ NUM_ENEMY_INTENTIONS ][ 20 ] = +CHAR16 gwGroupTypeString[ NUM_ENEMY_INTENTIONS ][ 20 ] = { L"RETREAT", L"ASSAULT", @@ -223,7 +223,7 @@ UINT16 gwGroupTypeString[ NUM_ENEMY_INTENTIONS ][ 20 ] = }; -void StringFromValue( wchar_t *str, INT32 iValue, UINT32 uiMax ) +void StringFromValue( STR16 str, INT32 iValue, UINT32 uiMax ) { if( iValue < 0 ) //a blank string is determined by a negative value. str[0] = '\0'; @@ -236,7 +236,7 @@ void StringFromValue( wchar_t *str, INT32 iValue, UINT32 uiMax ) BOOLEAN CreateAIViewer() { VOBJECT_DESC VObjectDesc; - wchar_t str[6]; + CHAR16 str[6]; //Kaiden: Loading INI file to read Values... // Here's another one of those INI reads @@ -447,7 +447,7 @@ void RenderStationaryGroups() HVOBJECT hVObject; SECTORINFO *pSector; INT32 x, y, xp, yp; - wchar_t str[20]; + CHAR16 str[20]; INT32 iSector = 0; UINT8 ubIconColor; UINT8 ubGroupSize = 0; @@ -851,7 +851,7 @@ void RenderViewer() } for( x = 1; x <= 16; x++ ) { - wchar_t str[3]; + CHAR16 str[3]; if( x == gsSelSectorX ) SetFontForeground( FONT_RED ); else if( x == gsHiSectorX ) @@ -1478,7 +1478,7 @@ enum TABLE_ENEMY_RANKS }; -UINT16 EnemyRankString[ TABLE_ENEMY_RANKS ][ 10 ] = +CHAR16 EnemyRankString[ TABLE_ENEMY_RANKS ][ 10 ] = { L"Adm", L"Trp", @@ -1502,7 +1502,7 @@ enum POP_TABLE_ENEMY_TYPES }; -UINT16 EnemyTypeString[ POP_TABLE_ENEMY_TYPES ][ 10 ] = +CHAR16 EnemyTypeString[ POP_TABLE_ENEMY_TYPES ][ 10 ] = { L"Pool", L"Garr", @@ -1529,8 +1529,8 @@ void PrintEnemyPopTable() UINT8 ubEnemyType; SECTORINFO *pSector; GROUP *pGroup; - UINT16 wPrintSpec[ 10 ]; - UINT16 wTempString [10 ]; + CHAR16 wPrintSpec[ 10 ]; + CHAR16 wTempString [10 ]; memset( &usEnemyPopTable, 0, sizeof ( usEnemyPopTable ) ); @@ -1684,7 +1684,7 @@ enum KILLED_TABLE_ROWS }; -UINT16 EnemiesKilledString[ KILLED_TABLE_ROWS ][ 10 ] = +CHAR16 EnemiesKilledString[ KILLED_TABLE_ROWS ][ 10 ] = { L"Tact", L"Auto", @@ -1703,8 +1703,8 @@ void PrintEnemiesKilledTable() UINT16 usEnemiesKilledTable[ TABLE_ENEMY_RANKS ][ KILLED_TABLE_ROWS ]; UINT8 ubEnemyRank; UINT8 ubKillType; - UINT16 wPrintSpec[ 10 ]; - UINT16 wTempString [10 ]; + CHAR16 wPrintSpec[ 10 ]; + CHAR16 wTempString [10 ]; memset( &usEnemiesKilledTable, 0, sizeof ( usEnemiesKilledTable ) ); @@ -1873,8 +1873,8 @@ void PrintDetailedEnemiesInSectorInfo( INT32 iScreenX, INT32 iScreenY, UINT8 ubS INT32 iDesired, iSurplus; UINT8 ubGroupCnt = 0; UINT8 ubSectorID; - UINT16 wString[ 120 ]; - UINT16 wSubString[ 120 ]; + CHAR16 wString[ 120 ]; + CHAR16 wSubString[ 120 ]; INT16 iGarrisonIndex; INT16 iPatrolIndex; WAYPOINT *pFinalWaypoint; diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index 2e862fdc..12f00828 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -1654,7 +1654,7 @@ void RenderAutoResolve() INT32 xp, yp; SOLDIERCELL *pCell = NULL; INT32 index = 0; - wchar_t str[100]; + CHAR16 str[100]; UINT8 bTownId = 0; UINT8 ubGood, ubBad; @@ -3293,8 +3293,8 @@ void RenderSoldierCellHealth( SOLDIERCELL *pCell ) { INT32 cnt, cntStart; INT32 xp, yp; - wchar_t *pStr; - wchar_t str[20]; + STR16 pStr; + CHAR16 str[20]; UINT8 *pDestBuf, *pSrcBuf; UINT32 uiSrcPitchBYTES, uiDestPitchBYTES; UINT16 usColor; diff --git a/Strategic/Campaign Init.cpp b/Strategic/Campaign Init.cpp index 4fa7d90d..c7a15d63 100644 --- a/Strategic/Campaign Init.cpp +++ b/Strategic/Campaign Init.cpp @@ -57,7 +57,7 @@ typedef enum typedef struct { ALTSECTORS_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 uiRowNumber; UINT32 currentDepth; @@ -65,7 +65,7 @@ typedef struct } altSectorsParseData; static void XMLCALL -altSectorsStartElementHandle(void *userData, const char *name, const char **atts) +altSectorsStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { altSectorsParseData * pData = (altSectorsParseData *) userData; @@ -96,7 +96,7 @@ altSectorsStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -altSectorsCharacterDataHandle(void *userData, const char *str, int len) +altSectorsCharacterDataHandle(void *userData, const XML_Char *str, int len) { altSectorsParseData * pData = (altSectorsParseData *) userData; @@ -106,7 +106,7 @@ altSectorsCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -altSectorsEndElementHandle(void *userData, const char *name) +altSectorsEndElementHandle(void *userData, const XML_Char *name) { altSectorsParseData * pData = (altSectorsParseData *) userData; @@ -118,7 +118,7 @@ altSectorsEndElementHandle(void *userData, const char *name) } else if(strcmp(name, "ROW") == 0 && pData->curElement == ALTSECTORS_ELEMENT_ROW) { - INT8 * curBuffer = pData->szCharData + strspn((const char *)pData->szCharData," \t\n\r"); + STR8 curBuffer = pData->szCharData + strspn(pData->szCharData," \t\n\r"); UINT32 curCellIndex = 0; UINT32 curNumber; @@ -126,13 +126,13 @@ altSectorsEndElementHandle(void *userData, const char *name) while(curBuffer[0] != '\0') { - sscanf( (const char *)curBuffer,"%d",&curNumber); + sscanf( curBuffer,"%d",&curNumber); RandomSector[curCellIndex+16*(pData->uiRowNumber - 1)] = curNumber; curCellIndex++; curBuffer += strcspn(curBuffer," \t\n\r\0"); - curBuffer += strspn((const char *)curBuffer," \t\n\r"); + curBuffer += strspn(curBuffer," \t\n\r"); } } pData->maxReadDepth--; diff --git a/Strategic/Creature Spreading.cpp b/Strategic/Creature Spreading.cpp index 3c4ac40c..554348a7 100644 --- a/Strategic/Creature Spreading.cpp +++ b/Strategic/Creature Spreading.cpp @@ -407,7 +407,7 @@ void InitCreatureQuest() default: #ifdef JA2BETAVERSION { - wchar_t str[512]; + CHAR16 str[512]; swprintf( str, L"Creature quest never chose a lair and won't infect any mines. Infectible mines = %d, iRandom = %d. " L"This isn't a bug if you are not receiving income from any mines.", iNumMinesInfectible, iOrigRandom ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); diff --git a/Strategic/Game Clock.cpp b/Strategic/Game Clock.cpp index 7982f0bd..4d05981d 100644 --- a/Strategic/Game Clock.cpp +++ b/Strategic/Game Clock.cpp @@ -82,7 +82,7 @@ INT32 iPausedPopUpBox = -1; UINT32 guiDay; UINT32 guiHour; UINT32 guiMin; -wchar_t gswzWorldTimeStr[20]; +CHAR16 gswzWorldTimeStr[20]; INT32 giTimeCompressSpeeds[ NUM_TIME_COMPRESS_SPEEDS ] = { 0, 1, 5 * 60, 30 * 60, 60 * 60 }; UINT16 usPausedActualWidth; UINT16 usPausedActualHeight; diff --git a/Strategic/Game Clock.h b/Strategic/Game Clock.h index 6d96aa8c..749ba22a 100644 --- a/Strategic/Game Clock.h +++ b/Strategic/Game Clock.h @@ -123,7 +123,7 @@ void AdvanceToNextDay(); void UpdateClock(); -extern wchar_t gswzWorldTimeStr[ 20 ]; //Day 99, 23:55 +extern CHAR16 gswzWorldTimeStr[ 20 ]; //Day 99, 23:55 extern UINT32 guiDay; extern UINT32 guiHour; diff --git a/Strategic/Game Events.cpp b/Strategic/Game Events.cpp index 1cfac842..0eb885ca 100644 --- a/Strategic/Game Events.cpp +++ b/Strategic/Game Events.cpp @@ -14,7 +14,7 @@ #ifdef JA2TESTVERSION -UINT16 gEventName[NUMBER_OF_EVENT_TYPES_PLUS_ONE][40]={ +CHAR16 gEventName[NUMBER_OF_EVENT_TYPES_PLUS_ONE][40]={ //1234567890123456789012345678901234567890 (increase size of array if necessary) L"Null", L"ChangeLightValue", diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 75bb095f..2fe1afe4 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -6872,7 +6872,7 @@ void ShowItemsOnMap( void ) { INT16 sMapX, sMapY; INT16 sXCorner, sYCorner; - UINT16 usXPos, usYPos; + INT16 usXPos, usYPos; UINT32 uiItemCnt; CHAR16 sString[ 10 ]; diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 57c186de..c3aede8b 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -1149,14 +1149,14 @@ void ActivateSoldierPopup( SOLDIERTYPE *pSoldier, UINT8 ubPopupType, INT16 xp, I -INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, wchar_t *zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) +INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect ) { // reset the highlighted line giHighLine = -1; return DoMessageBox( ubStyle, zString, uiExitScreen, ( UINT16 ) ( usFlags | MSG_BOX_FLAG_USE_CENTERING_RECT ), ReturnCallback, pCenteringRect ); } -INT32 DoMapMessageBox( UINT8 ubStyle, wchar_t * zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +INT32 DoMapMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { // WANNE 2 SGPRect CenteringRect= {0, 0, SCREEN_WIDTH, INV_INTERFACE_START_Y }; @@ -2821,9 +2821,9 @@ void DisplayUserDefineHelpTextRegions( FASTHELPREGION *pRegion ) -extern void DisplayHelpTokenizedString( STR16 pStringA, INT16 sX, INT16 sY ); -extern INT16 GetNumberOfLinesInHeight( STR16 pStringA ); -extern INT16 GetWidthOfString( STR16 pStringA ); +extern void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY ); +extern INT16 GetNumberOfLinesInHeight( const STR16 pStringA ); +extern INT16 GetWidthOfString( const STR16 pStringA ); void DisplaySoldierToolTip( FASTHELPREGION *pRegion ) { diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h index 6369e294..ac9bb7e9 100644 --- a/Strategic/Map Screen Interface.h +++ b/Strategic/Map Screen Interface.h @@ -391,7 +391,7 @@ void EnableTeamInfoPanels( void ); void ActivateSoldierPopup( SOLDIERTYPE *pSoldier, UINT8 ubPopupType, INT16 xp, INT16 yp ); // do mapscreen message box -INT32 DoMapMessageBox( UINT8 ubStyle, wchar_t * zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); +INT32 DoMapMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ); // hop up one leve,l int he map screen level interface void GoUpOneLevelInMap( void ); diff --git a/Strategic/Meanwhile.cpp b/Strategic/Meanwhile.cpp index 5c72c504..5b4bcd1c 100644 --- a/Strategic/Meanwhile.cpp +++ b/Strategic/Meanwhile.cpp @@ -350,12 +350,12 @@ BOOLEAN BeginMeanwhile( UINT8 ubMeanwhileID ) void BringupMeanwhileBox( ) { - wchar_t zStr[256]; + CHAR16 zStr[256]; #ifdef JA2TESTVERSION - swprintf( (wchar_t *)zStr, (wchar_t *)L"Meanwhile..... ( %S : Remember to make sure towns are controlled if required by script )", gzMeanwhileStr[ gCurrentMeanwhileDef.ubMeanwhileID ] ); + swprintf( zStr, L"Meanwhile..... ( %S : Remember to make sure towns are controlled if required by script )", gzMeanwhileStr[ gCurrentMeanwhileDef.ubMeanwhileID ] ); #else - swprintf( (wchar_t *)zStr, (wchar_t *)L"%s.....", pMessageStrings[ MSG_MEANWHILE ] ); + swprintf( zStr, L"%s.....", pMessageStrings[ MSG_MEANWHILE ] ); #endif #ifdef JA2TESTVERSION diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 5892f73c..bca4b07e 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -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, wchar_t *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent ); +void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, STR16 szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent ); void CheckForRobotAndIfItsControlled( void ); @@ -170,10 +170,10 @@ INT32 giHilitedInvolved, giHilitedUninvolved; extern void CalculateGroupRetreatSector( GROUP *pGroup ); -extern void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -extern void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -extern void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -extern void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, wchar_t sString[], UINT8 *pubFontColor ); +extern void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +extern void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +extern void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +extern void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, CHAR16 sString[], UINT8 *pubFontColor ); @@ -213,7 +213,7 @@ void ValidateAndCorrectInBattleCounters( GROUP *pLocGroup ) if( ubInvalidGroups || pSector->ubAdminsInBattle || pSector->ubTroopsInBattle || pSector->ubElitesInBattle || pSector->ubCreaturesInBattle ) { - wchar_t str[ 512 ]; + CHAR16 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) { - wchar_t str[100]; + CHAR16 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; - wchar_t str[100]; - wchar_t pSectorName[ 128 ]; + CHAR16 str[100]; + CHAR16 pSectorName[ 128 ]; UINT8 ubHPPercent, ubBPPercent; BOOLEAN fMouseInRetreatButtonArea; UINT8 ubJunk; @@ -1417,7 +1417,7 @@ enum COND_DEAD }; -void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, wchar_t *szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent ) +void GetSoldierConditionInfo( SOLDIERTYPE *pSoldier, STR16 szCondition, UINT8 *pubHPPercent, UINT8 *pubBPPercent ) { Assert( pSoldier ); *pubHPPercent = (UINT8)(pSoldier->bLife * 100 / pSoldier->bLifeMax); diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index 279dfb40..2f8b5e1b 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -81,7 +81,7 @@ void ValidateEnemiesHaveWeapons() // do message box and return if( iNumInvalid ) { - wchar_t str[ 100 ]; + CHAR16 str[ 100 ]; swprintf( str, L"%d enemies have been added without any weapons! KM:0. Please note sector.", iNumInvalid ); iErrorDialog = DoMessageBox( MSG_BOX_BASIC_STYLE, str, GAME_SCREEN, MSG_BOX_FLAG_OK, NULL, &CenteringRect ); } @@ -713,7 +713,7 @@ void ProcessQueenCmdImplicationsOfDeath( SOLDIERTYPE *pSoldier ) { INT32 iNumEnemiesInSector; SECTORINFO *pSector; -// wchar_t str[128]; +// CHAR16 str[128]; INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize; DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"QueenCommand"); @@ -766,7 +766,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"QueenCommand"); if( !pGroup ) { #ifdef JA2BETAVERSION - wchar_t str[256]; + CHAR16 str[256]; swprintf( str, L"Enemy soldier killed with ubGroupID of %d, and the group doesn't exist!", pSoldier->ubGroupID ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); #endif @@ -775,7 +775,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"QueenCommand"); if( pGroup->fPlayer ) { #ifdef JA2BETAVERSION - wchar_t str[256]; + CHAR16 str[256]; swprintf( str, L"Attempting to process player group thinking it's an enemy group in ProcessQueenCmdImplicationsOfDeath()", pSoldier->ubGroupID ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); #endif diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 772228d8..405a5446 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -48,8 +48,8 @@ // //******************************* -typedef void ( *DROP_DOWN_DISPLAY_CALLBACK ) (STR16); -typedef void ( *DROP_DOWN_SELECT_CALLBACK ) (STR16); +typedef void ( *DROP_DOWN_DISPLAY_CALLBACK ) ; +typedef void ( *DROP_DOWN_SELECT_CALLBACK ) ; #define QUEST_DEBUG_FILE "QuestDebugRecordLog.txt" @@ -438,7 +438,7 @@ INT16 gsQdsEnteringGridNo =0; UINT8 gubTextEntryAction = QD_DROP_DOWN_NO_ACTION; BOOLEAN gfTextEntryActive = FALSE; -//wchar_t gzTextEntryReturnString[ 16 ]; +//CHAR16 gzTextEntryReturnString[ 16 ]; BOOLEAN gfUseLocalNPCs = FALSE; @@ -626,7 +626,7 @@ void ChangeFactState( INT32 iNumber ); void DisplayCurrentGridNo(); void EnableQDSButtons(); -BOOLEAN DoQDSMessageBox( UINT8 ubStyle, wchar_t * zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ); +BOOLEAN DoQDSMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ); void IncrementActiveDropDownBox( INT16 sIncrementValue ); INT16 IsMercInTheSector( UINT16 usMercID ); void RefreshAllNPCInventory(); @@ -837,7 +837,7 @@ BOOLEAN EnterQuestDebugSystem() { UINT8 i; UINT16 usPosX, usPosY; - wchar_t zName[ 128 ]; + CHAR16 zName[ 128 ]; // UINT16 usListBoxFontHeight = GetFontHeight( QUEST_DBS_FONT_LISTBOX_TEXT ) + 2; @@ -1038,7 +1038,7 @@ BOOLEAN EnterQuestDebugSystem() if( giHaveSelectedNPC != -1 ) { - wchar_t zItemDesc[ SIZE_ITEM_INFO ]; + CHAR16 zItemDesc[ SIZE_ITEM_INFO ]; if( gfUseLocalNPCs ) swprintf( zItemDesc, L"%d - %s", gubCurrentNpcInSector[ giHaveSelectedNPC ], gMercProfiles[ gubCurrentNpcInSector[ giHaveSelectedNPC ] ].zNickname ); @@ -1053,8 +1053,8 @@ BOOLEAN EnterQuestDebugSystem() if( giHaveSelectedItem != -1 ) { - wchar_t zItemName[ SIZE_ITEM_NAME ]; - wchar_t zItemDesc[ SIZE_ITEM_INFO ]; + CHAR16 zItemName[ SIZE_ITEM_NAME ]; + CHAR16 zItemDesc[ SIZE_ITEM_INFO ]; wcscpy( zItemName, ShortItemNames[ giHaveSelectedItem ] ); @@ -1580,7 +1580,7 @@ void DisplayQuestList() { UINT16 usLoop1, usCount; UINT16 usTextHeight = GetFontHeight( QUEST_DBS_FONT_DYNAMIC_TEXT ) + 2; - wchar_t sTemp[15]; + CHAR16 sTemp[15]; UINT16 usPosY; usPosY = QUEST_DBS_FIRST_COL_NUMBER_Y + QUEST_DBS_LIST_TEXT_OFFSET; //&& (usCount < QUEST_DBS_MAX_DISPLAYED_ENTRIES ) @@ -1609,7 +1609,7 @@ void DisplayFactList() { UINT16 usLoop1, usCount; UINT16 usTextHeight = GetFontHeight( QUEST_DBS_FONT_DYNAMIC_TEXT ) + 2; - wchar_t sTemp[512]; + CHAR16 sTemp[512]; UINT16 usPosY; usPosY = QUEST_DBS_SECOND_COL_NUMBER_Y + QUEST_DBS_LIST_TEXT_OFFSET + QUEST_DBS_FACT_LIST_OFFSET; // @@ -1952,10 +1952,10 @@ void DisplaySelectedNPC() { UINT16 i; UINT16 usPosX, usPosY; - UINT16 usLocationX = 0, usLocationY = 0; + INT16 usLocationX = 0, usLocationY = 0; UINT16 usFontHeight = GetFontHeight( QUEST_DBS_FONT_LISTBOX_TEXT ) + 2; CHAR16 sTempString[ 64 ]; - wchar_t zButtonName[ 256 ]; + CHAR16 zButtonName[ 256 ]; @@ -2045,10 +2045,10 @@ void DisplaySelectedItem() UINT16 i; UINT16 usPosX, usPosY; UINT16 usFontHeight = GetFontHeight( QUEST_DBS_FONT_LISTBOX_TEXT ) + 2; - wchar_t zItemName[ SIZE_ITEM_NAME ]; -// wchar_t zItemDesc[ SIZE_ITEM_INFO ]; + CHAR16 zItemName[ SIZE_ITEM_NAME ]; +// CHAR16 zItemDesc[ SIZE_ITEM_INFO ]; - wchar_t zButtonName[ 256 ]; + CHAR16 zButtonName[ 256 ]; usPosX = gpActiveListBox->usScrollPosX; @@ -2443,8 +2443,8 @@ void BtnQuestDebugAddItemToLocationButtonCallback(GUI_BUTTON *btn,INT32 reason) if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) { CHAR16 zTemp[512]; - UINT16 zItemName[ SIZE_ITEM_NAME ]; -// UINT16 zItemDesc[ SIZE_ITEM_INFO ]; + CHAR16 zItemName[ SIZE_ITEM_NAME ]; +// CHAR16 zItemDesc[ SIZE_ITEM_INFO ]; btn->uiFlags &= (~BUTTON_CLICKED_ON ); // if ( !LoadItemInfo( gItemListBox.sCurSelectedItem, zItemName, zItemDesc ) ) @@ -2592,7 +2592,7 @@ void BtnQuestDebugNPCLogButtonButtonCallback(GUI_BUTTON *btn,INT32 reason) } if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) { - wchar_t zName[ 128 ]; + CHAR16 zName[ 128 ]; // btn->uiFlags &= (~BUTTON_CLICKED_ON ); @@ -2707,7 +2707,7 @@ void BtnQuestDebugStartMercTalkingButtonButtonCallback(GUI_BUTTON *btn,INT32 rea BOOLEAN CreateDestroyDisplayTextEntryBox( UINT8 ubAction, STR16 pString, TEXT_ENTRY_CALLBACK EntryCallBack ) { static BOOLEAN fMouseRegionCreated = FALSE; - static wchar_t zString[ 256 ]; + static CHAR16 zString[ 256 ]; static TEXT_ENTRY_CALLBACK TextEntryCallback; switch( ubAction ) @@ -2753,7 +2753,7 @@ BOOLEAN CreateDestroyDisplayTextEntryBox( UINT8 ubAction, STR16 pString, TEXT_EN case QD_DROP_DOWN_CANCEL: case QD_DROP_DOWN_DESTROY: { - wchar_t zText[ 32 ]; + CHAR16 zText[ 32 ]; INT32 iTextEntryNumber; if( !fMouseRegionCreated ) @@ -2875,7 +2875,7 @@ void ScrollQuestListRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason ) } else if (iReason & MSYS_CALLBACK_REASON_LBUTTON_UP) { - wchar_t String[ 512 ]; + CHAR16 String[ 512 ]; gubCurQuestSelected = (UINT8)MSYS_GetRegionUserData( pRegion, 0 ); @@ -2899,7 +2899,7 @@ void ScrollFactListRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason ) } else if (iReason & MSYS_CALLBACK_REASON_LBUTTON_UP) { - wchar_t String[ 512 ]; + CHAR16 String[ 512 ]; gusCurFactSelected = (UINT8)MSYS_GetRegionUserData( pRegion, 0 ) + gusFactAtTopOfList; @@ -2922,8 +2922,8 @@ void ScrollFactListRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason ) void InitQuestDebugTextInputBoxes() { UINT32 uiStartLoc=0; - wchar_t sTemp[ 640 ]; -// wchar_t sText[ 640 ]; + CHAR16 sTemp[ 640 ]; +// CHAR16 sText[ 640 ]; InitTextInputMode(); @@ -3120,8 +3120,8 @@ void CreateDestroyDisplayNPCInventoryPopup( UINT8 ubAction ) case QD_DROP_DOWN_DISPLAY: { - wchar_t zItemName[ SIZE_ITEM_NAME ]; -// wchar_t zItemDesc[ SIZE_ITEM_INFO ]; + CHAR16 zItemName[ SIZE_ITEM_NAME ]; +// CHAR16 zItemDesc[ SIZE_ITEM_INFO ]; UINT16 usFontHeight = GetFontHeight( QUEST_DBS_FONT_LISTBOX_TEXT ) + 2; @@ -3565,7 +3565,7 @@ void EnableQDSButtons() */ } -BOOLEAN DoQDSMessageBox( UINT8 ubStyle, wchar_t * zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ) +BOOLEAN DoQDSMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT8 ubFlags, MSGBOX_CALLBACK ReturnCallback ) { SGPRect pCenteringRect= {0, 0, 639, 479 }; diff --git a/Strategic/Scheduling.cpp b/Strategic/Scheduling.cpp index b99ce27d..714a54be 100644 --- a/Strategic/Scheduling.cpp +++ b/Strategic/Scheduling.cpp @@ -25,7 +25,7 @@ #endif #ifdef JA2EDITOR -extern UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20]; +extern CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20]; #endif BOOLEAN GetEarliestMorningScheduleEvent( SCHEDULENODE *pSchedule, UINT32 * puiTime ); diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index e68d7358..1f2bfafd 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -425,8 +425,8 @@ void ReinitializeUnvisitedGarrisons(); //was made. #ifdef JA2BETAVERSION -void LogStrategicEvent( char * str, ... ); //adds a timestamp. -void LogStrategicMsg( char * str, ... ); //doesn't use the time stamp +void LogStrategicEvent( STR8 str, ... ); //adds a timestamp. +void LogStrategicMsg( STR8 str, ... ); //doesn't use the time stamp void ClearStrategicLog(); #endif @@ -712,7 +712,7 @@ void ValidatePendingGroups() } if( iErrorsForInvalidPendingGroup ) { - wchar_t str[256]; + CHAR16 str[256]; swprintf( str, L"Strategic AI: Internal error -- %d pending groups were discovered to be invalid. Please report error and send save." L"You can continue playing, as this has been auto-corrected. No need to send any debug files.", iErrorsForInvalidPendingGroup ); SAIReportError( str ); @@ -747,7 +747,7 @@ void ValidateWeights( INT32 iID ) if( giReinforcementPoints != iSumReinforcementPoints || giRequestPoints != iSumRequestPoints ) { - wchar_t str[256]; + CHAR16 str[256]; swprintf( str, L"Strategic AI: Internal error #%02d (total request/reinforcement points). Please report error including error#. " L"You can continue playing, as the points have been auto-corrected. No need to send any save/debug files.", iID ); //Correct the misalignment. @@ -775,7 +775,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic2"); { #ifdef JA2BETAVERSION { - wchar_t str[256]; + CHAR16 str[256]; swprintf( str, L"Strategic AI: Internal error (invalid enemy group #%d location at %c%d, destination %c%d). Please send PRIOR save file and Strategic Decisions.txt.", pGroup->ubGroupID, pGroup->ubSectorY + 'A' - 1, pGroup->ubSectorX, pGroup->ubNextY + 'A' - 1, pGroup->ubNextX ); SAIReportError( str ); @@ -816,7 +816,7 @@ void ValidateLargeGroup( GROUP *pGroup ) #ifdef JA2BETAVERSION if( pGroup->ubGroupSize > 25 ) { - wchar_t str[ 512 ]; + CHAR16 str[ 512 ]; swprintf( str, L"Strategic AI warning: Enemy group containing %d soldiers " L"(%d admins, %d troops, %d elites) in sector %c%d. This message is a temporary test message " L"to evaluate a potential problems with very large enemy groups.", @@ -873,7 +873,7 @@ void ValidatePlayersAreInOneGroupOnly() GROUP *pGroup, *pOtherGroup; PLAYERGROUP *pPlayer; SOLDIERTYPE *pSoldier; - wchar_t str[ 1024 ]; + CHAR16 str[ 1024 ]; UINT8 ubGroupID; //Go through each merc slot in the player team iNumErrors = 0; @@ -1051,7 +1051,7 @@ void ValidatePlayersAreInOneGroupOnly() if( iNumErrors ) { //The first error to be detected is the one responsible for building the strings. We will simply append another string containing //the total number of detected errors. - UINT16 tempstr[ 128 ]; + CHAR16 tempstr[ 128 ]; swprintf( tempstr, L" A total of %d related errors have been detected.", iNumErrors ); wcscat( str, tempstr ); SAIReportError( str ); @@ -1084,8 +1084,8 @@ void SAIReportError( STR16 wErrorString ) } if( guiCurrentScreen == AIVIEWER_SCREEN ) { - UINT8 str[ 512 ]; - sprintf( (char *)str, "%S\n", wErrorString ); + CHAR8 str[ 512 ]; + sprintf( str, "%S\n", wErrorString ); OutputDebugString( (LPCSTR) str ); } @@ -2098,7 +2098,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic5"); { UINT8 ubCut; #ifdef JA2BETAVERSION - wchar_t str[512]; + CHAR16 str[512]; swprintf( str, L"Patrol group #%d in %c%d received too many reinforcements from group #%d that was created in %c%d. Size truncated from %d to %d." L"Please send Strategic Decisions.txt and PRIOR save.", pPatrolGroup->ubGroupID, pPatrolGroup->ubSectorY + 'A' - 1, pPatrolGroup->ubSectorX, @@ -4388,10 +4388,10 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto #ifdef JA2BETAVERSION -void LogStrategicMsg( char * str, ... ) +void LogStrategicMsg( STR8 str, ... ) { va_list argptr; - UINT8 string[512]; + CHAR8 string[512]; FILE *fp; @@ -4400,7 +4400,7 @@ void LogStrategicMsg( char * str, ... ) return; va_start(argptr, str ); - vsprintf( (char *)string, str, argptr); + vsprintf( string, str, argptr); va_end(argptr); fprintf( fp, "%s\n", string ); @@ -4417,10 +4417,10 @@ void LogStrategicMsg( char * str, ... ) fclose( fp ); } -void LogStrategicEvent( char * str, ... ) +void LogStrategicEvent( STR8 str, ... ) { va_list argptr; - UINT8 string[512]; + CHAR8 string[512]; FILE *fp; @@ -4429,7 +4429,7 @@ void LogStrategicEvent( char * str, ... ) return; va_start(argptr, str ); - vsprintf( (char *)string, str, argptr); + vsprintf( string, str, argptr); va_end(argptr); diff --git a/Strategic/Strategic Movement Costs.cpp b/Strategic/Strategic Movement Costs.cpp index 7a705d33..f2d68335 100644 --- a/Strategic/Strategic Movement Costs.cpp +++ b/Strategic/Strategic Movement Costs.cpp @@ -22,11 +22,11 @@ typedef enum typedef struct { SMCTABLE_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 currentDepth; UINT32 maxReadDepth; - //INT8 szCustomShortname[MAX_SECTORNAME_LENGTH+1]; + //CHAR8 szCustomShortname[MAX_SECTORNAME_LENGTH+1]; UINT32 uiRowNumber; UINT32 uiColNumber; UINT32 travRating; @@ -41,7 +41,7 @@ typedef struct /** Process the opening tag in this expat callback. */ static void XMLCALL -smctableStartElementHandle(void *userData, const char *name, const char **atts) +smctableStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { smctableParseData * pData = (smctableParseData *) userData; //FILE *outfile = fopen("smc.log", "at"); @@ -120,7 +120,7 @@ smctableStartElementHandle(void *userData, const char *name, const char **atts) /** Process any text content in this callback. */ static void XMLCALL -smctableCharacterDataHandle(void *userData, const char *str, int len) +smctableCharacterDataHandle(void *userData, const XML_Char *str, int len) { smctableParseData * pData = (smctableParseData *) userData; @@ -131,7 +131,7 @@ smctableCharacterDataHandle(void *userData, const char *str, int len) /** Process the closing tag in this expat callback. */ static void XMLCALL -smctableEndElementHandle(void *userData, const char *name) +smctableEndElementHandle(void *userData, const XML_Char *name) { smctableParseData * pData = (smctableParseData *) userData; diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 5736142e..a5969681 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -698,7 +698,7 @@ GROUP* CreateNewEnemyGroupDepartingFromSector( UINT32 uiSector, UINT8 ubNumAdmin #ifdef JA2BETAVERSION { - wchar_t str[ 512 ]; + CHAR16 str[ 512 ]; if( PlayerMercsInSector( pNew->ubSectorX, pNew->ubSectorY, 0 ) || CountAllMilitiaInSector( pNew->ubSectorX, pNew->ubSectorY ) ) { swprintf( str, L"Attempting to send enemy troops from player occupied location. " @@ -1150,7 +1150,7 @@ BOOLEAN CheckConditionsForBattle( GROUP *pGroup ) if( GetTownIdForSector( pGroup->ubSectorX, pGroup->ubSectorY ) == BLANK_SECTOR) { -// wchar_t str[ 256 ]; +// CHAR16 str[ 256 ]; // UINT16 uiSectorC = L'A' + pGroup->ubSectorY - 1; // swprintf( str, gpStrategicString[ STR_DIALOG_ENEMIES_ATTACK_MILITIA ], uiSectorC, pGroup->ubSectorX ); // DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, TriggerPrebattleInterface ); @@ -1159,8 +1159,8 @@ BOOLEAN CheckConditionsForBattle( GROUP *pGroup ) } else { - wchar_t str[ 256 ]; - wchar_t pSectorStr[ 128 ]; + CHAR16 str[ 256 ]; + CHAR16 pSectorStr[ 128 ]; GetSectorIDString( pGroup->ubSectorX, pGroup->ubSectorY, pGroup->ubSectorZ , pSectorStr, TRUE ); swprintf( str, gpStrategicString[ STR_DIALOG_ENEMIES_ATTACK_UNCONCIOUSMERCS ], pSectorStr ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, TriggerPrebattleInterface ); @@ -2228,8 +2228,8 @@ BOOLEAN PossibleToCoordinateSimultaneousGroupArrivals( GROUP *pFirstGroup ) if( ubNumNearbyGroups ) { //postpone the battle until the user answers the dialog. - wchar_t str[255]; - wchar_t *pStr, *pEnemyType; + CHAR16 str[255]; + STR16 pStr, pEnemyType; InterruptTime(); PauseGame(); LockPauseState( 13 ); @@ -4495,7 +4495,7 @@ void AddFuelToVehicle( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pVehicle ) if( !Item[pItem->usItem].gascan ) { #ifdef JA2BETAVERSION - wchar_t str[ 100 ]; + CHAR16 str[ 100 ]; swprintf( str, L"%s is supposed to have gas can in hand. ATE:0", pSoldier->name ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); #endif @@ -4526,7 +4526,7 @@ void AddFuelToVehicle( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pVehicle ) void ReportVehicleOutOfGas( INT32 iVehicleID, UINT8 ubSectorX, UINT8 ubSectorY ) { - wchar_t str[255]; + CHAR16 str[255]; //Report that the vehicle that just arrived is out of gas. swprintf( str, gzLateLocalizedString[ 5 ], pVehicleStrings[ pVehicleList[ iVehicleID ].ubVehicleType ], @@ -4754,8 +4754,8 @@ BOOLEAN TestForBloodcatAmbush( GROUP *pGroup ) void NotifyPlayerOfBloodcatBattle( UINT8 ubSectorX, UINT8 ubSectorY ) { - wchar_t str[ 256 ]; - wchar_t zTempString[ 128 ]; + CHAR16 str[ 256 ]; + CHAR16 zTempString[ 128 ]; if( gubEnemyEncounterCode == BLOODCAT_AMBUSH_CODE ) { GetSectorIDString( ubSectorX, ubSectorY, 0, zTempString, TRUE ); @@ -5156,7 +5156,7 @@ void ValidateGroups( GROUP *pGroup ) if( !pGroup->fPlayer && !pGroup->ubGroupSize ) { //report error - wchar_t str[ 512 ]; + CHAR16 str[ 512 ]; if( pGroup->ubSectorIDOfLastReassignment == 255 ) { swprintf( str, L"Enemy group found with 0 troops in it. This is illegal and group will be deleted." diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 138eb3ee..1beeb15e 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -1550,8 +1550,8 @@ void AdjustLoyaltyForCivsEatenByMonsters( INT16 sSectorX, INT16 sSectorY, UINT8 { INT8 bTownId = 0; UINT32 uiLoyaltyChange = 0; - wchar_t str[256]; - wchar_t pSectorString[128]; + CHAR16 str[256]; + CHAR16 pSectorString[128]; // get town id diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index 7fb5f439..a67c356c 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -657,7 +657,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Militia2"); return; } -void DoContinueMilitiaTrainingMessageBox( INT16 sSectorX, INT16 sSectorY, wchar_t *str, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) +void DoContinueMilitiaTrainingMessageBox( INT16 sSectorX, INT16 sSectorY, const STR16 str, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) { if( sSectorX <= 10 && sSectorY >= 6 && sSectorY <= 11 ) { @@ -725,12 +725,12 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Militia3"); // wilderness SAM site GetSectorIDString( sSectorX, sSectorY, 0, sStringB, TRUE ); void (*tempFptr)(INT16 , INT16 , INT8 , CHAR16 *, BOOLEAN) = GetSectorIDString; - swprintf( (wchar_t *)sString, (wchar_t *)pMilitiaConfirmStrings[ 10 ], sStringB, tempFptr, iMinLoyaltyToTrain ); + swprintf( sString, pMilitiaConfirmStrings[ 10 ], sStringB, tempFptr, iMinLoyaltyToTrain ); } else { // town - swprintf( (wchar_t *)sString, (wchar_t *)pMilitiaConfirmStrings[ 10 ], pTownNames[ bTownId ], iMinLoyaltyToTrain ); + swprintf( sString, pMilitiaConfirmStrings[ 10 ], pTownNames[ bTownId ], iMinLoyaltyToTrain ); } DoContinueMilitiaTrainingMessageBox( sSectorX, sSectorY, sString, MSG_BOX_FLAG_OK, CantTrainMilitiaOkBoxCallback ); return; @@ -1456,9 +1456,9 @@ BOOLEAN MilitiaTrainingAllowedInTown( INT8 bTownId ) return( gfMilitiaAllowedInTown[bTownId] ); } -void BuildMilitiaPromotionsString( wchar_t *str ) +void BuildMilitiaPromotionsString( STR16 str ) { - wchar_t pStr[256]; + CHAR16 pStr[256]; BOOLEAN fAddSpace = FALSE; swprintf( str, L"" ); diff --git a/Strategic/Town Militia.h b/Strategic/Town Militia.h index 42f4b4f9..d8d58b14 100644 --- a/Strategic/Town Militia.h +++ b/Strategic/Town Militia.h @@ -37,7 +37,7 @@ void StrategicRemoveMilitiaFromSector(INT16 sMapX, INT16 sMapY, UINT8 ubRank, UI // this will check for promotions and handle them for you UINT8 CheckOneMilitiaForPromotion(INT16 sMapX, INT16 sMapY, UINT8 ubCurrentRank, UINT8 ubRecentKillPts); -void BuildMilitiaPromotionsString( wchar_t *str ); +void BuildMilitiaPromotionsString( STR16 str ); // call this if the player attacks his own militia void HandleMilitiaDefections(INT16 sMapX, INT16 sMapY); diff --git a/Strategic/XML_Army.cpp b/Strategic/XML_Army.cpp index ad72411f..7852b630 100644 --- a/Strategic/XML_Army.cpp +++ b/Strategic/XML_Army.cpp @@ -36,7 +36,7 @@ typedef struct { GARRISON_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; garrisonInfo curGarrisonInfo; UINT32 uiGarrisonCount; @@ -45,7 +45,7 @@ typedef struct } garrisonParseData; static void XMLCALL -garrisonStartElementHandle(void *userData, const char *name, const char **atts) +garrisonStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { garrisonParseData * pData = (garrisonParseData *) userData; @@ -82,7 +82,7 @@ garrisonStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -garrisonCharacterDataHandle(void *userData, const char *str, int len) +garrisonCharacterDataHandle(void *userData, const XML_Char *str, int len) { garrisonParseData * pData = (garrisonParseData *) userData; @@ -92,7 +92,7 @@ garrisonCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -garrisonEndElementHandle(void *userData, const char *name) +garrisonEndElementHandle(void *userData, const XML_Char *name) { garrisonParseData * pData = (garrisonParseData *) userData; @@ -261,7 +261,7 @@ typedef struct { PATROL_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; patrolInfo curPatrolInfo; UINT32 uiPatrolCount; @@ -270,7 +270,7 @@ typedef struct } patrolParseData; static void XMLCALL -patrolStartElementHandle(void *userData, const char *name, const char **atts) +patrolStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { patrolParseData * pData = (patrolParseData *) userData; @@ -332,7 +332,7 @@ patrolStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -patrolCharacterDataHandle(void *userData, const char *str, int len) +patrolCharacterDataHandle(void *userData, const XML_Char *str, int len) { patrolParseData * pData = (patrolParseData *) userData; @@ -342,7 +342,7 @@ patrolCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -patrolEndElementHandle(void *userData, const char *name) +patrolEndElementHandle(void *userData, const XML_Char *name) { patrolParseData * pData = (patrolParseData *) userData; @@ -626,7 +626,7 @@ typedef struct { COMPOSITION_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; compositionInfo curCompositionInfo; INT32 iHighestIndex; @@ -635,7 +635,7 @@ typedef struct } compositionParseData; static void XMLCALL -compositionStartElementHandle(void *userData, const char *name, const char **atts) +compositionStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { compositionParseData * pData = (compositionParseData *) userData; @@ -697,7 +697,7 @@ compositionStartElementHandle(void *userData, const char *name, const char **att } static void XMLCALL -compositionCharacterDataHandle(void *userData, const char *str, int len) +compositionCharacterDataHandle(void *userData, const XML_Char *str, int len) { compositionParseData * pData = (compositionParseData *) userData; @@ -707,7 +707,7 @@ compositionCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -compositionEndElementHandle(void *userData, const char *name) +compositionEndElementHandle(void *userData, const XML_Char *name) { compositionParseData * pData = (compositionParseData *) userData; diff --git a/Strategic/XML_Roaming.cpp b/Strategic/XML_Roaming.cpp index 8cc6b603..94292663 100644 --- a/Strategic/XML_Roaming.cpp +++ b/Strategic/XML_Roaming.cpp @@ -32,7 +32,7 @@ typedef struct typedef struct { ROAMING_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; RoamingInfo curRoamingInfo; UINT32 uiSectorCount; UINT32 currentDepth; @@ -41,7 +41,7 @@ typedef struct static void XMLCALL -RoamingStartElementHandle(void *userData, const char *name, const char **atts) +RoamingStartElementHandle(void *userData, const XML_Char *name, const char **atts) { RoamingParseData * pData = (RoamingParseData *) userData; @@ -69,7 +69,7 @@ RoamingStartElementHandle(void *userData, const char *name, const char **atts) static void XMLCALL -RoamingCharacterDataHandle(void *userData, const char *str, int len) +RoamingCharacterDataHandle(void *userData, const XML_Char *str, int len) { RoamingParseData * pData = (RoamingParseData *) userData; @@ -79,7 +79,7 @@ RoamingCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -RoamingEndElementHandle(void *userData, const char *name) +RoamingEndElementHandle(void *userData, const XML_Char *name) { RoamingParseData * pData = (RoamingParseData *) userData; diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index ff74faf7..56088ee9 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -1030,10 +1030,10 @@ void BullsEyeOrChopperSelectionPopupCallback( UINT8 ubExitValue ); void WakeUpAnySleepingSelectedMercsOnFootOrDriving( void ); -void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ); -void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, wchar_t sString[], UINT8 *pubFontColor ); +void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ); +void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, CHAR16 sString[], UINT8 *pubFontColor ); void InitPreviousPaths( void ); void RememberPreviousPathForAllSelectedChars( void ); @@ -1539,8 +1539,8 @@ void DrawPay(INT16 sCharNumber) { // will draw the pay INT32 uiSalary; - wchar_t sString[7]; - UINT16 usX, usY; + CHAR16 sString[7]; + INT16 usX, usY; INT16 usMercProfileID; @@ -1631,8 +1631,8 @@ void DrawCharBars( void ) void DrawCharStats( INT16 sCharNum ) { // will draw the characters stats, max life, strength, dex, and skills - wchar_t sString[9]; - UINT16 usX, usY; + CHAR16 sString[9]; + INT16 usX, usY; //HVOBJECT hCrossHandle; SOLDIERTYPE *pSoldier = NULL; @@ -1884,8 +1884,8 @@ void DrawCharStats( INT16 sCharNum ) void DrawCharHealth( INT16 sCharNum ) { UINT32 uiHealthPercent = 0; - wchar_t sString[9]; - UINT16 usX, usY; + CHAR16 sString[9]; + INT16 usX, usY; SOLDIERTYPE *pSoldier = NULL; @@ -1978,8 +1978,8 @@ void DrawCharHealth( INT16 sCharNum ) // "character" refers to hired people AND vehicles void DrawCharacterInfo(INT16 sCharNumber) { - wchar_t sString[80]; - UINT16 usX, usY; + CHAR16 sString[80]; + INT16 usX, usY; INT16 usMercProfileID; INT32 iTimeRemaining=0; INT8 bMorale =0; @@ -4172,7 +4172,7 @@ void SetDayAlternate(STR16 pStringA, ...) // this sets the clock counter, unwind loop UINT16 uiX=0; UINT16 uiY=0; - wchar_t String[80]; + CHAR16 String[80]; va_list argptr; va_start(argptr, pStringA); // Set up variable argument pointer @@ -4206,7 +4206,7 @@ void SetHourAlternate(STR16 pStringA, ...) // this sets the clock counter, unwind loop UINT16 uiX=0; UINT16 uiY=0; - wchar_t String[80]; + CHAR16 String[80]; va_list argptr; va_start(argptr, pStringA); // Set up variable argument pointer @@ -4242,7 +4242,7 @@ void SetClockHour(STR16 pStringA, ...) // this sets the clock counter, unwind loop UINT16 uiX=0; UINT16 uiY=0; - wchar_t String[80]; + CHAR16 String[80]; va_list argptr; va_start(argptr, pStringA); // Set up variable argument pointer @@ -4271,7 +4271,7 @@ void SetClockHour(STR16 pStringA, ...) void SetClockMin(STR16 pStringA, ...) { // this sets the clock counter, unwind loop - wchar_t String[10]; + CHAR16 String[10]; va_list argptr; va_start(argptr, pStringA); // Set up variable argument pointer @@ -4299,8 +4299,8 @@ void SetClockMin(STR16 pStringA, ...) // WANNE 2 void DrawName(STR16 pName, INT16 sRowIndex, INT32 iFont) { - UINT16 usX=0; - UINT16 usY=0; + INT16 usX=0; + INT16 usY=0; // mercs if( sRowIndex < FIRST_VEHICLE ) @@ -4322,9 +4322,9 @@ void DrawName(STR16 pName, INT16 sRowIndex, INT32 iFont) void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) { - UINT16 usX=0; - UINT16 usY=0; - wchar_t sString[32]; + INT16 usX=0; + INT16 usY=0; + CHAR16 sString[32]; GetMapscreenMercAssignmentString( MercPtrs[ gCharactersList[ sCharNumber ].usSolID ], sString ); @@ -4356,9 +4356,9 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) void DrawLocation(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) { - UINT16 usX=0; - UINT16 usY=0; - wchar_t sString[32]; + INT16 usX=0; + INT16 usY=0; + CHAR16 sString[32]; GetMapscreenMercLocationString( MercPtrs[ gCharactersList[ sCharNumber ].usSolID ], sString ); @@ -4384,9 +4384,9 @@ void DrawLocation(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) void DrawDestination(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) { - UINT16 usX=0; - UINT16 usY=0; - wchar_t sString[32]; + INT16 usX=0; + INT16 usY=0; + CHAR16 sString[32]; GetMapscreenMercDestinationString( MercPtrs[ gCharactersList[ sCharNumber ].usSolID ], sString ); @@ -4415,9 +4415,9 @@ void DrawDestination(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) void DrawTimeRemaining( INT16 sCharNumber, INT32 iFont, UINT8 ubFontColor ) { - UINT16 usX=0; - UINT16 usY=0; - wchar_t sString[32]; + INT16 usX=0; + INT16 usY=0; + CHAR16 sString[32]; GetMapscreenMercDepartureString( MercPtrs[ gCharactersList[ sCharNumber ].usSolID ], sString, &ubFontColor ); @@ -6622,13 +6622,13 @@ void PollRightButtonInMapView( UINT32 *puiNewEvent ) -void PopupText( wchar_t *pFontString, ... ) +void PopupText( STR16 pFontString, ... ) { UINT8 *pDestBuf; UINT32 uiDestPitchBYTES; va_list argptr; INT16 sX, sY; - wchar_t PopupString[512]; + CHAR16 PopupString[512]; va_start(argptr, pFontString); // Set up variable argument pointer vswprintf(PopupString, pFontString, argptr); // process gprintf string (get output str) @@ -6752,7 +6752,7 @@ void BltCharInvPanel() HVOBJECT hCharListHandle; SOLDIERTYPE *pSoldier; CHAR16 sString[ 32 ]; - UINT16 usX, usY; + INT16 usX, usY; INT32 iCounter = 0; @@ -10876,8 +10876,8 @@ void TellPlayerWhyHeCantCompressTime( void ) { if( OnlyHostileCivsInSector() ) { - wchar_t str[ 256 ]; - wchar_t pSectorString[ 128 ]; + CHAR16 str[ 256 ]; + CHAR16 pSectorString[ 128 ]; GetSectorIDString( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, pSectorString, TRUE ); swprintf( str, gzLateLocalizedString[ 27 ], pSectorString ); DoMapMessageBox( MSG_BOX_BASIC_STYLE, str, MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback ); @@ -12601,14 +12601,14 @@ void HandlePostAutoresolveMessages() } else if( gbMilitiaPromotions ) { - wchar_t str[ 512 ]; + CHAR16 str[ 512 ]; BuildMilitiaPromotionsString( str ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback ); } } -void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, wchar_t sString[] ) +void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ) { if( pSoldier->bAssignment != VEHICLE ) { @@ -12621,9 +12621,9 @@ void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, wchar_t sString[] } -void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ) +void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ) { - wchar_t pTempString[32]; + CHAR16 pTempString[32]; if( pSoldier->bAssignment == IN_TRANSIT ) @@ -12657,7 +12657,7 @@ void GetMapscreenMercLocationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ) } -void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, wchar_t sString[] ) +void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, CHAR16 sString[] ) { INT32 iSectorX, iSectorY; INT16 sSector=0; @@ -12715,7 +12715,7 @@ void GetMapscreenMercDestinationString( SOLDIERTYPE *pSoldier, wchar_t sString[] } -void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, wchar_t sString[], UINT8 *pubFontColor ) +void GetMapscreenMercDepartureString( SOLDIERTYPE *pSoldier, CHAR16 sString[], UINT8 *pubFontColor ) { INT32 iMinsRemaining = 0; INT32 iDaysRemaining = 0; diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index bff92efe..2cbf7a64 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -369,7 +369,7 @@ typedef struct { SAMSITE_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; samInfo curSamInfo; UINT32 uiRowNumber; UINT32 uiHighestIndex; @@ -379,7 +379,7 @@ typedef struct } samsiteParseData; static void XMLCALL -samsiteStartElementHandle(void *userData, const char *name, const char **atts) +samsiteStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { samsiteParseData * pData = (samsiteParseData *) userData; @@ -481,7 +481,7 @@ samsiteStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -samsiteCharacterDataHandle(void *userData, const char *str, int len) +samsiteCharacterDataHandle(void *userData, const XML_Char *str, int len) { samsiteParseData * pData = (samsiteParseData *) userData; @@ -491,7 +491,7 @@ samsiteCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -samsiteEndElementHandle(void *userData, const char *name) +samsiteEndElementHandle(void *userData, const XML_Char *name) { samsiteParseData * pData = (samsiteParseData *) userData; @@ -507,7 +507,7 @@ samsiteEndElementHandle(void *userData, const char *name) } else if(strcmp(name, "MAP_ROW") == 0 && pData->curElement == SAMSITE_ELEMENT_MAP_ROW) { - INT8 * curBuffer = pData->szCharData + strspn((const char *)pData->szCharData," \t\n\r"); + STR8 curBuffer = pData->szCharData + strspn(pData->szCharData," \t\n\r"); UINT32 curCellIndex = 0; UINT32 curNumber; @@ -515,13 +515,13 @@ samsiteEndElementHandle(void *userData, const char *name) while(curBuffer[0] != '\0') { - sscanf( (const char *)curBuffer,"%d",&curNumber); + sscanf( curBuffer,"%d",&curNumber); ubSAMControlledSectors[pData->uiRowNumber][curCellIndex] = curNumber; curCellIndex++; curBuffer += strcspn(curBuffer," \t\n\r\0"); - curBuffer += strspn((const char *)curBuffer," \t\n\r"); + curBuffer += strspn(curBuffer," \t\n\r"); } } else if(strcmp(name, "SAMLIST") == 0 && pData->curElement == SAMSITE_ELEMENT_SAMLIST) @@ -784,7 +784,7 @@ typedef struct { CITYTABLE_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; cityInfo curCityInfo; UINT32 uiRowNumber; UINT32 uiHighestIndex; @@ -794,7 +794,7 @@ typedef struct } citytableParseData; static void XMLCALL -citytableStartElementHandle(void *userData, const char *name, const char **atts) +citytableStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { citytableParseData * pData = (citytableParseData *) userData; @@ -910,7 +910,7 @@ citytableStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -citytableCharacterDataHandle(void *userData, const char *str, int len) +citytableCharacterDataHandle(void *userData, const XML_Char *str, int len) { citytableParseData * pData = (citytableParseData *) userData; @@ -920,7 +920,7 @@ citytableCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -citytableEndElementHandle(void *userData, const char *name) +citytableEndElementHandle(void *userData, const XML_Char *name) { citytableParseData * pData = (citytableParseData *) userData; @@ -936,7 +936,7 @@ citytableEndElementHandle(void *userData, const char *name) } else if(strcmp(name, "CITY_TABLE_ROW") == 0 && pData->curElement == CITYTABLE_ELEMENT_CITYTABLEROW) { - INT8 * curBuffer = pData->szCharData + strspn((const char *)pData->szCharData," \t\n\r"); + STR8 curBuffer = pData->szCharData + strspn(pData->szCharData," \t\n\r"); UINT32 curCellIndex = 0; UINT32 curNumber; @@ -944,13 +944,13 @@ citytableEndElementHandle(void *userData, const char *name) while(curBuffer[0] != '\0') { - sscanf( (const char *)curBuffer,"%d",&curNumber); + sscanf( curBuffer,"%d",&curNumber); StrategicMap[curCellIndex+MAP_WORLD_X*pData->uiRowNumber].bNameId = curNumber; curCellIndex++; curBuffer += strcspn(curBuffer," \t\n\r\0"); - curBuffer += strspn((const char *)curBuffer," \t\n\r"); + curBuffer += strspn(curBuffer," \t\n\r"); } } else if(strcmp(name, "CITYLIST") == 0 && pData->curElement == CITYTABLE_ELEMENT_CITYLIST) @@ -989,7 +989,7 @@ citytableEndElementHandle(void *userData, const char *name) } else if(strcmp(name, "townName") == 0 && pData->curElement == CITYTABLE_ELEMENT_NAME) { - strncpy(pData->curCityInfo.cityName, (const char *) pData->szCharData, MAX_TOWN_NAME_LENGHT - 1); + strncpy(pData->curCityInfo.cityName, pData->szCharData, MAX_TOWN_NAME_LENGHT - 1); pData->curCityInfo.cityName[MAX_TOWN_NAME_LENGHT - 1] = 0; pData->curElement = CITYTABLE_ELEMENT_CITY; @@ -1313,7 +1313,7 @@ void EndLoadScreen( ) #ifdef JA2TESTVERSION //Report the time it took to load the map. This is temporary until we are satisfied with the time //it takes to load the map. - wchar_t str[60]; + CHAR16 str[60]; FILE *fp; UINT32 uiSeconds; UINT32 uiHundreths; @@ -1926,10 +1926,10 @@ BOOLEAN SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ ) BOOLEAN MapExists( UINT8 * szFilename ) { - UINT8 str[50]; + CHAR8 str[50]; HWFILE fp; - sprintf( (char *)str, "MAPS\\%s", szFilename ); - fp = FileOpen( (STR)str, FILE_ACCESS_READ, FALSE ); + sprintf( str, "MAPS\\%s", szFilename ); + fp = FileOpen( str, FILE_ACCESS_READ, FALSE ); if( !fp ) return FALSE; FileClose( fp ); @@ -2366,7 +2366,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY , INT8 bSectorZ ) // swprintf( str, L"Loading map: %S", bFilename ); // SetProgressBarTitle( 0, str, FONT12POINT1, FONT_BLACK, FONT_BLACK ); //#endif - if( !LoadWorld((UINT8 *) bFilename ) ) + if( !LoadWorld(bFilename ) ) { return( FALSE ); } @@ -2617,8 +2617,8 @@ void UpdateMercInSector( SOLDIERTYPE *pSoldier, INT16 sSectorX, INT16 sSectorY, pSoldier->sInsertionGridNo = SearchForClosestPrimaryMapEdgepoint( pSoldier->sPendingActionData2, (UINT8)pSoldier->usStrategicInsertionData ); #ifdef JA2BETAVERSION { - UINT8 str[256]; - sprintf( (char *)str, "%S's primary insertion gridno is %d using %d as initial search gridno and %d insertion code.", + CHAR8 str[256]; + sprintf( str, "%S's primary insertion gridno is %d using %d as initial search gridno and %d insertion code.", pSoldier->name, pSoldier->sInsertionGridNo, pSoldier->sPendingActionData2, pSoldier->usStrategicInsertionData ); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, str ); } @@ -2634,8 +2634,8 @@ void UpdateMercInSector( SOLDIERTYPE *pSoldier, INT16 sSectorX, INT16 sSectorY, pSoldier->sInsertionGridNo = SearchForClosestSecondaryMapEdgepoint( pSoldier->sPendingActionData2, (UINT8)pSoldier->usStrategicInsertionData ); #ifdef JA2BETAVERSION { - UINT8 str[256]; - sprintf( (char *)str, "%S's isolated insertion gridno is %d using %d as initial search gridno and %d insertion code.", + CHAR8 str[256]; + sprintf( str, "%S's isolated insertion gridno is %d using %d as initial search gridno and %d insertion code.", pSoldier->name, pSoldier->sInsertionGridNo, pSoldier->sPendingActionData2, pSoldier->usStrategicInsertionData ); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, str ); } @@ -2677,8 +2677,8 @@ void UpdateMercInSector( SOLDIERTYPE *pSoldier, INT16 sSectorX, INT16 sSectorY, if( fError ) { //strategic insertion failed because it expected to find an entry point. This is likely //a missing part of the map or possible fault in strategic movement costs, traversal logic, etc. - wchar_t szEntry[10]; - wchar_t szSector[10]; + CHAR16 szEntry[10]; + CHAR16 szSector[10]; INT16 sGridNo; GetLoadedSectorString( szSector ); if( gMapInformation.sNorthGridNo != -1 ) @@ -2767,27 +2767,27 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , CHAR16 * bMineIndex = GetIdOfMineForSector( sSectorX, sSectorY, bSectorZ ); if( bMineIndex != -1 ) { - swprintf( (wchar_t *)zString, (wchar_t *)L"%c%d: %s %s", 'A' + sSectorY - 1, sSectorX, pTownNames[ GetTownAssociatedWithMine( bMineIndex ) ], pwMineStrings[ 0 ] ); + swprintf( zString, L"%c%d: %s %s", 'A' + sSectorY - 1, sSectorX, pTownNames[ GetTownAssociatedWithMine( bMineIndex ) ], pwMineStrings[ 0 ] ); } else switch( SECTOR( sSectorX, sSectorY ) ) { case SEC_A10: - swprintf( (wchar_t *)zString, (wchar_t *)L"A10: %s", pLandTypeStrings[ REBEL_HIDEOUT ] ); + swprintf( zString, L"A10: %s", pLandTypeStrings[ REBEL_HIDEOUT ] ); break; case SEC_J9: - swprintf( (wchar_t *)zString,(wchar_t *) L"J9: %s", pLandTypeStrings[ TIXA_DUNGEON ] ); + swprintf( zString, L"J9: %s", pLandTypeStrings[ TIXA_DUNGEON ] ); break; case SEC_K4: - swprintf( (wchar_t *)zString, (wchar_t *)L"K4: %s", pLandTypeStrings[ ORTA_BASEMENT ] ); + swprintf( zString, L"K4: %s", pLandTypeStrings[ ORTA_BASEMENT ] ); break; case SEC_O3: - swprintf( (wchar_t *)zString,(wchar_t *) L"O3: %s", pLandTypeStrings[ TUNNEL ] ); + swprintf( zString, L"O3: %s", pLandTypeStrings[ TUNNEL ] ); break; case SEC_P3: - swprintf( (wchar_t *)zString, (wchar_t *)L"P3: %s", pLandTypeStrings[ SHELTER ] ); + swprintf( zString, L"P3: %s", pLandTypeStrings[ SHELTER ] ); break; default: - swprintf( (wchar_t *)zString, (wchar_t *)L"%c%d: %s", 'A' + sSectorY - 1, sSectorX, pLandTypeStrings[ CREATURE_LAIR ] ); + swprintf( zString, L"%c%d: %s", 'A' + sSectorY - 1, sSectorX, pLandTypeStrings[ CREATURE_LAIR ] ); break; } } @@ -2802,7 +2802,7 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , CHAR16 * ubSectorID = (UINT8)SECTOR( sSectorX, sSectorY ); pSector = &SectorInfo[ ubSectorID ]; ubLandType = pSector->ubTraversability[ 4 ]; - swprintf( (wchar_t *)zString, (wchar_t *)L"%c%d: ", 'A' + sSectorY - 1, sSectorX ); + swprintf( zString, L"%c%d: ", 'A' + sSectorY - 1, sSectorX ); if ( bTownNameID == BLANK_SECTOR ) { @@ -3850,8 +3850,8 @@ void DoneFadeOutAdjacentSector( ) else { #ifdef JA2BETAVERSION - UINT8 str[256]; - sprintf( (char *)str, "%S's gridno is NOWHERE, and is attempting to walk into sector.", curr->pSoldier->name ); + CHAR8 str[256]; + sprintf( str, "%S's gridno is NOWHERE, and is attempting to walk into sector.", curr->pSoldier->name ); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, str ); #endif } @@ -5253,7 +5253,7 @@ INT16 PickGridNoToWalkIn( SOLDIERTYPE *pSoldier, UINT8 ubInsertionDirection, UIN } -void GetLoadedSectorString( wchar_t *pString ) +void GetLoadedSectorString( STR16 pString ) { if( !gfWorldLoaded ) { diff --git a/Strategic/strategicmap.h b/Strategic/strategicmap.h index 53bd953a..6fa34af1 100644 --- a/Strategic/strategicmap.h +++ b/Strategic/strategicmap.h @@ -93,10 +93,10 @@ void GetShortSectorString( INT16 sMapX,INT16 sMapY, STR16 sString ); //Examples: A9 // A10_B1 // J9_B2_A ( >= BETAVERSION ) else J9_B2 (release equivalent) -void GetLoadedSectorString( wchar_t *pString ); +void GetLoadedSectorString( STR16 pString ); // This will get an ID string like A9- OMERTA... -void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , CHAR16 * zString, BOOLEAN fDetailed ); +void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zString, BOOLEAN fDetailed ); void GetMapFileName(INT16 sMapX,INT16 sMapY, INT8 bSectorZ, STR8 bString, BOOLEAN fUsePlaceholder, BOOLEAN fAddAlternateMapLetter ); diff --git a/Sys Globals.cpp b/Sys Globals.cpp index b2d6c9f9..219c42fb 100644 --- a/Sys Globals.cpp +++ b/Sys Globals.cpp @@ -12,23 +12,23 @@ // External globals -extern UINT8 gubFilename[ 200 ]; // symbol already declared globally in editscreen.cpp (jonathanl) +extern CHAR8 gubFilename[ 200 ]; // symbol already declared globally in editscreen.cpp (jonathanl) BOOLEAN gfEditMode = FALSE; -extern INT8 gDebugStr[128]; // symbol already defined in overhead.cpp (jonathanl) -INT8 gSystemDebugStr[128]; +extern CHAR8 gDebugStr[128]; // symbol already defined in overhead.cpp (jonathanl) +CHAR8 gSystemDebugStr[128]; INT8 gbFPSDisplay = SHOW_MIN_FPS; BOOLEAN gfResetInputCheck = FALSE; BOOLEAN gfGlobalError = FALSE; UINT32 guiGameCycleCounter = 0; -UINT8 gubErrorText[ 200 ]; +CHAR8 gubErrorText[ 200 ]; -BOOLEAN SET_ERROR( const char *String, ...) +BOOLEAN SET_ERROR( const STR8 String, ...) { va_list ArgPtr; va_start(ArgPtr, String); - vsprintf( (char *) gubErrorText, String, ArgPtr); + vsprintf( gubErrorText, String, ArgPtr); va_end(ArgPtr); SetPendingNewScreen( ERROR_SCREEN ); diff --git a/Sys Globals.h b/Sys Globals.h index c3c35b64..f899e545 100644 --- a/Sys Globals.h +++ b/Sys Globals.h @@ -4,13 +4,13 @@ #define SHOW_MIN_FPS 0 #define SHOW_FULL_FPS 1 -extern UINT8 gubErrorText[ 200 ]; +extern CHAR8 gubErrorText[ 200 ]; extern BOOLEAN gfAniEditMode; extern BOOLEAN gfEditMode; extern BOOLEAN fFirstTimeInGameScreen; extern BOOLEAN fDirtyRectangleMode; -extern INT8 gDebugStr[128]; -extern INT8 gSystemDebugStr[128]; +extern CHAR8 gDebugStr[128]; +extern CHAR8 gSystemDebugStr[128]; extern BOOLEAN gfMode; extern INT16 gsCurrentActionPoints; @@ -25,57 +25,6 @@ extern UINT32 guiGameCycleCounter; extern INT32 giFPSOverlay; extern INT32 giCounterPeriodOverlay; -extern BOOLEAN SET_ERROR( const char *String, ...); - - -//inline size_t strlen(INT8 *str) { return strlen((const char *)str); } -template -inline size_t strlen(type1 str) { return strlen((const char *)str); } - -template -inline char *strncat(type1 str1, type2 str2, size_t n) -{ return strncat((char *)str1, (const char *)str2, n); } - -/* -inline char *strncat(INT8 *str1, INT8 *str2, size_t n) { return strncat((char *)str1, (const char *)str2, n); } -inline char *strncat(char *str1, INT8 *str2, size_t n) { return strncat(str1, (const char *)str2, n); } -inline char *strncat(INT8 *str1, const char *str2, size_t n) { return strncat((char *)str1, str2, n); } -*/ -//inline long atol(INT8 *str) { return atol((const char *)str); } -template -inline long atol(type1 str) { return atol((const char *)str); } - -template -inline char *strncpy(type1 str1, type2 str2, size_t n) { return strncpy((char *)str1, (const char *)str2, n); } - -template -inline char *strcpy(type1 str1, type2 str2) { return strcpy((char *)str1, (const char *)str2); } - -template -inline size_t strcspn(string1 str1, string2 str2) { return strcspn((const char *)str1, (const char *)str2); } - -template -inline wchar_t *wcscpy(type1 str1, type2 str2) { return wcscpy((wchar_t *)str1, (const wchar_t *) str2); } - -template -inline wchar_t *wcscat(string1 str1, string2 str2) { return wcscat((wchar_t *)str1, (const wchar_t *)str2); } - -template -inline char *strcat(string1 str1, string2 str2) { return strcat((char *)str1, (const char *)str2); } - -template -inline int _stricmp(string1 str1, string2 str2) { return _stricmp((const char *)str1, (const char *) str2); } - -template -inline char *strrchr(string1 str1, int n) { return strrchr((const char *)str1, n); } - -template -inline int stricmp(string1 str1, string2 str2) { return stricmp((const char *)str1, (const char *)str2); } - -template -inline int strcmp(string1 str1, string2 str2) { return strcmp((const char *)str1, (const char *) str2); } - -template -inline char *strstr(string1 str1, string2 str2) { return strstr((const char *)str1, (const char *)str2); } +extern BOOLEAN SET_ERROR( const STR8 String, ...); #endif diff --git a/Tactical/Animation Control.h b/Tactical/Animation Control.h index 8a39f2e2..4a1a46d7 100644 --- a/Tactical/Animation Control.h +++ b/Tactical/Animation Control.h @@ -116,7 +116,7 @@ typedef struct UINT8 ubEndRoll; UINT8 ubFlags; UINT8 ubAnimHeight; - INT8 zSoundFile[ 30 ]; + CHAR8 zSoundFile[ 30 ]; } RANDOM_ANI_DEF; diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index 8f50c2a9..d08dde3a 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -843,7 +843,7 @@ BOOLEAN LoadAnimationSurface( UINT16 usSoldierID, UINT16 usSurfaceIndex, UINT16 AnimDebugMsg( String( "Surface Database: Loading %d", usSurfaceIndex ) ); - sprintf( (char *)gSystemDebugStr, "Cache Load" ); + sprintf( gSystemDebugStr, "Cache Load" ); // Create video object FilenameForBPP(gAnimSurfaceDatabase[ usSurfaceIndex ].Filename, sFilename); diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp index 3f2fef28..b6a240e2 100644 --- a/Tactical/Civ Quotes.cpp +++ b/Tactical/Civ Quotes.cpp @@ -96,7 +96,7 @@ typedef struct QUOTE_SYSTEM_STRUCT gCivQuoteData; -INT16 gzCivQuote[ 320 ]; +CHAR16 gzCivQuote[ 320 ]; UINT16 gusCivQuoteBoxWidth; UINT16 gusCivQuoteBoxHeight; @@ -113,9 +113,9 @@ void CopyNumEntriesIntoQuoteStruct( ) } -BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 *zQuote ) +BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, STR16 zQuote ) { - UINT8 zFileName[164]; + CHAR8 zFileName[164]; // Build filename.... if ( ubCivQuoteID == CIV_QUOTE_HINT ) @@ -123,22 +123,22 @@ BOOLEAN GetCivQuoteText( UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 *zQuote ) if ( gbWorldSectorZ > 0 ) { //sprintf( zFileName, "NPCData\\miners.edt" ); - sprintf( (char *)zFileName,"NPCDATA\\CIV%02d.edt", CIV_QUOTE_MINERS_NOT_FOR_PLAYER ); + sprintf( zFileName,"NPCDATA\\CIV%02d.edt", CIV_QUOTE_MINERS_NOT_FOR_PLAYER ); } else { - sprintf( (char *)zFileName, "NPCData\\%c%d.edt", 'A' + (gWorldSectorY - 1) , gWorldSectorX ); + sprintf( zFileName, "NPCData\\%c%d.edt", 'A' + (gWorldSectorY - 1) , gWorldSectorX ); } } else { - sprintf( (char *)zFileName,"NPCDATA\\CIV%02d.edt",ubCivQuoteID ); + sprintf( zFileName,"NPCDATA\\CIV%02d.edt",ubCivQuoteID ); } - CHECKF( FileExists( (STR)zFileName ) ); + CHECKF( FileExists( zFileName ) ); // Get data... - LoadEncryptedDataFromFile( (STR)zFileName, (STR16)zQuote, ubEntryID * 320, 320 ); + LoadEncryptedDataFromFile( zFileName, zQuote, ubEntryID * 320, 320 ); if( zQuote[0] == 0 ) { @@ -333,7 +333,7 @@ void QuoteOverlayClickCallback( MOUSE_REGION * pRegion, INT32 iReason ) void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT16 sX, INT16 sY ) { VIDEO_OVERLAY_DESC VideoOverlayDesc; - INT16 zQuote[ 320 ]; + CHAR16 zQuote[ 320 ]; // OK, do we have another on? if ( gCivQuoteData.bActive ) @@ -349,9 +349,9 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1 } #ifdef TAIWANESE - swprintf( (wchar_t *)gzCivQuote, (wchar_t *)L"%s", zQuote ); + swprintf( gzCivQuote, L"%s", zQuote ); #else - swprintf( (wchar_t *)gzCivQuote, (wchar_t *)L"\"%s\"", zQuote ); + swprintf( gzCivQuote, L"\"%s\"", zQuote ); #endif @@ -366,7 +366,7 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1 // Prepare text box SET_USE_WINFONTS( TRUE ); SET_WINFONT( giSubTitleWinFont ); - gCivQuoteData.iDialogueBox = PrepareMercPopupBox( gCivQuoteData.iDialogueBox , BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, (STR16)gzCivQuote, DIALOGUE_DEFAULT_WIDTH, 0, 0, 0, &gusCivQuoteBoxWidth, &gusCivQuoteBoxHeight ); + gCivQuoteData.iDialogueBox = PrepareMercPopupBox( gCivQuoteData.iDialogueBox , BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, gzCivQuote, DIALOGUE_DEFAULT_WIDTH, 0, 0, 0, &gusCivQuoteBoxWidth, &gusCivQuoteBoxHeight ); SET_USE_WINFONTS( FALSE ); // OK, find center for box...... @@ -421,7 +421,7 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT8 ubCivQuoteID, UINT8 ubEntryID, INT1 gCivQuoteData.uiTimeOfCreation = GetJA2Clock( ); - gCivQuoteData.uiDelayTime = FindDelayForString( (STR16)gzCivQuote ) + 500; + gCivQuoteData.uiDelayTime = FindDelayForString( gzCivQuote ) + 500; gCivQuoteData.pCiv = pCiv; diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 1ddf2a17..8fefbe23 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -142,7 +142,7 @@ UINT16 gusSubtitleBoxHeight; INT32 giTextBoxOverlay = -1; BOOLEAN gfFacePanelActive = FALSE; UINT32 guiScreenIDUsedWhenUICreated; -wchar_t gzQuoteStr[ QUOTE_MESSAGE_SIZE ]; +CHAR16 gzQuoteStr[ QUOTE_MESSAGE_SIZE ]; MOUSE_REGION gTextBoxMouseRegion; MOUSE_REGION gFacePopupMouseRegion; BOOLEAN gfUseAlternateDialogueFile = FALSE; @@ -187,12 +187,12 @@ void FaceOverlayClickCallback( MOUSE_REGION * pRegion, INT32 iReason ); // Handler functions for tactical ui diaplay -void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr ); -void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr ); +void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuoteStr ); +void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, STR16 zQuoteStr ); void HandleTacticalSpeechUI( UINT8 ubCharacterNum, INT32 iFaceIndex ); void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr ); -void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr ); +void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, STR16 zQuoteStr ); void HandleExternNPCSpeechFace( INT32 iIndex ); @@ -953,21 +953,21 @@ void HandleDialogue( ) swprintf( zText, SkiMessageBoxText[ SKI_SHORT_FUNDS_TEXT ], zMoney ); //popup a message stating the player doesnt have enough money - DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, ConfirmDontHaveEnoughForTheDealerMessageBoxCallBack ); + DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, ConfirmDontHaveEnoughForTheDealerMessageBoxCallBack ); break; case( 1 ): //if the player is trading items swprintf( zText, SkiMessageBoxText[ SKI_QUESTION_TO_DEDUCT_MONEY_FROM_PLAYERS_ACCOUNT_TO_COVER_DIFFERENCE ], zMoney ); //ask them if we should deduct money out the players account to cover the difference - DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack ); + DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack ); break; case( 2 ): swprintf( zText, SkiMessageBoxText[ SKI_QUESTION_TO_DEDUCT_MONEY_FROM_PLAYERS_ACCOUNT_TO_COVER_COST ], zMoney ); //ask them if we should deduct money out the players account to cover the difference - DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack ); + DoSkiMessageBox( MSG_BOX_BASIC_STYLE, zText, SHOPKEEPER_SCREEN, MSG_BOX_FLAG_YESNO, ConfirmToDeductMoneyFromPlayersAccountMessageBoxCallBack ); break; case( 3 ): // this means a dialogue event is in progress @@ -1184,7 +1184,7 @@ void HandleDialogue( ) MemFree( QItem ); } -BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, wchar_t * zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString ); +BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, STR16 zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString ); BOOLEAN DelayedTacticalCharacterDialogue( SOLDIERTYPE *pSoldier, UINT16 usQuoteNum ) @@ -1629,12 +1629,12 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 if( bUIHandlerID == DIALOGUE_EXTERNAL_NPC_UI ) { // external NPC - SetFaceTalking( iFaceIndex , zSoundString, (STR16)gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN ); + SetFaceTalking( iFaceIndex , zSoundString, gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN ); } else { // start "talking" system (portrait animation and start wav sample) - SetFaceTalking( iFaceIndex, zSoundString, (STR16)gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN ); + SetFaceTalking( iFaceIndex, zSoundString, gzQuoteStr, RATE_11025, 30, 1, MIDDLEPAN ); } // pSoldier can be null here... ( if NOT from an alive soldier ) CreateTalkingUI( bUIHandlerID, iFaceIndex, ubCharacterNum, pSoldier, gzQuoteStr ); @@ -1648,7 +1648,7 @@ BOOLEAN ExecuteCharacterDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 } -void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr ) +void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, SOLDIERTYPE *pSoldier, STR16 zQuoteStr ) { // Show text, if on @@ -1675,11 +1675,11 @@ void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, break; case DIALOGUE_EXTERNAL_NPC_UI: - DisplayTextForExternalNPC( ubCharacterNum, (STR16)zQuoteStr ); + DisplayTextForExternalNPC( ubCharacterNum, zQuoteStr ); break; case DIALOGUE_SHOPKEEPER_UI: - InitShopKeeperSubTitledText( (STR16)zQuoteStr ); + InitShopKeeperSubTitledText( zQuoteStr ); break; } } @@ -1706,9 +1706,9 @@ void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum, } -INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile ) +CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile ) { - static UINT8 zFileName[164]; + static CHAR8 zFileName[164]; UINT8 ubFileNumID; // Are we an NPC OR an RPC that has not been recruited? @@ -1720,23 +1720,23 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN // Lesh: patch to allow playback ogg speech files // build name of wav file (characternum + quotenum) #ifdef RUSSIAN - sprintf( (char *)zFileName,"NPC_SPEECH\\g_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); - if ( !FileExists( (STR)zFileName ) ) + sprintf( zFileName,"NPC_SPEECH\\g_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); + if ( !FileExists( zFileName ) ) { - sprintf( (char *)zFileName,"NPC_SPEECH\\g_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); + sprintf( zFileName,"NPC_SPEECH\\g_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); } #else - sprintf( (char *)zFileName,"NPC_SPEECH\\d_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); - if ( !FileExists( (STR)zFileName ) ) + sprintf( zFileName,"NPC_SPEECH\\d_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); + if ( !FileExists( zFileName ) ) { - sprintf( (char *)zFileName,"NPC_SPEECH\\d_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); + sprintf( zFileName,"NPC_SPEECH\\d_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); } #endif } else { // assume EDT files are in EDT directory on HARD DRIVE - sprintf( (char *)zFileName,"NPCDATA\\d_%03d.EDT", ubCharacterNum ); + sprintf( zFileName,"NPCDATA\\d_%03d.EDT", ubCharacterNum ); } } else if ( ubCharacterNum >= FIRST_RPC && ubCharacterNum < GASTON && @@ -1763,16 +1763,16 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN if ( fWavFile ) { // Lesh: patch to allow playback ogg speech files - sprintf( (char *)zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum ); - if ( !FileExists( (STR)zFileName ) ) + sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum ); + if ( !FileExists( zFileName ) ) { - sprintf( (char *)zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum ); + sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.wav",ubFileNumID,usQuoteNum ); } } else { // assume EDT files are in EDT directory on HARD DRIVE - sprintf( (char *)zFileName,"NPCDATA\\%03d.EDT", ubFileNumID ); + sprintf( zFileName,"NPCDATA\\%03d.EDT", ubFileNumID ); } } else @@ -1782,60 +1782,60 @@ INT8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN #ifdef RUSSIAN if( ubCharacterNum >= FIRST_RPC && ubCharacterNum < GASTON && gMercProfiles[ ubCharacterNum ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) { - sprintf( (char *) zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); - if ( !FileExists( (STR)zFileName ) ) + sprintf( zFileName,"SPEECH\\r_%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); + if ( !FileExists( zFileName ) ) { - sprintf( (char *) zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); + sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",ubCharacterNum,usQuoteNum ); } } else #endif { // build name of wav file (characternum + quotenum) - sprintf( (char *)zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); - if ( !FileExists( (STR)zFileName ) ) + sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",ubCharacterNum,usQuoteNum ); + if ( !FileExists( zFileName ) ) { - sprintf( (char *)zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum ); + sprintf( zFileName,"SPEECH\\%03d_%03d.wav",ubCharacterNum,usQuoteNum ); } } } else { // assume EDT files are in EDT directory on HARD DRIVE - sprintf( (char *)zFileName,"MERCEDT\\%03d.EDT", ubCharacterNum ); + sprintf( zFileName,"MERCEDT\\%03d.EDT", ubCharacterNum ); } } - return( (INT8 *) zFileName ); + return( zFileName ); } // Used to see if the dialog text file exists -BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, UINT8 **ppStr ) +BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr ) { - INT8 *pFilename; + STR8 pFilename; pFilename = GetDialogueDataFilename( ubCharacterNum, usQuoteNum, fWavFile ); if ( ppStr ) { - (*ppStr ) = (UINT8 *) pFilename; + (*ppStr ) = pFilename; } - return( FileExists( (STR)pFilename ) ); + return( FileExists( pFilename ) ); } -BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, wchar_t * zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString ) +BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, STR16 zDialogueText, UINT32 *puiSoundID, CHAR8 *zSoundString ) { - UINT8 *pFilename; + STR8 pFilename; // first things first - grab the text (if player has SUBTITLE PREFERENCE ON) //if ( gGameSettings.fOptions[ TOPTION_SUBTITLES ] ) { if ( DialogueDataFileExistsForProfile( ubCharacterNum, 0, FALSE, &pFilename ) ) { - LoadEncryptedDataFromFile( (STR)pFilename, zDialogueText, usQuoteNum * iDataSize, iDataSize ); + LoadEncryptedDataFromFile( pFilename, zDialogueText, usQuoteNum * iDataSize, iDataSize ); if(zDialogueText[0] == 0) { - swprintf( (wchar_t *)zDialogueText, (wchar_t *)L"I have no text in the EDT file ( %d ) %S", usQuoteNum, pFilename ); + swprintf( zDialogueText, L"I have no text in the EDT file ( %d ) %S", usQuoteNum, pFilename ); #ifndef JA2BETAVERSION return( FALSE ); @@ -1844,7 +1844,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, } else { - swprintf( (wchar_t *)zDialogueText, (wchar_t *)L"I have no text in the file ( %d ) %S", usQuoteNum , pFilename ); + swprintf( zDialogueText, L"I have no text in the file ( %d ) %S", usQuoteNum , pFilename ); #ifndef JA2BETAVERSION return( FALSE ); @@ -1854,7 +1854,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, // CHECK IF THE FILE EXISTS, IF NOT, USE DEFAULT! - pFilename = (UINT8 *) GetDialogueDataFilename( ubCharacterNum, usQuoteNum, TRUE ); + pFilename = GetDialogueDataFilename( ubCharacterNum, usQuoteNum, TRUE ); // Copy strcpy( zSoundString, pFilename ); @@ -1881,7 +1881,7 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, if ( gGameSettings.fOptions[ TOPTION_SPEECH ] ) { // Load it into memory! - *puiSoundID = SoundLoadSample( (STR) pFilename ); + *puiSoundID = SoundLoadSample( pFilename ); } @@ -1890,9 +1890,9 @@ BOOLEAN GetDialogue( UINT8 ubCharacterNum, UINT16 usQuoteNum, UINT32 iDataSize, // Handlers for tactical UI stuff -void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr ) +void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, STR16 zQuoteStr ) { - wchar_t zText[ QUOTE_MESSAGE_SIZE ]; + CHAR16 zText[ QUOTE_MESSAGE_SIZE ]; // Setup dialogue text box if ( guiCurrentScreen != MAP_SCREEN ) @@ -1905,8 +1905,8 @@ void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr ) #ifdef TAIWANESE swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr ); #else - swprintf( (wchar_t *)gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr ); - swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr ); + swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr ); + swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr ); MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText ); #endif } @@ -1915,7 +1915,7 @@ void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, wchar_t *zQuoteStr ) // Handlers for tactical UI stuff void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr ) { - INT16 zText[ QUOTE_MESSAGE_SIZE ]; + CHAR16 zText[ QUOTE_MESSAGE_SIZE ]; INT16 sLeft; @@ -1930,8 +1930,8 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr ) #ifdef TAIWANESE swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr ); #else - swprintf( (wchar_t *)gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr ); - swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr ); + swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr ); + swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr ); MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText ); #endif @@ -1945,25 +1945,25 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr ) sLeft = ( 110 ); } - ExecuteTacticalTextBox( sLeft, (STR16)gTalkPanel.zQuoteStr ); + ExecuteTacticalTextBox( sLeft, gTalkPanel.zQuoteStr ); return; } -void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQuoteStr ) +void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuoteStr ) { - wchar_t zText[ QUOTE_MESSAGE_SIZE ]; + CHAR16 zText[ QUOTE_MESSAGE_SIZE ]; INT16 sLeft = 0; //BUild text // How do we do this with defines? //swprintf( zText, L"\xb4\xa2 %s: \xb5 \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr ); #ifdef TAIWANESE - swprintf( (wchar_t *)zText, (wchar_t *)L"%s", zQuoteStr ); + swprintf( zText, L"%s", zQuoteStr ); #else - swprintf( (wchar_t *)zText, (wchar_t *)L"\"%s\"", zQuoteStr ); + swprintf( zText, L"\"%s\"", zQuoteStr ); #endif sLeft = 110; @@ -1971,10 +1971,10 @@ void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, wchar_t *zQu //previous version //sLeft = 110; - ExecuteTacticalTextBox( sLeft, (STR16)zText ); + ExecuteTacticalTextBox( sLeft, zText ); #ifndef TAIWANESE - swprintf( (wchar_t *)zText, L"%s: \"%s\"", gMercProfiles[ pSoldier->ubProfile ].zNickname, zQuoteStr ); + swprintf( zText, L"%s: \"%s\"", gMercProfiles[ pSoldier->ubProfile ].zNickname, zQuoteStr ); MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText ); #endif @@ -2320,7 +2320,7 @@ void RenderFaceOverlay( VIDEO_OVERLAY *pBlitter ) UINT8 *pDestBuf, *pSrcBuf; INT16 sFontX, sFontY; SOLDIERTYPE *pSoldier; - INT16 zTownIDString[50]; + CHAR16 zTownIDString[50]; if ( gpCurrentTalkingFace == NULL ) @@ -2359,9 +2359,9 @@ void RenderFaceOverlay( VIDEO_OVERLAY *pBlitter ) // What sector are we in, ( and is it the same as ours? ) if ( pSoldier->sSectorX != gWorldSectorX || pSoldier->sSectorY != gWorldSectorY || pSoldier->bSectorZ != gbWorldSectorZ || pSoldier->fBetweenSectors ) { - GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, (CHAR16 *)zTownIDString, FALSE ); + GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, zTownIDString, FALSE ); - ReduceStringLength( (STR16)zTownIDString, 64 , BLOCKFONT2 ); + ReduceStringLength( zTownIDString, 64 , BLOCKFONT2 ); VarFindFontCenterCoordinates( (INT16)( pBlitter->sX + 12 ), (INT16)( pBlitter->sY + 68 ), 73, 9, BLOCKFONT2, &sFontX, &sFontY, L"%s", zTownIDString ); mprintf( sFontX, sFontY, L"%s", zTownIDString ); diff --git a/Tactical/Dialogue Control.h b/Tactical/Dialogue Control.h index c9730115..47150f69 100644 --- a/Tactical/Dialogue Control.h +++ b/Tactical/Dialogue Control.h @@ -238,7 +238,7 @@ void HandleImportantMercQuote( SOLDIERTYPE * pSoldier, UINT16 usQuoteNumber ); // Send in a profile number to see if text dialog exists for this guy.... -BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, UINT8 **ppStr ); +BOOLEAN DialogueDataFileExistsForProfile( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile, STR8 *ppStr ); // Do special event as well as dialogue! BOOLEAN CharacterDialogueWithSpecialEvent( UINT8 ubCharacterNum, UINT16 usQuoteNum, INT32 iFaceIndex, UINT8 bUIHandlerID, BOOLEAN fFromSoldier, BOOLEAN fDelayed, UINT32 uiFlag, UINT32 uiData1, UINT32 uiData2 ); diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp index 618fe1b0..0ab5c5cb 100644 --- a/Tactical/End Game.cpp +++ b/Tactical/End Game.cpp @@ -415,7 +415,7 @@ void BeginHandleQueenBitchDeath( SOLDIERTYPE *pKillerSoldier, INT16 sGridNo, INT // HELLO! THESE ARE CREATURES! THEY CAN'T BE NEUTRAL! //if ( !pTeamSoldier->bNeutral && (pTeamSoldier->bSide != gbPlayerNum ) ) { - gTacticalStatus.ubAttackBusyCount++; + gTacticalStatus.ubAttackBusyCount++; EVENT_SoldierGotHit( pTeamSoldier, 0, 10000, 0, pTeamSoldier->bDirection, 320, NOBODY , FIRE_WEAPON_NO_SPECIAL, pTeamSoldier->bAimShotLocation, 0, NOWHERE ); } } diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index e9c2bc7b..7a45a9a3 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -187,8 +187,8 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, UINT16 usGridNo, INT8 bLevel, UINT16 us UINT8 ubDirection; INT16 sAdjustedGridNo; BOOLEAN fDropBomb = FALSE; - BOOLEAN fAddingTurningCost = FALSE; - BOOLEAN fAddingRaiseGunCost = FALSE; + BOOLEAN fAddingTurningCost = FALSE; + BOOLEAN fAddingRaiseGunCost = FALSE; LEVELNODE *pIntNode; STRUCTURE *pStructure; INT16 sGridNo; @@ -3209,7 +3209,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I INT16 sY; INVTYPE *pItem; ITEM_POOL *pTempItemPool; - wchar_t pStr[ 100 ]; + CHAR16 pStr[ 100 ]; INT16 cnt = 0, sHeight = 0; INT16 sLargeLineWidth = 0, sLineWidth; BOOLEAN fRecalcNumListed = FALSE; @@ -3302,11 +3302,11 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I // Set string if ( gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects > 1 ) { - swprintf( (wchar_t *)pStr, (wchar_t *)L"%s (%d)", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ], gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects ); + swprintf( pStr, L"%s (%d)", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ], gWorldItems[ pTempItemPool->iItemIndex ].o.ubNumberOfObjects ); } else { - swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ] ); + swprintf( pStr, L"%s", ShortItemNames[ gWorldItems[ pTempItemPool->iItemIndex ].o.usItem ] ); } // Get Width @@ -3379,7 +3379,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I { SetFontForeground( FONT_MCOLOR_DKGRAY ); } - swprintf( (wchar_t *)pStr, (wchar_t *)TacticalStr[ ITEMPOOL_POPUP_PREV_STR ] ); + swprintf( pStr, TacticalStr[ ITEMPOOL_POPUP_PREV_STR ] ); gprintfdirty( sFontX, sY, pStr ); mprintf( sFontX, sY, pStr ); sY += GetFontHeight( SMALLFONT1 ) - 2; @@ -3409,11 +3409,11 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I if ( gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects > 1 ) { - swprintf( (wchar_t *)pStr, (wchar_t *)L"%s (%d)", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ], gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects ); + swprintf( pStr, L"%s (%d)", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ], gWorldItems[ pItemPool->iItemIndex ].o.ubNumberOfObjects ); } else { - swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ] ); + swprintf( pStr, L"%s", ShortItemNames[ gWorldItems[ pItemPool->iItemIndex ].o.usItem ] ); } gprintfdirty( sFontX, sY, pStr ); @@ -3447,7 +3447,7 @@ BOOLEAN DrawItemPoolList( ITEM_POOL *pItemPool, INT16 sGridNo, UINT8 bCommand, I { SetFontForeground( FONT_MCOLOR_DKGRAY ); } - swprintf( (wchar_t *)pStr, (wchar_t *)TacticalStr[ ITEMPOOL_POPUP_MORE_STR ] ); + swprintf( pStr, TacticalStr[ ITEMPOOL_POPUP_MORE_STR ] ); gprintfdirty( sFontX, sY, pStr ); mprintf( sFontX, sY, pStr ); } diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 4475cb51..5254dc0d 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -357,13 +357,13 @@ UINT32 guiTimerLastUpdate = 0; UINT32 guiTimerCursorDelay = 0; -INT16 gzLocation[ 20 ]; +CHAR16 gzLocation[ 20 ]; BOOLEAN gfLocation = FALSE; -INT16 gzIntTileLocation[ 20 ]; +CHAR16 gzIntTileLocation[ 20 ]; BOOLEAN gfUIIntTileLocation; -INT16 gzIntTileLocation2[ 20 ]; +CHAR16 gzIntTileLocation2[ 20 ]; BOOLEAN gfUIIntTileLocation2; MOUSE_REGION gDisableRegion; @@ -2554,7 +2554,7 @@ UINT32 UIHandleCAMercShoot( UI_EVENT *pUIEvent ) // If this is one of our own guys.....pop up requiester... if ( ( pTSoldier->bTeam == gbPlayerNum || pTSoldier->bTeam == MILITIA_TEAM ) && Item[ pSoldier->inv[ HANDPOS ].usItem ].usItemClass != IC_MEDKIT && !Item[pSoldier->inv[ HANDPOS ].usItem].gascan && gTacticalStatus.ubLastRequesterTargetID != pTSoldier->ubProfile && ( pTSoldier->ubID != pSoldier->ubID ) ) { - wchar_t zStr[200]; + CHAR16 zStr[200]; gpRequesterMerc = pSoldier; gpRequesterTargetMerc = pTSoldier; @@ -2562,7 +2562,7 @@ UINT32 UIHandleCAMercShoot( UI_EVENT *pUIEvent ) fDidRequester = TRUE; - swprintf( (wchar_t *)zStr, (wchar_t *)TacticalStr[ ATTACK_OWN_GUY_PROMPT ], pTSoldier->name ); + swprintf( zStr, TacticalStr[ ATTACK_OWN_GUY_PROMPT ], pTSoldier->name ); DoMessageBox( MSG_BOX_BASIC_STYLE, zStr, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_YESNO, AttackRequesterCallback, NULL ); diff --git a/Tactical/Handle UI.h b/Tactical/Handle UI.h index 3760657f..e4605615 100644 --- a/Tactical/Handle UI.h +++ b/Tactical/Handle UI.h @@ -211,7 +211,7 @@ extern BOOLEAN gUITargetReady; extern BOOLEAN gUITargetShotWaiting; extern UINT16 gsUITargetShotGridNo; -extern INT16 gzLocation[ 20 ]; +extern CHAR16 gzLocation[ 20 ]; extern BOOLEAN gfUIBodyHitLocation; extern UINT8 gsBulletCount; @@ -222,10 +222,10 @@ extern BOOLEAN gfUIAutofireBulletCount; extern BOOLEAN gfUICtHBar; extern UINT8 gbCtH; -extern INT16 gzIntTileLocation[ 20 ]; +extern CHAR16 gzIntTileLocation[ 20 ]; extern BOOLEAN gfUIIntTileLocation; -extern INT16 gzIntTileLocation2[ 20 ]; +extern CHAR16 gzIntTileLocation2[ 20 ]; extern BOOLEAN gfUIIntTileLocation2; extern BOOLEAN gfUIWaitingForUserSpeechAdvance; diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index 9cff5b0b..6388b1b9 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -359,7 +359,7 @@ BOOLEAN InternalInitTalkingMenu( UINT8 ubCharacterNum, INT16 sX, INT16 sY ) UINT16 usHeight; VOBJECT_DESC VObjectDesc; INT16 sCenterYVal, sCenterXVal; - UINT8 ubString[48]; + CHAR8 ubString[48]; // disable scroll messages @@ -500,7 +500,7 @@ BOOLEAN InternalInitTalkingMenu( UINT8 ubCharacterNum, INT16 sX, INT16 sY ) gFacesData[ iFaceIndex ].uiFlags |= FACE_INACTIVE_HANDLED_ELSEWHERE; // Load buttons, create button - sprintf( (char *)ubString, "INTERFACE\\talkbox2.sti" ); + sprintf( ubString, "INTERFACE\\talkbox2.sti" ); gTalkPanel.iButtonImages = LoadButtonImage( ubString, -1,3,-1,4,-1 ); @@ -766,7 +766,7 @@ void RenderTalkingMenu( ) SET_USE_WINFONTS( TRUE ); SET_WINFONT( giSubTitleWinFont ); - iInterfaceDialogueBox = PrepareMercPopupBox( iInterfaceDialogueBox,BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, (STR16) gTalkPanel.zQuoteStr, TALK_PANEL_DEFAULT_SUBTITLE_WIDTH, 0, 0, 0, &usTextBoxWidth, &usTextBoxHeight ); + iInterfaceDialogueBox = PrepareMercPopupBox( iInterfaceDialogueBox,BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, gTalkPanel.zQuoteStr, TALK_PANEL_DEFAULT_SUBTITLE_WIDTH, 0, 0, 0, &usTextBoxWidth, &usTextBoxHeight ); SET_USE_WINFONTS( FALSE ); gTalkPanel.fSetupSubTitles = FALSE; @@ -4378,7 +4378,7 @@ BOOLEAN PlayerTeamHasTwoSpotsLeft( ) void StartDialogueMessageBox( UINT8 ubProfileID, UINT16 usMessageBoxType ) { INT32 iTemp; - wchar_t zTemp[256], zTemp2[256]; + CHAR16 zTemp[256], zTemp2[256]; gusDialogueMessageBoxType = usMessageBoxType; switch( gusDialogueMessageBoxType ) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 86bd467d..662f2988 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -257,13 +257,13 @@ BOOLEAN gfInItemDescBox = FALSE; UINT32 guiCurrentItemDescriptionScreen=0; OBJECTTYPE *gpItemDescObject = NULL; BOOLEAN gfItemDescObjectIsAttachment = FALSE; -wchar_t gzItemName[ SIZE_ITEM_NAME ]; -wchar_t gzItemDesc[ SIZE_ITEM_INFO ]; -wchar_t gzItemPros[ SIZE_ITEM_PROS ]; -wchar_t gzItemCons[ SIZE_ITEM_CONS ]; -wchar_t gzFullItemPros[ SIZE_ITEM_PROS ]; -wchar_t gzFullItemCons[ SIZE_ITEM_PROS ]; -wchar_t gzFullItemTemp[ SIZE_ITEM_PROS ]; // necessary, unfortunately +CHAR16 gzItemName[ SIZE_ITEM_NAME ]; +CHAR16 gzItemDesc[ SIZE_ITEM_INFO ]; +CHAR16 gzItemPros[ SIZE_ITEM_PROS ]; +CHAR16 gzItemCons[ SIZE_ITEM_CONS ]; +CHAR16 gzFullItemPros[ SIZE_ITEM_PROS ]; +CHAR16 gzFullItemCons[ SIZE_ITEM_PROS ]; +CHAR16 gzFullItemTemp[ SIZE_ITEM_PROS ]; // necessary, unfortunately void ItemDescCallback( MOUSE_REGION * pRegion, INT32 iReason ); INT16 gsInvDescX; INT16 gsInvDescY; @@ -590,10 +590,10 @@ BOOLEAN AttemptToAddSubstring( STR16 zDest, STR16 zTemp, UINT32 * puiStringLengt } } -void GenerateProsString( wchar_t * zItemPros, OBJECTTYPE * pObject, UINT32 uiPixLimit ) +void GenerateProsString( STR16 zItemPros, OBJECTTYPE * pObject, UINT32 uiPixLimit ) { UINT32 uiStringLength = 0; - wchar_t * zTemp; + STR16 zTemp; UINT16 usItem = pObject->usItem; UINT8 ubWeight; @@ -714,10 +714,10 @@ void GenerateProsString( wchar_t * zItemPros, OBJECTTYPE * pObject, UINT32 uiPix } } -void GenerateConsString( wchar_t * zItemCons, OBJECTTYPE * pObject, UINT32 uiPixLimit ) +void GenerateConsString( STR16 zItemCons, OBJECTTYPE * pObject, UINT32 uiPixLimit ) { UINT32 uiStringLength = 0; - wchar_t * zTemp; + STR16 zTemp; UINT8 ubWeight; UINT16 usItem = pObject->usItem; @@ -1058,7 +1058,7 @@ void RenderInvBodyPanel( SOLDIERTYPE *pSoldier, INT16 sX, INT16 sY ) void HandleRenderInvSlots( SOLDIERTYPE *pSoldier, UINT8 fDirtyLevel ) { INT32 cnt; - static wchar_t pStr[ 150 ]; + static CHAR16 pStr[ 150 ]; if ( InItemDescriptionBox( ) || InItemStackPopup( ) || InKeyRingPopup( ) ) { @@ -1999,7 +1999,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec INT16 sFontX2, sFontY2; INT16 sFontX, sFontY; - static wchar_t pStr[ 100 ], pStr2[ 100 ]; + static CHAR16 pStr[ 100 ], pStr2[ 100 ]; if ( pObject->usItem == NOTHING ) { @@ -2107,11 +2107,11 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec if ( sWidth >= ( BIG_INV_SLOT_WIDTH - 10 ) ) { - swprintf( (wchar_t *)pStr, TacticalStr[ JAMMED_ITEM_STR ] ); + swprintf( pStr, TacticalStr[ JAMMED_ITEM_STR ] ); } else { - swprintf( (wchar_t *)pStr, TacticalStr[ SHORT_JAMMED_GUN ] ); + swprintf( pStr, TacticalStr[ SHORT_JAMMED_GUN ] ); } VarFindFontCenterCoordinates( sX, sY, sWidth, sHeight , ITEM_FONT, &sNewX, &sNewY, pStr ); @@ -2130,7 +2130,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec SetFontForeground( FONT_GRAY4 ); sNewY = sY + sHeight - 10; - swprintf( (wchar_t *)pStr, L"%d", pObject->ubNumberOfObjects ); + swprintf( pStr, L"%d", pObject->ubNumberOfObjects ); // Get length of string uiStringLength=StringPixLength(pStr, ITEM_FONT ); @@ -2160,7 +2160,7 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec } sNewY = sY; - swprintf( (wchar_t *)pStr, L"*" ); + swprintf( pStr, L"*" ); // Get length of string uiStringLength=StringPixLength(pStr, ITEM_FONT ); @@ -2181,27 +2181,27 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec sNewY = sY + 13; // rather arbitrary if ( pSoldier->bWeaponMode == WM_BURST ) { - swprintf( (wchar_t *)pStr, L"BRST" ); + swprintf( pStr, L"BRST" ); SetFontForeground( FONT_RED ); } else if(pSoldier->bWeaponMode == WM_AUTOFIRE) { - swprintf( (wchar_t *)pStr, L"AUTO" ); + swprintf( pStr, L"AUTO" ); SetFontForeground( FONT_RED ); } else if(pSoldier->bWeaponMode == WM_ATTACHED_GL) { - swprintf( (wchar_t *)pStr, L"GL" ); + swprintf( pStr, L"GL" ); SetFontForeground( FONT_YELLOW ); } else if(pSoldier->bWeaponMode == WM_ATTACHED_GL_BURST) { - swprintf( (wchar_t *)pStr, L"GL BRST" ); + swprintf( pStr, L"GL BRST" ); SetFontForeground( FONT_YELLOW ); } else if(pSoldier->bWeaponMode == WM_ATTACHED_GL_AUTO) { - swprintf( (wchar_t *)pStr, L"GL AUTO" ); + swprintf( pStr, L"GL AUTO" ); SetFontForeground( FONT_YELLOW ); } @@ -2235,11 +2235,11 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec // Set string if ( ubStatusIndex < RENDER_ITEM_ATTACHMENT1 ) { - swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usItem ] ); + swprintf( pStr, L"%s", ShortItemNames[ pObject->usItem ] ); } else { - swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usAttachItem[ ubStatusIndex - RENDER_ITEM_ATTACHMENT1 ] ] ); + swprintf( pStr, L"%s", ShortItemNames[ pObject->usAttachItem[ ubStatusIndex - RENDER_ITEM_ATTACHMENT1 ] ] ); } fLineSplit = WrapString( pStr, pStr2, WORD_WRAP_INV_WIDTH, ITEM_FONT ); @@ -2362,10 +2362,10 @@ BOOLEAN InitKeyItemDescriptionBox( SOLDIERTYPE *pSoldier, UINT8 ubPosition, INT1 BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY, UINT8 ubStatusIndex, SOLDIERTYPE *pSoldier ) { VOBJECT_DESC VObjectDesc; - UINT8 ubString[48]; + CHAR8 ubString[48]; INT32 cnt; - INT16 pStr[10]; - UINT16 usX, usY; + CHAR16 pStr[10]; + INT16 usX, usY; INT16 sForeColour; INT16 sProsConsIndent; @@ -2415,11 +2415,11 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY, // if( guiCurrentScreen != MAP_SCREEN ) //if( guiCurrentItemDescriptionScreen != MAP_SCREEN ) if ( GetMagSize(gpItemDescObject) <= 99 ) - swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubGunShotsLeft, GetMagSize(gpItemDescObject)); + swprintf( pStr, L"%d/%d", gpItemDescObject->ubGunShotsLeft, GetMagSize(gpItemDescObject)); else - swprintf( (wchar_t *)pStr, L"%d", gpItemDescObject->ubGunShotsLeft ); + swprintf( pStr, L"%d", gpItemDescObject->ubGunShotsLeft ); - FilenameForBPP("INTERFACE\\infobox.sti", (STR)ubString); + FilenameForBPP("INTERFACE\\infobox.sti", ubString); sForeColour = ITEMDESC_AMMO_FORE; // TODO: WANNE: Make own sti for the ammo types and an own for the interface @@ -2799,7 +2799,7 @@ BOOLEAN ReloadItemDesc( ) void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason) { static BOOLEAN fRightDown = FALSE; - wchar_t pStr[10]; + CHAR16 pStr[10]; /* region gets disabled in SKI for shopkeeper boxes. It now works normally for merc's inventory boxes! //if we are currently in the shopkeeper interface, return; @@ -2831,7 +2831,7 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason) gpItemPointer = &gItemPointer; gpItemPointerSoldier = gpItemDescSoldier; - swprintf( (wchar_t *)pStr, L"0" ); + swprintf( pStr, L"0" ); SpecifyButtonText( giItemDescAmmoButton, pStr ); // Set mouse @@ -2863,7 +2863,7 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason) //fItemDescDelete = TRUE; fInterfacePanelDirty = DIRTYLEVEL2; - swprintf( (wchar_t *)pStr, L"0" ); + swprintf( pStr, L"0" ); SpecifyButtonText( giItemDescAmmoButton, pStr ); fItemDescDelete = TRUE; @@ -3061,10 +3061,10 @@ void RenderItemDescriptionBox( ) CHAR16 sTempString[ 128 ]; UINT16 uiStringLength, uiRightLength; - static INT16 pStr[ 100 ]; + static CHAR16 pStr[ 100 ]; INT32 cnt; FLOAT fWeight; - UINT16 usX, usY; + INT16 usX, usY; UINT8 ubAttackAPs; BOOLEAN fHatchOutAttachments = gfItemDescObjectIsAttachment; // if examining attachment, always hatch out attachment slots INT16 sProsConsIndent; @@ -3203,11 +3203,11 @@ void RenderItemDescriptionBox( ) if ( (Item[gpItemDescObject->usItem].fingerprintid ) && gpItemDescObject->ubImprintID < NO_PROFILE ) { // add name noting imprint - swprintf( (wchar_t *)pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname ); + swprintf( pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname ); } else { - swprintf( (wchar_t *)pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] ); + swprintf( pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] ); } FindFontRightCoordinates( (INT16) MAP_ITEMDESC_CALIBER_X, (INT16) MAP_ITEMDESC_CALIBER_Y, MAP_ITEMDESC_CALIBER_WIDTH, ITEM_STATS_HEIGHT, pStr, ITEMDESC_FONT, &usX, &usY); @@ -3301,7 +3301,7 @@ void RenderItemDescriptionBox( ) SetFontShadow( DEFAULT_SHADOW ); //LABELS - swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); + swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); mprintf( gMapWeaponStats[ 0 ].sX + gsInvDescX, gMapWeaponStats[ 0 ].sY + gsInvDescY, L"%s", sTempString ); //mprintf( gMapWeaponStats[ 2 ].sX + gsInvDescX, gMapWeaponStats[ 2 ].sY + gsInvDescY, L"%s", gMapWeaponStats[ 2 ].zDesc ); if ( Item[ gpItemDescObject->usItem ].usItemClass & (IC_GUN | IC_LAUNCHER ) ) @@ -3330,7 +3330,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); //Status // This is gross, but to get the % to work out right... - swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); + swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + 6), (INT16)(gMapWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); wcscat( pStr, L"%%" ); mprintf( usX, usY, pStr ); @@ -3345,7 +3345,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); } //Weight - swprintf( (wchar_t *)pStr, L"%1.1f", fWeight ); + swprintf( pStr, L"%1.1f", fWeight ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx+6), (INT16)(gMapWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); @@ -3362,7 +3362,7 @@ void RenderItemDescriptionBox( ) } //Range - swprintf( (wchar_t *)pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 ); + swprintf( pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 3 ].sX + gsInvDescX + gMapWeaponStats[ 3 ].sValDx), (INT16)(gMapWeaponStats[ 3 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3381,7 +3381,7 @@ void RenderItemDescriptionBox( ) } //Damage - swprintf( (wchar_t *)pStr, L"%2d", ubImpact ); + swprintf( pStr, L"%2d", ubImpact ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX + gMapWeaponStats[ 4 ].sValDx), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3400,7 +3400,7 @@ void RenderItemDescriptionBox( ) //Ap's if ( !Weapon[gpItemDescObject->usItem].NoSemiAuto ) { - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs ); + swprintf( pStr, L"%2d", ubAttackAPs ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 5 ].sX + gsInvDescX + gMapWeaponStats[ 5 ].sValDx), (INT16)(gMapWeaponStats[ 5 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3417,7 +3417,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); } - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); + swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 6 ].sX + gsInvDescX + gMapWeaponStats[ 6 ].sValDx), (INT16)(gMapWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3426,7 +3426,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, gpItemDescObject, 3 ) ); + swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, gpItemDescObject, 3 ) ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 6 ].sX + gsInvDescX + gMapWeaponStats[ 6 ].sValDx), (INT16)(gMapWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3443,9 +3443,9 @@ void RenderItemDescriptionBox( ) // if the player is taking money from their account if( gfAddingMoneyToMercFromPlayersAccount ) - swprintf( (wchar_t *)pStr, L"%ld", LaptopSaveInfo.iCurrentBalance ); + swprintf( pStr, L"%ld", LaptopSaveInfo.iCurrentBalance ); else - swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiTotalAmount ); + swprintf( pStr, L"%ld", gRemoveMoney.uiTotalAmount ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); @@ -3474,7 +3474,7 @@ void RenderItemDescriptionBox( ) mprintf( (UINT16)(gMapMoneyButtonLoc.x + gMoneyButtonOffsets[cnt].x), (UINT16)(gMapMoneyButtonLoc.y + gMoneyButtonOffsets[cnt].y ), gzMoneyAmounts[4] ); // The Money Remaining - swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemaining ); + swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemaining ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); @@ -3484,7 +3484,7 @@ void RenderItemDescriptionBox( ) // The money removing SetFontForeground( 5 ); - swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemoving ); + swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemoving ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); @@ -3502,7 +3502,7 @@ void RenderItemDescriptionBox( ) { SetFontForeground( FONT_FCOLOR_WHITE ); SetFontShadow( DEFAULT_SHADOW ); - swprintf( (wchar_t *)pStr, L"%ld", gpItemDescObject->uiMoneyAmount ); + swprintf( pStr, L"%ld", gpItemDescObject->uiMoneyAmount ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); @@ -3525,7 +3525,7 @@ void RenderItemDescriptionBox( ) { mprintf( gMapWeaponStats[ 1 ].sX + gsInvDescX, gMapWeaponStats[ 1 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 1 ] ); } - swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); + swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); mprintf( gMapWeaponStats[ 0 ].sX + gsInvDescX, gMapWeaponStats[ 0 ].sY + gsInvDescY, sTempString ); // Values @@ -3535,7 +3535,7 @@ void RenderItemDescriptionBox( ) if ( Item[ gpItemDescObject->usItem ].usItemClass & IC_AMMO ) { // Ammo - swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo. + swprintf( pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo. uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); // sStrX = gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx + ( uiRightLength - uiStringLength ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 2 ].sX + gsInvDescX + gMapWeaponStats[ 2 ].sValDx+6), (INT16)(gMapWeaponStats[ 2 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY); @@ -3544,7 +3544,7 @@ void RenderItemDescriptionBox( ) else { //Status - swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); + swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); // sStrX = gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + ( uiRightLength - uiStringLength ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 1 ].sX + gsInvDescX + gMapWeaponStats[ 1 ].sValDx + 6), (INT16)(gMapWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY); @@ -3553,7 +3553,7 @@ void RenderItemDescriptionBox( ) } //Weight - swprintf( (wchar_t *)pStr, L"%1.1f", fWeight ); + swprintf( pStr, L"%1.1f", fWeight ); uiStringLength=StringPixLength(pStr, ITEMDESC_FONT ); // sStrX = gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx + ( uiRightLength - uiStringLength ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 0 ].sX + gsInvDescX + gMapWeaponStats[ 0 ].sValDx+6), (INT16)(gMapWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY); @@ -3564,19 +3564,19 @@ void RenderItemDescriptionBox( ) SetFontForeground( 6 ); // build description for keys .. the sector found - swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 0 ] ); + swprintf( pStr, L"%s", sKeyDescriptionStrings[ 0 ] ); mprintf( gMapWeaponStats[ 4 ].sX + gsInvDescX, gMapWeaponStats[ 4 ].sY + gsInvDescY, pStr ); - swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 1 ] ); + swprintf( pStr, L"%s", sKeyDescriptionStrings[ 1 ] ); mprintf( gMapWeaponStats[ 4 ].sX + gsInvDescX, gMapWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 , pStr ); SetFontForeground( 5 ); GetShortSectorString( ( INT16 ) SECTORX( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), ( INT16 ) SECTORY( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), sTempString ); - swprintf( (wchar_t *)pStr, L"%s", sTempString ); + swprintf( pStr, L"%s", sTempString ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); - swprintf( (wchar_t *)pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound ); + swprintf( pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound ); FindFontRightCoordinates( (INT16)(gMapWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gMapWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3707,11 +3707,11 @@ void RenderItemDescriptionBox( ) if ( ( Item[gpItemDescObject->usItem].fingerprintid ) && gpItemDescObject->ubImprintID < NO_PROFILE ) { // add name noting imprint - swprintf( (wchar_t *)pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname ); + swprintf( pStr, L"%s %s (%s)", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ], gMercProfiles[ gpItemDescObject->ubImprintID ].zNickname ); } else { - swprintf( (wchar_t *)pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] ); + swprintf( pStr, L"%s %s", AmmoCaliber[ Weapon[ gpItemDescObject->usItem ].ubCalibre ], WeaponType[ Weapon[ gpItemDescObject->usItem ].ubWeaponType ] ); } FindFontRightCoordinates( (INT16) ITEMDESC_CALIBER_X, (INT16) ITEMDESC_CALIBER_Y, ITEMDESC_CALIBER_WIDTH, ITEM_STATS_HEIGHT, pStr, ITEMDESC_FONT, &usX, &usY); @@ -3795,7 +3795,7 @@ void RenderItemDescriptionBox( ) SetFontShadow( DEFAULT_SHADOW ); //LABELS - swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); + swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); mprintf( gWeaponStats[ 0 ].sX + gsInvDescX, gWeaponStats[ 0 ].sY + gsInvDescY, sTempString ); // mprintf( gWeaponStats[ 1 ].sX + gsInvDescX, gWeaponStats[ 1 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 1 ].zDesc ); // mprintf( gWeaponStats[ 2 ].sX + gsInvDescX, gWeaponStats[ 2 ].sY + gsInvDescY, L"%s", gWeaponStats[ 2 ].zDesc ); @@ -3831,13 +3831,13 @@ void RenderItemDescriptionBox( ) } //Status - swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bGunStatus ); + swprintf( pStr, L"%2d%%", gpItemDescObject->bGunStatus ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 1 ].sX + gsInvDescX + gWeaponStats[ 1 ].sValDx), (INT16)(gWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); wcscat( pStr, L"%%" ); mprintf( usX, usY, pStr ); //Wieght - swprintf( (wchar_t *)pStr, L"%1.1f", fWeight ); + swprintf( pStr, L"%1.1f", fWeight ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 0 ].sX + gsInvDescX + gWeaponStats[ 0 ].sValDx), (INT16)(gWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); @@ -3852,7 +3852,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); } - swprintf( (wchar_t *)pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 ); + swprintf( pStr, L"%2d", ( GunRange( gpItemDescObject ) ) / 10 ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 3 ].sX + gsInvDescX + gWeaponStats[ 3 ].sValDx), (INT16)(gWeaponStats[ 3 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3869,7 +3869,7 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); } - swprintf( (wchar_t *)pStr, L"%2d", ubImpact ); + swprintf( pStr, L"%2d", ubImpact ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX + gWeaponStats[ 4 ].sValDx), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3887,7 +3887,7 @@ void RenderItemDescriptionBox( ) if ( !Weapon[gpItemDescObject->usItem].NoSemiAuto ) { - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs ); + swprintf( pStr, L"%2d", ubAttackAPs ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 5 ].sX + gsInvDescX + gWeaponStats[ 5 ].sValDx), (INT16)(gWeaponStats[ 5 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -3903,14 +3903,14 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); } - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); + swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 6 ].sX + gsInvDescX + gWeaponStats[ 6 ].sValDx), (INT16)(gWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT, pStr, BLOCKFONT2, &usX, &usY ); mprintf( usX, usY, pStr ); } else if (GetAutofireShotsPerFiveAPs(gpItemDescObject)> 0) { SetFontForeground( 5 ); - swprintf( (wchar_t *)pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); + swprintf( pStr, L"%2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, gpItemDescObject ) ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 6 ].sX + gsInvDescX + gWeaponStats[ 6 ].sValDx), (INT16)(gWeaponStats[ 6 ].sY + gsInvDescY ), ITEM_STATS_WIDTH, ITEM_STATS_HEIGHT, pStr, BLOCKFONT2, &usX, &usY ); mprintf( usX, usY, pStr ); } @@ -3951,7 +3951,7 @@ void RenderItemDescriptionBox( ) // Total Amount SetFontForeground( FONT_WHITE ); - swprintf( (wchar_t *)pStr, L"%d", gRemoveMoney.uiTotalAmount ); + swprintf( pStr, L"%d", gRemoveMoney.uiTotalAmount ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); FindFontRightCoordinates( (INT16)(ITEMDESC_NAME_X), (INT16)(ITEMDESC_NAME_Y ), 295,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); @@ -3981,14 +3981,14 @@ void RenderItemDescriptionBox( ) SetFontForeground( 5 ); //Display the total amount of money remaining - swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemaining ); + swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemaining ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); FindFontRightCoordinates( (INT16)(gMoneyStats[ 1 ].sX + gsInvDescX + gMoneyStats[ 1 ].sValDx), (INT16)(gMoneyStats[ 1 ].sY + gsInvDescY ), (UINT16)(ITEM_STATS_WIDTH-3),ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); //Display the total amount of money removing - swprintf( (wchar_t *)pStr, L"%ld", gRemoveMoney.uiMoneyRemoving ); + swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemoving ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); FindFontRightCoordinates( (INT16)(gMoneyStats[ 3 ].sX + gsInvDescX + gMoneyStats[ 3 ].sValDx), (INT16)(gMoneyStats[ 3 ].sY + gsInvDescY), (UINT16)(ITEM_STATS_WIDTH-3) ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); @@ -3999,7 +3999,7 @@ void RenderItemDescriptionBox( ) { SetFontForeground( FONT_FCOLOR_WHITE ); SetFontShadow( DEFAULT_SHADOW ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%ld", gpItemDescObject->uiMoneyAmount ); + swprintf( pStr, L"%ld", gpItemDescObject->uiMoneyAmount ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); @@ -4025,7 +4025,7 @@ void RenderItemDescriptionBox( ) } //Weight - swprintf( sTempString, (wchar_t *)gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); + swprintf( sTempString, gWeaponStatsDesc[ 0 ], GetWeightUnitString() ); mprintf( gWeaponStats[ 0 ].sX + gsInvDescX, gWeaponStats[ 0 ].sY + gsInvDescY, sTempString ); // Values @@ -4035,14 +4035,14 @@ void RenderItemDescriptionBox( ) { // Ammo - print amount //Status - swprintf( (wchar_t *)pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo + swprintf( pStr, L"%d/%d", gpItemDescObject->ubShotsLeft[gubItemDescStatusIndex], Magazine[ Item[ gpItemDescObject->usItem ].ubClassIndex ].ubMagSize ); //Pulmu: Correct # of rounds for stacked ammo FindFontRightCoordinates( (INT16)(gWeaponStats[ 2 ].sX + gsInvDescX + gWeaponStats[ 2 ].sValDx), (INT16)(gWeaponStats[ 2 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } else { //Status - swprintf( (wchar_t *)pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); + swprintf( pStr, L"%2d%%", gpItemDescObject->bStatus[ gubItemDescStatusIndex ] ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 1 ].sX + gsInvDescX + gWeaponStats[ 1 ].sValDx), (INT16)(gWeaponStats[ 1 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); wcscat( pStr, L"%%" ); mprintf( usX, usY, pStr ); @@ -4053,19 +4053,19 @@ void RenderItemDescriptionBox( ) SetFontForeground( 6 ); // build description for keys .. the sector found - swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 0 ] ); + swprintf( pStr, L"%s", sKeyDescriptionStrings[ 0 ] ); mprintf( gWeaponStats[ 4 ].sX + gsInvDescX, gWeaponStats[ 4 ].sY + gsInvDescY, pStr ); - swprintf( (wchar_t *)pStr, L"%s", sKeyDescriptionStrings[ 1 ] ); + swprintf( pStr, L"%s", sKeyDescriptionStrings[ 1 ] ); mprintf( gWeaponStats[ 4 ].sX + gsInvDescX, gWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 , pStr ); SetFontForeground( 5 ); GetShortSectorString( ( INT16 ) SECTORX( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), ( INT16 ) SECTORY( KeyTable[ gpItemDescObject->ubKeyID ].usSectorFound ), sTempString ); - swprintf( (wchar_t *)pStr, L"%s", sTempString ); + swprintf( pStr, L"%s", sTempString ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); - swprintf( (wchar_t *)pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound ); + swprintf( pStr, L"%d", KeyTable[ gpItemDescObject->ubKeyID ].usDateFound ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX ), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY + GetFontHeight( BLOCKFONT ) + 2 ), 110 ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -4074,7 +4074,7 @@ void RenderItemDescriptionBox( ) //Weight - swprintf( (wchar_t *)pStr, L"%1.1f", fWeight ); + swprintf( pStr, L"%1.1f", fWeight ); FindFontRightCoordinates( (INT16)(gWeaponStats[ 0 ].sX + gsInvDescX + gWeaponStats[ 0 ].sValDx), (INT16)(gWeaponStats[ 0 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } @@ -6188,7 +6188,7 @@ void SetItemPickupMenuDirty( BOOLEAN fDirtyLevel ) BOOLEAN InitializeItemPickupMenu( SOLDIERTYPE *pSoldier, INT16 sGridNo, ITEM_POOL *pItemPool, INT16 sScreenX, INT16 sScreenY, INT8 bZLevel ) { VOBJECT_DESC VObjectDesc; - UINT8 ubString[48]; + CHAR8 ubString[48]; ITEM_POOL *pTempItemPool; INT32 cnt; INT16 sCenX, sCenY, sX, sY, sCenterYVal; @@ -6314,7 +6314,7 @@ BOOLEAN InitializeItemPickupMenu( SOLDIERTYPE *pSoldier, INT16 sGridNo, ITEM_POO gItemPickupMenu.fAllSelected = FALSE; //Load images for buttons - FilenameForBPP("INTERFACE\\itembox.sti", (STR)ubString ); + FilenameForBPP("INTERFACE\\itembox.sti", ubString ); gItemPickupMenu.iUpButtonImages = LoadButtonImage( ubString, -1,5,-1,10,-1 ); gItemPickupMenu.iDownButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 7, -1, 12, -1 ); gItemPickupMenu.iAllButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 6, -1,11, -1 ); @@ -6424,7 +6424,7 @@ void SetupPickupPage( INT8 bPage ) ITEM_POOL *pTempItemPool; INT16 sValue; OBJECTTYPE *pObject; - static INT16 pStr[ 200 ]; + static CHAR16 pStr[ 200 ]; // Zero out page slots @@ -6492,11 +6492,11 @@ void SetupPickupPage( INT8 bPage ) // Adjust for ammo, other thingys.. if( Item[ pObject->usItem ].usItemClass & IC_AMMO || Item[ pObject->usItem ].usItemClass & IC_KEY ) { - swprintf( (wchar_t *)pStr, L"" ); + swprintf( pStr, L"" ); } else { - swprintf( (wchar_t *)pStr, L"%d%%", sValue ); + swprintf( pStr, L"%d%%", sValue ); } SetRegionFastHelpText( &(gItemPickupMenu.Regions[ cnt - iStart ]), pStr ); @@ -6594,7 +6594,7 @@ void RenderItemPickupMenu( ) INT16 sX, sY, sCenX, sCenY, sFontX, sFontY, sNewX, sNewY; UINT32 uiDestPitchBYTES; UINT8 *pDestBuf; - INT16 pStr[ 100 ]; + CHAR16 pStr[ 100 ]; UINT16 usSubRegion, usHeight, usWidth; INVTYPE *pItem; OBJECTTYPE *pObject; @@ -6702,7 +6702,7 @@ void RenderItemPickupMenu( ) sCenX = sX - 4; sCenY = sY + 14; - swprintf( (wchar_t *)pStr, L"%d", pObject->ubNumberOfObjects ); + swprintf( pStr, L"%d", pObject->ubNumberOfObjects ); VarFindFontRightCoordinates( sCenX, sCenY, 42, 1 , ITEM_FONT, &sFontX, &sFontY, pStr ); mprintf_buffer( pDestBuf, uiDestPitchBYTES, ITEM_FONT, sFontX, sFontY, pStr ); @@ -6717,7 +6717,7 @@ void RenderItemPickupMenu( ) SetFontShadow( DEFAULT_SHADOW ); sNewY = sCenY + 2; - swprintf( (wchar_t *)pStr, L"*" ); + swprintf( pStr, L"*" ); // Get length of string uiStringLength=StringPixLength( pStr, ITEM_FONT ); @@ -6757,16 +6757,16 @@ void RenderItemPickupMenu( ) // If we are money... if ( Item[ pObject->usItem ].usItemClass == IC_MONEY ) { - INT16 pStr2[20]; - swprintf( (wchar_t *)pStr2, L"%ld", pObject->uiMoneyAmount ); + CHAR16 pStr2[20]; + swprintf( pStr2, L"%ld", pObject->uiMoneyAmount ); InsertCommasForDollarFigure( pStr2 ); InsertDollarSignInToString( pStr2 ); - swprintf( (wchar_t *)pStr, L"%s (%ls)", ItemNames[ pObject->usItem ], pStr2 ); + swprintf( pStr, L"%s (%ls)", ItemNames[ pObject->usItem ], pStr2 ); } else { - swprintf( (wchar_t *)pStr, L"%s", ShortItemNames[ pObject->usItem ] ); + swprintf( pStr, L"%s", ShortItemNames[ pObject->usItem ] ); } VarFindFontCenterCoordinates( sCenX, sCenY, ITEMPICK_TEXT_WIDTH, 1 , ITEMDESC_FONT, &sFontX, &sFontY, pStr ); mprintf_buffer( pDestBuf, uiDestPitchBYTES, ITEMDESC_FONT, sFontX, sFontY, pStr ); @@ -7385,9 +7385,9 @@ BOOLEAN AttemptToApplyCamo( SOLDIERTYPE *pSoldier, UINT16 usItemIndex ) -void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier ) +void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier ) { - INT16 pStr[ 250 ]; + CHAR16 pStr[ 250 ]; UINT16 usItem = pObject->usItem; INT32 cnt = 0; INT32 iNumAttachments = 0; @@ -7396,8 +7396,8 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol { if ( pSoldier->uiStatusFlags & SOLDIER_DEAD ) { - swprintf((wchar_t *) pStr, L"" ); - swprintf( (wchar_t *)pzStr, L"%s", pStr ); + swprintf( pStr, L"" ); + swprintf( pzStr, L"%s", pStr ); return; } } @@ -7438,7 +7438,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol case MONEY: //Money { - swprintf( (wchar_t *)pStr, L"%ld", pObject->uiMoneyAmount ); + swprintf( pStr, L"%ld", pObject->uiMoneyAmount ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); } @@ -7448,34 +7448,34 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol // alternate money like silver or gold //if ( Item[ usItem ].usItemClass == IC_MONEY ) { - INT16 pStr2[20]; - swprintf( (wchar_t *)pStr2, L"%ld", pObject->uiMoneyAmount ); + CHAR16 pStr2[20]; + swprintf( pStr2, L"%ld", pObject->uiMoneyAmount ); InsertCommasForDollarFigure( pStr2 ); InsertDollarSignInToString( pStr2 ); - swprintf( (wchar_t *)pStr, L"%s (%ls)", ItemNames[ usItem ], pStr2 ); + swprintf( pStr, L"%s (%ls)", ItemNames[ usItem ], pStr2 ); } break; case IC_GUN: { //Calculate AP's - INT16 apStr[20]; - INT16 apStr2[20]; + CHAR16 apStr[20]; + CHAR16 apStr2[20]; UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject ); if ( Weapon[ usItem ].NoSemiAuto ) { - swprintf( (wchar_t *)apStr, L"-" ); + swprintf( apStr, L"-" ); } else { - 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 @@ -7485,7 +7485,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol 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 @@ -7494,7 +7494,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol } //Info for weapons - swprintf( (wchar_t *)pStr, L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", + swprintf( pStr, L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", ItemNames[ usItem ], AmmoCaliber[ Weapon[ usItem ].ubCalibre ], sValue, @@ -7517,15 +7517,15 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol case IC_LAUNCHER: { //Calculate AP's - INT16 apStr[20]; - INT16 apStr2[20]; + CHAR16 apStr[20]; + CHAR16 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 @@ -7535,7 +7535,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol 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 @@ -7544,7 +7544,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol } //Info for weapons - swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", ItemNames[ usItem ], sValue, gWeaponStatsDesc[ 9 ], //Accuracy String @@ -7567,7 +7567,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol case IC_THROWING_KNIFE: case IC_PUNCH: { - swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s", ItemNames[ usItem ], sValue, gWeaponStatsDesc[ 11 ], //Damage String @@ -7584,7 +7584,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol case IC_AMMO: { // The next is for ammunition which gets the measurement 'rnds' - swprintf( (wchar_t *)pStr, L"%s [%d rnds]\n%s %1.1f %s", + swprintf( pStr, L"%s [%d rnds]\n%s %1.1f %s", ItemNames[ usItem ], //Item long name pObject->ubShotsLeft[0], //Shots left gWeaponStatsDesc[ 12 ], //Weight String @@ -7593,7 +7593,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol ); //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 @@ -7613,7 +7613,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol UINT16 explDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ); UINT16 explStunDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubStunDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubStunDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ); - swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s", ItemNames[ usItem ], sValue, gWeaponStatsDesc[ 11 ], //Damage String @@ -7651,7 +7651,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol break; } - swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s", ItemNames[ usItem ], //Item long name sValue, //Item condition pInvPanelTitleStrings[ 4 ], //Protection string @@ -7675,7 +7675,7 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol default: { // The final, and typical case, is that of an item with a percent status - swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%%]\n%s %1.1f %s", ItemNames[ usItem ], //Item long name sValue, //Item condition gWeaponStatsDesc[ 12 ], //Weight String @@ -7690,8 +7690,8 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol // Fingerprint ID (Soldier Name) if ( ( Item[pObject->usItem].fingerprintid ) && pObject->ubImprintID < NO_PROFILE ) { - INT16 pStr2[20]; - swprintf( (wchar_t *)pStr2, L" [%s]", gMercProfiles[ pObject->ubImprintID ].zNickname ); + CHAR16 pStr2[20]; + swprintf( pStr2, L" [%s]", gMercProfiles[ pObject->ubImprintID ].zNickname ); wcscat( pStr, pStr2 ); } @@ -7724,11 +7724,11 @@ void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSol } else { - swprintf( (wchar_t *)pStr, L"" ); + swprintf( pStr, L"" ); } // Copy over... - swprintf( (wchar_t *)pzStr, L"%s", pStr ); + swprintf( pzStr, L"%s", pStr ); } @@ -7922,7 +7922,7 @@ void UpdateItemHatches() BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOpponent, ITEM_POOL *pItemPool, UINT8 ubCount) { VOBJECT_DESC VObjectDesc; - UINT8 ubString[48]; + CHAR8 ubString[48]; INT16 sCenX, sCenY, sX, sY, sCenterYVal; INT8 bZLevel =pOpponent->bLevel; INT16 sGridNo =pOpponent->sGridNo; @@ -8037,7 +8037,7 @@ BOOLEAN InitializeStealItemPickupMenu( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOppo gItemPickupMenu.fAllSelected = FALSE; //Load images for buttons - FilenameForBPP("INTERFACE\\itembox.sti", (STR)ubString ); + FilenameForBPP("INTERFACE\\itembox.sti", ubString ); gItemPickupMenu.iUpButtonImages = LoadButtonImage( ubString, -1,5,-1,10,-1 ); gItemPickupMenu.iDownButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 7, -1, 12, -1 ); gItemPickupMenu.iAllButtonImages = UseLoadedButtonImage( gItemPickupMenu.iUpButtonImages, -1, 6, -1,11, -1 ); diff --git a/Tactical/Interface Items.h b/Tactical/Interface Items.h index 3c502698..bd1f7e5b 100644 --- a/Tactical/Interface Items.h +++ b/Tactical/Interface Items.h @@ -134,7 +134,7 @@ UINT32 GetInterfaceGraphicForItem( INVTYPE *pItem ); UINT16 GetTileGraphicForItem( INVTYPE *pItem ); BOOLEAN LoadTileGraphicForItem( INVTYPE *pItem, UINT32 *puiVo ); -void GetHelpTextForItem( wchar_t * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier ); +void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier ); BOOLEAN AttemptToApplyCamo( SOLDIERTYPE *pSoldier, UINT16 usItemIndex ); diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index a58e39ef..e5b7da11 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -1524,14 +1524,14 @@ BOOLEAN InitializeSMPanel( ) BOOLEAN CreateSMPanelButtons( ) { -UINT8 ubString[48]; +CHAR8 ubString[48]; giSMStealthImages = -1; giSMStealthButton = -1; gfUIStanceDifferent = TRUE; gfAllDisabled = FALSE; - FilenameForBPP("INTERFACE\\inventory_buttons.sti", (STR)ubString); + FilenameForBPP("INTERFACE\\inventory_buttons.sti", ubString); // Load button Graphics iSMPanelImages[ STANCEUP_IMAGES ] = LoadButtonImage(ubString,-1,0,-1,10,-1 ); @@ -1555,11 +1555,11 @@ UINT8 ubString[48]; iBurstButtonImages[ WM_ATTACHED_GL_AUTO ] = UseLoadedButtonImage( iSMPanelImages[ STANCEUP_IMAGES ], -1, 17, -1, -1, -1 ); - FilenameForBPP("INTERFACE\\invadd-ons.sti", (STR)ubString); + FilenameForBPP("INTERFACE\\invadd-ons.sti", ubString); // Load button Graphics iSMPanelImages[ STANCE_IMAGES ] = LoadButtonImage(ubString,0,0,-1,2,-1 ); - FilenameForBPP("INTERFACE\\inventory_buttons_2.sti", (STR)ubString); + FilenameForBPP("INTERFACE\\inventory_buttons_2.sti", ubString); // Load button Graphics iSMPanelImages[ DONE_IMAGES ] = LoadButtonImage(ubString,-1,1,-1,3,-1 ); iSMPanelImages[ MAPSCREEN_IMAGES ] = UseLoadedButtonImage( iSMPanelImages[ DONE_IMAGES ] ,-1,0,-1,2,-1 ); @@ -1822,10 +1822,10 @@ BOOLEAN ShutdownSMPanel( ) void RenderSMPanel( BOOLEAN *pfDirty ) { INT16 sFontX, sFontY; - UINT16 usX, usY; - wchar_t sString[9]; + INT16 usX, usY; + CHAR16 sString[9]; UINT32 cnt; - static INT16 pStr[ 200 ], pMoraleStr[ 20 ]; + static CHAR16 pStr[ 200 ], pMoraleStr[ 20 ]; if ( gubSelectSMPanelToMerc != NOBODY ) { @@ -2078,18 +2078,18 @@ void RenderSMPanel( BOOLEAN *pfDirty ) { if ( gpSMCurrentMerc->uiStatusFlags & SOLDIER_VEHICLE ) { - swprintf( (wchar_t *)pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax ); + swprintf( pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax ); SetRegionFastHelpText( &(gSM_SELMERCBarsRegion), pStr ); } else if ( gpSMCurrentMerc->uiStatusFlags & SOLDIER_ROBOT ) { - swprintf( (wchar_t *)pStr, gzLateLocalizedString[ 16 ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax ); + swprintf( pStr, gzLateLocalizedString[ 16 ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax ); SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr ); } else { - GetMoraleString( gpSMCurrentMerc, (STR16)pMoraleStr ); - swprintf( (wchar_t *)pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax, pMoraleStr ); + GetMoraleString( gpSMCurrentMerc, pMoraleStr ); + swprintf( pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], gpSMCurrentMerc->bLife, gpSMCurrentMerc->bLifeMax, gpSMCurrentMerc->bBreath, gpSMCurrentMerc->bBreathMax, pMoraleStr ); SetRegionFastHelpText( &(gSM_SELMERCBarsRegion), pStr ); } } @@ -3795,7 +3795,7 @@ void RenderTEAMPanel( BOOLEAN fDirty ) INT16 sFontX, sFontY; UINT32 cnt, posIndex; SOLDIERTYPE *pSoldier; - static wchar_t pStr[ 200 ], pMoraleStr[ 20 ]; + static CHAR16 pStr[ 200 ], pMoraleStr[ 20 ]; // WANNE 2 if ( fDirty == DIRTYLEVEL2 ) @@ -3845,7 +3845,7 @@ void RenderTEAMPanel( BOOLEAN fDirty ) pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId ); //OK, for each item, set dirty text if applicable! - swprintf( (wchar_t *)pStr, TacticalStr[ DRIVER_POPUPTEXT ], pVehicle->bLife, pVehicle->bLifeMax, pVehicle->bBreath, pVehicle->bBreathMax ); + swprintf( pStr, TacticalStr[ DRIVER_POPUPTEXT ], pVehicle->bLife, pVehicle->bLifeMax, pVehicle->bBreath, pVehicle->bBreathMax ); SetRegionFastHelpText( &(gTEAM_FirstHandInv[ cnt ]), pStr ); } // Add text for first hand popup @@ -3958,18 +3958,18 @@ void RenderTEAMPanel( BOOLEAN fDirty ) { if ( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) { - swprintf( (wchar_t *)pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax ); + swprintf( pStr, TacticalStr[ VEHICLE_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax ); SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr ); } else if ( pSoldier->uiStatusFlags & SOLDIER_ROBOT ) { - swprintf( (wchar_t *)pStr, gzLateLocalizedString[ 16 ], pSoldier->bLife, pSoldier->bLifeMax ); + swprintf( pStr, gzLateLocalizedString[ 16 ], pSoldier->bLife, pSoldier->bLifeMax ); SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr ); } else { - GetMoraleString( pSoldier, (STR16)pMoraleStr ); - swprintf( (wchar_t *)pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax, pMoraleStr ); + GetMoraleString( pSoldier, pMoraleStr ); + swprintf( pStr, TacticalStr[ MERC_VITAL_STATS_POPUPTEXT ], pSoldier->bLife, pSoldier->bLifeMax, pSoldier->bBreath, pSoldier->bBreathMax, pMoraleStr ); SetRegionFastHelpText( &(gTEAM_BarsRegions[ cnt ]), pStr ); } } @@ -4070,9 +4070,9 @@ void RenderTEAMPanel( BOOLEAN fDirty ) BOOLEAN CreateTEAMPanelButtons( ) { -UINT8 ubString[48]; +CHAR8 ubString[48]; - FilenameForBPP("INTERFACE\\bottom_bar_buttons.sti", (STR)ubString); + FilenameForBPP("INTERFACE\\bottom_bar_buttons.sti", ubString); // Load button Graphics iTEAMPanelImages[ ENDTURN_IMAGES ] = LoadButtonImage(ubString,-1,0,-1, 3,-1 ); diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index ce2452f6..c231c610 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -111,7 +111,7 @@ typedef struct TOP_MESSAGE gTopMessage; BOOLEAN gfTopMessageDirty = FALSE; -void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, wchar_t * psString ); +void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString ); extern UINT16 GetAnimStateForInteraction( SOLDIERTYPE *pSoldier, BOOLEAN fDoor, UINT16 usAnimState ); @@ -681,7 +681,7 @@ void PopupMovementMenu( UI_EVENT *pUIEvent ) SOLDIERTYPE *pSoldier = NULL; INT32 iMenuAnchorX, iMenuAnchorY; UINT32 uiActionImages; - wchar_t zActionString[ 50 ]; + CHAR16 zActionString[ 50 ]; BOOLEAN fDisableAction = FALSE; // Erase other menus.... @@ -845,7 +845,7 @@ void PopupMovementMenu( UI_EVENT *pUIEvent ) { // Until we get mounted weapons... uiActionImages = CANCEL_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); fDisableAction = TRUE; } else @@ -853,12 +853,12 @@ void PopupMovementMenu( UI_EVENT *pUIEvent ) if ( Item[pSoldier->inv[ HANDPOS ].usItem].toolkit ) { uiActionImages = TOOLKITACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); } else if ( Item[pSoldier->inv[ HANDPOS ].usItem].wirecutters ) { uiActionImages = WIRECUTACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); } else { @@ -868,38 +868,38 @@ void PopupMovementMenu( UI_EVENT *pUIEvent ) case IC_PUNCH: uiActionImages = PUNCHACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ USE_HANDTOHAND_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ USE_HANDTOHAND_POPUPTEXT ] ); break; case IC_GUN: uiActionImages = TARGETACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ USE_FIREARM_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ USE_FIREARM_POPUPTEXT ] ); break; case IC_BLADE: uiActionImages = KNIFEACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ USE_BLADE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ USE_BLADE_POPUPTEXT ] ); break; case IC_GRENADE: case IC_BOMB: uiActionImages = BOMBACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ USE_EXPLOSIVE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ USE_EXPLOSIVE_POPUPTEXT ] ); break; case IC_MEDKIT: uiActionImages = AIDACTIONC_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ USE_MEDKIT_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ USE_MEDKIT_POPUPTEXT ] ); break; default: uiActionImages = CANCEL_IMAGES; - swprintf( (wchar_t *)zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); + swprintf( zActionString, TacticalStr[ NOT_APPLICABLE_POPUPTEXT ] ); fDisableAction = TRUE; break; } @@ -1489,8 +1489,8 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID ) INT16 sX, sY; INT32 iBack; TILE_ELEMENT TileElem; - wchar_t *pStr; - wchar_t NameStr[ 50 ]; + CHAR16 *pStr; + CHAR16 NameStr[ 50 ]; UINT16 usGraphicToUse = THIRDPOINTERS1; BOOLEAN fRaiseName = FALSE; BOOLEAN fDoName = TRUE; @@ -1836,11 +1836,11 @@ void RenderOverlayMessage( VIDEO_OVERLAY *pBlitter ) } -void BeginOverlayMessage( UINT32 uiFont, wchar_t *pFontString, ... ) +void BeginOverlayMessage( UINT32 uiFont, STR16 pFontString, ... ) { va_list argptr; VIDEO_OVERLAY_DESC VideoOverlayDesc; - wchar_t SlideString[512]; + CHAR16 SlideString[512]; va_start(argptr, pFontString); // Set up variable argument pointer @@ -2215,7 +2215,7 @@ BOOLEAN InitDoorOpenMenu( SOLDIERTYPE *pSoldier, STRUCTURE *pStructure, UINT8 ub void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) { INT32 iMenuAnchorX, iMenuAnchorY; - wchar_t zDisp[ 100 ]; + CHAR16 zDisp[ 100 ]; iMenuAnchorX = gOpenDoorMenu.sX; iMenuAnchorY = gOpenDoorMenu.sY; @@ -2244,11 +2244,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ USE_KEYRING_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ USE_KEYRING_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_KEYRING_ICON ], AP_UNLOCK_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_KEYRING_ICON ], AP_UNLOCK_DOOR ); } SetButtonFastHelpText( iActionIcons[ USE_KEYRING_ICON ], zDisp ); @@ -2275,11 +2275,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ], AP_USE_CROWBAR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ USE_CROWBAR_ICON ], AP_USE_CROWBAR ); } SetButtonFastHelpText( iActionIcons[ USE_CROWBAR_ICON ], zDisp ); @@ -2305,11 +2305,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ], AP_PICKLOCK ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ LOCKPICK_DOOR_ICON ], AP_PICKLOCK ); } SetButtonFastHelpText( iActionIcons[ LOCKPICK_DOOR_ICON ], zDisp ); @@ -2337,11 +2337,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ], AP_EXPLODE_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXPLOSIVE_DOOR_ICON ], AP_EXPLODE_DOOR ); } SetButtonFastHelpText( iActionIcons[ EXPLOSIVE_DOOR_ICON ], zDisp ); @@ -2371,22 +2371,22 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) { if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ], AP_OPEN_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ CANCEL_ICON + 1 ], AP_OPEN_DOOR ); } } else { if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ], AP_OPEN_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ OPEN_DOOR_ICON ], AP_OPEN_DOOR ); } } SetButtonFastHelpText( iActionIcons[ OPEN_DOOR_ICON ], zDisp ); @@ -2409,11 +2409,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ], AP_EXAMINE_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ EXAMINE_DOOR_ICON ], AP_EXAMINE_DOOR ); } SetButtonFastHelpText( iActionIcons[ EXAMINE_DOOR_ICON ], zDisp ); @@ -2433,11 +2433,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ], AP_BOOT_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ BOOT_DOOR_ICON ], AP_BOOT_DOOR ); } SetButtonFastHelpText( iActionIcons[ BOOT_DOOR_ICON ], zDisp ); @@ -2458,11 +2458,11 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor ) if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) ) { - swprintf( (wchar_t *)zDisp, pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ] ); + swprintf( zDisp, pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ] ); } else { - swprintf( (wchar_t *)zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ], AP_UNTRAP_DOOR ); + swprintf( zDisp, L"%s ( %d )", pTacticalPopupButtonStrings[ UNTRAP_DOOR_ICON ], AP_UNTRAP_DOOR ); } SetButtonFastHelpText( iActionIcons[ UNTRAP_DOOR_ICON ], zDisp ); @@ -2752,11 +2752,11 @@ void RenderUIMessage( VIDEO_OVERLAY *pBlitter ) } -void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... ) +void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, STR16 pFontString, ... ) { va_list argptr; VIDEO_OVERLAY_DESC VideoOverlayDesc; - wchar_t MsgString[512]; + CHAR16 MsgString[512]; va_start(argptr, pFontString); // Set up variable argument pointer @@ -2812,10 +2812,10 @@ void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... ) gfUseSkullIconMessage = fUseSkullIcon; } -void BeginUIMessage( wchar_t *pFontString, ... ) +void BeginUIMessage( STR16 pFontString, ... ) { va_list argptr; - wchar_t MsgString[512]; + CHAR16 MsgString[512]; va_start(argptr, pFontString); // Set up variable argument pointer vswprintf(MsgString, pFontString, argptr); // process gprintf string (get output str) @@ -2825,11 +2825,11 @@ void BeginUIMessage( wchar_t *pFontString, ... ) } -void BeginMapUIMessage( UINT8 ubPosition, wchar_t *pFontString, ... ) +void BeginMapUIMessage( UINT8 ubPosition, STR16 pFontString, ... ) { va_list argptr; VIDEO_OVERLAY_DESC VideoOverlayDesc; - wchar_t MsgString[512]; + CHAR16 MsgString[512]; memset( &VideoOverlayDesc, 0, sizeof( VideoOverlayDesc ) ); @@ -2919,7 +2919,7 @@ void EndUIMessage( ) #define PLAYER_TEAM_TIMER_TICKS_PER_ENEMY ( 2000 / PLAYER_TEAM_TIMER_SEC_PER_TICKS ) -BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString ) +BOOLEAN AddTopMessage( UINT8 ubType, STR16 pzString ) { UINT32 cnt; BOOLEAN fFound = FALSE; @@ -2956,7 +2956,7 @@ BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString ) return( FALSE ); } -void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, wchar_t * psString ) +void CreateTopMessage( UINT32 uiSurface, UINT8 ubType, STR16 psString ) { UINT32 uiBAR, uiPLAYERBAR, uiINTBAR; VOBJECT_DESC VObjectDesc; @@ -3598,7 +3598,7 @@ void DoorMenuBackregionCallback( MOUSE_REGION * pRegion, INT32 iReason ) } } -wchar_t *GetSoldierHealthString( SOLDIERTYPE *pSoldier ) +STR16 GetSoldierHealthString( SOLDIERTYPE *pSoldier ) { INT32 cnt, cntStart; if( pSoldier->bLife == pSoldier->bLifeMax ) diff --git a/Tactical/Interface.h b/Tactical/Interface.h index b2290517..7c70992c 100644 --- a/Tactical/Interface.h +++ b/Tactical/Interface.h @@ -146,7 +146,7 @@ void CancelOpenDoorMenu( ); void HandleInterfaceBackgrounds( ); -void BeginOverlayMessage( UINT32 uiFont, wchar_t *pFontString, ... ); +void BeginOverlayMessage( UINT32 uiFont, STR16 pFontString, ... ); void EndOverlayMessage( ); @@ -177,12 +177,12 @@ void DirtyMercPanelInterface( SOLDIERTYPE *pSoldier, UINT8 ubDirtyLevel ); void EndUIMessage( ); -void BeginUIMessage( wchar_t *pFontString, ... ); -void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, wchar_t *pFontString, ... ); +void BeginUIMessage( STR16 pFontString, ... ); +void InternalBeginUIMessage( BOOLEAN fUseSkullIcon, STR16 pFontString, ... ); // map screen version, for centering over the map area -void BeginMapUIMessage( UINT8 fPosition, wchar_t *pFontString, ... ); +void BeginMapUIMessage( UINT8 fPosition, STR16 pFontString, ... ); extern UINT16 gusUIOldSelectedSoldier; @@ -204,7 +204,7 @@ enum MESSAGE_TYPES void HandleTopMessages( ); -BOOLEAN AddTopMessage( UINT8 ubType, wchar_t * pzString ); +BOOLEAN AddTopMessage( UINT8 ubType, STR16 pzString ); BOOLEAN InTopMessageBarAnimation( ); void EndTopMessage( ); @@ -213,7 +213,7 @@ void PauseRT( BOOLEAN fPause ); void InitEnemyUIBar( UINT8 ubNumEnemies, UINT8 ubDoneEnemies ); -wchar_t *GetSoldierHealthString( SOLDIERTYPE *pSoldier ); +STR16 GetSoldierHealthString( SOLDIERTYPE *pSoldier ); void GetLaunchItemParamsFromUI( ); diff --git a/Tactical/Item Types.h b/Tactical/Item Types.h index df72f7ce..28ce1f7e 100644 --- a/Tactical/Item Types.h +++ b/Tactical/Item Types.h @@ -277,7 +277,7 @@ typedef struct UINT16 fFlags; UINT32 uiIndex; // added - INT8 szItemName[80]; //+1 for the null terminator //added + CHAR8 szItemName[80]; //+1 for the null terminator //added BOOLEAN damageable; BOOLEAN repairable; @@ -297,10 +297,10 @@ typedef struct BOOLEAN electronic; BOOLEAN inseparable; - INT8 szLongItemName[80]; - INT8 szItemDesc[400]; - INT8 szBRName[80]; - INT8 szBRDesc[400]; + CHAR8 szLongItemName[80]; + CHAR8 szItemDesc[400]; + CHAR8 szBRName[80]; + CHAR8 szBRDesc[400]; //TODO: quest items, boosters, money diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 28a3d1ea..541923f0 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1866,7 +1866,7 @@ BOOLEAN ValidItemAttachment( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN fAt if ( fAttemptingAttachment && ValidAttachmentClass( usAttachment, pObj->usItem ) ) { // well, maybe the player thought he could - wchar_t zTemp[ 100 ]; + CHAR16 zTemp[ 100 ]; swprintf( zTemp, Message[ STR_CANT_ATTACH ], ItemNames[ usAttachment ], ItemNames[ pObj->usItem ] ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp ); @@ -3793,7 +3793,7 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj ) { if ( !CompatibleFaceItem( pObj->usItem, pSoldier->inv[ HEAD2POS ].usItem ) ) { - wchar_t zTemp[ 150 ]; + CHAR16 zTemp[ 150 ]; swprintf( zTemp, Message[ STR_CANT_USE_TWO_ITEMS ], ItemNames[ pObj->usItem ], ItemNames[ pSoldier->inv[ HEAD2POS ].usItem ] ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp ); @@ -3804,7 +3804,7 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj ) { if ( !CompatibleFaceItem( pObj->usItem, pSoldier->inv[ HEAD1POS ].usItem ) ) { - wchar_t zTemp[ 150 ]; + CHAR16 zTemp[ 150 ]; swprintf( zTemp, Message[ STR_CANT_USE_TWO_ITEMS ], ItemNames[ pObj->usItem ], ItemNames[ pSoldier->inv[ HEAD1POS ].usItem ] ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, zTemp ); diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index d59583bf..0d74992f 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -1750,7 +1750,7 @@ BOOLEAN SoldierToSoldierLineOfSightTimingTest( SOLDIERTYPE * pStartSoldier, SOLD #ifdef _DEBUG fprintf(OutFile, "DEBUG: " ); #endif - fprintf(OutFile, (const char *)String( "Time for %d calls is %d milliseconds\n", uiLoopLimit, uiEndTime - uiStartTime)); + fprintf(OutFile, String( "Time for %d calls is %d milliseconds\n", uiLoopLimit, uiEndTime - uiStartTime)); fclose(OutFile); } return( TRUE ); diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index df06f7ff..5939fdde 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -233,7 +233,7 @@ void HandleMilitiaPromotions( void ) { // ATE: Problems here with bringing up message box... - // wchar_t str[ 512 ]; + // CHAR16 str[ 512 ]; // BuildMilitiaPromotionsString( str ); // DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); } diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index cc352ae0..a38135d6 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -321,7 +321,7 @@ enum BoxingStates // add new groups. Try to abbreviate the team name as much as possible. The text is in // EditorMercs.c #ifdef JA2EDITOR - extern UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ]; + extern CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ]; #endif // //----------------------------------------------- diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 3b91de8b..bca13688 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -161,7 +161,7 @@ extern BOOLEAN gfSurrendered; #define START_DEMO_SCENE 3 #define NUM_RANDOM_SCENES 4 -INT8 gDebugStr[128]; +CHAR8 gDebugStr[128]; #ifdef NETWORKED extern BYTE gfAmIHost; diff --git a/Tactical/Overhead.h b/Tactical/Overhead.h index d4e09083..1da15169 100644 --- a/Tactical/Overhead.h +++ b/Tactical/Overhead.h @@ -121,7 +121,7 @@ typedef struct UINT16 usTactialTurnLimitCounter; BOOLEAN fInTopMessage; UINT8 ubTopMessageType; - wchar_t zTopMessageString[20]; + CHAR16 zTopMessageString[20]; UINT16 usTactialTurnLimitMax; UINT32 uiTactialTurnLimitClock; BOOLEAN fTactialTurnLimitStartedBeep; diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 1e297625..080a0d62 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -449,7 +449,7 @@ INT32 AddRottingCorpse( ROTTING_CORPSE_DEFINITION *pCorpseDef ) ANITILE_PARAMS AniParams; UINT8 ubLevelID; STRUCTURE_FILE_REF * pStructureFileRef = NULL; - INT8 zFilename[150]; + CHAR8 zFilename[150]; DB_STRUCTURE_REF *pDBStructureRef; UINT8 ubLoop; INT16 sTileGridNo; @@ -607,7 +607,7 @@ INT32 AddRottingCorpse( ROTTING_CORPSE_DEFINITION *pCorpseDef ) // Get root filename... this removes path and extension // USed to find struct data fo rthis corpse... - GetRootName( zFilename, (INT8 *) AniParams.zCachedFile ); + GetRootName( zFilename, AniParams.zCachedFile ); // Add structure data..... CheckForAndAddTileCacheStructInfo( pCorpse->pAniTile->pLevelNode, pCorpse->def.sGridNo, ( UINT16 ) ( pCorpse->iCachedTileID ), GetCorpseStructIndex( pCorpseDef, TRUE ) ); @@ -1574,7 +1574,7 @@ INT16 FindNearestAvailableGridNoForCorpse( ROTTING_CORPSE_DEFINITION *pDef, INT8 UINT8 ubSaveNPCAPBudget; UINT8 ubSaveNPCDistLimit; STRUCTURE_FILE_REF * pStructureFileRef = NULL; - INT8 zFilename[150]; + CHAR8 zFilename[150]; UINT8 ubBestDirection=0; BOOLEAN fSetDirection = FALSE; @@ -1582,7 +1582,7 @@ INT16 FindNearestAvailableGridNoForCorpse( ROTTING_CORPSE_DEFINITION *pDef, INT8 // Get root filename... this removes path and extension // USed to find struct data fo rthis corpse... - GetRootName( zFilename, (INT8 *) zCorpseFilenames[pDef->ubType ] ); + GetRootName( zFilename, zCorpseFilenames[pDef->ubType ] ); pStructureFileRef = GetCachedTileStructureRefFromFilename( zFilename ); diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index 3576ee75..b5273cf6 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -364,7 +364,7 @@ UINT32 guiSmallSoldiersFace[ MAX_CHARACTER_COUNT ]; UINT8 gubNumberMercsInArray; //The subutitled text for what the merc is saying -wchar_t gsShopKeeperTalkingText[ SKI_SUBTITLE_TEXT_SIZE ]; +CHAR16 gsShopKeeperTalkingText[ SKI_SUBTITLE_TEXT_SIZE ]; UINT16 gusPositionOfSubTitlesX=0; @@ -652,9 +652,9 @@ void DisplayTheSkiDropItemToGroundString(); UINT32 EvaluateInvSlot( INVENTORY_IN_SLOT *pInvSlot ); -void BuildItemHelpTextString( wchar_t sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea ); -void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem ); -void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement ); +void BuildItemHelpTextString( CHAR16 sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea ); +void BuildRepairTimeString( CHAR16 sString[], UINT32 uiTimeInMinutesToFixItem ); +void BuildDoneWhenTimeString( CHAR16 sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement ); void DisableAllDealersInventorySlots( void ); void EnableAllDealersInventorySlots( void ); @@ -776,7 +776,7 @@ UINT32 ShopKeeperScreenHandle() { // tell player there's not enough room in the player's offer area // ARM: message is delayed because we need the mouse restriction to be in place BEFORE it comes up so it gets lifted/restored - DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL ); + DoSkiMessageBox( MSG_BOX_BASIC_STYLE, SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL ); gfDisplayNoRoomMsg = FALSE; } @@ -3788,7 +3788,7 @@ void PerformTransaction( UINT32 uiMoneyFromPlayersAccount ) if( CountNumberOfItemsInTheArmsDealersOfferArea( ) > uiAvailablePlayerOfferSlots ) { // tell player there's not enough room in the player's offer area - DoSkiMessageBox( MSG_BOX_BASIC_STYLE, (STR16)SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL ); + DoSkiMessageBox( MSG_BOX_BASIC_STYLE, SKI_Text[ SKI_TEXT_NO_MORE_ROOM_IN_PLAYER_OFFER_AREA ], SHOPKEEPER_SCREEN, MSG_BOX_FLAG_OK, NULL ); return; } @@ -7659,7 +7659,7 @@ UINT32 EvaluateInvSlot( INVENTORY_IN_SLOT *pInvSlot ) #define REPAIR_MINUTES_INTERVAL 15 -void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem ) +void BuildRepairTimeString( CHAR16 sString[], UINT32 uiTimeInMinutesToFixItem ) { UINT16 usNumberOfHoursToFixItem = 0; @@ -7705,7 +7705,7 @@ void BuildRepairTimeString( wchar_t sString[], UINT32 uiTimeInMinutesToFixItem ) -void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement ) +void BuildDoneWhenTimeString( CHAR16 sString[], UINT8 ubArmsDealer, UINT16 usItemIndex, UINT8 ubElement ) { UINT32 uiDoneTime; UINT32 uiDay, uiHour, uiMin; @@ -7752,7 +7752,7 @@ void BuildDoneWhenTimeString( wchar_t sString[], UINT8 ubArmsDealer, UINT16 usIt } -void BuildItemHelpTextString( wchar_t sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea ) +void BuildItemHelpTextString( CHAR16 sString[], INVENTORY_IN_SLOT *pInv, UINT8 ubScreenArea ) { CHAR16 zHelpText[ 512 ]; CHAR16 zRepairTime[ 64 ]; diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index b303ab8c..27f07510 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -787,7 +787,7 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier ) // ATE; Reduce it due to animation being stopped... DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Freeing up attacker - Burst animation ended") ); - ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE ); + ReduceAttackBusyCount( pSoldier->ubID, FALSE ); if ( CheckForImproperFireGunEnd( pSoldier ) ) @@ -1630,21 +1630,21 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier ) if ( Random( 100 ) < 10 ) { // Play sound - PlayJA2SampleFromFile( (STR8) pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); + PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); } } else { // Play sound - PlayJA2SampleFromFile( (STR8)pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); + PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); } } } else { // Play sound - PlayJA2SampleFromFile( (STR8)pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); + PlayJA2SampleFromFile( pAnimDef->zSoundFile, RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); } } else @@ -2480,13 +2480,13 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier ) // code: freeup attcker DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Reducing attacker busy count..., CODE FROM ANIMATION %s ( %d )", gAnimControl[ pSoldier->usAnimState ].zAnimStr, pSoldier->usAnimState ) ); - ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE ); + ReduceAttackBusyCount( pSoldier->ubID, FALSE ); // ATE: Here, reduce again if creaturequeen tentical attack... if ( pSoldier->usAnimState == QUEEN_SWIPE ) { DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("@@@@@@@ Reducing attacker busy count for end of queen swipe\n" ) ); - ReduceAttackBusyCount( (UINT8) pSoldier->ubID, FALSE ); + ReduceAttackBusyCount( pSoldier->ubID, FALSE ); } break; diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 303d4257..1cc9fe6e 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -7396,7 +7396,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, { sprintf( zFilename, "BATTLESNDS\\%03d_%s.ogg", pSoldier->ubProfile, gBattleSndsData[ ubSoundID ].zName ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\%03d_%s.wav", pSoldier->ubProfile, gBattleSndsData[ ubSoundID ].zName ); } @@ -7407,7 +7407,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, if ( pSoldier->ubBodyType == REGFEMALE ) { sprintf( zFilename, "BATTLESNDS\\f_%s.ogg", gBattleSndsData[ ubSoundID ].zName ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\f_%s.wav", gBattleSndsData[ ubSoundID ].zName ); } @@ -7415,7 +7415,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, else { sprintf( zFilename, "BATTLESNDS\\m_%s.ogg", gBattleSndsData[ ubSoundID ].zName ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\m_%s.wav", gBattleSndsData[ ubSoundID ].zName ); } @@ -7435,7 +7435,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, if ( ubSoundID == BATTLE_SOUND_DIE1 ) { sprintf( zFilename, "BATTLESNDS\\kid%d_dying.ogg", pSoldier->ubBattleSoundID ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\kid%d_dying.wav", pSoldier->ubBattleSoundID ); } @@ -7443,7 +7443,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, else { sprintf( zFilename, "BATTLESNDS\\kid%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\kid%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName ); } @@ -7454,7 +7454,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, if ( ubSoundID == BATTLE_SOUND_DIE1 ) { sprintf( zFilename, "BATTLESNDS\\bad%d_die.ogg", pSoldier->ubBattleSoundID ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\bad%d_die.wav", pSoldier->ubBattleSoundID ); } @@ -7462,7 +7462,7 @@ BOOLEAN InternalDoMercBattleSound( SOLDIERTYPE *pSoldier, UINT8 ubBattleSoundID, else { sprintf( zFilename, "BATTLESNDS\\bad%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName ); - if ( !FileExists( (STR)zFilename ) ) + if ( !FileExists( zFilename ) ) { sprintf( zFilename, "BATTLESNDS\\bad%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ ubSoundID ].zName ); } @@ -10349,7 +10349,7 @@ void SoldierCollapse( SOLDIERTYPE *pSoldier ) if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) && (pSoldier->uiStatusFlags & SOLDIER_UNDERAICONTROL)) { #ifdef TESTAICONTROL - DebugAI( (STR)String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); #endif EndAIGuysTurn( pSoldier ); diff --git a/Tactical/Soldier Control.h b/Tactical/Soldier Control.h index 263cecd8..7167c269 100644 --- a/Tactical/Soldier Control.h +++ b/Tactical/Soldier Control.h @@ -378,7 +378,7 @@ typedef struct INT8 bScientific; // traits INT16 sWeightCarriedAtTurnStart; - wchar_t name[ 10 ]; + CHAR16 name[ 10 ]; INT8 bVisible; // to render or not to render... diff --git a/Tactical/Soldier Create.h b/Tactical/Soldier Create.h index d48f5d45..4b8975da 100644 --- a/Tactical/Soldier Create.h +++ b/Tactical/Soldier Create.h @@ -109,7 +109,7 @@ typedef struct //Kris: Additions November 16, 1997 (padding down to 129 from 150) BOOLEAN fVisible; - wchar_t name[ 10 ]; + CHAR16 name[ 10 ]; UINT8 ubSoldierClass; //army, administrator, elite diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 821ee02f..6ce4247f 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -299,9 +299,9 @@ BOOLEAN LoadSoldiersFromMap( INT8 **hBuffer ) } if( fCowInSector ) { - UINT8 str[ 40 ]; - sprintf( (char *)str, "Sounds\\\\cowmoo%d.wav", Random( 3 ) + 1 ); - PlayJA2SampleFromFile( (STR8) str, RATE_11025, MIDVOLUME, 1, MIDDLEPAN ); + CHAR8 str[ 40 ]; + sprintf( str, "Sounds\\\\cowmoo%d.wav", Random( 3 ) + 1 ); + PlayJA2SampleFromFile( str, RATE_11025, MIDVOLUME, 1, MIDDLEPAN ); } return TRUE; } @@ -1865,7 +1865,7 @@ void AddSoldierInitListBloodcats() ubSectorID != SEC_I16 && ubSectorID != SEC_N5 ) { #ifdef JA2BETAVERSION - wchar_t str[200]; + CHAR16 str[200]; swprintf( str, L"Table specifies that there are %d bloodcat placements in sector %c%d, but the map actually has %d bloodcat placements. Map value takes precedence. KM,LC:1", pSector->bBloodCatPlacements, gWorldSectorY + 'A' - 1, gWorldSectorX, bBloodCatPlacements ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); @@ -2101,7 +2101,7 @@ BOOLEAN ValidateSoldierInitLinks( UINT8 ubCode ) { SOLDIERINITNODE *curr; UINT32 uiNumInvalids = 0; - wchar_t str[512]; + CHAR16 str[512]; curr = gSoldierInitHead; while( curr ) { diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index 8b5d8c0e..05f5baf3 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -213,17 +213,17 @@ BOOLEAN LoadMercProfiles(void) DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"LoadMercProfiles"); // FILE *fptr; HWFILE fptr; - char *pFileName = "BINARYDATA\\Prof.dat"; + STR8 pFileName = "BINARYDATA\\Prof.dat"; - char *pFileName1_Normal = "BINARYDATA\\Prof_Novice_NormalGuns.dat"; - char *pFileName2_Normal = "BINARYDATA\\Prof_Experienced_NormalGuns.dat"; - char *pFileName3_Normal = "BINARYDATA\\Prof_Expert_NormalGuns.dat"; - char *pFileName4_Normal = "BINARYDATA\\Prof_Insane_NormalGuns.dat"; + STR8 pFileName1_Normal = "BINARYDATA\\Prof_Novice_NormalGuns.dat"; + STR8 pFileName2_Normal = "BINARYDATA\\Prof_Experienced_NormalGuns.dat"; + STR8 pFileName3_Normal = "BINARYDATA\\Prof_Expert_NormalGuns.dat"; + STR8 pFileName4_Normal = "BINARYDATA\\Prof_Insane_NormalGuns.dat"; - char *pFileName1_Tons = "BINARYDATA\\Prof_Novice_TonsOfGuns.dat"; - char *pFileName2_Tons = "BINARYDATA\\Prof_Experienced_TonsOfGuns.dat"; - char *pFileName3_Tons = "BINARYDATA\\Prof_Expert_TonsOfGuns.dat"; - char *pFileName4_Tons = "BINARYDATA\\Prof_Insane_TonsOfGuns.dat"; + STR8 pFileName1_Tons = "BINARYDATA\\Prof_Novice_TonsOfGuns.dat"; + STR8 pFileName2_Tons = "BINARYDATA\\Prof_Experienced_TonsOfGuns.dat"; + STR8 pFileName3_Tons = "BINARYDATA\\Prof_Expert_TonsOfGuns.dat"; + STR8 pFileName4_Tons = "BINARYDATA\\Prof_Insane_TonsOfGuns.dat"; UINT32 uiLoop, uiLoop2;//, uiLoop3; UINT16 usItem;//, usNewGun, usAmmo, usNewAmmo; diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index b35f981b..1f1a81d4 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -417,13 +417,13 @@ void DrawMouseTooltip() UINT16 usRectColor2 = Get16BPPColor( FROMRGB( 227, 198, 88 ) ); static INT32 iX, iY, iW, iH; - extern INT16 GetWidthOfString(STR16); - extern INT16 GetNumberOfLinesInHeight(STR16); - extern void DisplayHelpTokenizedString(STR16,INT16,INT16); + extern INT16 GetWidthOfString(const STR16); + extern INT16 GetNumberOfLinesInHeight(const STR16); + extern void DisplayHelpTokenizedString(const STR16,INT16,INT16); extern BOOLEAN initTooltipBuffer(); extern PTR LockTooltipBuffer(UINT32*); extern void UnlockTooltipBuffer(); - extern void DisplayTooltipString( STR16 pStringA, INT16 sX, INT16 sY ); + extern void DisplayTooltipString( const STR16 pStringA, INT16 sX, INT16 sY ); extern void j_log(PTR,...); iX = mouseTT.iX;iY = mouseTT.iY; diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index c2dc6110..4d6611be 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -522,7 +522,7 @@ void UpdateSectorExitMenu( ) MSYS_DisableRegion(&(gExitDialog.SingleRegion) ); if( gExitDialog.fSelectedMercIsEPC ) { //EPCs cannot leave the sector alone and must be escorted - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; swprintf( str, pExitingSectorHelpText[ EXIT_GUI_ESCORTED_CHARACTERS_MUST_BE_ESCORTED_HELPTEXT ], MercPtrs[ gusSelectedSoldier ]->name ); SetButtonFastHelpText( gExitDialog.uiSingleMoveButton, str ); SetRegionFastHelpText( &gExitDialog.SingleRegion, str ); @@ -531,7 +531,7 @@ void UpdateSectorExitMenu( ) { //It has been previously determined that there are only two mercs in the squad, the selected merc //isn't an EPC, but the other merc is. That means that this merc cannot leave the sector alone //as he would isolate the EPC. - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; if( !gExitDialog.fSquadHasMultipleEPCs ) { if( gMercProfiles[ MercPtrs[ gusSelectedSoldier ]->ubProfile ].bSex == MALE ) @@ -562,7 +562,7 @@ void UpdateSectorExitMenu( ) } else { - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; EnableButton( gExitDialog.uiSingleMoveButton ); MSYS_EnableRegion(&(gExitDialog.SingleRegion) ); swprintf( str, pExitingSectorHelpText[ EXIT_GUI_SINGLE_TRAVERSAL_WILL_SEPARATE_SQUADS_HELPTEXT ], MercPtrs[ gusSelectedSoldier ]->name ); @@ -698,7 +698,7 @@ BOOLEAN HandleSectorExitMenu( ) void RemoveSectorExitMenu( BOOLEAN fOk ) { - wchar_t Str[ 50 ]; + CHAR16 Str[ 50 ]; if ( gfInSectorExitMenu ) { @@ -740,7 +740,7 @@ void RemoveSectorExitMenu( BOOLEAN fOk ) // Check if there are more than one in this squad if ( gExitDialog.ubNumPeopleOnSquad == 0 ) { - swprintf( (wchar_t *) Str, pMessageStrings[ MSG_EPC_CANT_TRAVERSE ], MercPtrs[ gusSelectedSoldier ]->name ); + swprintf( Str, pMessageStrings[ MSG_EPC_CANT_TRAVERSE ], MercPtrs[ gusSelectedSoldier ]->name ); DoMessageBox( MSG_BOX_BASIC_STYLE, Str, GAME_SCREEN, ( UINT8 )MSG_BOX_FLAG_OK, NULL, NULL ); return; diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp index ecbaab74..d48c4081 100644 --- a/Tactical/Tactical Save.cpp +++ b/Tactical/Tactical Save.cpp @@ -420,11 +420,11 @@ BOOLEAN LoadMapTempFilesFromSavedGameFile( HWFILE hFile ) if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion < 78 ) { - INT8 pMapName[ 128 ]; + CHAR8 pMapName[ 128 ]; // KILL IT!!! KILL KIT!!!! IT IS CORRUPTED!!! - GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, (STR)pMapName, sMapX, sMapY, 0 ); - FileDelete( (STR)pMapName ); + GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, pMapName, sMapX, sMapY, 0 ); + FileDelete( pMapName ); // turn off the flag SectorInfo[ SECTOR( sMapX,sMapY) ].uiFlags &= (~SF_CIV_PRESERVED_TEMP_FILE_EXISTS); @@ -514,11 +514,11 @@ BOOLEAN LoadMapTempFilesFromSavedGameFile( HWFILE hFile ) return FALSE; if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion < 78 ) { - INT8 pMapName[ 128 ]; + CHAR8 pMapName[ 128 ]; // KILL IT!!! KILL KIT!!!! IT IS CORRUPTED!!! - GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, (STR)pMapName, TempNode->ubSectorX, TempNode->ubSectorY, TempNode->ubSectorZ ); - FileDelete( (STR)pMapName ); + GetMapTempFileName( SF_CIV_PRESERVED_TEMP_FILE_EXISTS, pMapName, TempNode->ubSectorX, TempNode->ubSectorY, TempNode->ubSectorZ ); + FileDelete( pMapName ); // turn off the flag TempNode->uiFlags &= (~SF_CIV_PRESERVED_TEMP_FILE_EXISTS); @@ -2981,51 +2981,51 @@ void GetMapTempFileName( UINT32 uiType, STR pMapName, INT16 sMapX, INT16 sMapY, switch( uiType ) { case SF_ITEM_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\i_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\i_%s", MAPS_DIR, zTempName); break; case SF_ROTTING_CORPSE_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\r_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\r_%s", MAPS_DIR, zTempName); break; case SF_MAP_MODIFICATIONS_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\m_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\m_%s", MAPS_DIR, zTempName); break; case SF_DOOR_TABLE_TEMP_FILES_EXISTS: - sprintf( (char *)pMapName, "%s\\d_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\d_%s", MAPS_DIR, zTempName); break; case SF_REVEALED_STATUS_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\v_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\v_%s", MAPS_DIR, zTempName); break; case SF_DOOR_STATUS_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\ds_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\ds_%s", MAPS_DIR, zTempName); break; case SF_ENEMY_PRESERVED_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\e_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\e_%s", MAPS_DIR, zTempName); break; case SF_CIV_PRESERVED_TEMP_FILE_EXISTS: // NB save game version 0 is "saving game" if ( (gTacticalStatus.uiFlags & LOADING_SAVED_GAME) && guiSaveGameVersion != 0 && guiSaveGameVersion < 78 ) { - sprintf( (char *)pMapName, "%s\\c_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\c_%s", MAPS_DIR, zTempName); } else { - sprintf( (char *)pMapName, "%s\\cc_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\cc_%s", MAPS_DIR, zTempName); } break; case SF_SMOKE_EFFECTS_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\sm_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\sm_%s", MAPS_DIR, zTempName); break; case SF_LIGHTING_EFFECTS_TEMP_FILE_EXISTS: - sprintf( (char *)pMapName, "%s\\l_%s", MAPS_DIR, zTempName); + sprintf( pMapName, "%s\\l_%s", MAPS_DIR, zTempName); break; default: diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp index bc2cfaf8..b1372eee 100644 --- a/Tactical/TeamTurns.cpp +++ b/Tactical/TeamTurns.cpp @@ -590,7 +590,7 @@ void DisplayHiddenTurnbased( SOLDIERTYPE * pActingSoldier ) //JA2Gold: use function to make sure flags turned off everywhere else //pActingSoldier->uiStatusFlags |= SOLDIER_UNDERAICONTROL; SetSoldierAsUnderAiControl( pActingSoldier ); - DebugAI( (STR)String( "Giving AI control to %d", pActingSoldier->ubID ) ); + DebugAI( String( "Giving AI control to %d", pActingSoldier->ubID ) ); pActingSoldier->fTurnInProgress = TRUE; gTacticalStatus.uiTimeSinceMercAIStart = GetJA2Clock(); @@ -675,7 +675,7 @@ void StartInterrupt( void ) if (pSoldier->bTeam == OUR_TEAM) { // start interrupts for everyone on our side at once - INT16 sTemp[ 255 ]; + CHAR16 sTemp[ 255 ]; UINT8 ubInterrupters = 0; INT32 iSquad, iCounter; @@ -716,7 +716,7 @@ void StartInterrupt( void ) // flush... display string, then clear it (we could have 20 names!) // add comma to end, we know we have another person after this... wcscat( sTemp, L", " ); - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp ); wcscpy( sTemp, L"" ); ubInterrupters = 1; } @@ -730,7 +730,7 @@ void StartInterrupt( void ) } } - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp ); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp ); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("INTERRUPT: starting interrupt for %d", ubFirstInterrupter ) ); // gusSelectedSoldier should become the topmost guy on the interrupt list @@ -1717,7 +1717,7 @@ void AddToIntList( UINT8 ubID, BOOLEAN fGainControl, BOOLEAN fCommunicate ) // turn off AI control flag if they lost control if (Menptr[ubID].uiStatusFlags & SOLDIER_UNDERAICONTROL) { - DebugAI( (STR)String( "Taking away AI control from %d", ubID ) ); + DebugAI( String( "Taking away AI control from %d", ubID ) ); Menptr[ubID].uiStatusFlags &= (~SOLDIER_UNDERAICONTROL); } } diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index dadcf766..ab27f342 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -3895,7 +3895,7 @@ BOOLEAN HandleCheckForExitArrowsInput( BOOLEAN fAdjustConfirm ) } else if( gubLoneMercAttemptingToAbandonEPCs ) { - wchar_t str[256]; + CHAR16 str[256]; if( gubLoneMercAttemptingToAbandonEPCs == 1 ) { //Use the singular version of the string if( gMercProfiles[ MercPtrs[ gusSelectedSoldier ]->ubProfile ].bSex == MALE ) @@ -4208,7 +4208,7 @@ void RefreshSoldier() } if ( GetMouseMapPos( (INT16 *)&usMapPos ) ) - sprintf( (char *)gDebugStr, "%d %d %d %d %d %d %d %d", gubWorldMovementCosts[ usMapPos ][ 0 ][ 0 ], + sprintf( gDebugStr, "%d %d %d %d %d %d %d %d", gubWorldMovementCosts[ usMapPos ][ 0 ][ 0 ], gubWorldMovementCosts[ usMapPos ][ 1 ][gsInterfaceLevel], gubWorldMovementCosts[ usMapPos ][ 2 ][gsInterfaceLevel], gubWorldMovementCosts[ usMapPos ][ 3 ][gsInterfaceLevel], diff --git a/Tactical/UI Cursors.cpp b/Tactical/UI Cursors.cpp index 71de3a3f..538feb04 100644 --- a/Tactical/UI Cursors.cpp +++ b/Tactical/UI Cursors.cpp @@ -570,7 +570,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE { //AXP 29.03.2007: Rooftop CtH fix. See below. INT8 bTempTargetLevel = pSoldier->bTargetLevel; - pSoldier->bTargetLevel = gsInterfaceLevel; + pSoldier->bTargetLevel = (INT8) gsInterfaceLevel; UINT32 uiHitChance; uiHitChance = CalcChanceToHitGun( pSoldier, usMapPos, 0, pSoldier->bAimShotLocation ); @@ -590,7 +590,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, UINT16 usMapPos, BOOLE //AXP 29.03.2007: Rooftop CtH fix. Temporarily set soldier targetlevel to the real interface //level (selected with TAB), so the first shot after switching TL is calculated correctly INT8 bTempTargetLevel = pSoldier->bTargetLevel; - pSoldier->bTargetLevel = gsInterfaceLevel; + pSoldier->bTargetLevel = (INT8) gsInterfaceLevel; UINT32 uiHitChance; uiHitChance = CalcChanceToHitGun( pSoldier, usMapPos, (INT8)(pSoldier->bShownAimTime ), pSoldier->bAimShotLocation ); diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index eb3946c6..4eb7ec50 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -283,7 +283,7 @@ EXPLOSIVETYPE Explosive[MAXITEMS+1];// = //}; -INT8 gzBurstSndStrings[MAXITEMS*2][128];// = +CHAR8 gzBurstSndStrings[MAXITEMS*2][128];// = //{ // "", // NOAMMO // "", // 38 @@ -328,7 +328,7 @@ struct { WEP_PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; WEAPONTYPE curWeapon; WEAPONTYPE * curWeaponList; UINT32 maxWeapons; @@ -340,7 +340,7 @@ typedef weaponParseData; static void XMLCALL -weaponStartElementHandle(void *userData, const char *name, const char **atts) +weaponStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { weaponParseData * pData = (weaponParseData *)userData; @@ -412,7 +412,7 @@ weaponStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -weaponCharacterDataHandle(void *userData, const char *str, int len) +weaponCharacterDataHandle(void *userData, const XML_Char *str, int len) { weaponParseData * pData = (weaponParseData *)userData; @@ -425,7 +425,7 @@ weaponCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -weaponEndElementHandle(void *userData, const char *name) +weaponEndElementHandle(void *userData, const XML_Char *name) { weaponParseData * pData = (weaponParseData *)userData; @@ -702,7 +702,7 @@ BOOLEAN ReadInWeaponStats(STR fileName) FilePrintf(hFile,"\r\n"); for(cnt = 0;cnt < MAXITEMS;cnt++) { - INT8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML) + STR8 szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML) FilePrintf(hFile,"\t\r\n"); FilePrintf(hFile,"\t\t%d\r\n", Weapon[cnt].uiIndex); @@ -711,7 +711,7 @@ BOOLEAN ReadInWeaponStats(STR fileName) while(szRemainder[0] != '\0') { UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - INT8 invChar = szRemainder[uiCharLoc]; + CHAR8 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { @@ -805,7 +805,7 @@ BOOLEAN WriteWeaponStats() FilePrintf(hFile,"\r\n"); for(cnt = 0;cnt < MAXITEMS;cnt++) { - INT8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML) + CHAR8 * szRemainder = Weapon[cnt].szWeaponName; //the remaining string to be output (for making valid XML) FilePrintf(hFile,"\t\r\n"); FilePrintf(hFile,"\t\t%d\r\n", cnt);//Weapon[cnt].uiIndex); @@ -1512,7 +1512,7 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT16 sTargetGridNo ) UINT16 usItemNum; BOOLEAN fBuckshot; UINT8 ubVolume; - INT8 zBurstString[512]; + CHAR8 zBurstString[512]; UINT8 ubDirection; INT16 sNewGridNo; UINT8 ubMerc; @@ -1538,21 +1538,21 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT16 sTargetGridNo ) if( noisefactor < MAX_PERCENT_NOISE_VOLUME_FOR_SILENCED_SOUND || Weapon[ usItemNum ].ubAttackVolume <= 10 ) { // Pick sound file baed on how many bullets we are going to fire... - sprintf( (char *)zBurstString, (const char*)gzBurstSndStrings[ Weapon[ usItemNum ].sSilencedBurstSound ], pSoldier->bBulletsLeft ); + sprintf( zBurstString, gzBurstSndStrings[ Weapon[ usItemNum ].sSilencedBurstSound ], pSoldier->bBulletsLeft ); // Try playing sound... - pSoldier->iBurstSoundID = PlayJA2SampleFromFile( (STR8) zBurstString, RATE_11025, SoundVolume( HIGHVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); + pSoldier->iBurstSoundID = PlayJA2SampleFromFile( zBurstString, RATE_11025, SoundVolume( HIGHVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); } else { // Pick sound file baed on how many bullets we are going to fire... // Lesh: changed next line - sprintf( (char *)zBurstString, (const char*)gzBurstSndStrings[ Weapon[ usItemNum ].sBurstSound ], pSoldier->bBulletsLeft ); + sprintf( zBurstString, gzBurstSndStrings[ Weapon[ usItemNum ].sBurstSound ], pSoldier->bBulletsLeft ); INT8 volume = HIGHVOLUME; if ( noisefactor < 100 ) volume = (volume * noisefactor) / 100; // Try playing sound... - pSoldier->iBurstSoundID = PlayJA2SampleFromFile( (STR8) zBurstString, RATE_11025, SoundVolume( (INT8) volume, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); + pSoldier->iBurstSoundID = PlayJA2SampleFromFile( zBurstString, RATE_11025, SoundVolume( (INT8) volume, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) ); } /* diff --git a/Tactical/Weapons.h b/Tactical/Weapons.h index 30542f80..9874b7ea 100644 --- a/Tactical/Weapons.h +++ b/Tactical/Weapons.h @@ -259,7 +259,7 @@ typedef struct UINT8 bBurstAP; // Snap: Burst AP cost replaces bBaseAutofireCost UINT8 bAutofireShotsPerFiveAP; - INT8 szWeaponName[MAX_WEAPON_NAME_LENGTH+1]; //+1 for the null terminator + CHAR8 szWeaponName[MAX_WEAPON_NAME_LENGTH+1]; //+1 for the null terminator UINT32 uiIndex; BOOLEAN swapClips; @@ -311,7 +311,7 @@ extern WEAPONTYPE Weapon[ MAXITEMS ]; extern ARMOURTYPE Armour[MAXITEMS+1]; extern MAGTYPE Magazine[MAXITEMS+1]; extern EXPLOSIVETYPE Explosive[MAXITEMS+1]; -extern INT8 gzBurstSndStrings[MAXITEMS*2][128]; // Lesh: changed this +extern CHAR8 gzBurstSndStrings[MAXITEMS*2][128]; // Lesh: changed this extern AMMOTYPE AmmoTypes[MAXITEMS]; extern BOOLEAN ReadInWeaponStats(STR fileName); diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp index 35262c78..4da80452 100644 --- a/Tactical/XML_AmmoStrings.cpp +++ b/Tactical/XML_AmmoStrings.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 maxArraySize; UINT32 curIndex; @@ -58,7 +58,7 @@ struct typedef ammoParseData; static void XMLCALL -ammoStartElementHandle(void *userData, const char *name, const char **atts) +ammoStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { ammoParseData * pData = (ammoParseData *)userData; @@ -94,7 +94,7 @@ ammoStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -ammoCharacterDataHandle(void *userData, const char *str, int len) +ammoCharacterDataHandle(void *userData, const XML_Char *str, int len) { ammoParseData * pData = (ammoParseData *)userData; @@ -107,7 +107,7 @@ ammoCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -ammoEndElementHandle(void *userData, const char *name) +ammoEndElementHandle(void *userData, const XML_Char *name) { char temp; ammoParseData * pData = (ammoParseData *)userData; @@ -239,18 +239,18 @@ BOOLEAN WriteAmmoStats() { FilePrintf(hFile,"\t\r\n"); - wchar_t * szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML) + STR16 szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML) FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - UINT16 invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } @@ -292,13 +292,13 @@ BOOLEAN WriteAmmoStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - UINT16 invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } diff --git a/Tactical/XML_AmmoTypes.cpp b/Tactical/XML_AmmoTypes.cpp index c2eae81f..7acad268 100644 --- a/Tactical/XML_AmmoTypes.cpp +++ b/Tactical/XML_AmmoTypes.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; AMMOTYPE curAmmoType; AMMOTYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef ammotypeParseData; static void XMLCALL -ammotypeStartElementHandle(void *userData, const char *name, const char **atts) +ammotypeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { ammotypeParseData * pData = (ammotypeParseData *)userData; @@ -126,7 +126,7 @@ ammotypeStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -ammotypeCharacterDataHandle(void *userData, const char *str, int len) +ammotypeCharacterDataHandle(void *userData, const XML_Char *str, int len) { ammotypeParseData * pData = (ammotypeParseData *)userData; @@ -139,7 +139,7 @@ ammotypeCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -ammotypeEndElementHandle(void *userData, const char *name) +ammotypeEndElementHandle(void *userData, const XML_Char *name) { ammotypeParseData * pData = (ammotypeParseData *)userData; @@ -191,22 +191,22 @@ ammotypeEndElementHandle(void *userData, const char *name) else if(strcmp(name, "armourImpactReductionMultiplier") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.armourImpactReductionMultiplier = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.armourImpactReductionMultiplier = (INT32) atol(pData->szCharData); } else if(strcmp(name, "afterArmourDamageMultiplier") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.afterArmourDamageMultiplier = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.afterArmourDamageMultiplier = (INT32) atol(pData->szCharData); } else if(strcmp(name, "beforeArmourDamageMultiplier") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.beforeArmourDamageMultiplier = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.beforeArmourDamageMultiplier = (INT32) atol(pData->szCharData); } else if(strcmp(name, "multipleBulletDamageMultiplier") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.multipleBulletDamageMultiplier = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.multipleBulletDamageMultiplier = (INT32) atol(pData->szCharData); } else if(strcmp(name, "structureImpactReductionDivisor") == 0) { @@ -216,22 +216,22 @@ ammotypeEndElementHandle(void *userData, const char *name) else if(strcmp(name, "armourImpactReductionDivisor") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.armourImpactReductionDivisor = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.armourImpactReductionDivisor = (INT32) atol(pData->szCharData); } else if(strcmp(name, "afterArmourDamageDivisor") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.afterArmourDamageDivisor = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.afterArmourDamageDivisor = (INT32) atol(pData->szCharData); } else if(strcmp(name, "beforeArmourDamageDivisor") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.beforeArmourDamageDivisor = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.beforeArmourDamageDivisor = (INT32) atol(pData->szCharData); } else if(strcmp(name, "multipleBulletDamageDivisor") == 0) { pData->curElement = ELEMENT; - pData->curAmmoType.multipleBulletDamageDivisor = (INT32) atol((char *)pData->szCharData); + pData->curAmmoType.multipleBulletDamageDivisor = (INT32) atol(pData->szCharData); } else if(strcmp(name, "lockBustingPower") == 0) { diff --git a/Tactical/XML_Armour.cpp b/Tactical/XML_Armour.cpp index 5b95ee9e..4f273bf0 100644 --- a/Tactical/XML_Armour.cpp +++ b/Tactical/XML_Armour.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; ARMOURTYPE curArmour; ARMOURTYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef armourParseData; static void XMLCALL -armourStartElementHandle(void *userData, const char *name, const char **atts) +armourStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { armourParseData * pData = (armourParseData *)userData; @@ -102,7 +102,7 @@ armourStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -armourCharacterDataHandle(void *userData, const char *str, int len) +armourCharacterDataHandle(void *userData, const XML_Char *str, int len) { armourParseData * pData = (armourParseData *)userData; @@ -115,7 +115,7 @@ armourCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -armourEndElementHandle(void *userData, const char *name) +armourEndElementHandle(void *userData, const XML_Char *name) { armourParseData * pData = (armourParseData *)userData; diff --git a/Tactical/XML_AttachmentInfo.cpp b/Tactical/XML_AttachmentInfo.cpp index 31db2b1f..31e9c11a 100644 --- a/Tactical/XML_AttachmentInfo.cpp +++ b/Tactical/XML_AttachmentInfo.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; AttachmentInfoStruct curAttachmentInfo; AttachmentInfoStruct * curArray; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef attachmentinfoParseData; static void XMLCALL -attachmentinfoStartElementHandle(void *userData, const char *name, const char **atts) +attachmentinfoStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { attachmentinfoParseData * pData = (attachmentinfoParseData *)userData; @@ -101,7 +101,7 @@ attachmentinfoStartElementHandle(void *userData, const char *name, const char ** } static void XMLCALL -attachmentinfoCharacterDataHandle(void *userData, const char *str, int len) +attachmentinfoCharacterDataHandle(void *userData, const XML_Char *str, int len) { attachmentinfoParseData * pData = (attachmentinfoParseData *)userData; @@ -114,7 +114,7 @@ attachmentinfoCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -attachmentinfoEndElementHandle(void *userData, const char *name) +attachmentinfoEndElementHandle(void *userData, const XML_Char *name) { attachmentinfoParseData * pData = (attachmentinfoParseData *)userData; diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp index a1b45591..9bff01a2 100644 --- a/Tactical/XML_Attachments.cpp +++ b/Tactical/XML_Attachments.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT16 curAttachment[3]; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef attachmentParseData; static void XMLCALL -attachmentStartElementHandle(void *userData, const char *name, const char **atts) +attachmentStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { attachmentParseData * pData = (attachmentParseData *)userData; @@ -100,7 +100,7 @@ attachmentStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -attachmentCharacterDataHandle(void *userData, const char *str, int len) +attachmentCharacterDataHandle(void *userData, const XML_Char *str, int len) { attachmentParseData * pData = (attachmentParseData *)userData; @@ -113,7 +113,7 @@ attachmentCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -attachmentEndElementHandle(void *userData, const char *name) +attachmentEndElementHandle(void *userData, const XML_Char *name) { attachmentParseData * pData = (attachmentParseData *)userData; diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp index 04728eed..022b1f48 100644 --- a/Tactical/XML_BurstSounds.cpp +++ b/Tactical/XML_BurstSounds.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 maxArraySize; UINT32 curIndex; @@ -58,7 +58,7 @@ struct typedef burstSoundParseData; static void XMLCALL -burstSoundStartElementHandle(void *userData, const char *name, const char **atts) +burstSoundStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { burstSoundParseData * pData = (burstSoundParseData *)userData; @@ -86,7 +86,7 @@ burstSoundStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -burstSoundCharacterDataHandle(void *userData, const char *str, int len) +burstSoundCharacterDataHandle(void *userData, const XML_Char *str, int len) { burstSoundParseData * pData = (burstSoundParseData *)userData; @@ -99,7 +99,7 @@ burstSoundCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -burstSoundEndElementHandle(void *userData, const char *name) +burstSoundEndElementHandle(void *userData, const XML_Char *name) { burstSoundParseData * pData = (burstSoundParseData *)userData; @@ -212,7 +212,7 @@ BOOLEAN WriteBurstSoundArray() { FilePrintf(hFile,"\t"); - INT8 * szRemainder = gzBurstSndStrings[cnt]; //the remaining string to be output (for making valid XML) + STR8 szRemainder = gzBurstSndStrings[cnt]; //the remaining string to be output (for making valid XML) while(szRemainder[0] != '\0') { diff --git a/Tactical/XML_ComboMergeInfo.cpp b/Tactical/XML_ComboMergeInfo.cpp index 41a33b1d..baeec7b6 100644 --- a/Tactical/XML_ComboMergeInfo.cpp +++ b/Tactical/XML_ComboMergeInfo.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; ComboMergeInfoStruct curAttachmentComboMerge; ComboMergeInfoStruct * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef attachmentcombomergeParseData; static void XMLCALL -attachmentcombomergeStartElementHandle(void *userData, const char *name, const char **atts) +attachmentcombomergeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData; @@ -102,7 +102,7 @@ attachmentcombomergeStartElementHandle(void *userData, const char *name, const c } static void XMLCALL -attachmentcombomergeCharacterDataHandle(void *userData, const char *str, int len) +attachmentcombomergeCharacterDataHandle(void *userData, const XML_Char *str, int len) { attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData; @@ -115,7 +115,7 @@ attachmentcombomergeCharacterDataHandle(void *userData, const char *str, int len static void XMLCALL -attachmentcombomergeEndElementHandle(void *userData, const char *name) +attachmentcombomergeEndElementHandle(void *userData, const XML_Char *name) { attachmentcombomergeParseData * pData = (attachmentcombomergeParseData *)userData; diff --git a/Tactical/XML_CompatibleFaceItems.cpp b/Tactical/XML_CompatibleFaceItems.cpp index 213f0c76..ac5b0730 100644 --- a/Tactical/XML_CompatibleFaceItems.cpp +++ b/Tactical/XML_CompatibleFaceItems.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT16 curCompatibleFaceItem[2]; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef compatiblefaceitemParseData; static void XMLCALL -compatiblefaceitemStartElementHandle(void *userData, const char *name, const char **atts) +compatiblefaceitemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData; @@ -99,7 +99,7 @@ compatiblefaceitemStartElementHandle(void *userData, const char *name, const cha } static void XMLCALL -compatiblefaceitemCharacterDataHandle(void *userData, const char *str, int len) +compatiblefaceitemCharacterDataHandle(void *userData, const XML_Char *str, int len) { compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData; @@ -112,7 +112,7 @@ compatiblefaceitemCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -compatiblefaceitemEndElementHandle(void *userData, const char *name) +compatiblefaceitemEndElementHandle(void *userData, const XML_Char *name) { compatiblefaceitemParseData * pData = (compatiblefaceitemParseData *)userData; diff --git a/Tactical/XML_EnemyAmmoDrops.cpp b/Tactical/XML_EnemyAmmoDrops.cpp index 1fec113a..5d1461a5 100644 --- a/Tactical/XML_EnemyAmmoDrops.cpp +++ b/Tactical/XML_EnemyAmmoDrops.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; AMMO_DROPS curAmmoDrop; AMMO_DROPS * curArray; @@ -61,7 +61,7 @@ struct typedef ammoDropParseData; static void XMLCALL -ammoDropStartElementHandle(void *userData, const char *name, const char **atts) +ammoDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { ammoDropParseData * pData = (ammoDropParseData *)userData; @@ -102,7 +102,7 @@ ammoDropStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -ammoDropCharacterDataHandle(void *userData, const char *str, int len) +ammoDropCharacterDataHandle(void *userData, const XML_Char *str, int len) { ammoDropParseData * pData = (ammoDropParseData *)userData; @@ -115,7 +115,7 @@ ammoDropCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -ammoDropEndElementHandle(void *userData, const char *name) +ammoDropEndElementHandle(void *userData, const XML_Char *name) { ammoDropParseData * pData = (ammoDropParseData *)userData; diff --git a/Tactical/XML_EnemyArmourDrops.cpp b/Tactical/XML_EnemyArmourDrops.cpp index edcbd1cd..367767f1 100644 --- a/Tactical/XML_EnemyArmourDrops.cpp +++ b/Tactical/XML_EnemyArmourDrops.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; ARMOUR_DROPS curArmourDrop; ARMOUR_DROPS * curArray; @@ -61,7 +61,7 @@ struct typedef armourDropParseData; static void XMLCALL -armourDropStartElementHandle(void *userData, const char *name, const char **atts) +armourDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { armourDropParseData * pData = (armourDropParseData *)userData; @@ -102,7 +102,7 @@ armourDropStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -armourDropCharacterDataHandle(void *userData, const char *str, int len) +armourDropCharacterDataHandle(void *userData, const XML_Char *str, int len) { armourDropParseData * pData = (armourDropParseData *)userData; @@ -115,7 +115,7 @@ armourDropCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -armourDropEndElementHandle(void *userData, const char *name) +armourDropEndElementHandle(void *userData, const XML_Char *name) { armourDropParseData * pData = (armourDropParseData *)userData; diff --git a/Tactical/XML_EnemyExplosiveDrops.cpp b/Tactical/XML_EnemyExplosiveDrops.cpp index b6f7cb9f..97fb14ab 100644 --- a/Tactical/XML_EnemyExplosiveDrops.cpp +++ b/Tactical/XML_EnemyExplosiveDrops.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; EXPLOSIVE_DROPS curExplosiveDrop; EXPLOSIVE_DROPS * curArray; @@ -61,7 +61,7 @@ struct typedef explosiveDropParseData; static void XMLCALL -explosiveDropStartElementHandle(void *userData, const char *name, const char **atts) +explosiveDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { explosiveDropParseData * pData = (explosiveDropParseData *)userData; @@ -102,7 +102,7 @@ explosiveDropStartElementHandle(void *userData, const char *name, const char **a } static void XMLCALL -explosiveDropCharacterDataHandle(void *userData, const char *str, int len) +explosiveDropCharacterDataHandle(void *userData, const XML_Char *str, int len) { explosiveDropParseData * pData = (explosiveDropParseData *)userData; @@ -115,7 +115,7 @@ explosiveDropCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -explosiveDropEndElementHandle(void *userData, const char *name) +explosiveDropEndElementHandle(void *userData, const XML_Char *name) { explosiveDropParseData * pData = (explosiveDropParseData *)userData; diff --git a/Tactical/XML_EnemyItemChoice.cpp b/Tactical/XML_EnemyItemChoice.cpp index 208ec7dc..8f910ba8 100644 --- a/Tactical/XML_EnemyItemChoice.cpp +++ b/Tactical/XML_EnemyItemChoice.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; ARMY_GUN_CHOICE_TYPE curArmyItemChoices; ARMY_GUN_CHOICE_TYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef armyitemchoicesParseData; static void XMLCALL -armyitemchoicesStartElementHandle(void *userData, const char *name, const char **atts) +armyitemchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData; @@ -149,7 +149,7 @@ armyitemchoicesStartElementHandle(void *userData, const char *name, const char * } static void XMLCALL -armyitemchoicesCharacterDataHandle(void *userData, const char *str, int len) +armyitemchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len) { armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData; @@ -162,7 +162,7 @@ armyitemchoicesCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -armyitemchoicesEndElementHandle(void *userData, const char *name) +armyitemchoicesEndElementHandle(void *userData, const XML_Char *name) { armyitemchoicesParseData * pData = (armyitemchoicesParseData *)userData; diff --git a/Tactical/XML_EnemyMiscDrops.cpp b/Tactical/XML_EnemyMiscDrops.cpp index 39437990..63d25091 100644 --- a/Tactical/XML_EnemyMiscDrops.cpp +++ b/Tactical/XML_EnemyMiscDrops.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; MISC_DROPS curMiscDrop; MISC_DROPS * curArray; @@ -61,7 +61,7 @@ struct typedef miscDropParseData; static void XMLCALL -miscDropStartElementHandle(void *userData, const char *name, const char **atts) +miscDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { miscDropParseData * pData = (miscDropParseData *)userData; @@ -102,7 +102,7 @@ miscDropStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -miscDropCharacterDataHandle(void *userData, const char *str, int len) +miscDropCharacterDataHandle(void *userData, const XML_Char *str, int len) { miscDropParseData * pData = (miscDropParseData *)userData; @@ -115,7 +115,7 @@ miscDropCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -miscDropEndElementHandle(void *userData, const char *name) +miscDropEndElementHandle(void *userData, const XML_Char *name) { miscDropParseData * pData = (miscDropParseData *)userData; diff --git a/Tactical/XML_EnemyWeaponChoice.cpp b/Tactical/XML_EnemyWeaponChoice.cpp index a9488dd2..5e35aeeb 100644 --- a/Tactical/XML_EnemyWeaponChoice.cpp +++ b/Tactical/XML_EnemyWeaponChoice.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; ARMY_GUN_CHOICE_TYPE curExtendedArmyGunChoices; ARMY_GUN_CHOICE_TYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef extendedarmygunchoicesParseData; static void XMLCALL -extendedarmygunchoicesStartElementHandle(void *userData, const char *name, const char **atts) +extendedarmygunchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData; @@ -149,7 +149,7 @@ extendedarmygunchoicesStartElementHandle(void *userData, const char *name, const } static void XMLCALL -extendedarmygunchoicesCharacterDataHandle(void *userData, const char *str, int len) +extendedarmygunchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len) { extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData; @@ -162,7 +162,7 @@ extendedarmygunchoicesCharacterDataHandle(void *userData, const char *str, int l static void XMLCALL -extendedarmygunchoicesEndElementHandle(void *userData, const char *name) +extendedarmygunchoicesEndElementHandle(void *userData, const XML_Char *name) { extendedarmygunchoicesParseData * pData = (extendedarmygunchoicesParseData *)userData; diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp index 0e38ee17..2c86a2ce 100644 --- a/Tactical/XML_EnemyWeaponDrops.cpp +++ b/Tactical/XML_EnemyWeaponDrops.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; WEAPON_DROPS curWeaponDrop; WEAPON_DROPS * curArray; @@ -61,7 +61,7 @@ struct typedef weaponDropParseData; static void XMLCALL -weaponDropStartElementHandle(void *userData, const char *name, const char **atts) +weaponDropStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { weaponDropParseData * pData = (weaponDropParseData *)userData; @@ -102,7 +102,7 @@ weaponDropStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -weaponDropCharacterDataHandle(void *userData, const char *str, int len) +weaponDropCharacterDataHandle(void *userData, const XML_Char *str, int len) { weaponDropParseData * pData = (weaponDropParseData *)userData; @@ -115,7 +115,7 @@ weaponDropCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -weaponDropEndElementHandle(void *userData, const char *name) +weaponDropEndElementHandle(void *userData, const XML_Char *name) { weaponDropParseData * pData = (weaponDropParseData *)userData; diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp index 8aba8a19..2ed24a25 100644 --- a/Tactical/XML_Explosive.cpp +++ b/Tactical/XML_Explosive.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; EXPLOSIVETYPE curExplosive; EXPLOSIVETYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef explosiveParseData; static void XMLCALL -explosiveStartElementHandle(void *userData, const char *name, const char **atts) +explosiveStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { explosiveParseData * pData = (explosiveParseData *)userData; @@ -107,7 +107,7 @@ explosiveStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -explosiveCharacterDataHandle(void *userData, const char *str, int len) +explosiveCharacterDataHandle(void *userData, const XML_Char *str, int len) { explosiveParseData * pData = (explosiveParseData *)userData; @@ -120,7 +120,7 @@ explosiveCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -explosiveEndElementHandle(void *userData, const char *name) +explosiveEndElementHandle(void *userData, const XML_Char *name) { explosiveParseData * pData = (explosiveParseData *)userData; diff --git a/Tactical/XML_IMPItemChoices.cpp b/Tactical/XML_IMPItemChoices.cpp index eb5f627a..95ca45e3 100644 --- a/Tactical/XML_IMPItemChoices.cpp +++ b/Tactical/XML_IMPItemChoices.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; IMP_ITEM_CHOICE_TYPE curIMPItemChoices; IMP_ITEM_CHOICE_TYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef IMPitemchoicesParseData; static void XMLCALL -IMPitemchoicesStartElementHandle(void *userData, const char *name, const char **atts) +IMPitemchoicesStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData; @@ -150,7 +150,7 @@ IMPitemchoicesStartElementHandle(void *userData, const char *name, const char ** } static void XMLCALL -IMPitemchoicesCharacterDataHandle(void *userData, const char *str, int len) +IMPitemchoicesCharacterDataHandle(void *userData, const XML_Char *str, int len) { IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData; @@ -163,7 +163,7 @@ IMPitemchoicesCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -IMPitemchoicesEndElementHandle(void *userData, const char *name) +IMPitemchoicesEndElementHandle(void *userData, const XML_Char *name) { IMPitemchoicesParseData * pData = (IMPitemchoicesParseData *)userData; diff --git a/Tactical/XML_IncompatibleAttachments.cpp b/Tactical/XML_IncompatibleAttachments.cpp index 870e65b3..4109d436 100644 --- a/Tactical/XML_IncompatibleAttachments.cpp +++ b/Tactical/XML_IncompatibleAttachments.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT16 curIncompatibleAttachment[2]; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef incompatibleattachmentParseData; static void XMLCALL -incompatibleattachmentStartElementHandle(void *userData, const char *name, const char **atts) +incompatibleattachmentStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData; @@ -99,7 +99,7 @@ incompatibleattachmentStartElementHandle(void *userData, const char *name, const } static void XMLCALL -incompatibleattachmentCharacterDataHandle(void *userData, const char *str, int len) +incompatibleattachmentCharacterDataHandle(void *userData, const XML_Char *str, int len) { incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData; @@ -112,7 +112,7 @@ incompatibleattachmentCharacterDataHandle(void *userData, const char *str, int l static void XMLCALL -incompatibleattachmentEndElementHandle(void *userData, const char *name) +incompatibleattachmentEndElementHandle(void *userData, const XML_Char *name) { incompatibleattachmentParseData * pData = (incompatibleattachmentParseData *)userData; diff --git a/Tactical/XML_Launchable.cpp b/Tactical/XML_Launchable.cpp index c04f9bdf..f569d7f2 100644 --- a/Tactical/XML_Launchable.cpp +++ b/Tactical/XML_Launchable.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT16 curLaunchable[2]; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef launchableParseData; static void XMLCALL -launchableStartElementHandle(void *userData, const char *name, const char **atts) +launchableStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { launchableParseData * pData = (launchableParseData *)userData; @@ -99,7 +99,7 @@ launchableStartElementHandle(void *userData, const char *name, const char **atts } static void XMLCALL -launchableCharacterDataHandle(void *userData, const char *str, int len) +launchableCharacterDataHandle(void *userData, const XML_Char *str, int len) { launchableParseData * pData = (launchableParseData *)userData; @@ -112,7 +112,7 @@ launchableCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -launchableEndElementHandle(void *userData, const char *name) +launchableEndElementHandle(void *userData, const XML_Char *name) { launchableParseData * pData = (launchableParseData *)userData; diff --git a/Tactical/XML_Magazine.cpp b/Tactical/XML_Magazine.cpp index db16b1d4..bacf2046 100644 --- a/Tactical/XML_Magazine.cpp +++ b/Tactical/XML_Magazine.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; MAGTYPE curMagazine; MAGTYPE * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef magazineParseData; static void XMLCALL -magazineStartElementHandle(void *userData, const char *name, const char **atts) +magazineStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { magazineParseData * pData = (magazineParseData *)userData; @@ -101,7 +101,7 @@ magazineStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -magazineCharacterDataHandle(void *userData, const char *str, int len) +magazineCharacterDataHandle(void *userData, const XML_Char *str, int len) { magazineParseData * pData = (magazineParseData *)userData; @@ -114,7 +114,7 @@ magazineCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -magazineEndElementHandle(void *userData, const char *name) +magazineEndElementHandle(void *userData, const XML_Char *name) { magazineParseData * pData = (magazineParseData *)userData; diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp index 4a1572b0..0f965481 100644 --- a/Tactical/XML_Merge.cpp +++ b/Tactical/XML_Merge.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT16 curMerge[6]; UINT32 maxArraySize; @@ -59,7 +59,7 @@ struct typedef mergeParseData; static void XMLCALL -mergeStartElementHandle(void *userData, const char *name, const char **atts) +mergeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { mergeParseData * pData = (mergeParseData *)userData; @@ -103,7 +103,7 @@ mergeStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -mergeCharacterDataHandle(void *userData, const char *str, int len) +mergeCharacterDataHandle(void *userData, const XML_Char *str, int len) { mergeParseData * pData = (mergeParseData *)userData; @@ -116,7 +116,7 @@ mergeCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -mergeEndElementHandle(void *userData, const char *name) +mergeEndElementHandle(void *userData, const XML_Char *name) { mergeParseData * pData = (mergeParseData *)userData; diff --git a/Tactical/XML_Sounds.cpp b/Tactical/XML_Sounds.cpp index 49d4474f..817444d8 100644 --- a/Tactical/XML_Sounds.cpp +++ b/Tactical/XML_Sounds.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 maxArraySize; UINT32 curIndex; @@ -58,7 +58,7 @@ struct typedef soundParseData; static void XMLCALL -soundStartElementHandle(void *userData, const char *name, const char **atts) +soundStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { soundParseData * pData = (soundParseData *)userData; @@ -86,7 +86,7 @@ soundStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -soundCharacterDataHandle(void *userData, const char *str, int len) +soundCharacterDataHandle(void *userData, const XML_Char *str, int len) { soundParseData * pData = (soundParseData *)userData; @@ -99,7 +99,7 @@ soundCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -soundEndElementHandle(void *userData, const char *name) +soundEndElementHandle(void *userData, const XML_Char *name) { soundParseData * pData = (soundParseData *)userData; @@ -212,7 +212,7 @@ BOOLEAN WriteSoundArray() { FilePrintf(hFile,"\t"); - char * szRemainder = szSoundEffects[cnt]; //the remaining string to be output (for making valid XML) + STR8 szRemainder = szSoundEffects[cnt]; //the remaining string to be output (for making valid XML) while(szRemainder[0] != '\0') { diff --git a/Tactical/XML_TonyInventory.cpp b/Tactical/XML_TonyInventory.cpp index 04621869..70cad70f 100644 --- a/Tactical/XML_TonyInventory.cpp +++ b/Tactical/XML_TonyInventory.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; DEALER_POSSIBLE_INV curInventory; DEALER_POSSIBLE_INV * curArray; UINT32 maxArraySize; @@ -60,7 +60,7 @@ struct typedef inventoryParseData; static void XMLCALL -inventoryStartElementHandle(void *userData, const char *name, const char **atts) +inventoryStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { inventoryParseData * pData = (inventoryParseData *)userData; @@ -100,7 +100,7 @@ inventoryStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -inventoryCharacterDataHandle(void *userData, const char *str, int len) +inventoryCharacterDataHandle(void *userData, const XML_Char *str, int len) { inventoryParseData * pData = (inventoryParseData *)userData; @@ -113,7 +113,7 @@ inventoryCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -inventoryEndElementHandle(void *userData, const char *name) +inventoryEndElementHandle(void *userData, const XML_Char *name) { inventoryParseData * pData = (inventoryParseData *)userData; diff --git a/Tactical/interface Dialogue.h b/Tactical/interface Dialogue.h index 6a2513b1..2f614538 100644 --- a/Tactical/interface Dialogue.h +++ b/Tactical/interface Dialogue.h @@ -39,7 +39,7 @@ typedef struct BOOLEAN fHandledCanDeleteVal; BOOLEAN fRenderSubTitlesNow; BOOLEAN fSetupSubTitles; - INT16 zQuoteStr[ 480 ]; //QIALOGUE_SIZE is in dialog control which includes this file... + CHAR16 zQuoteStr[ 480 ]; //QIALOGUE_SIZE is in dialog control which includes this file... } NPC_DIALOGUE_TYPE; diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 29fd6568..60d887b5 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -4313,7 +4313,7 @@ void DebugSoldierPage3( ) } -void AppendAttachmentCode( UINT16 usItem, wchar_t *str ) +void AppendAttachmentCode( UINT16 usItem, STR16 str ) { switch( usItem ) { @@ -4334,7 +4334,7 @@ void AppendAttachmentCode( UINT16 usItem, wchar_t *str ) void WriteQuantityAndAttachments( OBJECTTYPE *pObject, INT32 yp ) { - wchar_t szAttach[30]; + CHAR16 szAttach[30]; BOOLEAN fAttachments; //100% Qty: 2 Attach: //100% Qty: 2 @@ -4360,8 +4360,8 @@ void WriteQuantityAndAttachments( OBJECTTYPE *pObject, INT32 yp ) { //ammo if( pObject->ubNumberOfObjects > 1 ) { - wchar_t str[50]; - wchar_t temp[5]; + CHAR16 str[50]; + CHAR16 temp[5]; UINT8 i; swprintf( str, L"Clips: %d (%d", pObject->ubNumberOfObjects, pObject->bStatus[0] ); for( i = 1; i < pObject->ubNumberOfObjects; i++ ) @@ -4400,8 +4400,8 @@ void DebugSoldierPage4( ) { SOLDIERTYPE *pSoldier; UINT32 uiMercFlags; - wchar_t szOrders[20]; - wchar_t szAttitude[20]; + CHAR16 szOrders[20]; + CHAR16 szAttitude[20]; UINT16 usSoldierIndex; UINT8 ubLine; diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index 4eb52453..0fbfe7ef 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -161,8 +161,8 @@ typedef enum{ typedef struct { - wchar_t zName[ NAME_LENGTH ]; - wchar_t zNickname[ NICKNAME_LENGTH ]; + CHAR16 zName[ NAME_LENGTH ]; + CHAR16 zNickname[ NICKNAME_LENGTH ]; UINT32 uiAttnSound; UINT32 uiCurseSound; UINT32 uiDieSound; diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index fdad1684..c85a79b8 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -102,7 +102,7 @@ void DebugAI( STR szOutput ) DebugMsg( TOPIC_JA2, DBG_LEVEL_3, szOutput ); if ((DebugFile = fopen( "aidebug.txt", "a+t" )) != NULL) { - fputs( reinterpret_cast(szOutput), DebugFile ); + fputs( szOutput, DebugFile ); fputs( "\n", DebugFile ); fclose( DebugFile ); } @@ -234,7 +234,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because set to moved", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because set to moved", pSoldier->ubID ) ); } #endif // this guy doesn't get to act! @@ -284,7 +284,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because not a boxer", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because not a boxer", pSoldier->ubID ) ); } #endif EndAIGuysTurn( pSoldier ); @@ -302,7 +302,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because bad life/inactive", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because bad life/inactive", pSoldier->ubID ) ); } #endif @@ -324,7 +324,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because asleep and no scheduled action", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because asleep and no scheduled action", pSoldier->ubID ) ); } #endif @@ -339,7 +339,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because out of sector and no scheduled action", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because out of sector and no scheduled action", pSoldier->ubID ) ); } #endif @@ -353,7 +353,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because is vehicle or robot", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because is vehicle or robot", pSoldier->ubID ) ); } #endif @@ -372,7 +372,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because unconscious", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because unconscious", pSoldier->ubID ) ); } #endif @@ -483,7 +483,7 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) // display deadlock message gfUIInDeadlock = TRUE; gUIDeadlockedSoldier = pSoldier->ubID; - DebugAI( (STR) String("DEADLOCK soldier %d action %s ABC %d", pSoldier->ubID, gzActionStr[pSoldier->bAction], gTacticalStatus.ubAttackBusyCount ) ); + DebugAI( String("DEADLOCK soldier %d action %s ABC %d", pSoldier->ubID, gzActionStr[pSoldier->bAction], gTacticalStatus.ubAttackBusyCount ) ); #else // If we are in beta version, also report message! @@ -709,7 +709,7 @@ void EndAIGuysTurn( SOLDIERTYPE *pSoldier ) #ifdef TESTAICONTROL if (!(gTacticalStatus.uiFlags & DEMOMODE)) - DebugAI( (STR)String("Ending control for %d", pSoldier->ubID ) ); + DebugAI( String("Ending control for %d", pSoldier->ubID ) ); #endif // find the next AI guy @@ -721,7 +721,7 @@ void EndAIGuysTurn( SOLDIERTYPE *pSoldier ) } // We are at the end, return control to next team - DebugAI( (STR)String("Ending AI turn\n" ) ); + DebugAI( String("Ending AI turn\n" ) ); EndAITurn(); } @@ -752,7 +752,7 @@ void EndAIDeadlock(void) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because breaking deadlock", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because breaking deadlock", pSoldier->ubID ) ); } #endif @@ -798,7 +798,7 @@ void StartNPCAI(SOLDIERTYPE *pSoldier) #ifdef TESTAICONTROL if (!(gTacticalStatus.uiFlags & DEMOMODE)) - DebugAI( (STR)String("Giving control to %d", pSoldier->ubID ) ); + DebugAI( String("Giving control to %d", pSoldier->ubID ) ); #endif gTacticalStatus.uiTimeSinceMercAIStart = GetJA2Clock(); @@ -1270,7 +1270,7 @@ void NPCDoesNothing(SOLDIERTYPE *pSoldier) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because doing no-action", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because doing no-action", pSoldier->ubID ) ); } #endif @@ -1288,7 +1288,7 @@ void CancelAIAction(SOLDIERTYPE *pSoldier, UINT8 ubForce) if (SkipCoverCheck) { STR tempstr; - sprintf((CHAR *) tempstr, "CancelAIAction: SkipCoverCheck turned OFF\n",0 ); + sprintf( tempstr, "CancelAIAction: SkipCoverCheck turned OFF\n",0 ); DebugAI (tempstr); } #endif @@ -1345,7 +1345,7 @@ void ActionTimeoutExceeded(SOLDIERTYPE *pSoldier, UCHAR alreadyFreedUp) #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"ActionInProgress - ERROR: %s's timeout limit exceeded. Action #%d (%d)", + sprintf(tempstr,"ActionInProgress - ERROR: %s's timeout limit exceeded. Action #%d (%d)", pSoldier->name,pSoldier->bAction,pSoldier->usActionData); #ifdef RECORDNET @@ -1508,7 +1508,7 @@ void MarkDetectableMines(SOLDIERTYPE *pSoldier) if (MarkedNPCMines) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"MarkDetectableMines: ERROR - mines still marked! Guynum %d",pSoldier->ubID); + sprintf(tempstr,"MarkDetectableMines: ERROR - mines still marked! Guynum %d",pSoldier->ubID); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n\n",tempstr); @@ -1754,7 +1754,7 @@ void TurnBasedHandleNPCAI(SOLDIERTYPE *pSoldier) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr, "HandleManAI - DECIDING for guynum %d(%s) at gridno %d, APs %d\n", + sprintf( tempstr, "HandleManAI - DECIDING for guynum %d(%s) at gridno %d, APs %d\n", pSoldier->ubID,pSoldier->name,pSoldier->sGridNo,pSoldier->bActionPoints ); DebugAI ( tempstr ); #endif @@ -2016,11 +2016,11 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) #ifdef TESTAICONTROL if (gfTurnBasedAI || gTacticalStatus.fAutoBandageMode) { - DebugAI( (STR)String( "%d does %s (a.d. %d) in %d with %d APs left", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, pSoldier->sGridNo, pSoldier->bActionPoints ) ); + DebugAI( String( "%d does %s (a.d. %d) in %d with %d APs left", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, pSoldier->sGridNo, pSoldier->bActionPoints ) ); } #endif - DebugAI( (STR)String( "%d does %s (a.d. %d) at time %ld", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, GetJA2Clock() ) ); + DebugAI( String( "%d does %s (a.d. %d) at time %ld", pSoldier->ubID, gzActionStr[pSoldier->bAction], pSoldier->usActionData, GetJA2Clock() ) ); switch (pSoldier->bAction) { @@ -2052,7 +2052,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr, "ExecuteAction: SkipCoverCheck ON\n" ); + sprintf( tempstr, "ExecuteAction: SkipCoverCheck ON\n" ); DebugAI (tempstr); #endif @@ -2064,7 +2064,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) if (!StartTurn(pSoldier,pSoldier->usActionData,FASTTURN)) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"ERROR: %s tried TURN to direction %d, StartTurn failed, action %d CANCELED", + sprintf(tempstr,"ERROR: %s tried TURN to direction %d, StartTurn failed, action %d CANCELED", pSoldier->name,pSoldier->usActionData,pSoldier->bAction); PopMessage(tempstr); #endif @@ -2152,7 +2152,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) // check for loop else if ( pSoldier->usActionData == pSoldier->sLastTwoLocations[1] && pSoldier->sGridNo == pSoldier->sLastTwoLocations[0] ) { - DebugAI( (STR)String( "%d in movement loop, aborting turn", pSoldier->ubID ) ); + DebugAI( String( "%d in movement loop, aborting turn", pSoldier->ubID ) ); // loop found! ActionDone( pSoldier ); @@ -2279,7 +2279,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) { #ifdef BETAVERSION // this should NEVER happen, indicates AI picked an illegal spot! - sprintf((CHAR *)tempstr,"ExecuteAction: ERROR - %s tried MOVE to gridno %d, NewDest failed, action %d CANCELED", + sprintf(tempstr,"ExecuteAction: ERROR - %s tried MOVE to gridno %d, NewDest failed, action %d CANCELED", pSoldier->name,pSoldier->usActionData,pSoldier->bAction); #ifdef RECORDNET @@ -2288,7 +2288,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) PopMessage(tempstr); - sprintf((CHAR *)tempstr,"BLACK-LISTING gridno %d for %s",pSoldier->usActionData,pSoldier->name); + sprintf(tempstr,"BLACK-LISTING gridno %d for %s",pSoldier->usActionData,pSoldier->name); PopMessage(tempstr); SaveGame(ERROR_SAVE); @@ -2296,7 +2296,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) // temporarily black list this gridno to stop enemy from going there pSoldier->sBlackList = (INT16) pSoldier->usActionData; - DebugAI( (STR)String( "Setting blacklist for %d to %d", pSoldier->ubID, pSoldier->sBlackList ) ); + DebugAI( String( "Setting blacklist for %d to %d", pSoldier->ubID, pSoldier->sBlackList ) ); CancelAIAction(pSoldier,FORCE); return(FALSE); // nothing is in progress @@ -2354,7 +2354,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) #ifdef TESTVERSION if (pSoldier->bAction == AI_ACTION_KNIFE_MOVE) { - sprintf((CHAR *)tempstr,"TEST MSG: %s is about to go stab %s. MAKE SURE HE DOES!", + sprintf(tempstr,"TEST MSG: %s is about to go stab %s. MAKE SURE HE DOES!", pSoldier->name, ExtMen[WhoIsThere(pSoldier->usActionData)].name); @@ -2370,14 +2370,14 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) { if ( iRetCode != ITEM_HANDLE_BROKEN ) // if the item broke, this is 'legal' and doesn't need reporting { - DebugAI( (STR)String( "AI %d got error code %ld from HandleItem, doing action %d, has %d APs... aborting deadlock!", pSoldier->ubID, iRetCode, pSoldier->bAction, pSoldier->bActionPoints ) ); + DebugAI( String( "AI %d got error code %ld from HandleItem, doing action %d, has %d APs... aborting deadlock!", pSoldier->ubID, iRetCode, pSoldier->bAction, pSoldier->bActionPoints ) ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_BETAVERSION, L"AI %d got error code %ld from HandleItem, doing action %d... aborting deadlock!", pSoldier->ubID, iRetCode, pSoldier->bAction ); } CancelAIAction( pSoldier, FORCE); #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); } #endif EndAIGuysTurn( pSoldier ); @@ -2464,7 +2464,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) SkipCoverCheck = TRUE; #ifdef DEBUGDECISIONS - sprintf((CHAR *) tempstr, "ExecuteAction: SkipCoverCheck ON\n" ); + sprintf( tempstr, "ExecuteAction: SkipCoverCheck ON\n" ); DebugAI (tempstr); #endif SendChangeSoldierStanceEvent( pSoldier, (UINT8) pSoldier->usActionData ); @@ -2512,7 +2512,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because of error from HandleItem", pSoldier->ubID ) ); } #endif EndAIGuysTurn( pSoldier ); @@ -2547,7 +2547,7 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because of error opening door", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because of error opening door", pSoldier->ubID ) ); } #endif EndAIGuysTurn( pSoldier ); @@ -2787,7 +2787,7 @@ void ManChecksOnFriends(SOLDIERTYPE *pSoldier) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s sees %s on alert, goes to RED ALERT!",pSoldier->name,pFriend->name ); + sprintf(tempstr,"%s sees %s on alert, goes to RED ALERT!",pSoldier->name,pFriend->name ); AIPopMessage(tempstr); #endif @@ -2804,7 +2804,7 @@ void ManChecksOnFriends(SOLDIERTYPE *pSoldier) (pSoldier->bAlertStatus < STATUS_YELLOW)) { #ifdef TESTVERSION - sprintf((CHAR *)tempstr,"TEST MSG: %s sees %s listening, goes to YELLOW ALERT!",pSoldier->name,ExtMen[pFriend->ubID].name); + sprintf(tempstr,"TEST MSG: %s sees %s listening, goes to YELLOW ALERT!",pSoldier->name,ExtMen[pFriend->ubID].name); PopMessage(tempstr); #endif pSoldier->bAlertStatus = STATUS_YELLOW; // also get suspicious @@ -2862,7 +2862,7 @@ void HandleAITacticalTraversal( SOLDIERTYPE * pSoldier ) #ifdef TESTAICONTROL if (gfTurnBasedAI) { - DebugAI( (STR)String("Ending turn for %d because traversing out", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because traversing out", pSoldier->ubID ) ); } #endif diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index 667cc156..6993b3cf 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -493,7 +493,7 @@ BOOLEAN IsActionAffordable(SOLDIERTYPE *pSoldier) if (ptsNeeded > pSoldier->bActionPoints) { /* - sprintf((CHAR *)tempstr,"AI ERROR: %s has insufficient points for attack action %d at grid %d", + sprintf(tempstr,"AI ERROR: %s has insufficient points for attack action %d at grid %d", pSoldier->name,pSoldier->bAction,pSoldier->usActionData); PopMessage(tempstr); */ @@ -1587,7 +1587,7 @@ INT16 ClosestReachableFriendInTrouble(SOLDIERTYPE *pSoldier, BOOLEAN * pfClimbin // if we can get there if (sPathCost != 0) { - //sprintf((CHAR *)tempstr,"Path cost to friend %s's location is %d",pFriend->name,pathCost); + //sprintf(tempstr,"Path cost to friend %s's location is %d",pFriend->name,pathCost); //PopMessage(tempstr); if (sPathCost < sShortestPath) @@ -1911,7 +1911,7 @@ INT8 CalcMorale(SOLDIERTYPE *pSoldier) sOppThreatValue = (iPercent * CalcManThreatValue(pOpponent,pSoldier->sGridNo,FALSE,pSoldier)) / 100; - //sprintf((CHAR *)tempstr,"Known opponent %s, opplist status %d, percent %d, threat = %d", + //sprintf(tempstr,"Known opponent %s, opplist status %d, percent %d, threat = %d", // ExtMen[pOpponent->ubID].name,ubMostRecentOpplistValue,ubPercent,sOppThreatValue); //PopMessage(tempstr); @@ -1967,7 +1967,7 @@ INT8 CalcMorale(SOLDIERTYPE *pSoldier) sFrndThreatValue = (iPercent * CalcManThreatValue(pFriend,pOpponent->sGridNo,FALSE,pSoldier)) / 100; - //sprintf((CHAR *)tempstr,"Known by friend %s, opplist status %d, percent %d, threat = %d", + //sprintf(tempstr,"Known by friend %s, opplist status %d, percent %d, threat = %d", // ExtMen[pFriend->ubID].name,pFriend->bOppList[pOpponent->ubID],ubPercent,sFrndThreatValue); //PopMessage(tempstr); @@ -2087,7 +2087,7 @@ INT8 CalcMorale(SOLDIERTYPE *pSoldier) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr, "Morale = %d (category %d)\n", + sprintf( tempstr, "Morale = %d (category %d)\n", pSoldier->bMorale,bMoraleCategory); DebugAI (tempstr); #endif @@ -2210,14 +2210,14 @@ INT32 CalcManThreatValue( SOLDIERTYPE *pEnemy, INT16 sMyGrid, UINT8 ubReduceForC iThreatValue = 1; } - //sprintf((CHAR *)tempstr,"%s's iThreatValue = ",pEnemy->name); + //sprintf(tempstr,"%s's iThreatValue = ",pEnemy->name); //NumMessage(tempstr,iThreatValue); #ifdef BETAVERSION // unnecessary for real release // NOTE: maximum is about 200 for a healthy Mike type with a mortar! if (iThreatValue > 250) { - sprintf((CHAR *)tempstr,"CalcManThreatValue: WARNING - %d has a very high threat value of %d",pEnemy->ubID,iThreatValue); + sprintf(tempstr,"CalcManThreatValue: WARNING - %d has a very high threat value of %d",pEnemy->ubID,iThreatValue); #ifdef RECORDNET fprintf(NetDebugFile,"\t%s\n",tempstr); @@ -2289,7 +2289,7 @@ INT16 RoamingRange(SOLDIERTYPE *pSoldier, INT16 * pusFromGridNo) return(MAX_ROAMING_RANGE); default: #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"%s has invalid orders = %d",pSoldier->name,pSoldier->bOrders); + sprintf(tempstr,"%s has invalid orders = %d",pSoldier->name,pSoldier->bOrders); PopMessage(tempstr); #endif return(0); @@ -2517,27 +2517,27 @@ BOOLEAN ArmySeesOpponents( void ) #ifdef DEBUGDECISIONS void AIPopMessage ( STR16 str ) { - DebugAI((STR)str); + DebugAI(str); } -void AIPopMessage ( const char* str ) +void AIPopMessage ( const STR8 str ) { STR tempstr; - sprintf((CHAR *) tempstr,"%s", str); + sprintf( tempstr,"%s", str); DebugAI(tempstr); } -void AINumMessage(const char* str, INT32 num) +void AINumMessage(const STR8 str, INT32 num) { STR tempstr; - sprintf((CHAR *) tempstr,"%s %d", str, num); + sprintf( tempstr,"%s %d", str, num); DebugAI(tempstr); } -void AINameMessage(SOLDIERTYPE * pSoldier,const char* str,INT32 num) +void AINameMessage(SOLDIERTYPE * pSoldier,const STR8 str,INT32 num) { STR tempstr; - sprintf((CHAR *) tempstr,"%d %s %d",pSoldier->name , str, num); + sprintf( tempstr,"%d %s %d",pSoldier->name , str, num); DebugAI( tempstr ); } #endif diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp index b3e67742..c284e36a 100644 --- a/TacticalAI/Attacks.cpp +++ b/TacticalAI/Attacks.cpp @@ -282,7 +282,7 @@ void CalcBestShot(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestShot, BOOLEAN shootUns // ExtMen[pOpponent->ubID].haveStats = TRUE; //NumMessage("chance to Hit = ",ubChanceToHit); - //sprintf((CHAR *)tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); + //sprintf(tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); //PopMessage(tempstr); iHitRate = (pSoldier->bActionPoints * ubChanceToHit) / (ubRawAPCost + ubAimTime); @@ -1133,7 +1133,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow) pBestThrow->ubAPCost = ubMinAPcost + ubMaxPossibleAimTime; pBestThrow->bTargetLevel = bOpponentLevel[ubLoop]; - //sprintf((CHAR *)tempstr,"new best THROW AttackValue = %d at grid #%d",iAttackValue/100000,gridno); + //sprintf(tempstr,"new best THROW AttackValue = %d at grid #%d",iAttackValue/100000,gridno); //PopMessage(tempstr); } } @@ -1296,7 +1296,7 @@ void CalcBestStab(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestStab, BOOLEAN fBladeAt ubChanceToHit = MAXCHANCETOHIT; //NumMessage("chance to Hit = ",ubChanceToHit); - //sprintf((CHAR *)tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); + //sprintf(tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); //PopMessage(tempstr); if (ubRawAPCost < 1) @@ -1472,7 +1472,7 @@ void CalcTentacleAttack(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestStab ) ubChanceToHit = MAXCHANCETOHIT; //NumMessage("chance to Hit = ",ubChanceToHit); - //sprintf((CHAR *)tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); + //sprintf(tempstr,"Vs. %s, at AimTime %d, ubChanceToHit = %d",ExtMen[pOpponent->ubID].name,ubAimTime,ubChanceToHit); //PopMessage(tempstr); if (ubRawAPCost < 1) @@ -2014,7 +2014,7 @@ INT8 CanNPCAttack(SOLDIERTYPE *pSoldier) { //LocateMember(pSoldier->ubID,SETLOCATOR); // locate to this NPC, don't center STR16 tempstr; - sprintf((CHAR *)tempstr,"%s can't attack! (not OKToAttack, Reason code = %d)",pSoldier->name,bCanAttack); + sprintf(tempstr,"%s can't attack! (not OKToAttack, Reason code = %d)",pSoldier->name,bCanAttack); AIPopMessage(tempstr); } #endif diff --git a/TacticalAI/CreatureDecideAction.cpp b/TacticalAI/CreatureDecideAction.cpp index 0bae3fcd..ded2618e 100644 --- a/TacticalAI/CreatureDecideAction.cpp +++ b/TacticalAI/CreatureDecideAction.cpp @@ -216,7 +216,7 @@ INT8 CreatureDecideActionGreen( SOLDIERTYPE * pSoldier ) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -285,7 +285,7 @@ INT8 CreatureDecideActionGreen( SOLDIERTYPE * pSoldier ) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - RANDOM PATROL to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - RANDOM PATROL to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -347,7 +347,7 @@ INT8 CreatureDecideActionGreen( SOLDIERTYPE * pSoldier ) if (RandomFriendWithin(pSoldier)) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEK FRIEND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEK FRIEND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -403,7 +403,7 @@ INT8 CreatureDecideActionGreen( SOLDIERTYPE * pSoldier ) #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - TURNS to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -495,7 +495,7 @@ INT8 CreatureDecideActionYellow( SOLDIERTYPE * pSoldier ) pSoldier->usActionData = ubNoiseDir; #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS NOISE to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS NOISE to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif //if ( InternalIsValidStance( pSoldier, (INT8) pSoldier->usActionData, ANIM_STAND ) ) @@ -564,7 +564,7 @@ INT8 CreatureDecideActionYellow( SOLDIERTYPE * pSoldier ) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - INVESTIGATING NOISE at grid %d, moving to %d", + sprintf(tempstr,"%s - INVESTIGATING NOISE at grid %d, moving to %d", pSoldier->name,sNoiseGridNo,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -643,7 +643,7 @@ INT8 CreatureDecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -689,7 +689,7 @@ INT8 CreatureDecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s RESTS (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); + sprintf(tempstr,"%s RESTS (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); AIPopMessage(tempstr); #endif @@ -765,7 +765,7 @@ INT8 CreatureDecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", + sprintf(tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", pSoldier->name,sClosestFriend,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -792,7 +792,7 @@ INT8 CreatureDecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) #ifdef DEBUGDECISIONS // do it! STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - SEEKING OPPONENT at grid %d, MOVING to %d", + sprintf(tempstr,"%s - SEEKING OPPONENT at grid %d, MOVING to %d", pSoldier->name,sClosestDisturbance,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -868,7 +868,7 @@ INT8 CreatureDecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1013,7 +1013,7 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier ) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - GASSED or LOW ON BREATH (%d), RUNNING AWAY to grid %d",pSoldier->name,pSoldier->bBreath,pSoldier->usActionData); + sprintf(tempstr,"%s - GASSED or LOW ON BREATH (%d), RUNNING AWAY to grid %d",pSoldier->name,pSoldier->bBreath,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1037,7 +1037,7 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier ) { #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1246,7 +1246,7 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier ) // get the minimum cost to attack with this knife ubMinAPCost = MinAPsToAttack(pSoldier,pSoldier->sLastTarget,DONTADDTURNCOST); - //sprintf((CHAR *)tempstr,"%s - ubMinAPCost = %d",pSoldier->name,ubMinAPCost); + //sprintf(tempstr,"%s - ubMinAPCost = %d",pSoldier->name,ubMinAPCost); //PopMessage(tempstr); // if we can afford the minimum AP cost to stab with this knife weapon @@ -1347,7 +1347,7 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier ) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr, "%d(%s) %s %d(%s) at gridno %d (%d APs aim)\n", + sprintf( tempstr, "%d(%s) %s %d(%s) at gridno %d (%d APs aim)\n", pSoldier->ubID,pSoldier->name, (ubBestAttackAction == AI_ACTION_FIRE_GUN)?"SHOOTS":((ubBestAttackAction == AI_ACTION_TOSS_PROJECTILE)?"TOSSES AT":"STABS"), BestAttack.ubOpponent,ExtMen[BestAttack.ubOpponent].name, @@ -1411,7 +1411,7 @@ INT8 CreatureDecideActionBlack( SOLDIERTYPE * pSoldier ) #ifdef DEBUGDECISIONS STR16 tempstr; - sprintf((CHAR *)tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1491,7 +1491,7 @@ INT8 CreatureDecideAction( SOLDIERTYPE *pSoldier ) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr, "DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData ); + sprintf( tempstr, "DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData ); DebugAI(tempstr); #endif @@ -1631,7 +1631,7 @@ void CreatureDecideAlertStatus( SOLDIERTYPE *pSoldier ) // if (!pSoldier->human) // { STR16 tempstr; - sprintf((CHAR *)tempstr,"%s's Alert Status changed from %d to %d", + sprintf(tempstr,"%s's Alert Status changed from %d to %d", pSoldier->name ,bOldStatus,pSoldier->bAlertStatus); AIPopMessage(tempstr); // } diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp index 11740bc8..24271053 100644 --- a/TacticalAI/DecideAction.cpp +++ b/TacticalAI/DecideAction.cpp @@ -546,7 +546,7 @@ INT8 DecideActionBoxerEnteringRing(SOLDIERTYPE *pSoldier) pSoldier->usActionData = ubDesiredMercDir; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS CLOSEST PC to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS CLOSEST PC to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -606,7 +606,7 @@ INT8 DecideActionNamedNPC( SOLDIERTYPE * pSoldier ) pSoldier->usActionData = ubDesiredMercDir; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS CLOSEST PC to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS CLOSEST PC to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -885,7 +885,7 @@ BOOLEAN fCivilian = (PTR_CIVILIAN && (pSoldier->ubCivilianGroup == NON_CIV_GROUP if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1050,7 +1050,7 @@ BOOLEAN fCivilian = (PTR_CIVILIAN && (pSoldier->ubCivilianGroup == NON_CIV_GROUP if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - RANDOM PATROL to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - RANDOM PATROL to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1114,7 +1114,7 @@ BOOLEAN fCivilian = (PTR_CIVILIAN && (pSoldier->ubCivilianGroup == NON_CIV_GROUP { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEK FRIEND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEK FRIEND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1230,7 +1230,7 @@ DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("DecideActionGreen: Snipers like to raise #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1353,7 +1353,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier) { pSoldier->usActionData = ubNoiseDir; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS NOISE to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS NOISE to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif if ( pSoldier->bOrders == SNIPER ) @@ -1576,7 +1576,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - INVESTIGATING NOISE at grid %d, moving to %d", + sprintf(tempstr,"%s - INVESTIGATING NOISE at grid %d, moving to %d", pSoldier->name,sNoiseGridNo,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1716,7 +1716,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", + sprintf(tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", pSoldier->name,sClosestFriend,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1812,7 +1812,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TAKING COVER at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TAKING COVER at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -1849,7 +1849,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier) if (!fCivilian && !PTR_CROUCHED && IsValidStance( pSoldier, ANIM_CROUCH ) ) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s CROUCHES (STATUS YELLOW)",pSoldier->name); + sprintf(tempstr,"%s CROUCHES (STATUS YELLOW)",pSoldier->name); AIPopMessage(tempstr); #endif @@ -1974,7 +1974,7 @@ INT8 DecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -2377,7 +2377,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: crouch and rest if running out if (!fCivilian && !PTR_CROUCHED && IsValidStance( pSoldier, ANIM_CROUCH ) && gAnimControl[ pSoldier->usAnimState ].ubHeight != ANIM_PRONE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s CROUCHES, NEEDING REST (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); + sprintf(tempstr,"%s CROUCHES, NEEDING REST (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); AIPopMessage(tempstr); #endif @@ -2390,7 +2390,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: crouch and rest if running out } #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s RESTS (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); + sprintf(tempstr,"%s RESTS (STATUS RED), breath = %d",pSoldier->name,pSoldier->bBreath); AIPopMessage(tempstr); #endif @@ -2418,7 +2418,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: calculate morale"); if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -2724,7 +2724,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); { #ifdef DEBUGDECISIONS // do it! - sprintf((CHAR *)tempstr,"%s - SEEKING OPPONENT at grid %d, MOVING to %d", + sprintf(tempstr,"%s - SEEKING OPPONENT at grid %d, MOVING to %d", pSoldier->name,sClosestDisturbance,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -2934,7 +2934,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", + sprintf(tempstr,"%s - SEEKING FRIEND at %d, MOVING to %d", pSoldier->name,sClosestFriend,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -3055,7 +3055,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -3080,7 +3080,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s CROUCHES (STATUS RED)",pSoldier->name); + sprintf(tempstr,"%s CROUCHES (STATUS RED)",pSoldier->name); AIPopMessage(tempstr); #endif @@ -3145,7 +3145,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); pSoldier->usActionData = ubOpponentDir; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif if ( pSoldier->bOrders == SNIPER ) @@ -3195,7 +3195,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); pSoldier->usActionData = ubOpponentDir; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS TOWARDS CLOSEST ENEMY to face direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -3306,7 +3306,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"decideactionred: radio red alert?"); { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s CROUCHES (STATUS RED)",pSoldier->name ); + sprintf(tempstr,"%s CROUCHES (STATUS RED)",pSoldier->name ); AIPopMessage(tempstr); #endif @@ -3525,7 +3525,7 @@ INT8 DecideActionBlack(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - GASSED or LOW ON BREATH (%d), RUNNING AWAY to grid %d",pSoldier->name,pSoldier->bBreath,pSoldier->usActionData); + sprintf(tempstr,"%s - GASSED or LOW ON BREATH (%d), RUNNING AWAY to grid %d",pSoldier->name,pSoldier->bBreath,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -3559,7 +3559,7 @@ INT8 DecideActionBlack(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - SEEKING NEAREST UNGASSED LAND at grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -3574,7 +3574,7 @@ INT8 DecideActionBlack(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - NO LAND NEAR, RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - NO LAND NEAR, RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -4168,7 +4168,7 @@ bCanAttack = FALSE; #ifdef DEBUGDECISIONS STR tempstr=""; - sprintf((CHAR *) tempstr, "%s - CHOICE: iOffense = %d, iDefense = %d\n", + sprintf( tempstr, "%s - CHOICE: iOffense = %d, iDefense = %d\n", pSoldier->name,iOffense,iDefense); DebugAI( tempstr ); #endif @@ -4237,7 +4237,7 @@ bCanAttack = FALSE; pSoldier->usActionData = bDirection; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -4491,7 +4491,7 @@ bCanAttack = FALSE; #ifdef DEBUGDECISIONS STR tempstr=""; - sprintf((CHAR *) tempstr, + sprintf( tempstr, "%d(%s) %s %d(%s) at gridno %d (%d APs aim)\n", pSoldier->ubID,pSoldier->name, (ubBestAttackAction == AI_ACTION_FIRE_GUN)?"SHOOTS":((ubBestAttackAction == AI_ACTION_TOSS_PROJECTILE)?"TOSSES AT":"STABS"), @@ -4597,7 +4597,7 @@ bCanAttack = FALSE; { #ifdef DEBUGDECISIONS STR tempstr=""; - sprintf ((CHAR *) tempstr,"%s - TAKING COVER at gridno %d (%d%% better)\n", + sprintf ( tempstr,"%s - TAKING COVER at gridno %d (%d%% better)\n", pSoldier->name,sBestCover,iCoverPercentBetter); DebugAI( tempstr ) ; #endif @@ -4624,7 +4624,7 @@ bCanAttack = FALSE; if (pSoldier->usActionData != NOWHERE) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - RUNNING AWAY to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -4704,7 +4704,7 @@ bCanAttack = FALSE; pSoldier->usNextActionData = pSoldier->usActionData; pSoldier->usActionData = bDirection; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif return(AI_ACTION_CHANGE_FACING); @@ -4758,7 +4758,7 @@ bCanAttack = FALSE; pSoldier->usActionData = bDirection; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - TURNS to face CLOSEST OPPONENT in direction %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -4996,8 +4996,8 @@ INT8 DecideAction(SOLDIERTYPE *pSoldier) #ifdef DEBUGDECISIONS - sprintf((CHAR *) tempstr,"DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData); - DebugAI((STR) tempstr ); + sprintf( tempstr,"DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData); + DebugAI( tempstr ); #endif DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"DecideAction done"); @@ -5015,7 +5015,7 @@ INT8 DecideActionEscort(SOLDIERTYPE *pSoldier) if (pSoldier->usActionData != NOWHERE && (pSoldier->sGridNo != pSoldier->usActionData)) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - ESCORTED NPC GOING to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - ESCORTED NPC GOING to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -5180,7 +5180,7 @@ void DecideAlertStatus( SOLDIERTYPE *pSoldier ) #ifdef DEBUGDECISIONS // don't report status changes for human-controlled mercs - sprintf((CHAR *)tempstr,"%s's Alert Status changed from %d to %d", + sprintf(tempstr,"%s's Alert Status changed from %d to %d", pSoldier->name,bOldStatus,pSoldier->bAlertStatus); AIPopMessage(tempstr); #endif diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp index 72523422..c0f51632 100644 --- a/TacticalAI/FindLocations.cpp +++ b/TacticalAI/FindLocations.cpp @@ -55,7 +55,7 @@ INT32 CalcPercentBetter(INT32 iOldValue, INT32 iNewValue, INT32 iOldScale, INT32 if (iValueChange <= 0) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"CalcPercentBetter: ERROR - invalid valueChange = %d",valueChange); + sprintf(tempstr,"CalcPercentBetter: ERROR - invalid valueChange = %d",valueChange); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n\n",tempstr); @@ -74,7 +74,7 @@ INT32 CalcPercentBetter(INT32 iOldValue, INT32 iNewValue, INT32 iOldScale, INT32 if (iScaleSum <= 0) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"CalcPercentBetter: ERROR - invalid scaleSum = %d",iScaleSum); + sprintf(tempstr,"CalcPercentBetter: ERROR - invalid scaleSum = %d",iScaleSum); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n\n",tempstr); @@ -777,7 +777,7 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB // add this opponent's cover value to our current total cover value iCurrentCoverValue += CalcCoverValue(pSoldier,pSoldier->sGridNo,iMyThreatValue,pSoldier->bActionPoints,uiLoop,Threat[uiLoop].iOrigRange,morale,&iCurrentScale); } - //sprintf((CHAR *)tempstr,"iCurrentCoverValue after opponent %d is now %d",iLoop,iCurrentCoverValue); + //sprintf(tempstr,"iCurrentCoverValue after opponent %d is now %d",iLoop,iCurrentCoverValue); //PopMessage(tempstr); } @@ -824,7 +824,7 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB #ifdef DEBUGDECISIONS STR tempstr=""; - sprintf((CHAR *) tempstr, "FBNC: CURRENT iCoverValue = %d\n",iCurrentCoverValue ); + sprintf( tempstr, "FBNC: CURRENT iCoverValue = %d\n",iCurrentCoverValue ); DebugAI( tempstr ); #endif @@ -960,7 +960,7 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB uiLoop,iThreatRange,morale,&iCoverScale); } - //sprintf((CHAR *)tempstr,"iCoverValue after opponent %d is now %d",iLoop,iCoverValue); + //sprintf(tempstr,"iCoverValue after opponent %d is now %d",iLoop,iCoverValue); //PopMessage(tempstr); } @@ -1029,7 +1029,7 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr,"FBNC: NEW BEST iCoverValue at gridno %d is %d\n",sGridNo,iCoverValue ); + sprintf( tempstr,"FBNC: NEW BEST iCoverValue at gridno %d is %d\n",sGridNo,iCoverValue ); DebugAI( tempstr ); #endif // remember it instead @@ -1081,7 +1081,7 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB { #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *) tempstr,"Found Cover: current %ld, best %ld, %%%%Better %ld\n", iCurrentCoverValue,iBestCoverValue,*piPercentBetter ); + sprintf( tempstr,"Found Cover: current %ld, best %ld, %%%%Better %ld\n", iCurrentCoverValue,iBestCoverValue,*piPercentBetter ); DebugAI( tempstr ); #endif @@ -1937,7 +1937,7 @@ INT8 SearchForItems( SOLDIERTYPE * pSoldier, INT8 bReason, UINT16 usItem ) if (sBestSpot != NOWHERE) { - DebugAI( (STR)String( "%d decides to pick up %S", pSoldier->ubID, ItemNames[ gWorldItems[ iBestItemIndex ].o.usItem ] ) ); + DebugAI( String( "%d decides to pick up %S", pSoldier->ubID, ItemNames[ gWorldItems[ iBestItemIndex ].o.usItem ] ) ); if (Item[gWorldItems[ iBestItemIndex ].o.usItem].usItemClass == IC_GUN) { if (FindBetterSpotForItem( pSoldier, HANDPOS ) == FALSE) @@ -1949,14 +1949,14 @@ INT8 SearchForItems( SOLDIERTYPE * pSoldier, INT8 bReason, UINT16 usItem ) if (pSoldier->inv[HANDPOS].fFlags & OBJECT_UNDROPPABLE) { // destroy this item! - DebugAI( (STR)String( "%d decides he must drop %S first so destroys it", pSoldier->ubID, ItemNames[ pSoldier->inv[HANDPOS].usItem ] ) ); + DebugAI( String( "%d decides he must drop %S first so destroys it", pSoldier->ubID, ItemNames[ pSoldier->inv[HANDPOS].usItem ] ) ); DeleteObj( &(pSoldier->inv[HANDPOS]) ); DeductPoints( pSoldier, AP_PICKUP_ITEM, 0 ); } else { // we want to drop this item! - DebugAI( (STR)String( "%d decides he must drop %S first", pSoldier->ubID, ItemNames[ pSoldier->inv[HANDPOS].usItem ] ) ); + DebugAI( String( "%d decides he must drop %S first", pSoldier->ubID, ItemNames[ pSoldier->inv[HANDPOS].usItem ] ) ); pSoldier->bNextAction = AI_ACTION_PICKUP_ITEM; pSoldier->usNextActionData = sBestSpot; diff --git a/TacticalAI/Movement.cpp b/TacticalAI/Movement.cpp index feaa2521..d865e1e9 100644 --- a/TacticalAI/Movement.cpp +++ b/TacticalAI/Movement.cpp @@ -139,7 +139,7 @@ int TryToResumeMovement(SOLDIERTYPE *pSoldier, INT16 sGridno) { #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *)tempstr, "%d CONTINUES MOVEMENT to gridno %d...\n", pSoldier->ubID,sGridno ); + sprintf(tempstr, "%d CONTINUES MOVEMENT to gridno %d...\n", pSoldier->ubID,sGridno ); DebugAI( tempstr ); #endif @@ -158,7 +158,7 @@ int TryToResumeMovement(SOLDIERTYPE *pSoldier, INT16 sGridno) else { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"TryToResumeMovement: ERROR - NewDest failed for %s, action CANCELED",pSoldier->name); + sprintf(tempstr,"TryToResumeMovement: ERROR - NewDest failed for %s, action CANCELED",pSoldier->name); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n",tempstr); @@ -179,7 +179,7 @@ int TryToResumeMovement(SOLDIERTYPE *pSoldier, INT16 sGridno) // legally if another soldier gets in the way between turns #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"TryToResumeMovement: %d can't continue to gridno %d, no longer legal!",pSoldier->ubID,gridno); + sprintf(tempstr,"TryToResumeMovement: %d can't continue to gridno %d, no longer legal!",pSoldier->ubID,gridno); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n",tempstr); @@ -247,7 +247,7 @@ INT16 NextPatrolPoint(SOLDIERTYPE *pSoldier) if ((pSoldier->bPatrolCnt < 1) || (pSoldier->bPatrolCnt >= MAXPATROLGRIDS)) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"NextPatrolPoint: ERROR: Invalid patrol count = %d for %s",pSoldier->bPatrolCnt,pSoldier->name); + sprintf(tempstr,"NextPatrolPoint: ERROR: Invalid patrol count = %d for %s",pSoldier->bPatrolCnt,pSoldier->name); PopMessage(tempstr); #endif @@ -337,7 +337,7 @@ INT8 PointPatrolAI(SOLDIERTYPE *pSoldier) // passed all tests - start moving towards next patrol point #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - POINT PATROL to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - POINT PATROL to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -427,7 +427,7 @@ INT8 RandomPointPatrolAI(SOLDIERTYPE *pSoldier) // passed all tests - start moving towards next patrol point #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - POINT PATROL to grid %d",pSoldier->name,pSoldier->usActionData); + sprintf(tempstr,"%s - POINT PATROL to grid %d",pSoldier->name,pSoldier->usActionData); AIPopMessage(tempstr); #endif @@ -486,7 +486,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN } #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s wants to go towards %d (has range %d)",pSoldier->name,sDesGrid,usMaxDist); + sprintf(tempstr,"%s wants to go towards %d (has range %d)",pSoldier->name,sDesGrid,usMaxDist); AIPopMessage(tempstr); #endif @@ -532,7 +532,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN if (!LegalNPCDestination(pSoldier,sDesGrid,ENSURE_PATH,NOWATER,fPathFlags)) { #ifdef DEBUGDECISIONS - AIPopMessage((STR16)"destination Grid # itself not valid, looking around it"); + AIPopMessage("destination Grid # itself not valid, looking around it"); #endif if ( CREATURE_OR_BLOODCAT( pSoldier ) ) { @@ -625,7 +625,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN if (sTempDest == sGoToGrid) { #ifdef BETAVERSION - sprintf((CHAR *)tempstr,"GoAsFarAsPossibleTowards: ERROR - gridno along valid route is invalid! guynum %d, sTempDest = %d",pSoldier->ubID,sTempDest); + sprintf(tempstr,"GoAsFarAsPossibleTowards: ERROR - gridno along valid route is invalid! guynum %d, sTempDest = %d",pSoldier->ubID,sTempDest); #ifdef RECORDNET fprintf(NetDebugFile,"\n\t%s\n",tempstr); @@ -733,7 +733,7 @@ INT16 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT16 sDesGrid, IN if (sGoToGrid == pSoldier->sGridNo) { #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s will go NOWHERE, path doesn't meet criteria",pSoldier->name); + sprintf(tempstr,"%s will go NOWHERE, path doesn't meet criteria",pSoldier->name); AIPopMessage(tempstr); #endif @@ -859,13 +859,13 @@ void HaltMoveForSoldierOutOfPoints(SOLDIERTYPE *pSoldier) AdjustNoAPToFinishMove( pSoldier, TRUE ); // We'll keep his action intact though... - DebugAI( (STR)String("NO AP TO FINISH MOVE for %d (%d APs left)",pSoldier->ubID, pSoldier->bActionPoints) ); + DebugAI( String("NO AP TO FINISH MOVE for %d (%d APs left)",pSoldier->ubID, pSoldier->bActionPoints) ); // if this dude is under AI right now, then pass the baton to someone else if (pSoldier->uiStatusFlags & SOLDIER_UNDERAICONTROL) { #ifdef TESTAICONTROL - DebugAI( (STR)String("Ending turn for %d because out of APs for movement", pSoldier->ubID ) ); + DebugAI( String("Ending turn for %d because out of APs for movement", pSoldier->ubID ) ); #endif EndAIGuysTurn(pSoldier); diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp index 125e27a1..9cc246a5 100644 --- a/TacticalAI/NPC.cpp +++ b/TacticalAI/NPC.cpp @@ -1169,9 +1169,9 @@ BOOLEAN HandleNPCBeingGivenMoneyByPlayer( UINT8 ubNPC, UINT32 uiMoneyAmount, UIN } else { - INT16 sTempString[ 100 ]; + CHAR16 sTempString[ 100 ]; - swprintf( (wchar_t *)sTempString, L"%ld", iCost - uiMoneyAmount - giHospitalTempBalance ); + swprintf( sTempString, L"%ld", iCost - uiMoneyAmount - giHospitalTempBalance ); InsertDollarSignInToString( sTempString ); // not enough cash diff --git a/TacticalAI/PanicButtons.cpp b/TacticalAI/PanicButtons.cpp index 52e25bed..92942924 100644 --- a/TacticalAI/PanicButtons.cpp +++ b/TacticalAI/PanicButtons.cpp @@ -268,7 +268,7 @@ INT8 PanicAI(SOLDIERTYPE *pSoldier, UINT8 ubCanMove) if (pSoldier->bActionPoints >= AP_USE_REMOTE) { #ifdef TESTVERSION - sprintf((CHAR *)tempstr,"TEST MSG: %s - ACTIVATING his DETONATOR!",pSoldier->name); + sprintf(tempstr,"TEST MSG: %s - ACTIVATING his DETONATOR!",pSoldier->name); PopMessage(tempstr); #endif // blow up all the PANIC bombs! @@ -346,7 +346,7 @@ INT8 PanicAI(SOLDIERTYPE *pSoldier, UINT8 ubCanMove) pSoldier->usActionData = sPanicTriggerGridNo; #ifdef TESTVERSION - sprintf((CHAR *)tempstr,"TEST MSG: %s - PULLS PANIC TRIGGER at grid %d", + sprintf(tempstr,"TEST MSG: %s - PULLS PANIC TRIGGER at grid %d", pSoldier->name,pSoldier->usActionData); PopMessage(tempstr); #endif @@ -372,7 +372,7 @@ INT8 PanicAI(SOLDIERTYPE *pSoldier, UINT8 ubCanMove) pSoldier->bPathStored = TRUE; #ifdef DEBUGDECISIONS - sprintf((CHAR *)tempstr,"%s - GETTING CLOSER to PANIC TRIGGER at grid %d (Trigger at %d)", pSoldier->name,pSoldier->usActionData,sPanicTriggerGridNo); + sprintf(tempstr,"%s - GETTING CLOSER to PANIC TRIGGER at grid %d (Trigger at %d)", pSoldier->name,pSoldier->usActionData,sPanicTriggerGridNo); AIPopMessage(tempstr); #endif diff --git a/TacticalAI/QuestDebug.cpp b/TacticalAI/QuestDebug.cpp index 8a09cb24..0b5fed30 100644 --- a/TacticalAI/QuestDebug.cpp +++ b/TacticalAI/QuestDebug.cpp @@ -38,7 +38,7 @@ UINT8 gubNPCDebugOutPutLevel = QD_OUTPUT_LEVEL_ALL; //set the current output mode for either the NPC or the quest output void ToggleQuestDebugModes( UINT8 ubType ) { - wchar_t sType[16]; + CHAR16 sType[16]; UINT8 ubLevel; if( ubType == QD_NPC_MSG ) diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp index d3c0bf96..ed2033b4 100644 --- a/TacticalAI/Realtime.cpp +++ b/TacticalAI/Realtime.cpp @@ -29,8 +29,8 @@ INT8 RTPlayerDecideAction( SOLDIERTYPE * pSoldier ) #ifdef DEBUGDECISIONS STR tempstr; - sprintf((CHAR *)tempstr,"DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData); - DebugAI((STR) tempstr ); + sprintf(tempstr,"DecideAction: selected action %d, actionData %d\n\n",bAction,pSoldier->usActionData); + DebugAI( tempstr ); #endif return(bAction); diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 4e610778..7dfcf7a2 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -746,17 +746,17 @@ BOOLEAN CopyExternBackgroundRect( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 s // to the video buffer. // //***************************************************************************** -UINT16 gprintfdirty(INT16 x, INT16 y, wchar_t * pFontString, ...) +UINT16 gprintfdirty(INT16 x, INT16 y, STR16 pFontString, ...) { va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT16 uiStringLength, uiStringHeight; INT32 iBack; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); if ( USE_WINFONTS( ) ) @@ -783,16 +783,16 @@ INT32 iBack; return(uiStringLength); } -UINT16 gprintfinvalidate(INT16 x, INT16 y, wchar_t * pFontString, ...) +UINT16 gprintfinvalidate(INT16 x, INT16 y, STR16 pFontString, ...) { va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT16 uiStringLength, uiStringHeight; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); uiStringLength=StringPixLength(string, FontDefault); @@ -805,18 +805,16 @@ UINT16 uiStringLength, uiStringHeight; return(uiStringLength); } -// explicit instantiating work around MSVC not supporting export templated functions/classes (jonathanl) - -UINT16 gprintfRestore(INT16 x, INT16 y, wchar_t * pFontString, ...) +UINT16 gprintfRestore(INT16 x, INT16 y, STR16 pFontString, ...) { va_list argptr; -wchar_t string[512]; +CHAR16 string[512]; UINT16 uiStringLength, uiStringHeight; Assert(pFontString!=NULL); va_start(argptr, pFontString); // Set up variable argument pointer - vswprintf(string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str) + vswprintf(string, pFontString, argptr); // process gprintf string (get output str) va_end(argptr); uiStringLength=StringPixLength(string, FontDefault); diff --git a/TileEngine/Render Dirty.h b/TileEngine/Render Dirty.h index c7f5fda7..13b111d0 100644 --- a/TileEngine/Render Dirty.h +++ b/TileEngine/Render Dirty.h @@ -61,7 +61,7 @@ typedef struct _VIDEO_OVERLAY INT16 sY; UINT8 ubFontBack; UINT8 ubFontFore; - INT16 zText[ 200 ]; + CHAR16 zText[ 200 ]; UINT32 uiDestBuff; OVERLAY_CALLBACK BltCallback; @@ -83,7 +83,7 @@ typedef struct INT16 sY; UINT8 ubFontBack; UINT8 ubFontFore; - wchar_t pzText[ 200 ]; + CHAR16 pzText[ 200 ]; OVERLAY_CALLBACK BltCallback; } VIDEO_OVERLAY_DESC; @@ -124,9 +124,9 @@ BOOLEAN EmptyBackgroundRects( void ); // GPRINTF DIRTY STUFF -UINT16 gprintfdirty(INT16 x, INT16 y, wchar_t * pFontString, ...); -UINT16 gprintfinvalidate(INT16 x, INT16 y, wchar_t * pFontString, ...); -UINT16 gprintfRestore(INT16 x, INT16 y, wchar_t * pFontString, ...); +UINT16 gprintfdirty(INT16 x, INT16 y, STR16 pFontString, ...); +UINT16 gprintfinvalidate(INT16 x, INT16 y, STR16 pFontString, ...); +UINT16 gprintfRestore(INT16 x, INT16 y, STR16 pFontString, ...); // VIDEO OVERLAY STUFF diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 0bb92a02..e5b00cf4 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -440,7 +440,7 @@ void RenderTacticalPlacementGUI() SOLDIERTYPE *pSoldier; UINT32 uiDestPitchBYTES; UINT16 usHatchColor; - wchar_t str[ 128 ]; + CHAR16 str[ 128 ]; UINT8 *pDestBuf; UINT8 ubColor; diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 6e04f44d..8a3ffe80 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -77,7 +77,7 @@ ANITILE *CreateAnimationTile( ANITILE_PARAMS *pAniParams ) { if ( ( uiFlags & ANITILE_CACHEDTILE ) ) { - iCachedTile = GetCachedTile( (INT8 *)pAniParams->zCachedFile ); + iCachedTile = GetCachedTile( pAniParams->zCachedFile ); if ( iCachedTile == -1 ) { diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index 846faa4a..c7c2c1fd 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -74,7 +74,7 @@ BOOLEAN InitTileCache( ) sprintf( gpTileCacheStructInfo[ cnt ].Filename, "TILECACHE\\%s", FileInfo.zFileName ); // Get root name - GetRootName( (INT8 *)gpTileCacheStructInfo[ cnt ].zRootName, (INT8 *)gpTileCacheStructInfo[ cnt ].Filename ); + GetRootName( gpTileCacheStructInfo[ cnt ].zRootName, gpTileCacheStructInfo[ cnt ].Filename ); // Load struc data.... gpTileCacheStructInfo[ cnt ].pStructureFileRef = LoadStructureFile( gpTileCacheStructInfo[ cnt ].Filename ); @@ -125,7 +125,7 @@ void DeleteTileCache( ) guiCurTileCacheSize = 0; } -INT16 FindCacheStructDataIndex( INT8 * cFilename ) +INT16 FindCacheStructDataIndex( STR8 cFilename ) { UINT32 cnt; @@ -140,7 +140,7 @@ INT16 FindCacheStructDataIndex( INT8 * cFilename ) return( -1 ); } -INT32 GetCachedTile( INT8 * cFilename ) +INT32 GetCachedTile( const STR8 cFilename ) { UINT32 cnt; UINT32 ubLowestIndex = 0; @@ -189,7 +189,7 @@ INT32 GetCachedTile( INT8 * cFilename ) if ( gpTileCache[ cnt ].pImagery == NULL ) { // Insert here - gpTileCache[ cnt ].pImagery = LoadTileSurface( (char *)cFilename ); + gpTileCache[ cnt ].pImagery = LoadTileSurface( cFilename ); if ( gpTileCache[ cnt ].pImagery == NULL ) { @@ -200,9 +200,9 @@ INT32 GetCachedTile( INT8 * cFilename ) gpTileCache[ cnt ].sHits = 1; // Get root name - GetRootName( (INT8 *)gpTileCache[ cnt ].zRootName, cFilename ); + GetRootName( gpTileCache[ cnt ].zRootName, cFilename ); - gpTileCache[ cnt ].sStructRefID = FindCacheStructDataIndex( (INT8 *)gpTileCache[ cnt ].zRootName ); + gpTileCache[ cnt ].sStructRefID = FindCacheStructDataIndex( gpTileCache[ cnt ].zRootName ); // ATE: Add z-strip info if ( gpTileCache[ cnt ].sStructRefID != -1 ) @@ -296,7 +296,7 @@ STRUCTURE_FILE_REF *GetCachedTileStructureRef( INT32 iIndex ) } -STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( INT8 *cFilename ) +STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( const STR8 cFilename ) { INT16 sStructDataIndex; @@ -350,7 +350,7 @@ void CheckForAndDeleteTileCacheStructInfo( LEVELNODE *pNode, UINT16 usIndex ) } } -void GetRootName( INT8 * pDestStr, INT8 * pSrcStr ) +void GetRootName( STR8 pDestStr, const STR8 pSrcStr ) { // Remove path and extension CHAR8 cTempFilename[ 120 ]; @@ -370,7 +370,7 @@ void GetRootName( INT8 * pDestStr, INT8 * pSrcStr ) } // Now remove extension... - cEndOfName = strchr( (char *)pDestStr, '.' ); + cEndOfName = strchr( pDestStr, '.' ); if (cEndOfName != NULL) { *cEndOfName = '\0'; diff --git a/TileEngine/Tile Cache.h b/TileEngine/Tile Cache.h index fa536263..64416cb1 100644 --- a/TileEngine/Tile Cache.h +++ b/TileEngine/Tile Cache.h @@ -34,18 +34,18 @@ BOOLEAN InitTileCache( ); void DeleteTileCache( ); -INT32 GetCachedTile( INT8 *cFilename ); +INT32 GetCachedTile( const STR8 cFilename ); BOOLEAN RemoveCachedTile( INT32 iCachedTile ); -STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( INT8 *cFilename ); +STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( const STR8 cFilename ); HVOBJECT GetCachedTileVideoObject( INT32 iIndex ); STRUCTURE_FILE_REF *GetCachedTileStructureRef( INT32 iIndex ); void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT16 sGridNo, UINT16 usIndex, UINT16 usSubIndex ); void CheckForAndDeleteTileCacheStructInfo( LEVELNODE *pNode, UINT16 usIndex ); -void GetRootName( INT8 *pDestStr, INT8 *pSrcStr ); +void GetRootName( STR8 pDestStr, const STR8 pSrcStr ); // OF COURSE, FOR SPEED, WE EXPORT OUR ARRAY diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 66e718ca..4cc1143d 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -23,7 +23,7 @@ TILE_IMAGERY *gTileSurfaceArray[ NUMBEROFTILETYPES ]; UINT8 gbDefaultSurfaceUsed[ NUMBEROFTILETYPES ]; UINT8 gbSameAsDefaultSurfaceUsed[ NUMBEROFTILETYPES ]; -TILE_IMAGERY *LoadTileSurface( char * cFilename ) +TILE_IMAGERY *LoadTileSurface( STR8 cFilename ) { // Add tile surface PTILE_IMAGERY pTileSurf = NULL; @@ -158,14 +158,14 @@ void DeleteTileSurface( PTILE_IMAGERY pTileSurf ) } -extern void GetRootName( INT8 *pDestStr, INT8 *pSrcStr ); +extern void GetRootName( STR8 pDestStr, const STR8 pSrcStr ); -void SetRaisedObjectFlag( char *cFilename, TILE_IMAGERY *pTileSurf ) +void SetRaisedObjectFlag( STR8 cFilename, TILE_IMAGERY *pTileSurf ) { INT32 cnt = 0; CHAR8 cRootFile[ 128 ]; - UINT8 ubRaisedObjectFiles[][80] = + CHAR8 ubRaisedObjectFiles[][80] = { "bones", "bones2", @@ -185,7 +185,7 @@ void SetRaisedObjectFlag( char *cFilename, TILE_IMAGERY *pTileSurf ) // set global value... if ( ( pTileSurf->fType >= DEBRISWOOD && pTileSurf->fType <= DEBRISWEEDS ) || pTileSurf->fType == DEBRIS2MISC || pTileSurf->fType == ANOTHERDEBRIS ) { - GetRootName( (INT8 *)cRootFile, (INT8 *)cFilename ); + GetRootName( cRootFile, cFilename ); while( ubRaisedObjectFiles[ cnt ][ 0 ] != '1' ) { if ( _stricmp( ubRaisedObjectFiles[ cnt ], cRootFile ) == 0 ) diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index ed8f1d63..df485b34 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -79,7 +79,7 @@ void InitEngineTilesets( ) FileRead( hfile, &(gTilesets[ cnt ].ubAmbientID), sizeof( UINT8 ), &uiNumBytesRead ); // Set into tileset - swprintf( (wchar_t *)gTilesets[ cnt ].zName, L"%S", zName ); + swprintf( gTilesets[ cnt ].zName, L"%S", zName ); // Loop for files for ( cnt2 = 0; cnt2 < uiNumFiles; cnt2++ ) diff --git a/TileEngine/WorldDat.h b/TileEngine/WorldDat.h index 52886967..432c68d9 100644 --- a/TileEngine/WorldDat.h +++ b/TileEngine/WorldDat.h @@ -10,7 +10,7 @@ typedef void (*TILESET_CALLBACK)( void ); typedef struct { - INT16 zName[ 32 ]; + CHAR16 zName[ 32 ]; CHAR8 TileSurfaceFilenames[ NUMBEROFTILETYPES ][32]; UINT8 ubAmbientID; TILESET_CALLBACK MovementCostFnc; diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index 4ceeb612..a6667ba8 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -14,7 +14,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; EXPLOSION_DATA expData; UINT32 maxArraySize; @@ -25,7 +25,7 @@ struct typedef explosionDataParseData; static void XMLCALL -explosionDataStartElementHandle(void *userData, const char *name, const char **atts) +explosionDataStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { explosionDataParseData * pData = (explosionDataParseData *)userData; @@ -69,7 +69,7 @@ explosionDataStartElementHandle(void *userData, const char *name, const char **a } static void XMLCALL -explosionDataCharacterDataHandle(void *userData, const char *str, int len) +explosionDataCharacterDataHandle(void *userData, const XML_Char *str, int len) { explosionDataParseData * pData = (explosionDataParseData *)userData; @@ -82,7 +82,7 @@ explosionDataCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -explosionDataEndElementHandle(void *userData, const char *name) +explosionDataEndElementHandle(void *userData, const XML_Char *name) { explosionDataParseData * pData = (explosionDataParseData *)userData; diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index 00500aaa..fbaba3a3 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -212,7 +212,7 @@ void LoadShadeTablesFromTextFile() FILE *fp; INT32 i, j; INT32 num; - UINT8 str[10]; + CHAR8 str[10]; if( gfLoadShadeTablesFromTextFile ) { fp = fopen( "ShadeTables.txt", "r" ); @@ -224,7 +224,7 @@ void LoadShadeTablesFromTextFile() for( j = 0; j < 3; j++ ) { fscanf( fp, "%s", str ); - sscanf( (const char *)str, "%d", &num ); + sscanf( str, "%d", &num ); gusShadeLevels[i][j] = (UINT16)num; } } @@ -2088,7 +2088,7 @@ INT16 iCountY, iCountX; INT32 LightCreateOmni(UINT8 ubIntensity, INT16 iRadius) { INT32 iLight; -UINT8 usName[14]; +CHAR8 usName[14]; iLight=LightGetFree(); if(iLight!=(-1)) @@ -2096,7 +2096,7 @@ UINT8 usName[14]; LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius*DISTANCE_SCALE), (INT16)(iRadius*DISTANCE_SCALE)); } - sprintf((char *)usName, "LTO%d.LHT", iRadius); + sprintf(usName, "LTO%d.LHT", iRadius); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); strcpy(pLightNames[iLight], usName); @@ -2112,7 +2112,7 @@ UINT8 usName[14]; INT32 LightCreateSquare(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2) { INT32 iLight; -UINT8 usName[14]; +CHAR8 usName[14]; iLight=LightGetFree(); if(iLight!=(-1)) @@ -2120,7 +2120,7 @@ UINT8 usName[14]; LightGenerateSquare(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE)); } - sprintf((char *)usName, "LTS%d-%d.LHT", iRadius1, iRadius2); + sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); strcpy(pLightNames[iLight], usName); @@ -2136,13 +2136,13 @@ UINT8 usName[14]; INT32 LightCreateElliptical(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2) { INT32 iLight; -UINT8 usName[14]; +CHAR8 usName[14]; iLight=LightGetFree(); if(iLight!=(-1)) LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE)); - sprintf((char *) usName, "LTE%d-%d.LHT", iRadius1, iRadius2); + sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); strcpy(pLightNames[iLight], usName); @@ -3226,7 +3226,7 @@ INT32 iSprite; LightSprites[iSprite].iOldY=WORLD_ROWS+1; LightSprites[iSprite].uiLightType=uiLightType; - if((LightSprites[iSprite].iTemplate=LightLoadCachedTemplate((STR) pName))==(-1)) + if((LightSprites[iSprite].iTemplate=LightLoadCachedTemplate( pName))==(-1)) return(-1); LightSprites[iSprite].uiFlags|=LIGHT_SPR_ACTIVE; diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index 3b2e547b..71d21cf3 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -1356,7 +1356,7 @@ void RenderOverheadOverlays() usLineColor = Get16BPPColor( FROMRGB( 255, 0, 0 ) ); } - PixelDraw( FALSE, sX, sY, usLineColor, (INT8 *)pDestBuf ); + PixelDraw( FALSE, sX, sY, usLineColor, pDestBuf ); InvalidateRegion( sX, sY, (INT16)( sX + 1 ), (INT16)( sY + 1 ) ); diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index 16eb61e9..20ccb45c 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -52,7 +52,7 @@ #include "Render Z.cpp" /////////////////////////// -extern INT8 gDebugStr[128]; +extern CHAR8 gDebugStr[128]; extern BOOLEAN fLandLayerDirty = TRUE; extern INT16 gsVIEWPORT_START_X; @@ -4052,7 +4052,7 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL fOutBottom = TRUE; } - sprintf( (char *)gDebugStr, "Angles: %d %d %d %d", (int)at1, (int)at2, (int)at3, (int)at4 ); + sprintf( gDebugStr, "Angles: %d %d %d %d", (int)at1, (int)at2, (int)at3, (int)at4 ); if ( !fOutRight && !fOutLeft && !fOutTop && !fOutBottom ) { @@ -4166,7 +4166,7 @@ BOOLEAN ApplyScrolling( INT16 sTempRenderCenterX, INT16 sTempRenderCenterY, BOOL { if ( !fCheckOnly ) { - sprintf( (char *)gDebugStr, "Center: %d %d ", (int)gsRenderCenterX, (int)gsRenderCenterY ); + sprintf( gDebugStr, "Center: %d %d ", (int)gsRenderCenterX, (int)gsRenderCenterY ); //Makesure it's a multiple of 5 sMult = sTempRenderCenterX / CELL_X_SIZE; diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 159ff0fe..53949aa5 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -78,10 +78,10 @@ #ifdef JA2EDITOR extern BOOLEAN gfErrorCatch; - extern UINT16 gzErrorCatchString[256]; + extern CHAR16 gzErrorCatchString[256]; #endif -UINT8 gubFilename[200]; +CHAR8 gubFilename[200]; // TEMP BOOLEAN gfForceLoadPlayers = FALSE; @@ -119,7 +119,7 @@ BOOLEAN IsRoofVisibleForWireframe( INT16 sMapPos ); INT8 IsHiddenTileMarkerThere( INT16 sGridNo ); extern void SetInterfaceHeightLevel( ); -extern void GetRootName( INT8 *pDestStr, INT8 *pSrcStr ); +extern void GetRootName( STR8 pDestStr, const STR8 pSrcStr ); void SaveMapLights( HWFILE hfile ); @@ -350,7 +350,7 @@ BOOLEAN LoadTileSurfaces( char ppTileSurfaceFilenames[][32], UINT8 ubTilesetID ) else { for (uiLoop = 0; uiLoop < NUMBEROFTILETYPES; uiLoop++) - strcpy( TileSurfaceFilenames[uiLoop], ppTileSurfaceFilenames[uiLoop] );//(char *)(ppTileSurfaceFilenames + (65 * uiLoop)) ); + strcpy( TileSurfaceFilenames[uiLoop], ppTileSurfaceFilenames[uiLoop] );//(ppTileSurfaceFilenames + (65 * uiLoop)) ); } @@ -430,7 +430,7 @@ BOOLEAN LoadTileSurfaces( char ppTileSurfaceFilenames[][32], UINT8 ubTilesetID ) // ATE: If here, don't load default surface if already loaded... if ( !gbDefaultSurfaceUsed[ uiLoop ] ) { - strcpy( TileSurfaceFilenames[uiLoop], gTilesets[ TLS_GENERIC_1 ].TileSurfaceFilenames[uiLoop] );//(char *)(ppTileSurfaceFilenames + (65 * uiLoop)) ); + strcpy( TileSurfaceFilenames[uiLoop], gTilesets[ TLS_GENERIC_1 ].TileSurfaceFilenames[uiLoop] );//(ppTileSurfaceFilenames + (65 * uiLoop)) ); if (AddTileSurface( gTilesets[ TLS_GENERIC_1 ].TileSurfaceFilenames[uiLoop], uiLoop, TLS_GENERIC_1, FALSE ) == FALSE) { DestroyTileSurfaces( ); @@ -449,7 +449,7 @@ BOOLEAN LoadTileSurfaces( char ppTileSurfaceFilenames[][32], UINT8 ubTilesetID ) return( TRUE ); } -BOOLEAN AddTileSurface( char * cFilename, UINT32 ubType, UINT8 ubTilesetID, BOOLEAN fGetFromRoot ) +BOOLEAN AddTileSurface( STR8 cFilename, UINT32 ubType, UINT8 ubTilesetID, BOOLEAN fGetFromRoot ) { // Add tile surface PTILE_IMAGERY TileSurf; @@ -581,7 +581,7 @@ void BuildTileShadeTables( ) { fForceRebuildForSlot = FALSE; - GetRootName( (INT8 *)cRootFile, (INT8 *)TileSurfaceFilenames[ uiLoop ] ); + GetRootName( cRootFile, TileSurfaceFilenames[ uiLoop ] ); if ( strcmp( cRootFile, "grass2" ) == 0 ) { @@ -1621,7 +1621,7 @@ void CompileWorldMovementCosts( ) // SAVING CODE -BOOLEAN SaveWorld( UINT8 * puiFilename ) +BOOLEAN SaveWorld( const STR8 puiFilename ) { #ifdef JA2EDITOR INT32 cnt; @@ -2115,7 +2115,7 @@ BOOLEAN SaveWorld( UINT8 * puiFilename ) FileClose( hfile ); - sprintf( (char *)gubFilename, (char *)puiFilename ); + sprintf( gubFilename, puiFilename ); #endif //JA2EDITOR return( TRUE ); @@ -2220,7 +2220,7 @@ void InitLoadedWorld( ) extern double MasterStart, MasterEnd; extern BOOLEAN gfUpdatingNow; -BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel ) +BOOLEAN EvaluateWorld( STR8 pSector, UINT8 ubLevel ) { FLOAT dMajorMapVersion; SUMMARYFILE *pSummary; @@ -2233,20 +2233,20 @@ BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel ) INT32 cnt; INT32 i; INT32 iTilesetID; - wchar_t str[40]; + CHAR16 str[40]; UINT8 bCounts[ WORLD_MAX ][8]; UINT8 ubCombine; - UINT8 szDirFilename[ 50 ]; - UINT8 szFilename[ 40 ]; + CHAR8 szDirFilename[ 50 ]; + CHAR8 szFilename[ 40 ]; UINT8 ubMinorMapVersion; //Make sure the file exists... if not, then return false - sprintf( (char *)szFilename, (char *)pSector ); + sprintf( szFilename, pSector ); if( ubLevel % 4 ) { - UINT8 str[4]; - sprintf( (char *)str, "_b%d", ubLevel % 4 ); + CHAR8 str[4]; + sprintf( str, "_b%d", ubLevel % 4 ); strcat( szFilename, str ); } if( ubLevel >= 4 ) @@ -2254,17 +2254,17 @@ BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel ) strcat( szFilename, "_a" ); } strcat( szFilename, ".dat" ); - sprintf( (char *)szDirFilename, "MAPS\\%s", szFilename ); + sprintf( szDirFilename, "MAPS\\%s", szFilename ); if( gfMajorUpdate ) { if( !LoadWorld( szFilename ) ) //error return FALSE; - FileClearAttributes( (STR)szDirFilename ); + FileClearAttributes( szDirFilename ); SaveWorld( szFilename ); } - hfile = FileOpen( (STR)szDirFilename, FILE_ACCESS_READ, FALSE ); + hfile = FileOpen( szDirFilename, FILE_ACCESS_READ, FALSE ); if( !hfile ) return FALSE; @@ -2622,7 +2622,7 @@ BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel ) extern UINT8 GetCurrentSummaryVersion(); extern void LoadShadeTablesFromTextFile(); -BOOLEAN LoadWorld( UINT8 * puiFilename ) +BOOLEAN LoadWorld( const STR8 puiFilename ) { HWFILE hfile; FLOAT dMajorMapVersion; @@ -3164,13 +3164,13 @@ BOOLEAN LoadWorld( UINT8 * puiFilename ) // SAVE FILENAME strcpy( gzLastLoadedFile, puiFilename ); - LoadRadarScreenBitmap( (CHAR8 *)puiFilename ); + LoadRadarScreenBitmap( puiFilename ); RenderProgressBar( 0, 80 ); gfWorldLoaded = TRUE; - sprintf( (char *)gubFilename, (char *)puiFilename ); + sprintf( gubFilename, puiFilename ); //Remove this rather large chunk of memory from the system now! MemFree( pBufferHead ); @@ -3399,7 +3399,7 @@ void TrashWorld( void ) //gfBlitBattleSectorLocator = FALSE; gfWorldLoaded = FALSE; - sprintf( (char *)gubFilename, "none" ); + sprintf( gubFilename, "none" ); } @@ -3966,14 +3966,14 @@ void ReloadTileset( UINT8 ubID ) giCurrentTilesetID = ubID; // Save Map - SaveWorld( (UINT8 *)TEMP_FILE_FOR_TILESET_CHANGE ); + SaveWorld( TEMP_FILE_FOR_TILESET_CHANGE ); //IMPORTANT: If this is not set, the LoadTileset() will assume that //it is loading the same tileset and ignore it... giCurrentTilesetID = iCurrTilesetID; // Load Map with new tileset - LoadWorld( (UINT8 *)TEMP_FILE_FOR_TILESET_CHANGE ); + LoadWorld( TEMP_FILE_FOR_TILESET_CHANGE ); // Delete file sprintf( aFilename, "MAPS\\%s", TEMP_FILE_FOR_TILESET_CHANGE ); @@ -4056,7 +4056,7 @@ void LoadMapLights( INT8 **hBuffer ) UINT8 ubNumColors; UINT16 usNumLights; INT32 cnt; - INT8 str[30]; + CHAR8 str[30]; UINT8 ubStrLen; LIGHT_SPRITE TmpLight; INT32 iLSprite; @@ -4108,7 +4108,7 @@ void LoadMapLights( INT8 **hBuffer ) str[ ubStrLen ] = 0; - iLSprite = LightSpriteCreate( (STR)str, TmpLight.uiLightType ); + iLSprite = LightSpriteCreate( str, TmpLight.uiLightType ); //if this fails, then we will ignore the light. // ATE: Don't add ANY lights of mapscreen util is on if( iLSprite != -1 && guiCurrentScreen != MAPUTILITY_SCREEN ) diff --git a/TileEngine/worlddef.h b/TileEngine/worlddef.h index 9eb0bfd7..dba229c5 100644 --- a/TileEngine/worlddef.h +++ b/TileEngine/worlddef.h @@ -261,8 +261,8 @@ void TrashWorld(void); void TrashMapTile(INT16 MapTile); BOOLEAN NewWorld( void ); -BOOLEAN SaveWorld( UINT8 * puiFilename ); -BOOLEAN LoadWorld( UINT8 *puiFilename ); +BOOLEAN SaveWorld( const STR8 puiFilename ); +BOOLEAN LoadWorld( const STR8 puiFilename ); void CompileWorldMovementCosts( ); void RecompileLocalMovementCosts( INT16 sCentreGridNo ); diff --git a/Utils/Animated ProgressBar.cpp b/Utils/Animated ProgressBar.cpp index da661245..0802a8f2 100644 --- a/Utils/Animated ProgressBar.cpp +++ b/Utils/Animated ProgressBar.cpp @@ -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, wchar_t *pString, UINT32 usFont, UINT8 ubForeColor, UINT8 ubShadowColor ) +void SetProgressBarTitle( UINT32 ubID, STR16 pString, UINT32 usFont, UINT8 ubForeColor, UINT8 ubShadowColor ) { PROGRESSBAR *pCurr; Assert( ubID < MAX_PROGRESSBARS ); @@ -142,7 +142,7 @@ void SetProgressBarTitle( UINT32 ubID, wchar_t *pString, UINT32 usFont, UINT8 ub } if( pString && wcslen( pString ) ) { - pCurr->swzTitle = (wchar_t*)MemAlloc( sizeof( wchar_t ) * ( wcslen( pString ) + 1 ) ); + pCurr->swzTitle = (STR16) MemAlloc( sizeof( CHAR16 ) * ( 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, wchar_t *str) +void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, STR16 str) { PROGRESSBAR *pCurr; UINT16 usStartX, usStartY; diff --git a/Utils/Animated ProgressBar.h b/Utils/Animated ProgressBar.h index 69d15cb3..08fcc24b 100644 --- a/Utils/Animated ProgressBar.h +++ b/Utils/Animated ProgressBar.h @@ -12,7 +12,7 @@ typedef struct PROGRESSBAR BOOLEAN fPanel; UINT16 usPanelLeft, usPanelTop, usPanelRight, usPanelBottom; UINT16 usColor, usLtColor, usDkColor; - wchar_t *swzTitle; + STR16 swzTitle; UINT16 usTitleFont; UINT8 ubTitleFontForeColor, ubTitleFontShadowColor; UINT16 usMsgFont; @@ -44,7 +44,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, STR16 pString, UINT32 usFont, UINT8 ubForeColor, UINT8 ubShadowColor ); //Unless you set up the attributes, any text you pass to SetRelativeStartAndEndPercentage will //default to FONT12POINT1 in a black color. @@ -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, wchar_t *str); +void SetRelativeStartAndEndPercentage( UINT8 ubID, UINT32 uiRelStartPerc, UINT32 uiRelEndPerc, STR16 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 diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index 17617987..1dde5689 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1303,7 +1303,7 @@ void BltJA2CursorData( ) void DrawMouseText( ) { - INT16 pStr[ 512 ]; + CHAR16 pStr[ 512 ]; INT16 sX, sY; static BOOLEAN fShow = FALSE; static BOOLEAN fHoldInvalid = TRUE; @@ -1342,11 +1342,11 @@ void DrawMouseText( ) else SetFontForeground( FONT_MCOLOR_LTYELLOW ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%d", gsBulletCount ); + swprintf( pStr, L"%d", gsBulletCount ); FindFontCenterCoordinates( 0, 0, gsCurMouseWidth, gsCurMouseHeight, pStr, TINYFONT1, &sX, &sY ); mprintf( sX, sY - 10 - GetFontHeight(TINYFONT1), pStr ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%d", gsTotalBulletCount ); + swprintf( pStr, L"%d", gsTotalBulletCount ); FindFontCenterCoordinates( 0, 0, gsCurMouseWidth, gsCurMouseHeight, pStr, TINYFONT1, &sX, &sY ); mprintf( sX, sY + 7 + GetFontHeight(TINYFONT1), pStr ); @@ -1428,7 +1428,7 @@ void DrawMouseText( ) // Set dest for gprintf to be different SetFontDestBuffer( MOUSE_BUFFER , 0, 0, 64, 64, FALSE ); - swprintf( (wchar_t *)pStr, (wchar_t *)L"%d", gsCurrentActionPoints ); + swprintf( pStr, L"%d", gsCurrentActionPoints ); if ( gfUIDisplayActionPointsCenter ) { diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp index 3f2b8391..227caad9 100644 --- a/Utils/Font Control.cpp +++ b/Utils/Font Control.cpp @@ -354,7 +354,7 @@ UINT16 WFGetFontHeight( INT32 FontNum ) } -INT16 WFStringPixLength( wchar_t *string,INT32 UseFont ) +INT16 WFStringPixLength( STR16 string,INT32 UseFont ) { if ( USE_WINFONTS( ) ) { diff --git a/Utils/Font Control.h b/Utils/Font Control.h index 1d016a88..532a8caf 100644 --- a/Utils/Font Control.h +++ b/Utils/Font Control.h @@ -22,7 +22,7 @@ extern INT32 giCurWinFont; // ATE: A few winfont wrappers.. UINT16 WFGetFontHeight( INT32 FontNum ); -INT16 WFStringPixLength( wchar_t *string,INT32 UseFont ); +INT16 WFStringPixLength( STR16 string,INT32 UseFont ); diff --git a/Utils/INIReader.cpp b/Utils/INIReader.cpp index 99a5ed3d..e3ff7184 100644 --- a/Utils/INIReader.cpp +++ b/Utils/INIReader.cpp @@ -6,7 +6,7 @@ // Kaiden: INI reading function definitions: -CIniReader::CIniReader(const char* szFileName) +CIniReader::CIniReader(const STR8 szFileName) { // Snap: Look for the INI file in the custom Data directory. // If not there, leave at default location. @@ -19,13 +19,13 @@ CIniReader::CIniReader(const char* szFileName) } -int CIniReader::ReadInteger(const char* szSection, const char* szKey, int iDefaultValue) +int CIniReader::ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue) { return GetPrivateProfileInt(szSection, szKey, iDefaultValue, m_szFileName); } -int CIniReader::ReadInteger(const char* szSection, const char* szKey, int iDefaultValue, int iMinValue, int iMaxValue) +int CIniReader::ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue, int iMinValue, int iMaxValue) { int i = GetPrivateProfileInt(szSection, szKey, iDefaultValue, m_szFileName); if (i < iMinValue) @@ -35,11 +35,11 @@ int CIniReader::ReadInteger(const char* szSection, const char* szKey, int iDefau return i; } - int ReadInteger(const char* szSection, const char* szKey, int iDefaultValue, int iMinValue, int iMaxValue); + int ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue, int iMinValue, int iMaxValue); -float CIniReader::ReadFloat(const char* szSection, const char* szKey, float fltDefaultValue) +float CIniReader::ReadFloat(const STR8 szSection, const STR8 szKey, float fltDefaultValue) { char szResult[255]; char szDefault[255]; @@ -51,7 +51,7 @@ float CIniReader::ReadFloat(const char* szSection, const char* szKey, float fltD } -bool CIniReader::ReadBoolean(const char* szSection, const char* szKey, bool bolDefaultValue) +bool CIniReader::ReadBoolean(const STR8 szSection, const STR8 szKey, bool bolDefaultValue) { char szResult[255]; char szDefault[255]; @@ -63,9 +63,9 @@ bool CIniReader::ReadBoolean(const char* szSection, const char* szKey, bool bolD } -char* CIniReader::ReadString(const char* szSection, const char* szKey, const char* szDefaultValue) +STR8 CIniReader::ReadString(const STR8 szSection, const STR8 szKey, const STR8 szDefaultValue) { - char* szResult = new char[255]; + STR8 szResult = new char[255]; memset(szResult, 0x00, 255); GetPrivateProfileString(szSection, szKey, szDefaultValue, szResult, 255, m_szFileName); return szResult; diff --git a/Utils/INIReader.h b/Utils/INIReader.h index e39fe858..979cd0b3 100644 --- a/Utils/INIReader.h +++ b/Utils/INIReader.h @@ -2,6 +2,7 @@ #define INIREADER_H #include +#include // Kaiden: This will read any value out of // an INI file as long as the correct type is specified. @@ -9,12 +10,12 @@ class CIniReader { public: - CIniReader(const char* szFileName); - int ReadInteger(const char* szSection, const char* szKey, int iDefaultValue); - int ReadInteger(const char* szSection, const char* szKey, int iDefaultValue, int iMinValue, int iMaxValue); - float ReadFloat(const char* szSection, const char* szKey, float fltDefaultValue); - bool ReadBoolean(const char* szSection, const char* szKey, bool bolDefaultValue); - char* ReadString(const char* szSection, const char* szKey, const char* szDefaultValue); + CIniReader(const STR8 szFileName); + int ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue); + int ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue, int iMinValue, int iMaxValue); + float ReadFloat(const STR8 szSection, const STR8 szKey, float fltDefaultValue); + bool ReadBoolean(const STR8 szSection, const STR8 szKey, bool bolDefaultValue); + STR8 ReadString(const STR8 szSection, const STR8 szKey, const STR8 szDefaultValue); private: char m_szFileName[MAX_PATH]; }; diff --git a/Utils/MapUtility.cpp b/Utils/MapUtility.cpp index ce2766a4..42e8f75f 100644 --- a/Utils/MapUtility.cpp +++ b/Utils/MapUtility.cpp @@ -66,7 +66,7 @@ UINT32 MapUtilScreenHandle( ) static FDLG_LIST *FListNode; static INT16 sFiles = 0, sCurFile = 0; static FDLG_LIST *FileList = NULL; - INT8 zFilename[ 260 ], zFilename2[ 260 ]; + CHAR8 zFilename[ 260 ], zFilename2[ 260 ]; VSURFACE_DESC vs_desc; UINT16 usWidth; UINT16 usHeight; @@ -157,10 +157,10 @@ UINT32 MapUtilScreenHandle( ) return( MAPUTILITY_SCREEN ); } - sprintf( (char *)zFilename, "%s", FListNode->FileInfo.zFileName ); + sprintf( zFilename, "%s", FListNode->FileInfo.zFileName ); // OK, load maps and do overhead shrinkage of them... - if ( !LoadWorld( (UINT8 *)zFilename ) ) + if ( !LoadWorld( zFilename ) ) { return( ERROR_SCREEN ); } @@ -313,7 +313,7 @@ UINT32 MapUtilScreenHandle( ) } } - sprintf( (char *)zFilename2, "RADARMAPS\\%s.STI", zFilename ); + sprintf( zFilename2, "RADARMAPS\\%s.STI", zFilename ); WriteSTIFile( (INT8 *)pDataPtr, pPalette, MINIMAP_X_SIZE, MINIMAP_Y_SIZE, (STR) zFilename2, CONVERT_ETRLE_COMPRESS, 0 ); UnLockVideoSurface(gi8BitMiniMap); diff --git a/Utils/MercTextBox.cpp b/Utils/MercTextBox.cpp index e58fc5c6..a8c6d640 100644 --- a/Utils/MercTextBox.cpp +++ b/Utils/MercTextBox.cpp @@ -404,7 +404,7 @@ INT32 PrepareMercPopupBox( INT32 iBoxId, UINT8 ubBackgroundIndex, UINT8 ubBorde usTextWidth = usWidth - ( MERC_TEXT_POPUP_WINDOW_TEXT_OFFSET_X ) * 2 + 1 - usMarginX; } - usNumberVerticalPixels = IanWrappedStringHeight(0,0, usTextWidth, 2, TEXT_POPUP_FONT, MERC_TEXT_COLOR, (STR16) pString, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED); + usNumberVerticalPixels = IanWrappedStringHeight(0,0, usTextWidth, 2, TEXT_POPUP_FONT, MERC_TEXT_COLOR, pString, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED); usNumberOfLines = usNumberVerticalPixels / TEXT_POPUP_GAP_BN_LINES; diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp index 10212b93..f4308851 100644 --- a/Utils/Multi Language Graphic Utils.cpp +++ b/Utils/Multi Language Graphic Utils.cpp @@ -244,7 +244,7 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID ) #elif defined( POLISH ) sprintf( zLanguage, "POLISH" ); #elif defined( RUSSIAN ) - sprintf( (char *)zLanguage, "RUSSIAN" ); + sprintf( zLanguage, "RUSSIAN" ); #elif defined( SPANISH ) sprintf( zLanguage, "SPANISH" ); #elif defined( TAIWANESE ) diff --git a/Utils/Multilingual Text Code Generator.cpp b/Utils/Multilingual Text Code Generator.cpp index 52aa883d..a1f5426a 100644 --- a/Utils/Multilingual Text Code Generator.cpp +++ b/Utils/Multilingual Text Code Generator.cpp @@ -73,12 +73,12 @@ enum #define LCG_FOREIGNNEWFILE "_NewGermanText.c" //Given a file pointer, searches for the next DB string -UINT32 CountDoubleByteStringsInFile( UINT8 * filename ); +UINT32 CountDoubleByteStringsInFile( STR8 filename ); //One function does it all. First looks for the cmd line arg, and if it matches //the above define, searches for the files, and processes them automatically. -BOOLEAN ProcessIfMultilingualCmdLineArgDetected( UINT8 *str ) +BOOLEAN ProcessIfMultilingualCmdLineArgDetected( STR8 str ) { STRING512 ExecDir; STRING512 CurrDir; @@ -86,7 +86,7 @@ BOOLEAN ProcessIfMultilingualCmdLineArgDetected( UINT8 *str ) UINT32 uiEnglishStrings, uiForeignStrings; //check if command line argument matches the LCG's - if( strcmp( (const char *)str, LCG_COMMANDLINEARGUMENT ) ) + if( strcmp( str, LCG_COMMANDLINEARGUMENT ) ) { //string is different, so return return FALSE; } @@ -122,10 +122,10 @@ BOOLEAN ProcessIfMultilingualCmdLineArgDetected( UINT8 *str ) //Begin file preparation checks... //STEP1: Read the English master file and count the number of DB strings that exist - uiEnglishStrings = CountDoubleByteStringsInFile( (UINT8 *)LCG_ENGLISHMASTERFILE ); + uiEnglishStrings = CountDoubleByteStringsInFile( LCG_ENGLISHMASTERFILE ); //STEP2: Read the Foreigh master file and count the number of DB strings that exist - uiForeignStrings = CountDoubleByteStringsInFile( (UINT8 *)LCG_FOREIGNMASTERFILE ); + uiForeignStrings = CountDoubleByteStringsInFile( LCG_FOREIGNMASTERFILE ); //Make sure they match, otherwise, we can't continue. if( uiEnglishStrings != uiForeignStrings ) @@ -140,13 +140,13 @@ BOOLEAN ProcessIfMultilingualCmdLineArgDetected( UINT8 *str ) return TRUE; } -UINT32 CountDoubleByteStringsInFile( UINT8 * filename ) +UINT32 CountDoubleByteStringsInFile( STR8 filename ) { FILE *fp = NULL; UINT32 uiNumStrings = 0; //open file - fp = fopen( (const char *)filename, "r" ); + fp = fopen( filename, "r" ); if( !fp ) { return 0; diff --git a/Utils/Multilingual Text Code Generator.h b/Utils/Multilingual Text Code Generator.h index d10d97aa..653fd559 100644 --- a/Utils/Multilingual Text Code Generator.h +++ b/Utils/Multilingual Text Code Generator.h @@ -2,7 +2,7 @@ //If special command line argument is used, then the utility will kick in //and activate the special code generator. -BOOLEAN ProcessIfMultilingualCmdLineArgDetected( UINT8 *str ); +BOOLEAN ProcessIfMultilingualCmdLineArgDetected( STR8 str ); #else diff --git a/Utils/PopUpBox.cpp b/Utils/PopUpBox.cpp index bfd54bc7..c8b99d83 100644 --- a/Utils/PopUpBox.cpp +++ b/Utils/PopUpBox.cpp @@ -1381,7 +1381,7 @@ BOOLEAN DrawBoxText(UINT32 uiCounter) { UINT32 uiCount=0; INT16 uX, uY; - wchar_t sString[100]; + CHAR16 sString[100]; if ( ( uiCounter < 0 ) || ( uiCounter >= MAX_POPUP_BOX_COUNT ) ) diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index 127f294f..dee98926 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -20,7 +20,7 @@ #include "Sound Control.h" #endif -UINT16 *szClipboard; +STR16 szClipboard; BOOLEAN gfNoScroll = FALSE; //The internal callback functions assigned to each text field. @@ -32,7 +32,7 @@ void AddChar( UINT32 uiKey ); void RemoveChar( UINT8 ubArrayIndex ); void DeleteHilitedText(); -void DoublePercentileCharacterFromStringIntoString( wchar_t *pSrcString, wchar_t *pDstString ); +void DoublePercentileCharacterFromStringIntoString( STR16 pSrcString, STR16 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; - wchar_t *szString; + STR16 szString; UINT8 ubStrLen; BOOLEAN fEnabled; BOOLEAN fUserField; @@ -141,7 +141,7 @@ UINT8 gubStartHilite = 0; UINT8 gubEndHilite = 0; //allow the user to cut, copy, and paste just like windows. -UINT16 gszClipboardString[256]; +CHAR16 gszClipboardString[256]; //Simply initiates that you wish to begin inputting text. This should only apply to screen //initializations that contain fields that edit text. It also verifies and clears any existing @@ -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, - wchar_t *szInitText, UINT8 ubMaxChars, UINT16 usInputType ) + STR16 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 = (wchar_t*)MemAlloc( (ubMaxChars+1)*sizeof(wchar_t) ); + pNode->szString = (STR16) MemAlloc( (ubMaxChars+1)*sizeof(CHAR16) ); 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, wchar_t *szNewText ) +void SetInputFieldStringWith16BitString( UINT8 ubField, const STR16 szNewText ) { TEXTINPUTNODE *curr; curr = gpTextInputHead; @@ -412,7 +412,7 @@ void SetInputFieldStringWith16BitString( UINT8 ubField, wchar_t *szNewText ) } } -void SetInputFieldStringWith8BitString( UINT8 ubField, UINT8 * szNewText ) +void SetInputFieldStringWith8BitString( UINT8 ubField, const STR8 szNewText ) { TEXTINPUTNODE *curr; curr = gpTextInputHead; @@ -442,7 +442,7 @@ 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 Get8BitStringFromField( UINT8 ubField, STR8 szString ) { TEXTINPUTNODE *curr; curr = gpTextInputHead; @@ -450,7 +450,7 @@ void Get8BitStringFromField( UINT8 ubField, UINT8 *szString ) { if( curr->ubID == ubField ) { - sprintf( (char *)szString, "%S", curr->szString ); + sprintf( szString, "%S", curr->szString ); return; } curr = curr->next; @@ -458,7 +458,7 @@ void Get8BitStringFromField( UINT8 ubField, UINT8 *szString ) szString[0] = '\0'; } -void Get16BitStringFromField( UINT8 ubField, wchar_t *szString ) +void Get16BitStringFromField( UINT8 ubField, STR16 szString ) { TEXTINPUTNODE *curr; curr = gpTextInputHead; @@ -478,8 +478,8 @@ void Get16BitStringFromField( UINT8 ubField, wchar_t *szString ) //returns -1 if blank or invalid. Only works for positive numbers. INT32 GetNumericStrictValueFromField( UINT8 ubField ) { - wchar_t *ptr; - wchar_t str[20]; + STR16 ptr; + CHAR16 str[20]; INT32 total; Get16BitStringFromField( ubField, str ); //Blank string, so return -1 @@ -1242,7 +1242,7 @@ void RenderActiveTextField() { UINT32 uiCursorXPos; UINT16 usOffset; - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; if( !gpActive || !gpActive->szString ) return; @@ -1320,7 +1320,7 @@ void RenderInactiveTextField( UINT8 ubID ) { UINT16 usOffset; TEXTINPUTNODE* pNode, *curr; - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; curr = gpTextInputHead; pNode = NULL; while( curr ) @@ -1348,7 +1348,7 @@ void RenderInactiveTextField( UINT8 ubID ) void RenderInactiveTextFieldNode( TEXTINPUTNODE *pNode ) { UINT16 usOffset; - wchar_t str[ 256 ]; + CHAR16 str[ 256 ]; if( !pNode || !pNode->szString ) return; SaveFontSettings(); @@ -1579,7 +1579,7 @@ void ExecuteCopyCommand() ubEnd = gubStartHilite; } ubCount = (UINT8)(ubEnd - ubStart); - szClipboard = (UINT16*)MemAlloc( ( ubCount + 1 ) * sizeof(CHAR16) ); + szClipboard = (STR16)MemAlloc( ( ubCount + 1 ) * sizeof(CHAR16) ); Assert( szClipboard ); for( ubCount = ubStart; ubCount < ubEnd; ubCount++ ) { @@ -1747,7 +1747,7 @@ void SetExclusive24HourTimeValue( UINT8 ubField, UINT16 usTime ) } } -void DoublePercentileCharacterFromStringIntoString( wchar_t *pSrcString, wchar_t *pDstString ) +void DoublePercentileCharacterFromStringIntoString( STR16 pSrcString, STR16 pDstString ) { INT32 iSrcIndex = 0, iDstIndex = 0; while( pSrcString[ iSrcIndex ] != 0 ) diff --git a/Utils/Text Input.h b/Utils/Text Input.h index 6bd28892..14c1ec86 100644 --- a/Utils/Text Input.h +++ b/Utils/Text Input.h @@ -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, - wchar_t *szInitText, UINT8 ubMaxChars, UINT16 usInputType ); + STR16 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, wchar_t *szNewText ); +void SetInputFieldStringWith16BitString( UINT8 ubField, const STR16 szNewText ); -void SetInputFieldStringWith8BitString( UINT8 ubField, UINT8 * szNewText ); +void SetInputFieldStringWith8BitString( UINT8 ubField, const STR8 szNewText ); //Allows external functions to access the strings within the fields at anytime. -void Get8BitStringFromField( UINT8 ubField, UINT8 *szString ); -void Get16BitStringFromField( UINT8 ubField, wchar_t *szString ); +void Get8BitStringFromField( UINT8 ubField, STR8 szString ); +void Get16BitStringFromField( UINT8 ubField, STR16 szString ); //Utility functions for the INPUTTYPE_EXCLUSIVE_24HOURCLOCK input type. UINT16 GetExclusive24HourTimeValueFromField( UINT8 ubField ); diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index 969e76a6..b497a02e 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -964,7 +964,7 @@ void LoadAllExternalText( void ) LoadAllItemNames(); } -wchar_t* GetWeightUnitString( void ) +STR16 GetWeightUnitString( void ) { if ( gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] ) // metric { diff --git a/Utils/Text.h b/Utils/Text.h index 302d1bd8..df591bd1 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -8,14 +8,14 @@ #define STRING_LENGTH 255 extern STR16 pCreditsJA2113[]; -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 CHAR16 ShortItemNames[MAXITEMS][80]; +extern CHAR16 ItemNames[MAXITEMS][80]; +extern CHAR16 AmmoCaliber[MAXITEMS][20]; +extern CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20]; +extern CHAR16 WeaponType[MAXITEMS][30]; -extern wchar_t Message[][STRING_LENGTH]; -extern wchar_t TeamTurnString[][STRING_LENGTH]; +extern CHAR16 Message[][STRING_LENGTH]; +extern CHAR16 TeamTurnString[][STRING_LENGTH]; extern STR16 pMilitiaControlMenuStrings[]; //lal //extern STR16 pTalkToAllMenuStrings[]; extern STR16 pAssignMenuStrings[]; @@ -261,7 +261,7 @@ enum }; extern STR16 pMessageStrings[]; -extern wchar_t ItemPickupHelpPopup[][40]; +extern CHAR16 ItemPickupHelpPopup[][40]; enum { @@ -383,20 +383,20 @@ enum #define MED_STRING_LENGTH 80 #define SMALL_STRING_LENGTH 20 -extern wchar_t TacticalStr[][MED_STRING_LENGTH]; -extern wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ]; +extern CHAR16 TacticalStr[][MED_STRING_LENGTH]; +extern CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ]; -extern wchar_t zDialogActions[][ SMALL_STRING_LENGTH ]; -extern wchar_t zDealerStrings[][ SMALL_STRING_LENGTH ]; -extern wchar_t zTalkMenuStrings[][ SMALL_STRING_LENGTH ]; +extern CHAR16 zDialogActions[][ SMALL_STRING_LENGTH ]; +extern CHAR16 zDealerStrings[][ SMALL_STRING_LENGTH ]; +extern CHAR16 zTalkMenuStrings[][ SMALL_STRING_LENGTH ]; extern STR16 gzMoneyAmounts[6]; -extern wchar_t gzProsLabel[10]; -extern wchar_t gzConsLabel[10]; -extern wchar_t gMoneyStatsDesc[][ 13 ]; -extern wchar_t gWeaponStatsDesc[][ 14 ]; +extern CHAR16 gzProsLabel[10]; +extern CHAR16 gzConsLabel[10]; +extern CHAR16 gMoneyStatsDesc[][ 13 ]; +extern CHAR16 gWeaponStatsDesc[][ 14 ]; extern STR16 sKeyDescriptionStrings[2]; -extern wchar_t zHealthStr[][13]; +extern CHAR16 zHealthStr[][13]; extern STR16 zVehicleName[ 6 ]; enum @@ -1523,7 +1523,7 @@ STR16 gzCreditNameTitle[]; STR16 gzCreditNameFunny[]; -extern wchar_t * GetWeightUnitString( void ); +extern STR16 GetWeightUnitString( void ); FLOAT GetWeightBasedOnMetricOption( UINT32 uiObjectWeight ); diff --git a/Utils/Utilities.cpp b/Utils/Utilities.cpp index 6b99979a..f34d10a5 100644 --- a/Utils/Utilities.cpp +++ b/Utils/Utilities.cpp @@ -29,15 +29,15 @@ BOOLEAN PerformTimeLimitedCheck(); * Modified this routine to eliminate recursion and to avoid infinite * expansion of string when newpiece contains oldpiece. --Byron */ -//char *Replace(char *string, char *oldpiece, char *newpiece) +//STR8 Replace(STR8 string, STR8 oldpiece, STR8 newpiece) //{ // int str_index, newstr_index, oldpiece_index, end, // // new_len, old_len, cpy_len; -// char *c; +// STR8 c; // static char newstring[MAXLINE]; // -// if ((c = (char *) strstr(string, oldpiece)) == NULL) +// if ((c = strstr(string, oldpiece)) == NULL) // // return string; // @@ -64,7 +64,7 @@ BOOLEAN PerformTimeLimitedCheck(); // str_index += old_len; // // //Check for another pattern match -// if((c = (char *) strstr(string+str_index, oldpiece)) != NULL) +// if((c = strstr(string+str_index, oldpiece)) != NULL) // oldpiece_index = c - string; // // @@ -76,7 +76,7 @@ BOOLEAN PerformTimeLimitedCheck(); //} // WANNE: Replaces german specific characters -//char *ReplaceGermanSpecialCharacters(char *text) +//STR8 ReplaceGermanSpecialCharacters(STR8 text) //{ // // ä // text = Replace(text, "ä", "ä"); @@ -101,7 +101,7 @@ BOOLEAN PerformTimeLimitedCheck(); //#define TIME_LIMITED_VERSION void FilenameForBPP(STR pFilename, STR pDestination) { -UINT8 Drive[128], Dir[128], Name[128], Ext[128]; +CHAR8 Drive[128], Dir[128], Name[128], Ext[128]; if(GETPIXELDEPTH()==16) { @@ -110,7 +110,7 @@ UINT8 Drive[128], Dir[128], Name[128], Ext[128]; } else { - _splitpath(pFilename, (char *)Drive, (char *)Dir, (char *)Name, (char *)Ext); + _splitpath(pFilename, Drive, Dir, Name, Ext); strcat(Name, "_8"); @@ -197,10 +197,11 @@ BOOLEAN DisplayPaletteRep( PaletteRepID aPalRep, UINT8 ubXPos, UINT8 ubYPos, UIN } -BOOLEAN WrapString( wchar_t *pStr, wchar_t *pStr2, UINT16 usWidth, INT32 uiFont ) +BOOLEAN WrapString( STR16 pStr, STR16 pStr2, UINT16 usWidth, INT32 uiFont ) { UINT32 Cur, uiLet, uiNewLet, uiHyphenLet; - wchar_t *curletter,transletter; + STR16 curletter; + INT16 transletter; BOOLEAN fLineSplit = FALSE; HVOBJECT hFont; @@ -246,7 +247,7 @@ BOOLEAN WrapString( wchar_t *pStr, wchar_t *pStr2, UINT16 usWidth, INT32 uiFont if( !fLineSplit) { //We completed the check for a space, but failed, so use the hyphen method. - swprintf( (wchar_t *)pStr2, (wchar_t *)L"-%s", &(pStr[uiHyphenLet]) ); + swprintf( pStr2, L"-%s", &(pStr[uiHyphenLet]) ); pStr[uiHyphenLet] = (INT16)'/0'; fLineSplit = TRUE; //hyphen method break; @@ -298,7 +299,7 @@ void HandleLimitedNumExecutions( ) { // Get system directory HWFILE hFileHandle; - UINT8 ubSysDir[ 512 ]; + CHAR8 ubSysDir[ 512 ]; INT8 bNumRuns; GetSystemDirectory( (LPSTR) ubSysDir, sizeof( ubSysDir ) ); diff --git a/Utils/Utilities.h b/Utils/Utilities.h index 55357c0d..20a44838 100644 --- a/Utils/Utilities.h +++ b/Utils/Utilities.h @@ -15,7 +15,7 @@ BOOLEAN DisplayPaletteRep( PaletteRepID aPalRep, UINT8 ubXPos, UINT8 ubYPos, UIN void FilenameForBPP(STR pFilename, STR pDestination); -BOOLEAN WrapString( wchar_t *pStr, wchar_t *pStr2, UINT16 usWidth, INT32 uiFont ); +BOOLEAN WrapString( STR16 pStr, STR16 pStr2, UINT16 usWidth, INT32 uiFont ); BOOLEAN IfWinNT(void); BOOLEAN IfWin95(void); @@ -26,11 +26,11 @@ BOOLEAN HandleJA2CDCheck( ); BOOLEAN HandleJA2CDCheckTwo( ); // WANNE: This method replaces characters in a given text with new characters -char *Replace(char *string, char *oldpiece, char *newpiece); +STR8 Replace(STR8 string, STR8 oldpiece, STR8 newpiece); // WANNE: This method calls the replace method and replaces all german specific characters // WANNE: Not used! -//char *ReplaceGermanSpecialCharacters(char *text); +//STR8 ReplaceGermanSpecialCharacters(STR8 text); // Snap: integer division that rounds the result to the nearest integer diff --git a/Utils/WordWrap.cpp b/Utils/WordWrap.cpp index abdaaf32..7318b0ec 100644 --- a/Utils/WordWrap.cpp +++ b/Utils/WordWrap.cpp @@ -26,15 +26,15 @@ WRAPPED_STRING *LineWrapForSingleCharWords(UINT32 ulFont, UINT16 usLineWidthPixe { WRAPPED_STRING FirstWrappedString; WRAPPED_STRING *pWrappedString = NULL; - wchar_t TempString[1024]; -// wchar_t pNullString[2]; + CHAR16 TempString[1024]; +// CHAR16 pNullString[2]; INT16 usCurIndex, usEndIndex, usDestIndex; - wchar_t DestString[1024]; + CHAR16 DestString[1024]; va_list argptr; BOOLEAN fDone = FALSE; UINT16 usCurrentWidthPixels=0; // UINT16 usCurrentLineWidthPixels=0; - wchar_t OneChar[2]; + CHAR16 OneChar[2]; BOOLEAN fNewLine=FALSE; // BOOLEAN fTheStringIsToLong=FALSE; // INT32 iCounter=0; @@ -84,7 +84,7 @@ WRAPPED_STRING *LineWrapForSingleCharWords(UINT32 ulFont, UINT16 usLineWidthPixe //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc( sizeof(WRAPPED_STRING) ); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* sizeof(CHAR16) ); if( pWrappedString->pNextWrappedString->sString == NULL) return (NULL); @@ -113,7 +113,7 @@ WRAPPED_STRING *LineWrapForSingleCharWords(UINT32 ulFont, UINT16 usLineWidthPixe //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc(sizeof(WRAPPED_STRING)); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc((wcslen(DestString) +2 )* 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc((wcslen(DestString) +2 )* sizeof(CHAR16) ); //Copy the string into the new struct wcscpy(pWrappedString->pNextWrappedString->sString, DestString); @@ -143,16 +143,16 @@ WRAPPED_STRING *LineWrap(UINT32 ulFont, UINT16 usLineWidthPixels, UINT16 *pusLin { WRAPPED_STRING FirstWrappedString; WRAPPED_STRING *pWrappedString = NULL; - wchar_t TempString[1024]; - wchar_t pNullString[2]; + CHAR16 TempString[1024]; + CHAR16 pNullString[2]; INT16 usCurIndex, usEndIndex, usDestIndex; STR16 pCurrentStringLoc; - wchar_t DestString[1024]; + CHAR16 DestString[1024]; va_list argptr; BOOLEAN fDone = FALSE; UINT16 usCurrentWidthPixels=0; UINT16 usCurrentLineWidthPixels=0; - wchar_t OneChar[2]; + CHAR16 OneChar[2]; BOOLEAN fNewLine=FALSE; BOOLEAN fTheStringIsToLong=FALSE; INT32 iCounter=0; @@ -212,7 +212,7 @@ WRAPPED_STRING *LineWrap(UINT32 ulFont, UINT16 usLineWidthPixels, UINT16 *pusLin //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc( sizeof(WRAPPED_STRING) ); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* sizeof(CHAR16) ); if( pWrappedString->pNextWrappedString->sString == NULL) { DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LineWrap: done")); @@ -263,7 +263,7 @@ WRAPPED_STRING *LineWrap(UINT32 ulFont, UINT16 usLineWidthPixels, UINT16 *pusLin { //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc( sizeof(WRAPPED_STRING) ); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) +2 )* sizeof(CHAR16) ); if( pWrappedString->pNextWrappedString->sString == NULL) { DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LineWrap: done")); @@ -304,7 +304,7 @@ WRAPPED_STRING *LineWrap(UINT32 ulFont, UINT16 usLineWidthPixels, UINT16 *pusLin //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc( sizeof(WRAPPED_STRING) ); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) + 2) * 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc( (wcslen(DestString) + 2) * sizeof(CHAR16) ); if( pWrappedString->pNextWrappedString->sString == NULL) return (NULL); @@ -318,7 +318,7 @@ WRAPPED_STRING *LineWrap(UINT32 ulFont, UINT16 usLineWidthPixels, UINT16 *pusLin //allocate memory for the string pWrappedString->pNextWrappedString = (WRAPPED_STRING *) MemAlloc(sizeof(WRAPPED_STRING)); - pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc((wcslen(pNullString) +2 )* 2 ); + pWrappedString->pNextWrappedString->sString = (STR16) MemAlloc((wcslen(pNullString) +2 )* sizeof(CHAR16) ); wcscpy(pWrappedString->pNextWrappedString->sString, pNullString); pWrappedString->pNextWrappedString->pNextWrappedString = NULL; } @@ -381,11 +381,11 @@ UINT16 DisplayWrappedString(UINT16 usPosX, UINT16 usPosY, UINT16 usWidth, UINT8 //If we are to a Single char for a word ( like in Taiwan ) if( gfUseSingleCharWordsForWordWrap ) { - pFirstWrappedString = LineWrapForSingleCharWords(uiFont, usWidth, &usLineWidthIfWordIsWiderThenWidth, (STR16) pString); + pFirstWrappedString = LineWrapForSingleCharWords(uiFont, usWidth, &usLineWidthIfWordIsWiderThenWidth, pString); } else { - pFirstWrappedString = LineWrap(uiFont, usWidth, &usLineWidthIfWordIsWiderThenWidth, (STR16) pString); + pFirstWrappedString = LineWrap(uiFont, usWidth, &usLineWidthIfWordIsWiderThenWidth, pString); } //if an error occured and a word was bigger then the width passed in, reset the width @@ -1963,9 +1963,9 @@ FileStringPtr GetFirstStringOnThisPage( FileStringPtr RecordList, UINT32 uiFont, BOOLEAN ReduceStringLength( STR16 pString, UINT32 uiWidthToFitIn, UINT32 uiFont ) { - wchar_t OneChar[2]; - UINT16 zTemp[ 1024 ]; - wchar_t zStrDots[16]; + CHAR16 OneChar[2]; + CHAR16 zTemp[ 1024 ]; + CHAR16 zStrDots[16]; UINT32 uiDotWidth; UINT32 uiTempStringPixWidth=0; UINT32 uiStringPixWidth; @@ -2026,7 +2026,7 @@ BOOLEAN ReduceStringLength( STR16 pString, UINT32 uiWidthToFitIn, UINT32 uiFont //combine the temp string and the '...' to form the finished string - swprintf( (wchar_t *)pString, (wchar_t *)L"%s%s", zTemp, zStrDots ); + swprintf( pString, L"%s%s", zTemp, zStrDots ); return( TRUE ); } diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 5fa1b05a..bb684b84 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -49,7 +49,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; INVTYPE curItem; INVTYPE * curArray; UINT32 maxArraySize; @@ -62,7 +62,7 @@ typedef itemParseData; BOOLEAN localizedTextOnly; static void XMLCALL -itemStartElementHandle(void *userData, const char *name, const char **atts) +itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { itemParseData * pData = (itemParseData *)userData; @@ -227,7 +227,7 @@ itemStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -itemCharacterDataHandle(void *userData, const char *str, int len) +itemCharacterDataHandle(void *userData, const XML_Char *str, int len) { itemParseData * pData = (itemParseData *)userData; @@ -240,7 +240,7 @@ itemCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -itemEndElementHandle(void *userData, const char *name) +itemEndElementHandle(void *userData, const XML_Char *name) { itemParseData * pData = (itemParseData *)userData; char temp; @@ -1054,10 +1054,10 @@ BOOLEAN ReadInItemStats(STR fileName, BOOLEAN localizedVersion ) //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("done reading item stats")); - //wchar_t str[512]; + //CHAR16 str[512]; //for (int i = 0; i < MAXITEMS; i++) //{ - // swprintf(str,(STR16) Item[i].szLongItemName); + // swprintf(str, Item[i].szLongItemName); // DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("ReadInItemStats: long item name: %s", str)); //} @@ -1076,8 +1076,8 @@ BOOLEAN WriteItemStats() { UINT32 cnt; - wchar_t str[100]; - wchar_t strDesc[500]; + CHAR16 str[100]; + CHAR16 strDesc[500]; FilePrintf(hFile,"\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"); - wchar_t * szRemainder = str; //the remaining string to be output (for making valid XML) + STR16 szRemainder = str; //the remaining string to be output (for making valid XML) FilePrintf(hFile,"\t\r\n"); FilePrintf(hFile,"\t\t%d\r\n", cnt); @@ -1093,13 +1093,13 @@ BOOLEAN WriteItemStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - wchar_t invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder, L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } @@ -1145,13 +1145,13 @@ BOOLEAN WriteItemStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - wchar_t invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder, L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } @@ -1196,8 +1196,8 @@ BOOLEAN WriteItemStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - wchar_t invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder, L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writeitemstats: characters set"); @@ -1206,7 +1206,7 @@ BOOLEAN WriteItemStats() //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("writeitemstats: setting remainder[%d] to \0",uiCharLoc)); szRemainder[uiCharLoc] = '\0'; //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("writeitemstats: printing '%s' to file",szRemainder)); - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("writeitemstats: setting remainder[%d] to %d",uiCharLoc,invChar)); szRemainder[uiCharLoc] = invChar; } @@ -1248,7 +1248,7 @@ BOOLEAN WriteItemStats() //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writeitemstats: end tag printed"); - //wchar_t sText[400]; + //CHAR16 sText[400]; //UINT32 uiStartLoc=0; //#define BOBBYR_ITEM_DESC_NAME_SIZE 160 @@ -1267,13 +1267,13 @@ BOOLEAN WriteItemStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - wchar_t invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } @@ -1323,13 +1323,13 @@ BOOLEAN WriteItemStats() FilePrintf(hFile,"\t\t"); while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - wchar_t invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } diff --git a/Utils/XML_Strings.cpp b/Utils/XML_Strings.cpp index 35cdf48d..51564e94 100644 --- a/Utils/XML_Strings.cpp +++ b/Utils/XML_Strings.cpp @@ -48,7 +48,7 @@ struct { PARSE_STAGE curElement; - INT8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; UINT32 maxArraySize; UINT32 curIndex; @@ -58,7 +58,7 @@ struct typedef stringParseData; static void XMLCALL -stringStartElementHandle(void *userData, const char *name, const char **atts) +stringStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) { stringParseData * pData = (stringParseData *)userData; @@ -86,7 +86,7 @@ stringStartElementHandle(void *userData, const char *name, const char **atts) } static void XMLCALL -stringCharacterDataHandle(void *userData, const char *str, int len) +stringCharacterDataHandle(void *userData, const XML_Char *str, int len) { stringParseData * pData = (stringParseData *)userData; @@ -99,7 +99,7 @@ stringCharacterDataHandle(void *userData, const char *str, int len) static void XMLCALL -stringEndElementHandle(void *userData, const char *name) +stringEndElementHandle(void *userData, const XML_Char *name) { stringParseData * pData = (stringParseData *)userData; @@ -115,7 +115,7 @@ stringEndElementHandle(void *userData, const char *name) if(pData->curIndex < pData->maxArraySize) { - strcpy(AmmoCaliber[pData->curIndex],pData->szCharData); + swprintf(AmmoCaliber[pData->curIndex], L"%S", pData->szCharData); } } @@ -207,17 +207,17 @@ BOOLEAN WriteStringArray() { FilePrintf(hFile,"\t"); - wchar_t * szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML) + STR16 szRemainder = AmmoCaliber[cnt]; //the remaining string to be output (for making valid XML) while(szRemainder[0] != '\0') { - UINT32 uiCharLoc = strcspn(szRemainder,"&<>\'\"\0"); - UINT16 invChar = szRemainder[uiCharLoc]; + UINT32 uiCharLoc = wcscspn(szRemainder,L"&<>\'\"\0"); + CHAR16 invChar = szRemainder[uiCharLoc]; if(uiCharLoc) { szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%s",szRemainder); + FilePrintf(hFile,"%S",szRemainder); szRemainder[uiCharLoc] = invChar; } diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 17e8d2a4..6ef2c8fd 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -112,13 +112,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -128,7 +128,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 kal", @@ -156,7 +156,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 kal", @@ -177,7 +177,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Other", L"Pistol", @@ -190,7 +190,7 @@ wchar_t WeaponType[][30] = L"Shotgun", }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Beurt speler", L"Beurt opponent", @@ -200,7 +200,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1117,7 +1117,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. -wchar_t zHealthStr[][13] = +CHAR16 zHealthStr[][13] = { L"STERVEND", // >= 0 L"KRITIEK", // >= 15 @@ -1150,7 +1150,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Wat?", //meaning "Repeat yourself" L"Aardig", //approach in a friendly @@ -1161,7 +1161,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Koop/Verkoop", //Buy/Sell L"Koop", //Buy @@ -1169,7 +1169,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Repareer", //Repair }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1210,7 +1210,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Luchtaanval", L"Automatisch EHBO toepassen?", @@ -2550,7 +2550,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Je bent verslagen in deze sector!", L"De vijand, geen genade kennende, slacht ieder teamlid af!", @@ -3790,7 +3790,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Scroll Omhoog", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 5b8f6d7a..56b6d4ab 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -118,13 +118,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -134,7 +134,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 cal", @@ -164,7 +164,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 cal", @@ -188,7 +188,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[MAXITEMS][30] = +CHAR16 WeaponType[MAXITEMS][30] = { L"Other", L"Pistol", @@ -201,7 +201,7 @@ wchar_t WeaponType[MAXITEMS][30] = L"Shotgun", }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Player's Turn", // player's turn L"Opponents' Turn", @@ -211,7 +211,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1079,7 +1079,7 @@ STR16 sKeyDescriptionStrings[2] = //The headers used to describe various weapon statistics. -wchar_t gWeaponStatsDesc[][ 14 ] = +CHAR16 gWeaponStatsDesc[][ 14 ] = { L"Weight (%s):", L"Status:", @@ -1102,7 +1102,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] = //The headers used for the merc's money. -wchar_t gMoneyStatsDesc[][ 13 ] = +CHAR16 gMoneyStatsDesc[][ 13 ] = { L"Amount", L"Remaining:", //this is the overall balance @@ -1118,7 +1118,7 @@ wchar_t 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. -wchar_t zHealthStr[][13] = +CHAR16 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." -wchar_t gzProsLabel[10] = +CHAR16 gzProsLabel[10] = { L"Pros:", }; -wchar_t gzConsLabel[10] = +CHAR16 gzConsLabel[10] = { L"Cons:", }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Come Again?", //meaning "Repeat yourself" L"Friendly", //approach in a friendly @@ -1162,7 +1162,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Buy/Sell", L"Buy", @@ -1170,7 +1170,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Repair", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Done", }; @@ -1211,7 +1211,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Air Raid", L"Apply first aid automatically?", @@ -2553,7 +2553,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 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!", @@ -3795,7 +3795,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Scroll Up", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 4aa68a54..ce1361ad 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -117,13 +117,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -133,7 +133,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L"cal .38", @@ -161,7 +161,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L"cal .38", @@ -182,7 +182,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Divers", L"Pistolet", @@ -195,7 +195,7 @@ wchar_t WeaponType[][30] = L"Fusil à pompe", }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Tour du joueur", // player's turn L"Tour de l'adversaire", @@ -205,7 +205,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1107,7 +1107,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. -wchar_t zHealthStr[][13] = +CHAR16 zHealthStr[][13] = { L"MOURANT", // >= 0 L"CRITIQUE", // >= 15 @@ -1140,7 +1140,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Pardon ?", //meaning "Repeat yourself" L"Amical", //approach in a friendly @@ -1151,7 +1151,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Acheter/Vendre", L"Acheter", @@ -1159,7 +1159,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Réparer", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1200,7 +1200,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Raid aérien", L"Appliquer les premiers soins ?", @@ -2539,7 +2539,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Vous avez été vaincu dans ce secteur !", L"L'ennemi, sans aucune compassion, ne fait pas de quartier !", @@ -3780,7 +3780,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Défilement haut", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index f795fd3d..a7202658 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -118,12 +118,12 @@ STR16 pCreditsJA2113[] = L"@};(Alle weiteren Community Mitglieder die Ideen und Feedback eingebracht haben!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -133,7 +133,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 Kal", @@ -161,7 +161,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 Kal", @@ -181,7 +181,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= // L"", // dart //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Andere", L"Pistole", @@ -194,7 +194,7 @@ wchar_t WeaponType[][30] = L"Schrotflinte", }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Spielzug Spieler", L"Spielzug Gegner", @@ -204,7 +204,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1048,7 +1048,7 @@ STR16 sKeyDescriptionStrings[2]= }; //The headers used to describe various weapon statistics. -wchar_t gWeaponStatsDesc[][ 14 ] = //USED TO BE 13 +CHAR16 gWeaponStatsDesc[][ 14 ] = //USED TO BE 13 { L"Gew. (%s):", //weight L"Status:", @@ -1068,7 +1068,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] = //USED TO BE 13 }; //The headers used for the merc's money. -wchar_t gMoneyStatsDesc[][ 13 ] = +CHAR16 gMoneyStatsDesc[][ 13 ] = { L"Betrag", L"Verbleibend:", //this is the overall balance @@ -1082,7 +1082,7 @@ wchar_t 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. -wchar_t zHealthStr[][13] = //used to be 10 +CHAR16 zHealthStr[][13] = //used to be 10 { L"STIRBT", // >= 0 L"KRITISCH", // >= 15 @@ -1104,18 +1104,18 @@ STR16 gzMoneyAmounts[6] = }; // short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons." -wchar_t gzProsLabel[10] = +CHAR16 gzProsLabel[10] = { L"Pro:", }; -wchar_t gzConsLabel[10] = +CHAR16 gzConsLabel[10] = { L"Kontra:", }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Wie bitte?", //meaning "Repeat yourself" L"Freundlich", //approach in a friendly @@ -1126,7 +1126,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Handeln", L"Kaufen", @@ -1134,7 +1134,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Reparieren", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Fertig", }; @@ -1170,7 +1170,7 @@ STR16 zVehicleName[] = }; //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Luftangriff", L"Automatisch Erste Hilfe leisten?", @@ -2447,7 +2447,7 @@ STR16 pUpdatePanelButtons[] = }; // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Sie sind in diesem Sektor geschlagen worden!", L"Der Feind hat kein Erbarmen mit den Seelen Ihrer Teammitglieder und verschlingt jeden einzelnen.", @@ -3595,7 +3595,7 @@ STR16 pMessageStrings[] = #endif }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Hochscrollen", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 1fe9e89b..78b07841 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -110,13 +110,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -126,7 +126,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L"cal .38", @@ -154,7 +154,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L"cal .38", @@ -175,7 +175,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Altro", L"Arma", @@ -188,7 +188,7 @@ wchar_t WeaponType[][30] = L"Fucile a canne mozze", }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Turno del giocatore", // player's turn L"Turno degli avversari", @@ -198,7 +198,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1100,7 +1100,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. -wchar_t zHealthStr[][13] = +CHAR16 zHealthStr[][13] = { L"MORENTE", // >= 0 L"CRITICO", // >= 15 @@ -1133,7 +1133,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Vuoi ripetere?", //meaning "Repeat yourself" L"Amichevole", //approach in a friendly @@ -1144,7 +1144,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Compra/Vendi", L"Compra", @@ -1152,7 +1152,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Ripara", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Fine", }; @@ -1193,7 +1193,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Attacco aereo", L"Ricorrete al pronto soccorso automaticamente?", @@ -2533,7 +2533,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Siete stati sconfitti in questo settore!", L"Il nemico, non avendo alcuna pietà delle anime della squadra, divorerà ognuno di voi!", @@ -3772,7 +3772,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Scorrimento su", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 8cd3adb1..cccf08a1 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -111,13 +111,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"", }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"", }; @@ -127,7 +127,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 cal", @@ -155,7 +155,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 cal", @@ -176,7 +176,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Inny", L"Pistolet", @@ -189,7 +189,7 @@ wchar_t WeaponType[][30] = L"Strzelba" }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Tura gracza", // player's turn L"Tura przeciwnika", @@ -199,7 +199,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1101,7 +1101,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. -wchar_t zHealthStr[][13] = +CHAR16 zHealthStr[][13] = { L"UMIERAJ¥CY", // >= 0 L"KRYTYCZNY", // >= 15 @@ -1134,7 +1134,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Powtórz", //meaning "Repeat yourself" L"PrzyjaŸnie", //approach in a friendly @@ -1145,7 +1145,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Kup/Sprzedaj", L"Kup", @@ -1153,7 +1153,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Napraw", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1194,7 +1194,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Nalot", L"Udzieliæ automatycznie pierwszej pomocy?", @@ -2533,7 +2533,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Pokonano ciê w tym sektorze!", L"Wróg nie zna litoœci i po¿era was wszystkich!", @@ -3772,7 +3772,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"W górê", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 45fcf4f9..0b3c3180 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -110,13 +110,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -wchar_t ItemNames[MAXITEMS][80] = +CHAR16 ItemNames[MAXITEMS][80] = { L"" }; -wchar_t ShortItemNames[MAXITEMS][80] = +CHAR16 ShortItemNames[MAXITEMS][80] = { L"" }; @@ -126,7 +126,7 @@ wchar_t ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t AmmoCaliber[MAXITEMS][20];// = +CHAR16 AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L",38 êàë", @@ -156,7 +156,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L",38 êàë", @@ -180,7 +180,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -wchar_t WeaponType[][30] = +CHAR16 WeaponType[][30] = { L"Äðóãîå", L"Ïèñòîëåò", @@ -193,7 +193,7 @@ wchar_t WeaponType[][30] = L"Ðåâîëüâåð" }; -wchar_t TeamTurnString[][STRING_LENGTH] = +CHAR16 TeamTurnString[][STRING_LENGTH] = { L"Õîä Èãðîêà", // player's turn L"Õîä Îïïîíåíòà", @@ -203,7 +203,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] = // planning turn }; -wchar_t Message[][STRING_LENGTH] = +CHAR16 Message[][STRING_LENGTH] = { L"", @@ -1072,7 +1072,7 @@ STR16 sKeyDescriptionStrings[2] = //The headers used to describe various weapon statistics. -wchar_t gWeaponStatsDesc[][ 14 ] = +CHAR16 gWeaponStatsDesc[][ 14 ] = { L"Âåñ (%s):", L"Ñòàòóñ:", @@ -1093,7 +1093,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] = //The headers used for the merc's money. -wchar_t gMoneyStatsDesc[][ 13 ] = +CHAR16 gMoneyStatsDesc[][ 13 ] = { L"Êîë-âî", L"Îñòàëîñü:", //this is the overall balance @@ -1109,7 +1109,7 @@ wchar_t 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. -wchar_t zHealthStr[][13] = +CHAR16 zHealthStr[][13] = { L"ÓÌÈÐÀÅÒ", // >= 0 L"ÊÐÈÒÈ×ÅÍ", // >= 15 @@ -1131,18 +1131,18 @@ STR16 gzMoneyAmounts[6] = }; // short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons." -wchar_t gzProsLabel[10] = +CHAR16 gzProsLabel[10] = { L"Çà:", }; -wchar_t gzConsLabel[10] = +CHAR16 gzConsLabel[10] = { L"Ïðîò:", }; //Conversation options a player has when encountering an NPC -wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Åùå ðàç?", //meaning "Repeat yourself" L"Äðóæåñêè", //approach in a friendly @@ -1153,7 +1153,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= +CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Êóï/Ïðîä", L"Êóï.", @@ -1161,7 +1161,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Ðåìîíò", }; -wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = +CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Ãîòîâî", }; @@ -1202,7 +1202,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -wchar_t TacticalStr[][ MED_STRING_LENGTH ] = +CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = { L"Âîçäóøíûé Ðåéä", L"Îêàçûâàòü ïåðâ.ïîìîùü ñðàçó?", @@ -2542,7 +2542,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L" ýòîì ñåêòîðå âàì íàíåñëè ïîðàæåíèå!", L"Âðàã, íå èñïûòûâàÿ óãðûçåíèé ñîâåñòè, ïîæðåò âñåõ äî åäèíîãî!", @@ -3783,7 +3783,7 @@ STR16 pMessageStrings[] = }; -wchar_t ItemPickupHelpPopup[][40] = +CHAR16 ItemPickupHelpPopup[][40] = { L"OK", L"Ëèñòàòü ââåðõ", diff --git a/Utils/message.cpp b/Utils/message.cpp index ed6f5cf8..1ac13664 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -234,7 +234,7 @@ BOOLEAN CreateStringVideoOverlay( ScrollStringStPtr pStringSt, UINT16 usX, UINT1 VideoOverlayDesc.ubFontFore = (unsigned char)pStringSt->usColor; VideoOverlayDesc.sX = VideoOverlayDesc.sLeft; VideoOverlayDesc.sY = VideoOverlayDesc.sTop; - swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)pStringSt->pString16 ); + swprintf( VideoOverlayDesc.pzText, pStringSt->pString16 ); VideoOverlayDesc.BltCallback = BlitString; pStringSt->iVideoOverlay = RegisterVideoOverlay( ( VOVERLAY_DIRTYBYTEXT ), &VideoOverlayDesc ); @@ -575,7 +575,7 @@ void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...) { //__try //{ - wchar_t DestString[512]; + CHAR16 DestString[512]; va_list argptr; if( fDisableJustForIan == TRUE ) @@ -707,12 +707,12 @@ void TacticalScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... ) UINT16 usStringLength=0; UINT16 usCurrentSPosition=0; UINT16 usCurrentLookup=0; - //wchar_t *pString; + //STR16pString; BOOLEAN fLastLine=FALSE; va_list argptr; - wchar_t DestString[512];//, DestStringA[ 512 ]; - //wchar_t *pStringBuffer; + CHAR16 DestString[512];//, DestStringA[ 512 ]; + //STR16pStringBuffer; BOOLEAN fMultiLine=FALSE; ScrollStringStPtr pTempStringSt=NULL; WRAPPED_STRING *pStringWrapper=NULL; @@ -860,11 +860,11 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... ) UINT16 usStringLength=0; UINT16 usCurrentSPosition=0; UINT16 usCurrentLookup=0; - //wchar_t *pString; + //STR16pString; BOOLEAN fLastLine=FALSE; va_list argptr; - wchar_t DestString[512], DestStringA[ 512 ]; - //wchar_t *pStringBuffer; + CHAR16 DestString[512], DestStringA[ 512 ]; + //STR16pStringBuffer; BOOLEAN fMultiLine=FALSE; WRAPPED_STRING *pStringWrapper=NULL; WRAPPED_STRING *pStringWrapperHead=NULL; diff --git a/aniviewscreen.cpp b/aniviewscreen.cpp index eab29191..7436ea47 100644 --- a/aniviewscreen.cpp +++ b/aniviewscreen.cpp @@ -326,7 +326,7 @@ UINT32 AniEditScreenHandle(void) } -UINT16 GetAnimStateFromName( INT8 *zName ) +UINT16 GetAnimStateFromName( STR8 zName ) { INT32 cnt; @@ -346,11 +346,11 @@ UINT16 GetAnimStateFromName( INT8 *zName ) void BuildListFile( ) { FILE *infoFile; - char currFilename[128]; + CHAR8 currFilename[128]; int numEntries = 0; int cnt; UINT16 usState; - wchar_t zError[128]; + CHAR16 zError[128]; //Verify the existance of the header text file. @@ -383,7 +383,7 @@ void BuildListFile( ) currFilename[ strlen( currFilename ) -1 ] = '\0'; currFilename[ strlen( currFilename ) -1 ] = '\0'; - usState = GetAnimStateFromName( (INT8 *)currFilename ); + usState = GetAnimStateFromName( currFilename ); if ( usState != 5555 ) { @@ -393,7 +393,7 @@ void BuildListFile( ) } else { - swprintf( (wchar_t *)zError, (wchar_t *)L"Animation str %S is not known: ", currFilename ); + swprintf( zError, L"Animation str %S is not known: ", currFilename ); DoMessageBox( MSG_BOX_BASIC_STYLE, zError, ANIEDIT_SCREEN, ( UINT8 )MSG_BOX_FLAG_YESNO, NULL, NULL ); fclose( infoFile ); return; diff --git a/gamescreen.cpp b/gamescreen.cpp index 31cd9830..c3681fca 100644 --- a/gamescreen.cpp +++ b/gamescreen.cpp @@ -165,7 +165,7 @@ UINT32 MainGameScreenInit(void) VideoOverlayDesc.ubFontFore = FONT_MCOLOR_DKGRAY ; VideoOverlayDesc.sX = VideoOverlayDesc.sLeft; VideoOverlayDesc.sY = VideoOverlayDesc.sTop; - swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)L"90" ); + swprintf( VideoOverlayDesc.pzText, L"90" ); VideoOverlayDesc.BltCallback = BlitMFont; giFPSOverlay = RegisterVideoOverlay( ( VOVERLAY_STARTDISABLED | VOVERLAY_DIRTYBYTEXT ), &VideoOverlayDesc ); @@ -174,7 +174,7 @@ UINT32 MainGameScreenInit(void) VideoOverlayDesc.sTop = 0; VideoOverlayDesc.sX = VideoOverlayDesc.sLeft; VideoOverlayDesc.sY = VideoOverlayDesc.sTop; - swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)L"Levelnodes: 100000" ); + swprintf( VideoOverlayDesc.pzText, L"Levelnodes: 100000" ); VideoOverlayDesc.BltCallback = BlitMFont; giCounterPeriodOverlay = RegisterVideoOverlay( ( VOVERLAY_STARTDISABLED | VOVERLAY_DIRTYBYTEXT ), &VideoOverlayDesc ); diff --git a/jascreens.cpp b/jascreens.cpp index 39889e1f..6e0f44c0 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -151,12 +151,12 @@ void DisplayFrameRate( ) { // FRAME RATE memset( &VideoOverlayDesc, 0, sizeof( VideoOverlayDesc ) ); - swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)L"%ld", __min( uiFPS, 1000 ) ); + swprintf( VideoOverlayDesc.pzText, L"%ld", __min( uiFPS, 1000 ) ); VideoOverlayDesc.uiFlags = VOVERLAY_DESC_TEXT; UpdateVideoOverlay( &VideoOverlayDesc, giFPSOverlay, FALSE ); // TIMER COUNTER - swprintf( (wchar_t *)VideoOverlayDesc.pzText, (wchar_t *)L"%ld", __min( giTimerDiag, 1000 ) ); + swprintf( VideoOverlayDesc.pzText, L"%ld", __min( giTimerDiag, 1000 ) ); VideoOverlayDesc.uiFlags = VOVERLAY_DESC_TEXT; UpdateVideoOverlay( &VideoOverlayDesc, giCounterPeriodOverlay, FALSE ); @@ -266,7 +266,7 @@ UINT32 ErrorScreenHandle(void) InputAtom InputEvent; static BOOLEAN fFirstTime = FALSE; #ifdef JA2BETAVERSION - wchar_t str[256]; + CHAR16 str[256]; #endif // For quick setting of new video stuff / to be changed diff --git a/jascreens.h b/jascreens.h index 84f37276..265ed9f7 100644 --- a/jascreens.h +++ b/jascreens.h @@ -125,7 +125,7 @@ void DisplayFrameRate( ); void HandleTitleScreenAnimation(); //External Globals -extern UINT8 gubFilename[ 200 ]; +extern CHAR8 gubFilename[ 200 ]; extern UINT32 guiCurrentScreen; typedef void (*RENDER_HOOK)( void );