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-07-22 13:40:22 +02:00 · 2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
@@ -37,7 +37,7 @@ extern INT16 sGridX; // symbol already declared globally in editscreen.cpp (jona
 extern INT16 sGridY; // symbol already declared globally in editscreen.cpp (jonathanl)
 INT16 sBadMarker = -1;

-UINT16 *wszSelType[6]= { L"Small", L"Medium", L"Large", L"XLarge", L"Width: xx", L"Area" };
+STR16 wszSelType[6]= { L"Small", L"Medium", L"Large", L"XLarge", L"Width: xx", L"Area" };

 BOOLEAN gfAllowRightButtonSelections = FALSE;
 BOOLEAN gfCurrentSelectionWithRightButton = FALSE;
@@ -29,7 +29,7 @@ void IncreaseSelectionDensity();
 void DecreaseSelectionDensity();
 void RemoveCursors();

-extern UINT16 *wszSelType[6];
+extern STR16 wszSelType[6];

 extern BOOLEAN gfCurrentSelectionWithRightButton;

@@ -48,8 +48,8 @@ void InitEditorItemStatsButtons()

 void InitEditorMercsToolbar()
 {
-	INT16 TempString[30];
-	UINT16 *FaceDirs[8] = {L"north",L"northeast",L"east",L"southeast",L"south",L"southwest",L"west",L"northwest"};
+	CHAR16 TempString[30];
+	STR16 FaceDirs[8] = {L"north",L"northeast",L"east",L"southeast",L"south",L"southwest",L"west",L"northwest"};
 	INT32 x;

 	iEditorButton[ MERCS_PLAYERTOGGLE ] = 
@@ -256,8 +256,8 @@ void InitEditorMercsToolbar()
 		iScreenWidthOffset + 360, 2 * iScreenHeightOffset + 395, 30, 30, BUTTON_TOGGLE, MSYS_PRIORITY_NORMAL + 1, DEFAULT_MOVE_CALLBACK, MercsDirectionSetCallback );
 	for ( x = 0; x < 8; x++ )
 	{ 
-		swprintf( (wchar_t *)TempString, (wchar_t *)L"Set merc to face %s", FaceDirs[x] );
-		SetButtonFastHelpText( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], (UINT16 *) TempString );
+		swprintf( TempString, L"Set merc to face %s", FaceDirs[x] );
+		SetButtonFastHelpText( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], TempString );
 		MSYS_SetBtnUserData( iEditorButton[ FIRST_MERCS_DIRECTION_BUTTON + x ], 0, x);
 	}

@@ -428,10 +428,10 @@ void EnableEditorTaskbar(void)
 //A specialized mprint function that'll restore the editor panel underneath the
 //string before rendering the string.  This is obviously only useful for drawing text
 //in the editor taskbar.
-void mprintfEditor(INT16 x, INT16 y, UINT16 *pFontString, ...)
+void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...)
 {
 	va_list argptr;
-	wchar_t	string[512];
+	CHAR16	string[512];
 	UINT16 uiStringLength, uiStringHeight;

 	Assert( pFontString != NULL );
@@ -475,7 +475,7 @@ void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom )
 //This is a new function which duplicates the older "yellow info boxes" that
 //are common throughout the editor.  This draws the yellow box with the indentation
 //look.
-void DrawEditorInfoBox( wchar_t *str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h )
+void DrawEditorInfoBox( STR16 str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h )
 {
 	UINT16 usFillColorDark, usFillColorLight, usFillColorBack;
 	UINT16 x2, y2;
@@ -694,7 +694,7 @@ void RenderMapEntryPointsAndLights()
 	}
 }

-void BuildTriggerName( OBJECTTYPE *pItem, UINT16 *szItemName )
+void BuildTriggerName( OBJECTTYPE *pItem, STR16 szItemName )
 {
 	if( pItem->usItem == SWITCH )
 	{
@@ -727,7 +727,7 @@ void RenderDoorLockInfo()
 {
 	INT16 i, xp, yp;
 	INT16 sScreenX, sScreenY;
-	wchar_t str[ 50 ];
+	CHAR16 str[ 50 ];
 	for( i = 0; i < gubNumDoors; i++ )
 	{
 		GetGridNoScreenPos( DoorTable[ i ].sGridNo, 0, &sScreenX, &sScreenY );
@@ -781,7 +781,7 @@ void RenderSelectedItemBlownUp()
 	HVOBJECT hVObject;
 	INT16 sScreenX, sScreenY, xp, yp;
 	ITEM_POOL	*pItemPool;
-	UINT16 szItemName[ SIZE_ITEM_NAME ];
+	CHAR16 szItemName[ SIZE_ITEM_NAME ];
 	INT32 i;
 	INT16 sWidth, sHeight, sOffsetX, sOffsetY;

@@ -826,7 +826,7 @@ void RenderSelectedItemBlownUp()

 	if( gpItem->usItem == ACTION_ITEM )
 	{
-		UINT16 *pStr;
+		STR16 pStr;
 		pStr = GetActionItemName( gpItem );
 		xp = sScreenX - (StringPixLength( pStr, FONT10ARIALBOLD ) - 40) / 2;
 		yp += 10;
@@ -865,7 +865,7 @@ void RenderSelectedItemBlownUp()

 void RenderEditorInfo( )
 {
-	wchar_t					FPSText[ 50 ];
+	CHAR16					FPSText[ 50 ];
 	static INT32		iSpewWarning = 0;
 	INT16						iMapIndex;

@@ -53,9 +53,9 @@ void DisableEditorRegion( INT8 bRegionID );


 //Rendering Utils
-void mprintfEditor(INT16 x, INT16 y, wchar_t *pFontString, ...);
+void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...);
 void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom );
-void DrawEditorInfoBox( wchar_t *str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h );
+void DrawEditorInfoBox( STR16 str, UINT32 uiFont, UINT16 x, UINT16 y, UINT16 w, UINT16 h );

 extern INT32	giEditMercDirectionIcons[2];
 extern UINT32 guiMercInventoryPanel;
@@ -729,7 +729,7 @@ void RemoveLockedDoorCursors()

 void SetupTextInputForBuildings()
 {
-	wchar_t str[4];
+	CHAR16 str[4];
 	InitTextInputModeWithScheme( DEFAULT_SCHEME );
 	AddUserInputField( NULL );  //just so we can use short cut keys while not typing.
 	swprintf( str, L"%d", gubMaxRoomNumber );
@@ -738,7 +738,7 @@ void SetupTextInputForBuildings()

 void ExtractAndUpdateBuildingInfo()
 {
-	wchar_t str[4];
+	CHAR16 str[4];
 	INT32 temp;
 	//extract light1 colors
 	temp = min( GetNumericStrictValueFromField( 1 ), 255 );
@@ -221,8 +221,8 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 	INT16 sWidth, sOffset, sStart;
 	INT16 i, x, y;
 	UINT16 usCounter;
-	INT16 pStr[ 100 ];//, pStr2[ 100 ];
-	UINT16 pItemName[SIZE_ITEM_NAME];
+	CHAR16 pStr[ 100 ];//, pStr2[ 100 ];
+	CHAR16 pItemName[SIZE_ITEM_NAME];
 	UINT8						ubBitDepth;
 	BOOLEAN fTypeMatch;
 	INT32 iEquipCount = 0;
@@ -366,8 +366,8 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 			SetFontForeground( FONT_MCOLOR_WHITE );
 			SetFontDestBuffer( eInfo.uiBuffer, 0, 0, eInfo.sWidth, eInfo.sHeight, FALSE );

-			swprintf( (wchar_t *)pStr, (wchar_t *)L"%S", LockTable[ i ].ubEditorName );
-			DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16) pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
+			swprintf( pStr, L"%S", LockTable[ i ].ubEditorName );
+			DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE,  pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );

 			//Calculate the center position of the graphic in a 60 pixel wide area.
 			sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth;
@@ -474,46 +474,46 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 				if( eInfo.uiItemType != TBAR_MODE_ITEM_TRIGGERS )
 				{
 					LoadItemInfo( usCounter, pItemName, NULL );
-					swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", pItemName );
+					swprintf( pStr, L"%s", pItemName );
 				}
 				else
 				{
 					if( i == PRESSURE_ACTION_ID )
 					{
-						swprintf( (wchar_t *)pStr, (wchar_t *)L"Pressure Action" );
+						swprintf( pStr, L"Pressure Action" );
 					}
 					else if( i < 2 )
 					{
 						if( usCounter == SWITCH )
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger1" );
+							swprintf( pStr, L"Panic Trigger1" );
 						else
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action1" );
+							swprintf( pStr, L"Panic Action1" );
 					}
 					else if( i < 4 )
 					{
 						if( usCounter == SWITCH )
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger2" );
+							swprintf( pStr, L"Panic Trigger2" );
 						else
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action2" );
+							swprintf( pStr, L"Panic Action2" );
 					}
 					else if( i < 6 )
 					{
 						if( usCounter == SWITCH )
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger3" );
+							swprintf( pStr, L"Panic Trigger3" );
 						else
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action3" );
+							swprintf( pStr, L"Panic Action3" );
 					}
 					else
 					{
 						if( usCounter == SWITCH )
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Trigger%d", (i-4)/2 );
+							swprintf( pStr, L"Trigger%d", (i-4)/2 );
 						else
-							swprintf( (wchar_t *)pStr, (wchar_t *)L"Action%d", (i-4)/2 );
+							swprintf( pStr, L"Action%d", (i-4)/2 );
 					}
 				}

 				// WANNE: EDITOR?
-				DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16)pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
+				DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );

 				//Calculate the center position of the graphic in a 60 pixel wide area.
 				sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth;
@@ -1616,7 +1616,7 @@ void DisplayItemStatistics()
 {
 	BOOLEAN fUseSelectedItem;
 	INT16 usItemIndex;
-	UINT16 pItemName[SIZE_ITEM_NAME];
+	CHAR16 pItemName[SIZE_ITEM_NAME];
 	INVTYPE *pItem;
 	
 	if( !eInfo.fActive )
@@ -68,7 +68,7 @@ BOOLEAN gfEditorForceShadeTableRebuild = FALSE;

 void SetupTextInputForMapInfo()
 {
-	wchar_t str[10];
+	CHAR16 str[10];
 	
 	InitTextInputModeWithScheme( DEFAULT_SCHEME );

@@ -149,7 +149,7 @@ void UpdateMapInfo()

 void UpdateMapInfoFields()
 {
-	wchar_t str[10];
+	CHAR16 str[10];
 	//Update the text fields to reflect the validated values.
 	//light rgb fields
 	swprintf( str, L"%d", gEditorLightColor.peRed );
@@ -175,7 +175,7 @@ void UpdateMapInfoFields()

 void ExtractAndUpdateMapInfo()
 {
-	wchar_t str[10];
+	CHAR16 str[10];
 	INT32 temp;
 	BOOLEAN fUpdateLight1 = FALSE;
 	//extract light1 colors
@@ -246,7 +246,7 @@ void ExtractAndUpdateMapInfo()

 BOOLEAN ApplyNewExitGridValuesToTextFields()
 {
-	wchar_t str[10];
+	CHAR16 str[10];
 	//exit grid input fields
 	if( iCurrentTaskbar != TASK_MAPINFO )
 		return FALSE;
@@ -74,7 +74,7 @@ extern void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT1
 //	SANMONA_ARMS_GROUP,
 //	ANGELS_GROUP,
 //	NUM_CIV_GROUPS
-UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] = 
+CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] = 
 {
 	L"NONE",
 	L"REBEL",
@@ -112,7 +112,7 @@ UINT16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] =
 //	SCHEDULE_ACTION_ENTERSECTOR,
 //	SCHEDULE_ACTION_STAYINSECTOR,
 //  SCHEDULE_ACTION_SLEEP,
-UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20] = 
+CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20] = 
 {
 	L"No action",
 	L"Lock door",
@@ -185,7 +185,7 @@ void SetupTextInputForMercSchedule();
 void ExtractAndUpdateMercAttributes();
 void ExtractAndUpdateMercProfile();
 void ExtractAndUpdateMercSchedule();
-void CalcStringForValue( wchar_t *str, INT32 iValue, UINT32 uiMax );
+void CalcStringForValue( STR16 str, INT32 iValue, UINT32 uiMax );
 void ChangeBodyType( INT8 bOffset );  //+1 or -1 only

 //internal merc variables
@@ -264,21 +264,21 @@ BOOLEAN gfShowCivilians = TRUE;

 INT16 sCurBaseDiff = DEFAULT_DIFF;
 BOOLEAN fAskForBaseDifficulty = TRUE;
-UINT16 *zDiffNames[NUM_DIFF_LVLS] = { L"Wimp", L"Easy", L"Average", L"Tough", L"Steroid Users Only" };
+STR16 zDiffNames[NUM_DIFF_LVLS] = { L"Wimp", L"Easy", L"Average", L"Tough", L"Steroid Users Only" };
 INT16 sBaseStat[NUM_DIFF_LVLS] = { 50, 60, 70, 80, 90 };
 INT16 sBaseExpLvl[NUM_DIFF_LVLS] = { 1, 3, 5, 7, 9 };

-UINT16 *EditMercStat[12] = { L"Max Health",L"Cur Health",L"Strength",
+STR16 EditMercStat[12] = { L"Max Health",L"Cur Health",L"Strength",
 														 L"Agility",L"Dexterity",L"Charisma",
 														 L"Wisdom",L"Marksmanship",L"Explosives",
 														 L"Medical",L"Scientific",L"Exp Level" };

 #define NUM_MERC_ORDERS 8
-UINT16 *EditMercOrders[8] = { L"Stationary",L"On Guard",L"Close Patrol",
+STR16 EditMercOrders[8] = { L"Stationary",L"On Guard",L"Close Patrol",
 															L"Far Patrol",L"Point Patrol",L"On Call",
 															L"Seek Enemy", L"Random Point Patrol"};

-UINT16 *EditMercAttitudes[6] = { L"Defensive",L"Brave Loner",L"Brave Buddy",
+STR16 EditMercAttitudes[6] = { L"Defensive",L"Brave Loner",L"Brave Buddy",
 																	L"Cunning Loner",L"Cunning Buddy",
 																	L"Aggressive" };

@@ -772,7 +772,7 @@ void DisplayEditMercWindow( void )
 	INT32 iXPos, iYPos, iHeight, iWidth;
 	UINT16 usFillColorBack, usFillColorDark, usFillColorLight, usFillColorTextBk;
 	INT32 x, iXOff;
-	INT16 TempString[30];
+	CHAR16 TempString[30];
 	SOLDIERTYPE *pSoldier;
 	INT8 iEditStat[12];

@@ -852,7 +852,7 @@ void DisplayEditMercWindow( void )
 		ColorFillVideoSurfaceArea(FRAME_BUFFER, iXPos + 117, iYPos + 111 + (20 * x), iXPos + 116 + 30, iYPos + 111 + (20 * x) + 19, usFillColorLight );
 		ColorFillVideoSurfaceArea(FRAME_BUFFER, iXPos + 117, iYPos + 111 + (20 * x), iXPos + 116 + 29, iYPos + 111 + (20 * x) + 18, usFillColorTextBk );
 		
-		swprintf( (wchar_t *)TempString, (wchar_t *)L"%d", iEditStat[x] );
+		swprintf( TempString, L"%d", iEditStat[x] );
 		iXOff = (30 - StringPixLength( TempString, FONT12POINT1 )) / 2;
 		gprintf( iXPos + 118 + iXOff, iYPos + 114 + (20 * x), L"%s", TempString );
 	}
@@ -1719,7 +1719,7 @@ void DeleteSelectedMerc()

 void SetupTextInputForMercProfile()
 {
-	wchar_t str[4];
+	CHAR16 str[4];
 	INT16 sNum;

 	InitTextInputModeWithScheme( DEFAULT_SCHEME );
@@ -1735,7 +1735,7 @@ void SetupTextInputForMercProfile()

 void SetupTextInputForMercAttributes()
 {
-	wchar_t str[4];
+	CHAR16 str[4];

 	InitTextInputModeWithScheme( DEFAULT_SCHEME );

@@ -1773,7 +1773,7 @@ void SetupTextInputForMercAttributes()
 //In the merc editing, all detailed placement values for generated attributes are set to -1.  
 //When making a generated attribute static, we then set the value to its applicable value.
 //This function is similar to the itoa function except that -1 is converted to a null string.
-void CalcStringForValue( wchar_t *str, INT32 iValue, UINT32 uiMax )
+void CalcStringForValue( STR16 str, INT32 iValue, UINT32 uiMax )
 {
 	if( iValue < 0 )			//a blank string is determined by a negative value.
 		str[0] = '\0';
@@ -2388,7 +2388,7 @@ void SetMercEditingMode( UINT8 ubNewMode )

 void DisplayBodyTypeInfo()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	switch( gpSelected->pBasicPlacement->bBodyType )
 	{
 		case RANDOM:							swprintf( str, L"Random" );					break;
@@ -2534,7 +2534,7 @@ void UpdateMercsInfo()
 			SetFontForeground( FONT_YELLOW );
 			SetFontShadow( FONT_NEARBLACK );
 			{ //scope trick
-				UINT16 tempStr[500];
+				CHAR16 tempStr[500];
 				swprintf( tempStr, L"%s%s%s%s%s%d.",
 					L"By specifying a profile index, all of the information will be extracted from the profile ",
 					L"and override any values that you have edited.  It will also disable the editing features ", 
@@ -2583,8 +2583,8 @@ void UpdateMercsInfo()
 			mprintf( iScreenWidthOffset + 172, 2 * iScreenHeightOffset + 439, L"4)" );
 			if( gubScheduleInstructions )
 			{
-				wchar_t str[255];
-				UINT16 keyword[10] = L"";
+				CHAR16 str[255];
+				CHAR16 keyword[10] = L"";
 				ColorFillVideoSurfaceArea( FRAME_BUFFER, iScreenWidthOffset + 431, 2 * iScreenHeightOffset + 388, iScreenWidthOffset + 590, 2 * iScreenHeightOffset + 450, Get16BPPColor( FROMRGB( 32, 45, 72 ) ) );
 				switch( gCurrSchedule.ubAction[ gubCurrentScheduleActionIndex ] )
 				{
@@ -2657,7 +2657,7 @@ void RenderSelectedMercsInventory()
 	UINT8 *pSrc, *pDst;
 	INT32 xp, yp;
 	UINT32 uiSrcPitchBYTES, uiDstPitchBYTES;
-	UINT16 pItemName[100];
+	CHAR16 pItemName[100];
 	UINT8 ubFontColor;
 	if( gsSelectedMercID == -1 )
 		return;
@@ -3110,9 +3110,9 @@ void RenderMercStrings()
 	SOLDIERTYPE								 *pSoldier;
 	INT16 sXPos, sYPos;
 	INT16 sX, sY;
-	UINT16 *pStr;
+	STR16 pStr;
 	SOLDIERINITNODE *curr;
-	wchar_t str[50];
+	CHAR16 str[50];

 	curr = gSoldierInitHead;
 	while( curr )
@@ -3306,7 +3306,7 @@ void CancelCurrentScheduleAction()

 void RegisterCurrentScheduleAction( INT32 iMapIndex )
 {
-	wchar_t str[6];
+	CHAR16 str[6];
 	MarkWorldDirty();
 	swprintf( str, L"%d", iMapIndex );
 	if( gfUseScheduleData2 )
@@ -3498,7 +3498,7 @@ void RenderCurrentSchedule()
 	INT16 sXMapPos, sYMapPos;
 	INT16 sScreenX, sScreenY;
 	INT16 sX, sY;
-	wchar_t str[ 3 ];
+	CHAR16 str[ 3 ];
 	for( i = 0; i < 8; i++ )
 	{
 		if( i % 2 )
@@ -3542,7 +3542,7 @@ void UpdateScheduleInfo()
 {
 	INT32 i;
 	SCHEDULENODE *pSchedule;
-	wchar_t str[6];
+	CHAR16 str[6];
 	if( gpSelected->pSoldier->ubScheduleID )
 	{
 		pSchedule = GetSchedule( gpSelected->pSoldier->ubScheduleID );
@@ -49,7 +49,7 @@ extern UINT8 gubCurrMercMode, gubPrevMercMode;

 #define NUM_DIFF_LVLS						5

-extern wchar_t *zDiffNames[NUM_DIFF_LVLS];
+extern STR16 zDiffNames[NUM_DIFF_LVLS];
 extern INT16 sCurBaseDiff;
 extern INT16 gsSelectedMercID;
 extern INT16 gsSelectedMercGridNo;
@@ -40,7 +40,7 @@ INT32 giSciFiCheckboxButton = -1;
 INT32 giAlarmTriggerButton = -1;
 INT32 giOwnershipGroupButton = -1;

-UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] = 
+CHAR16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] = 
 {
 	L"Klaxon Mine",
 	L"Flare Mine",
@@ -78,7 +78,7 @@ UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ] =
 	L"Big teargas",
 };

-UINT16* GetActionItemName( OBJECTTYPE *pItem )
+const STR16 GetActionItemName( OBJECTTYPE *pItem )
 {
 	if( !pItem || pItem->usItem != ACTION_ITEM )
 		return NULL;
@@ -642,7 +642,7 @@ void RemoveGameTypeFlags()

 void SetupGunGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	INT16 yp;
 	memset( gfAttachment, 0, NUM_ATTACHMENT_BUTTONS );
 	swprintf( str, L"%d", gpItem->bGunStatus );
@@ -788,7 +788,7 @@ void ExtractAndUpdateGunGUI()

 void SetupAmmoGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	swprintf( str, L"%d", gpItem->ubNumberOfObjects );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 1, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gpItem->bTrap );
@@ -833,7 +833,7 @@ void ExtractAndUpdateAmmoGUI()

 void SetupArmourGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	swprintf( str, L"%d", gpItem->bStatus[0] );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gpItem->bTrap );
@@ -894,7 +894,7 @@ void ExtractAndUpdateArmourGUI()

 void SetupEquipGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	swprintf( str, L"%d", gpItem->bStatus[0] );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gpItem->bTrap );
@@ -938,7 +938,7 @@ void ExtractAndUpdateEquipGUI()

 void SetupExplosivesGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	INT16 yp;
 	swprintf( str, L"%d", gpItem->bStatus[0] );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
@@ -1020,7 +1020,7 @@ void ExtractAndUpdateExplosivesGUI()

 void SetupMoneyGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	swprintf( str, L"%d", gpItem->uiMoneyAmount );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 45, 15, MSYS_PRIORITY_NORMAL, str, 5, INPUTTYPE_NUMERICSTRICT );
 	if( gpEditingItemPool )
@@ -1058,7 +1058,7 @@ void RemoveMoneyGUI()

 void SetupOwnershipGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	swprintf( str, L"%d", gpItem->ubOwnerProfile );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 380, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
 	giOwnershipGroupButton = 
@@ -1104,7 +1104,7 @@ void RemoveOwnershipGUI()

 void SetupKeysGUI()
 {
-	wchar_t str[20];
+	CHAR16 str[20];
 	if( gpEditingItemPool )
 	{
 		swprintf( str, L"%d", 100 - gWorldItems[ gpEditingItemPool->iItemIndex ].ubNonExistChance );
@@ -1130,8 +1130,8 @@ void RemoveKeysGUI()

 void SetupActionItemsGUI()
 {
-	wchar_t str[4];
-	UINT16 *pStr;
+	CHAR16 str[4];
+	STR16 pStr;
 	swprintf( str, L"%d", gpItem->bStatus[0] );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 365, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gpItem->bTrap );
@@ -1197,7 +1197,7 @@ void AlarmTriggerCheckboxCallback( GUI_BUTTON *btn, INT32 reason )

 void SetupTriggersGUI()
 {
-	wchar_t str[4];
+	CHAR16 str[4];
 	swprintf( str, L"%d", gpItem->bTrap );
 	AddTextInputField( iScreenWidthOffset + 485, 2 * iScreenHeightOffset + 365, 25, 15, MSYS_PRIORITY_NORMAL, str, 3, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gpItem->ubTolerance );
@@ -81,9 +81,9 @@ enum
 	ACTIONITEM_BIG_TEAR_GAS,
 	NUM_ACTIONITEMS
 };
-extern UINT16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ];
+extern CHAR16 gszActionItemDesc[ NUM_ACTIONITEMS ][ 30 ];
 //Returns a pointer to one of the above string array.
-extern UINT16* GetActionItemName( OBJECTTYPE *pItem );
+extern const STR16 GetActionItemName( OBJECTTYPE *pItem );
 //Called by the popup menu, when a selection is made.
 extern void UpdateActionItem( INT8 bActionItemIndex );
 //Changes an action item into the type specified by the ACTIONITEM enumeration.
@@ -48,7 +48,7 @@
 //===========================================================================

 BOOLEAN gfErrorCatch = FALSE;
-UINT16 gzErrorCatchString[ 256 ] = L"";
+CHAR16 gzErrorCatchString[ 256 ] = L"";
 INT32	giErrorCatchMessageBox = 0;

 extern void RemoveMercsInSector();
@@ -86,7 +86,7 @@ INT32 iCurrFileShown;
 INT32	iLastFileClicked;
 INT32 iLastClickTime;

-UINT16 gzFilename[31];
+CHAR16 gzFilename[31];

 FDLG_LIST *FileList = NULL;

@@ -101,7 +101,7 @@ BOOLEAN gfIllegalName;
 BOOLEAN gfDeleteFile;
 BOOLEAN gfNoFiles;

-UINT16 zOrigName[60];
+CHAR16 zOrigName[60];
 GETFILESTRUCT FileInfo;

 BOOLEAN fEnteringLoadSaveScreen = TRUE;
@@ -371,7 +371,7 @@ UINT32 LoadSaveScreenHandle(void)
 			sprintf( gszCurrFilename, "MAPS\\%S", gzFilename );
 			if( GetFileFirst(gszCurrFilename, &FileInfo) )
 			{
-				wchar_t str[40];
+				CHAR16 str[40];
 				if( FileInfo.uiFileAttribs & (FILE_IS_READONLY|FILE_IS_HIDDEN|FILE_IS_SYSTEM) )
 				{
 					swprintf( str, L" Delete READ-ONLY file %s? ", gzFilename );
@@ -434,7 +434,7 @@ UINT32 LoadSaveScreenHandle(void)
 }


-void CreateFileDialog( UINT16 *zTitle )
+void CreateFileDialog( STR16 zTitle )
 {

 	iFDlgState = DIALOG_NONE;
@@ -511,7 +511,7 @@ void FileDialogModeCallback( UINT8 ubID, BOOLEAN fEntering )
 			if( iCurrFileShown == (x-iTopFileShown) )
 			{
 				FListNode->FileInfo.zFileName[30] = 0;
-				SetInputFieldStringWith8BitString( 0, (UINT8 *)FListNode->FileInfo.zFileName );
+				SetInputFieldStringWith8BitString( 0, FListNode->FileInfo.zFileName );
 				return;
 			}
 			FListNode = FListNode->pNext;
@@ -721,7 +721,7 @@ void SetTopFileToLetter( UINT16 usLetter )
 		iTopFileShown = x;
 		if( iTopFileShown > iTotalFiles - 7 )
 			iTopFileShown = iTotalFiles - 7;
-		SetInputFieldStringWith8BitString( 0, (UINT8 *)prev->FileInfo.zFileName );
+		SetInputFieldStringWith8BitString( 0, prev->FileInfo.zFileName );
 	}
 }

@@ -814,16 +814,16 @@ void HandleMainKeyEvents( InputAtom *pEvent )
 		}
 		if( curr )	
 		{
-			SetInputFieldStringWith8BitString( 0, (UINT8 *)curr->FileInfo.zFileName );
+			SetInputFieldStringWith8BitString( 0, curr->FileInfo.zFileName );
 			swprintf( gzFilename, L"%S", curr->FileInfo.zFileName );
 		}
 	}
 }

 //editor doesn't care about the z value.  It uses it's own methods.
-void SetGlobalSectorValues( UINT16 *szFilename )
+void SetGlobalSectorValues( STR16 szFilename )
 {
-	UINT16 *pStr;
+	STR16 pStr;
 	if( ValidCoordinate() )
 	{
 		//convert the coordinate string into into the actual global sector coordinates.
@@ -869,7 +869,7 @@ void InitErrorCatchDialog()
 UINT32 ProcessFileIO()
 {
 	INT16 usStartX, usStartY;
-	UINT8 ubNewFilename[50];
+	CHAR8 ubNewFilename[50];
 	switch( gbCurrentFileIOStatus )
 	{
 		case INITIATE_MAP_SAVE:	//draw save message 
@@ -889,7 +889,7 @@ UINT32 ProcessFileIO()
 			gbCurrentFileIOStatus = SAVING_MAP;
 			return LOADSAVE_SCREEN;
 		case SAVING_MAP: //save map
-			sprintf( (char *)ubNewFilename, "%S", gzFilename );
+			sprintf( ubNewFilename, "%S", gzFilename );
 			RaiseWorldLand();
 			if( gfShowPits )
 				RemoveAllPits();
@@ -934,7 +934,7 @@ UINT32 ProcessFileIO()
 			return LOADSAVE_SCREEN;
 		case LOADING_MAP: //load map
 			DisableUndo();
-			sprintf( (char *)ubNewFilename, "%S", gzFilename );
+			sprintf( ubNewFilename, "%S", gzFilename );
 			
 			RemoveMercsInSector( );

@@ -1097,7 +1097,7 @@ BOOLEAN ValidCoordinate()

 BOOLEAN ValidFilename()
 {
-	UINT16 *pDest;
+	STR16 pDest;
 	if( gzFilename[0] != '\0' )// ; <----- I really think they didn't mean this!! (jonathanl)
 	{
 		pDest = wcsstr( gzFilename, L".dat" );
@@ -1109,7 +1109,7 @@ BOOLEAN ValidFilename()
 	return FALSE;
 }

-BOOLEAN ExternalLoadMap( UINT16 *szFilename )
+BOOLEAN ExternalLoadMap( STR16 szFilename )
 {
 	Assert( szFilename );
 	if( !wcslen( szFilename ) )
@@ -1127,7 +1127,7 @@ BOOLEAN ExternalLoadMap( UINT16 *szFilename )
 	return FALSE;
 }

-BOOLEAN ExternalSaveMap( UINT16 *szFilename )
+BOOLEAN ExternalSaveMap( STR16 szFilename )
 {
 	Assert( szFilename );
 	if( !wcslen( szFilename ) )
@@ -26,7 +26,7 @@ extern BOOLEAN gfDestroyFDlg;

 UINT32 WaitForFileName( void );
 void RemoveFileDialog(void);
-void CreateFileDialog( wchar_t *zTitle );
+void CreateFileDialog( STR16 zTitle );

 void SelectFileDialogYPos( UINT16 usRelativeYPos );

@@ -37,11 +37,11 @@ BOOLEAN ExtractFilenameFromFields();
 BOOLEAN ValidCoordinate();
 BOOLEAN ValidFilename();

-BOOLEAN ExternalLoadMap( wchar_t *szFilename );
-BOOLEAN ExternalSaveMap( wchar_t *szFilename );
+BOOLEAN ExternalLoadMap( STR16 szFilename );
+BOOLEAN ExternalSaveMap( STR16 szFilename );

 extern BOOLEAN gfErrorCatch;
-extern UINT16 gzErrorCatchString[ 256 ];
+extern CHAR16 gzErrorCatchString[ 256 ];

 #endif
 #endif
@@ -54,7 +54,7 @@ enum{
 	BETA,
 	RELEASE
 };
-UINT16 gszVersionType[5][10] = { L"Pre-Alpha", L"Alpha", L"Demo", L"Beta", L"Release" };
+CHAR16 gszVersionType[5][10] = { L"Pre-Alpha", L"Alpha", L"Demo", L"Beta", L"Release" };
 #define GLOBAL_SUMMARY_STATE			RELEASE

 //Regular masks
@@ -85,7 +85,7 @@ BOOLEAN gfMustForceUpdateAllMaps = FALSE;
 UINT16 gusNumberOfMapsToBeForceUpdated = 0;
 BOOLEAN gfMajorUpdate = FALSE;

-void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion );
+void LoadSummary( STR8 pSector, UINT8 ubLevel, FLOAT dMajorMapVersion );
 void RegenerateSummaryInfoForAllOutdatedMaps();

 void SetupItemDetailsMode( BOOLEAN fAllowRecursion );
@@ -214,9 +214,9 @@ extern INT16 gsSelSectorY; // symbol already declared globally in AI Viewer.cpp
 //summary is going to be persistant or not.
 UINT32 giInitTimer;

-UINT16 gszFilename[40];
-UINT16 gszTempFilename[21];
-UINT16 gszDisplayName[21];
+CHAR16 gszFilename[40];
+CHAR16 gszTempFilename[21];
+CHAR16 gszDisplayName[21];

 void CalculateOverrideStatus();

@@ -499,7 +499,7 @@ void DestroySummaryWindow()

 void RenderSectorInformation()
 {
-	//wchar_t str[ 100 ];
+	//CHAR16 str[ 100 ];
 	MAPCREATE_STRUCT *m;
 	SUMMARYFILE *s;
 	UINT8 ePoints = 0;
@@ -677,7 +677,7 @@ void RenderItemDetails()
 	FLOAT dAvgExistChance, dAvgStatus;
 	OBJECTTYPE *pItem;
 	INT32 index, i;
-	wchar_t str[100];
+	CHAR16 str[100];
 	UINT32 uiQuantity, uiExistChance, uiStatus;
 	UINT32 uiTriggerQuantity[8], uiActionQuantity[8], uiTriggerExistChance[8], uiActionExistChance[8];
 	UINT32 xp, yp;
@@ -1025,7 +1025,7 @@ void RenderSummaryWindow()
 		SetFontShadow( FONT_NEARBLACK );
 		if( gfGlobalSummaryExists )
 		{
-			wchar_t str[100];
+			CHAR16 str[100];
 			BOOLEAN fSectorSummaryExists = FALSE;
 			if( gusNumEntriesWithOutdatedOrNoSummaryInfo && !gfOutdatedDenied )
 			{
@@ -1379,7 +1379,7 @@ void RenderSummaryWindow()
 		}
 		for( x = 1; x <= 16; x++ )
 		{
-			wchar_t str[3];
+			CHAR16 str[3];
 			swprintf( str, L"%d", x );
 			mprintf( MAP_LEFT+x*13-(13+StringPixLength( str, SMALLCOMPFONT ))/2, MAP_TOP-8, str );
 		}
@@ -1402,7 +1402,7 @@ void RenderSummaryWindow()
 		if( gfRenderProgress )
 		{
 			UINT8 ubNumUndergroundLevels;
-			wchar_t str[2];
+			CHAR16 str[2];
 			for( y = 0; y < 16; y++ ) 
 			{
 				ClipRect.iTop = MAP_TOP + y*13;
@@ -1526,11 +1526,11 @@ void RenderSummaryWindow()
 	}
 }

-void UpdateSectorSummary( UINT16 *gszFilename, BOOLEAN fUpdate )
+void UpdateSectorSummary( STR16 gszFilename, BOOLEAN fUpdate )
 {
-	wchar_t str[50];
-	UINT8 szCoord[40];
-	UINT16 *ptr;
+	CHAR16 str[50];
+	CHAR8 szCoord[40];
+	STR16 ptr;
 	INT16 x, y;

 	gfRenderSummary = TRUE;
@@ -1637,7 +1637,7 @@ void UpdateSectorSummary( UINT16 *gszFilename, BOOLEAN fUpdate )
 			CreateProgressBar( 0, iScreenWidthOffset + 250, iScreenHeightOffset + 200, iScreenWidthOffset + 390, iScreenHeightOffset + 210 );
 		}

-		sprintf( (char *)szCoord, "%S", gszFilename );
+		sprintf( szCoord, "%S", gszFilename );
 		if( gsSectorX > 9 )
 			szCoord[3] = '\0';
 		else
@@ -2088,8 +2088,8 @@ void SummaryLoadMapCallback( GUI_BUTTON *btn, INT32 reason )
 {
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
 	{
-		UINT16 *ptr;
-		wchar_t str[ 50 ];
+		STR16 ptr;
+		CHAR16 str[ 50 ];
 		gfRenderSummary = TRUE;
 		
 		SetFont( FONT10ARIAL );
@@ -2145,9 +2145,9 @@ void SummarySaveMapCallback( GUI_BUTTON *btn, INT32 reason )
 		{
 			if( gubOverrideStatus == READONLY )
 			{
-				UINT8 filename[40];
-				sprintf( (char *)filename, "MAPS\\%S", gszDisplayName );
-				FileClearAttributes( (STR)filename );
+				CHAR8 filename[40];
+				sprintf( filename, "MAPS\\%S", gszDisplayName );
+				FileClearAttributes( filename );
 			}	
 			if(	ExternalSaveMap( gszDisplayName ) )
 			{
@@ -2232,8 +2232,8 @@ void LoadGlobalSummary()
 	UINT32 uiNumBytesRead;
 	FLOAT	dMajorVersion;
  INT32 x,y;
-	UINT8 szFilename[40];
-	UINT8 szSector[6];
+	CHAR8 szFilename[40];
+	CHAR8 szSector[6];

 	OutputDebugString( "Executing LoadGlobalSummary()...\n" );

@@ -2269,12 +2269,12 @@ void LoadGlobalSummary()
 		for( x = 0; x < 16; x++ )
 		{
 			gbSectorLevels[x][y] = 0;
-			sprintf( (char *)szSector, "%c%d", 'A' + y, x + 1 );
+			sprintf( szSector, "%c%d", 'A' + y, x + 1 );

 			//main ground level
-			sprintf( (char *)szFilename, "%c%d.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2285,13 +2285,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//main B1 level
-			sprintf( (char *)szFilename, "%c%d_b1.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b1.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2302,13 +2302,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b1.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b1.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//main B2 level
-			sprintf( (char *)szFilename, "%c%d_b2.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b2.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2319,13 +2319,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b2.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b2.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//main B3 level
-			sprintf( (char *)szFilename, "%c%d_b3.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b3.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2336,13 +2336,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b3.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b3.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//alternate ground level
-			sprintf( (char *)szFilename, "%c%d_a.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_a.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2353,13 +2353,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_a.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_a.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//alternate B1 level
-			sprintf( (char *)szFilename, "%c%d_b1_a.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b1_a.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2370,13 +2370,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b1_a.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b1_a.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//alternate B2 level
-			sprintf( (char *)szFilename, "%c%d_b2_a.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b2_a.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2387,13 +2387,13 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b2_a.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b2_a.sum", szSector );
+				FileDelete( szFilename );
 			}
 			//alternate B3 level
-			sprintf( (char *)szFilename, "%c%d_b3_a.dat", 'A' + y, x + 1 );
+			sprintf( szFilename, "%c%d_b3_a.dat", 'A' + y, x + 1 );
 			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			SetFileManCurrentDirectory( DevInfoDir );
 			if( hfile )
 			{
@@ -2404,8 +2404,8 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-				sprintf( (char *)szFilename, "%s_b3_a.sum", szSector );
-				FileDelete( (STR)szFilename );
+				sprintf( szFilename, "%s_b3_a.sum", szSector );
+				FileDelete( szFilename );
 			}
 		}
 		OutputDebugString( (LPCSTR)String("Sector Row %c complete... \n", y + 'A') );
@@ -2462,7 +2462,7 @@ void GenerateSummaryList()
 	//SetFileManCurrentDirectory( Dir );
 }

-void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo )
+void WriteSectorSummaryUpdate( STR8 puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo )
 {
 	FILE *fp;
 	STRING512			DataDir;
@@ -2486,7 +2486,7 @@ void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *p
 	sprintf( ptr, ".sum" );

 	//write the summary information
-	fp = fopen( (const char *)puiFilename, "wb" );
+	fp = fopen( puiFilename, "wb" );
 	Assert( fp );
 	fwrite( pSummaryFileInfo, 1, sizeof( SUMMARYFILE ), fp );
 	fclose( fp );
@@ -2546,17 +2546,17 @@ void SummaryNewCaveLevelCallback( GUI_BUTTON *btn, INT32 reason )
 	}
 }

-void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion )
+void LoadSummary( STR8 pSector, UINT8 ubLevel, FLOAT dMajorMapVersion )
 {
-	UINT8 filename[40];
+	CHAR8 filename[40];
 	SUMMARYFILE temp;
 	INT32 x, y;
 	FILE *fp;
-	sprintf( (char *)filename, (const char *)pSector );
+	sprintf( filename, pSector );
 	if( ubLevel % 4 )
 	{
-		UINT8 str[4];
-		sprintf( (char *)str, "_b%d", ubLevel % 4 );
+		CHAR8 str[4];
+		sprintf( str, "_b%d", ubLevel % 4 );
 		strcat( filename, str );
 	}
 	if( ubLevel >= 4 )
@@ -2565,7 +2565,7 @@ void LoadSummary( UINT8 *pSector, UINT8 ubLevel, FLOAT dMajorMapVersion )
 	}
 	strcat( filename, ".sum" );

-	fp = fopen( (const char *)filename, "rb" );
+	fp = fopen( filename, "rb" );
 	if( !fp )
 	{
 		gusNumEntriesWithOutdatedOrNoSummaryInfo++;
@@ -2620,11 +2620,11 @@ void UpdateMasterProgress()
 	}
 }

-void ReportError( UINT8 *pSector, UINT8 ubLevel )
+void ReportError( STR8 pSector, UINT8 ubLevel )
 {
 	static INT32 yp = iScreenHeightOffset + 180;
-	wchar_t str[40];
-	UINT16 temp[10];
+	CHAR16 str[40];
+	CHAR16 temp[10];

 	//Make sure the file exists... if not, then return false
 	swprintf( str, L"%S", pSector );
@@ -2642,7 +2642,7 @@ void ReportError( UINT8 *pSector, UINT8 ubLevel )
 void RegenerateSummaryInfoForAllOutdatedMaps()
 {
 	INT32 x, y;
-	UINT8 str[40];
+	CHAR8 str[40];
 	SUMMARYFILE *pSF;
 	//CreateProgressBar( 0, 20, 120, 300, 132 ); //slave (individual)
 	//CreateProgressBar( 1, 20, 100, 300, 112 ); //master (total)
@@ -2659,7 +2659,7 @@ void RegenerateSummaryInfoForAllOutdatedMaps()

 	for( y = 0; y < 16; y++ ) for( x = 0; x < 16; x++ )
 	{
-		sprintf( (char *)str, "%c%d", y + 'A', x + 1 );
+		sprintf( str, "%c%d", y + 'A', x + 1 );
 		if( gbSectorLevels[x][y] & GROUND_LEVEL_MASK )
 		{
 			pSF = gpSectorSummary[x][y][0];
@@ -2726,7 +2726,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason )
 {
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
 	{
-		UINT8 str[40];
+		CHAR8 str[40];
 		CreateProgressBar( 0, iScreenWidthOffset + 20, iScreenHeightOffset + 100, iScreenWidthOffset + 300, iScreenHeightOffset + 112 ); //slave (individual)
 		DefineProgressBarPanel( 0, 65, 79, 94, iScreenWidthOffset + 10, iScreenHeightOffset + 80, iScreenWidthOffset + 310, iScreenHeightOffset + 132 );
 		SetProgressBarTitle( 0, L"Generating map summary", BLOCKFONT2, FONT_RED, FONT_NEARBLACK );
@@ -2738,7 +2738,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason )
 			gpCurrentSectorSummary = NULL;
 		}

-		sprintf( (char *)str, "%c%d", gsSelSectorY + 'A' - 1, gsSelSectorX );
+		sprintf( str, "%c%d", gsSelSectorY + 'A' - 1, gsSelSectorX );
 		EvaluateWorld( str, (UINT8)giCurrLevel );

 		gpSectorSummary[ gsSelSectorX ][ gsSelSectorY ][ giCurrLevel ] = gpCurrentSectorSummary;
@@ -2751,7 +2751,7 @@ void SummaryUpdateCallback( GUI_BUTTON *btn, INT32 reason )

 void ExtractTempFilename()
 {
-	wchar_t str[40];
+	CHAR16 str[40];
 	Get16BitStringFromField( 1, str );
 	if( wcscmp( gszTempFilename, str ) )
 	{
@@ -2766,8 +2766,8 @@ void ExtractTempFilename()
 void ApologizeOverrideAndForceUpdateEverything()
 {
 	INT32 x, y;
-	wchar_t str[ 50 ];
-	UINT8 name[50];
+	CHAR16 str[ 50 ];
+	CHAR8 name[50];
 	SUMMARYFILE *pSF;
 	//Create one huge assed button
 	gfMajorUpdate = TRUE;
@@ -2801,7 +2801,7 @@ void ApologizeOverrideAndForceUpdateEverything()

 	for( y = 0; y < 16; y++ ) for( x = 0; x < 16; x++ )
 	{
-		sprintf( (char *)name, "%c%d", y + 'A', x + 1 );
+		sprintf( name, "%c%d", y + 'A', x + 1 );
 		if( gbSectorLevels[x][y] & GROUND_LEVEL_MASK )
 		{
 			pSF = gpSectorSummary[x][y][0];
@@ -2884,7 +2884,7 @@ void ApologizeOverrideAndForceUpdateEverything()
 		}
 	}

-	EvaluateWorld( (UINT8 *)"p3_m.dat", 0 );
+	EvaluateWorld( "p3_m.dat", 0 );

 	RemoveProgressBar( 2 );
 	gfUpdatingNow = FALSE;
@@ -2901,7 +2901,7 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion )
 	HWFILE hfile;
 	UINT32 uiNumBytesRead;
 	UINT32 uiNumItems;
-	UINT8 szFilename[40];
+	CHAR8 szFilename[40];
 	BASIC_SOLDIERCREATE_STRUCT basic;
 	SOLDIERCREATE_STRUCT priority;
 	INT32 i, j;
@@ -2937,8 +2937,8 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion )
 		gpCurrentSectorSummary = gpSectorSummary[ gsSelSectorX - 1 ][ gsSelSectorY - 1 ][ giCurrLevel ];
 	}
 	//Open the original map for the sector
-	sprintf( (char *)szFilename, "MAPS\\%S", gszFilename );
-	hfile = FileOpen( (STR)szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
+	sprintf( szFilename, "MAPS\\%S", gszFilename );
+	hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 	if( !hfile )
 	{ //The file couldn't be found!
 		return;
@@ -14,7 +14,7 @@ void DestroySummaryWindow();
 void RenderSummaryWindow();
 void LoadWorldInfo();

-void UpdateSectorSummary( wchar_t *gszFilename, BOOLEAN fUpdate );
+void UpdateSectorSummary( STR16 gszFilename, BOOLEAN fUpdate );

 void SaveGlobalSummary();
 void LoadGlobalSummary();
@@ -97,9 +97,9 @@ typedef struct SUMMARYFILE

 extern BOOLEAN gfAutoLoadA9;

-extern BOOLEAN EvaluateWorld( UINT8 * pSector, UINT8 ubLevel );
+extern BOOLEAN EvaluateWorld( STR8 pSector, UINT8 ubLevel );

-extern void WriteSectorSummaryUpdate( UINT8 *puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo );
+extern void WriteSectorSummaryUpdate( STR8 puiFilename, UINT8 ubLevel, SUMMARYFILE *pSummaryFileInfo );

 extern BOOLEAN gfMustForceUpdateAllMaps;
 extern BOOLEAN gfMajorUpdate;
@@ -119,7 +119,7 @@ BOOLEAN			gfConfirmExitPending = FALSE;
 BOOLEAN			gfIntendOnEnteringEditor = FALSE;

 //original
-extern UINT8				gubFilename[ 200 ];
+extern CHAR8				gubFilename[ 200 ];
 INT16				gsBanksSubIndex = 0;
 INT16				gsOldBanksSubIndex = 1;
 INT16				gsCliffsSubIndex = 0;
@@ -3540,7 +3540,7 @@ void ProcessAreaSelection( BOOLEAN fWithLeftButton )
 				gubMaxRoomNumber++;
 				if( iCurrentTaskbar == TASK_BUILDINGS && TextInputMode() )
 				{
-					wchar_t str[4];
+					CHAR16 str[4];
 					swprintf( str, L"%d", gubCurrRoomNumber );
 					SetInputFieldStringWith16BitString( 1, str );
 					SetActiveField( 0 );
@@ -3816,7 +3816,7 @@ void UpdateLastActionBeforeLeaving()

 void ReloadMap()
 {
-	UINT16 szFilename[30];
+	CHAR16 szFilename[30];
 	swprintf( szFilename, L"%S", gubFilename );
 	ExternalLoadMap( szFilename );
 }
@@ -29,7 +29,7 @@ UINT8 gubMessageBoxStatus = MESSAGEBOX_NONE;
 void MsgBoxOkClkCallback( GUI_BUTTON *butn, INT32 reason );
 void MsgBoxCnclClkCallback( GUI_BUTTON *butn, INT32 reason );

-void CreateMessageBox( UINT16 *wzString )
+void CreateMessageBox( STR16 wzString )
 {
 	INT16 sPixLen;
 	INT16 sStartX, sStartY;
@@ -14,7 +14,7 @@ enum
 extern UINT8 gubMessageBoxStatus;
 extern BOOLEAN gfMessageBoxResult;

-void CreateMessageBox( wchar_t *wzString );
+void CreateMessageBox( STR16 wzString );
 BOOLEAN MessageBoxHandled();
 void RemoveMessageBox();

@@ -46,11 +46,11 @@ MOUSE_REGION popupRegion;
 UINT16 gusEntryHeight;
 BOOLEAN fWaitingForLButtonRelease = FALSE;

-extern UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20];
+extern CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20];

 //Finds the string for any popup menu in JA2 -- the strings are stored
 //in different ways in each instance.
-INT16* GetPopupMenuString( UINT8 ubIndex )
+STR16 GetPopupMenuString( UINT8 ubIndex )
 {
 	switch( gPopup.ubPopupMenuID )
 	{
@@ -58,11 +58,11 @@ INT16* GetPopupMenuString( UINT8 ubIndex )
 			return gTilesets[ ubIndex ].zName;
 		case OWNERSHIPGROUP_POPUP: //civilian groups
 		case CHANGECIVGROUP_POPUP: //civilian groups
-			return (INT16 *)gszCivGroupNames[ ubIndex ];
+			return gszCivGroupNames[ ubIndex ];
 		case SCHEDULEACTION_POPUP: //setting scheduling actions
-			return (INT16 *)gszScheduleActions[ ubIndex ];
+			return gszScheduleActions[ ubIndex ];
 		case ACTIONITEM_POPUP:
-			return (INT16 *)gszActionItemDesc[ ubIndex ];
+			return gszActionItemDesc[ ubIndex ];
 		default:
 			return 0;
 	}
@@ -85,7 +85,7 @@ typedef struct currentPopupMenuInformation{

 //A global var that keeps the popup menu information.  
 extern CurrentPopupMenuInformation gPopup;
-extern wchar_t *popupMenuStrings[5];
+extern STR16 popupMenuStrings[5];

 //These are the two main functions that outside users would call.
 void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection );
@@ -86,7 +86,7 @@ typedef struct
 		};
 		struct
 		{
-			wchar_t *	pString;
+			STR16	pString;
 		};
 	};
 }