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

Tactical/Boxing.cpp

@@ -313,9 +313,10 @@ BOOLEAN CheckOnBoxers( void )
 			// WANNE: Safty check!
 			if (ubID < TOTAL_SOLDIERS)
 			{
-				if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT )
+				if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT &&
+					IS_MERC_BODY_TYPE( MercPtrs[ ubID ] ) )
 				{	
-					// no weapon so this guy is a boxer
+					// no weapon and not a civilian so this guy is a boxer
 					gubBoxerID[ uiLoop ] = ubID;
 				}
 			}

Tactical/Handle Items.cpp

@@ -5439,6 +5439,7 @@ UINT8 StealItems(SOLDIERTYPE* pSoldier,SOLDIERTYPE* pOpponent, UINT8* ubIndexRet
 
 	InitializeStealItemPickupMenu( pSoldier, pOpponent, pItemPool, ubCount);
 	guiPendingOverrideEvent = G_GETTINGITEM;
+	HandleTacticalUI(); // 0verhaul:  Added to keep this event from going out of style before it is acted on
 	return( ubCount );
 }
 

Tactical/Handle UI.cpp

@@ -475,7 +475,7 @@ void PreventFromTheFreezingBug(SOLDIERTYPE* pSoldier)
 {
 	gfUIInterfaceSetBusy = FALSE;
 	UnSetUIBusy( pSoldier->ubID );
-	gTacticalStatus.ubAttackBusyCount = 0;
+//	gTacticalStatus.ubAttackBusyCount = 0; // 0verhaul:  I know commenting this may not be a good idea, but then neither is this kludgy routine.
 	guiPendingOverrideEvent = LU_ENDUILOCK;
 	UIHandleLUIEndLock( NULL );
 }
@@ -5817,7 +5817,7 @@ void SetUIBusy( UINT8 ubID )
 
 void UnSetUIBusy( UINT8 ubID )
 {
-	if ( (gTacticalStatus.uiFlags & INCOMBAT ) && ( gTacticalStatus.uiFlags & TURNBASED ) && ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
+	if ( gfUserTurnRegionActive && (gTacticalStatus.uiFlags & INCOMBAT ) && ( gTacticalStatus.uiFlags & TURNBASED ) && ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
 	{
 		if ( !gTacticalStatus.fUnLockUIAfterHiddenInterrupt )
 		{

Tactical/Interface Dialogue.cpp

@@ -77,6 +77,7 @@
 	#include "BobbyRMailOrder.h"
 	#include "end game.h"
 	#include "Map Screen Helicopter.h"
+	#include "Cheats.h"
 #endif
 
 INT16	sBasementEnterGridNos[ ] = { 13362, 13363, 13364, 13365, 13525, 13524 };

Tactical/Interface Items.cpp

@@ -6992,7 +6992,7 @@ void ItemPickupOK( GUI_BUTTON *btn, INT32 reason )
 			if ((gpOpponent->inv[HANDPOS].usItem == NOTHING ) && (usLastItem!=NOTHING))
 				ReLoadSoldierAnimationDueToHandItemChange( gpOpponent, usLastItem, NOTHING );
 
-			PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
+//			PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
 		}
 		else
 		{
@@ -7026,7 +7026,7 @@ void ItemPickupCancel( GUI_BUTTON *btn, INT32 reason )
 		{
 			DeletePool(gItemPickupMenu.pItemPool);
 
-			PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
+//			PreventFromTheFreezingBug(gItemPickupMenu.pSoldier);
 		}
 	}
 	else if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE )

Tactical/Items.cpp

@@ -2617,6 +2617,8 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
 	INT8			bReloadType;
 	UINT16			usNewAmmoItem;
 
+	bAPs = 0;
+
 	if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
 	{
 		bAPs = GetAPsToReloadGunWithAmmo( pGun, pAmmo );

Tactical/Overhead.cpp

@@ -1506,7 +1506,7 @@ BOOLEAN ExecuteOverhead( )
 										if ( pSoldier->usPathDataSize != MAX_PATH_LIST_SIZE )
 										{
 #ifdef JA2BETAVERSION
-											ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest .", pSoldier->name, pSoldier->ubID );
+											ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Path for %s ( %d ) did not make merc get to dest (%d spaces away).", pSoldier->name, pSoldier->ubID, PythSpacesAway( pSoldier->sFinalDestination, pSoldier->sGridNo) );
 #endif
 										}
 
@@ -1534,6 +1534,7 @@ BOOLEAN ExecuteOverhead( )
 											if ( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT)
 											{
 												ActionDone( pSoldier);
+												SoldierGotoStationaryStance( pSoldier );
 												continue;
 											}
 											else

Tactical/PATHAI.cpp

@@ -918,6 +918,21 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo
 
 		//DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String( "PATHAI %d", curLoc ) );
 
+		// 0verhaul:  Cannot change direction over a fence!
+		if (prevCost == TRAVELCOST_FENCE)
+		{
+			iLoopStart = trailTree[pCurrPtr->sPathNdx].stepDir;
+			if (bLoopState == LOOPING_CLOCKWISE) {
+				iLoopEnd = gOneCCDirection[ iLoopStart];
+			} else {
+				iLoopEnd = gOneCDirection[ iLoopStart];
+			}
+		}
+		else
+		{
+			iLoopStart = iLoopEnd = 0;
+		}
+
 		if (fContinuousTurnNeeded)
 		{
 			if (trailTreeNdx < 2)
@@ -942,7 +957,6 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo
 		//for ( iCnt = iLoopStart; iCnt != iLoopEnd; iCnt = (iCnt + iLoopIncrement) % MAXDIR )
 		for ( iCnt = iLoopStart; ; )
 		{
-
 #ifdef VEHICLE
 			/*
 			if (fTurnSlow)

Tactical/ShopKeeper Interface.cpp

@@ -2625,8 +2625,8 @@ UINT32 DisplayInvSlot( UINT8 ubSlotNum, UINT16 usItemIndex, UINT16 usPosX, UINT1
 	usHeight				= (UINT32)pTrav->usHeight;
 	usWidth					= (UINT32)pTrav->usWidth;
 
-	sCenX = usPosX + 7 + (INT16)( abs( SKI_INV_WIDTH - 3.0 - usWidth ) / 2 ) - pTrav->sOffsetX;
-	sCenY = usPosY + (INT16)( abs( SKI_INV_HEIGHT - (double)usHeight ) / 2 ) - pTrav->sOffsetY;
+	sCenX = usPosX + 7 + (INT16)( abs( (long) (SKI_INV_WIDTH - 3 - usWidth) ) / 2 ) - pTrav->sOffsetX;
+	sCenY = usPosY + (INT16)( abs( (long) (SKI_INV_HEIGHT - usHeight) ) / 2 ) - pTrav->sOffsetY;
 
 
 	//Restore the background region
@@ -7878,4 +7878,4 @@ void HatchOutInvSlot( UINT16 usPosX, UINT16 usPosY )
 	//Hatch it out
 	DrawHatchOnInventory( guiRENDERBUFFER, usSlotX, usSlotY, usSlotWidth, usSlotHeight );
 	InvalidateRegion( usSlotX, usSlotY, usSlotX + usSlotWidth, usSlotY + usSlotHeight );
-}
+}

Tactical/Soldier Ani.cpp

@@ -1475,13 +1475,14 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
 			case 485:
 
 				// CODE: Try steal.....
+//				UnSetUIBusy( pSoldier->ubID);
 				UseHandToHand( pSoldier, pSoldier->sPendingActionData2, TRUE );
 				//jackaians:
 				//if we are not waiting for the pickup menu to be displayed
-				if (guiPendingOverrideEvent != G_GETTINGITEM)
-				{
-					PreventFromTheFreezingBug(pSoldier);
-				}
+//				if (guiPendingOverrideEvent != G_GETTINGITEM)
+//				{
+//					PreventFromTheFreezingBug(pSoldier);
+//				}
 				break;
 
 			case 486:

Tactical/Soldier Control.cpp

@@ -11229,6 +11229,7 @@ void PickDropItemAnimation( SOLDIERTYPE *pSoldier )
 
 		SoldierHandleDropItem( pSoldier );
 		SoldierGotoStationaryStance( pSoldier );
+		ActionDone( pSoldier);
 		break;
 	}
 }
@@ -11535,6 +11536,7 @@ void MercStealFromMerc( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pTarget )
 	{
 		// SEND PENDING ACTION
 		pSoldier->ubPendingAction = MERC_STEAL;
+		pSoldier->bTargetLevel = pTarget->bLevel; // 0verhaul:  Update the level too!
 		pSoldier->sPendingActionData2  = pTarget->sGridNo;
 		pSoldier->bPendingActionData3  = ubDirection;
 		pSoldier->ubPendingActionAnimCount = 0;

Tactical/Tactical_2005Express.vcproj

@@ -0,0 +1,854 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Tactical_2005Express"
+	ProjectGUID="{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
+	RootNamespace="Tactical_2005Express"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2_2005Express.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2_2005Express.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="0"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\Action Items.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Air Raid.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Cache.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Data.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Arms Dealer Init.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ArmsDealerInvInit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Auto Bandage.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Boxing.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Bullets.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Campaign.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Civ Quotes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Dialogue Control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\DisplayCover.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Drugs And Alcohol.h"
+				>
+			</File>
+			<File
+				RelativePath=".\End Game.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Enemy Soldier Save.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EnemyItemDrops.h"
+				>
+			</File>
+			<File
+				RelativePath=".\faces.h"
+				>
+			</File>
+			<File
+				RelativePath=".\fov.h"
+				>
+			</File>
+			<File
+				RelativePath=".\GAP.H"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle Doors.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle Items.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle UI Plan.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle UI.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Cursors.h"
+				>
+			</File>
+			<File
+				RelativePath=".\interface Dialogue.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Items.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Panels.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Utils.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Inventory Choosing.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Item Types.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Items.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Keys.h"
+				>
+			</File>
+			<File
+				RelativePath=".\LOS.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Map Information.h"
+				>
+			</File>
+			<File
+				RelativePath=".\merc entering.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Merc Hiring.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Militia Control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Morale.h"
+				>
+			</File>
+			<File
+				RelativePath=".\opplist.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Overhead Types.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Overhead.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PATHAI.H"
+				>
+			</File>
+			<File
+				RelativePath=".\PathAIDebug.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Points.h"
+				>
+			</File>
+			<File
+				RelativePath=".\qarray.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Rain.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Rotting Corpses.h"
+				>
+			</File>
+			<File
+				RelativePath=".\rt time defines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ShopKeeper Interface.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ShopKeeper Quotes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\SkillCheck.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Add.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Ani.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Control.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Create.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Find.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Functions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Init List.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier macros.h"
+				>
+			</File>
+			<File
+				RelativePath=".\soldier profile type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Profile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\soldier tile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Spread burst.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Squads.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Strategic Exit GUI.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Structure Wrap.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Tactical All.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Tactical Save.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Tactical Turns.h"
+				>
+			</File>
+			<File
+				RelativePath=".\TeamTurns.h"
+				>
+			</File>
+			<File
+				RelativePath=".\UI Cursors.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Vehicles.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Weapons.h"
+				>
+			</File>
+			<File
+				RelativePath=".\World Items.h"
+				>
+			</File>
+			<File
+				RelativePath=".\XML.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Air Raid.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Cache.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Control.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Animation Data.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Arms Dealer Init.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ArmsDealerInvInit.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Auto Bandage.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Boxing.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\bullets.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Campaign.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Civ Quotes.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Dialogue Control.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\DisplayCover.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Drugs And Alcohol.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\End Game.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Enemy Soldier Save.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EnemyItemDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Faces.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\fov.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\GAP.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle Doors.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle Items.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle UI Plan.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Handle UI.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Control.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Cursors.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Dialogue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Items.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Panels.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface Utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Interface.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Inventory Choosing.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Items.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Keys.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LOS.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Map Information.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Merc Entering.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Merc Hiring.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Militia Control.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Morale.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\opplist.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Overhead.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PATHAI.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Points.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\QARRAY.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Rain.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Real Time Input.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Rotting Corpses.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ShopKeeper Interface.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SkillCheck.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Add.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Ani.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Control.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Create.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Find.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Init List.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Profile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Soldier Tile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SoldierTooltips.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Spread Burst.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Squads.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Strategic Exit GUI.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Structure Wrap.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Tactical Save.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Tactical Turns.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\TeamTurns.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Turn Based Input.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\UI Cursors.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Vehicles.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Weapons.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\World Items.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_AmmoStrings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_AmmoTypes.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Armour.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_AttachmentInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Attachments.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_BurstSounds.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_ComboMergeInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_CompatibleFaceItems.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyAmmoDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyArmourDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyExplosiveDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyItemChoice.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyMiscDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyWeaponChoice.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_EnemyWeaponDrops.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Explosive.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_IMPItemChoices.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_IncompatibleAttachments.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Launchable.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Magazine.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Merge.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_SectorLoadscreens.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_Sounds.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\XML_TonyInventory.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>