bug fixes from Overhaul:

- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521

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;

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;

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--;

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 );

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;

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;

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",

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 ];
 

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 )
 {

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 );

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

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);

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

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 };
   

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 );

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);
 
 	

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;
 

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."

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

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"" );
 

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);

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;
 

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;
 

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 <change 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;

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 )
 	{

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 );