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
2026-08-12 14:10:23 +02:00 · 2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
@@ -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;
@@ -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
@@ -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 )
 			{
@@ -354,7 +354,7 @@ UINT16    WFGetFontHeight( INT32 FontNum )
 }


-INT16 WFStringPixLength( wchar_t *string,INT32 UseFont )
+INT16 WFStringPixLength( STR16 string,INT32 UseFont )
 {
  if ( USE_WINFONTS( ) )
  {
@@ -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 );



@@ -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;
@@ -2,6 +2,7 @@
 #define INIREADER_H

 #include <Windows.h>
+#include <Types.h>

 // 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];
 };
@@ -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);
@@ -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;

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

@@ -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 ) )
@@ -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 )
@@ -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 );
@@ -964,7 +964,7 @@ void LoadAllExternalText( void )
 	LoadAllItemNames();
 }

-wchar_t* GetWeightUnitString( void )
+STR16 GetWeightUnitString( void )
 {
 	if ( gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] ) // metric
 	{
@@ -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 );


@@ -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 ) );
@@ -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
@@ -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 );
 }
@@ -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,"<ITEMLIST>\r\n");
 		for(cnt = 0;cnt < 351;cnt++)//just do the old limit for now
@@ -1085,7 +1085,7 @@ BOOLEAN WriteItemStats()
 			LoadShortNameItemInfo( (UINT16)cnt, str );

 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writeitemstats: itemname");
-			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<ITEM>\r\n");
 			FilePrintf(hFile,"\t\t<uiIndex>%d</uiIndex>\r\n",									cnt);
@@ -1093,13 +1093,13 @@ BOOLEAN WriteItemStats()
 			FilePrintf(hFile,"\t\t<szItemName>");
 			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<szLongItemName>");
 			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<szItemDesc>");
 			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<szBRName>");
 			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<szBRDesc>");
 			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;
 				}

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

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

@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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ê",
@@ -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"Ëèñòàòü ââåðõ",
@@ -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;