New attack busy system

Added missing #includes

Added LUA scripting and console

Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain

Fixed signedness of many grid variables used in GetMouseMapPos calls

Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure

Added checks so enemies don't try to chuck RPG grenades with their hands

Now possible to shoot a someone in the head if he's in water

Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.

Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have

Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.

Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock

Change to greatly speed up closing the sector inventory window in an unloaded sector

Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting


Check builddefines.h for the conditional flags.  Of greatest interest might be LUA_CONSOLE.  This will cause the game to bring up a command console when run.  However this console is severely lacking in many areas.  If anybody knows of an open-source terminal/console that could be used instead, it would be appreciated.  The existing console does bad things when you try to close it, and since it counts as a separate app, it pauses the game while it has focus.

LUA scripting is very limited, basically just proof of concept.  There is one global variable, the Soldiers array.  An array index gives you the soldier in that slot in the currently loaded sector.  The soldier has a few things that can be accessed:  name (short name); fullname (long name); grid (current grid #, can be changed); walkto(grid) (function to walk to another grid); runto(grid) (function to run to another grid)


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

Strategic/AI Viewer.cpp

@@ -4,6 +4,7 @@
 	#include "Strategic All.h"
 	#include "INIReader.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "english.h"
@@ -33,6 +34,11 @@
 	#include "Creature Spreading.h"
 	#include "message.h"
 	#include "Game Init.h"
+	#include "Strategic AI.h"
+	#include "Campaign.h"
+	#include "Auto Resolve.h"
+	#include "Strategic Status.h"
+	#include "wordwrap.h"
 #endif
 
 #ifdef JA2BETAVERSION

Strategic/Assignments.cpp

@@ -56,6 +56,13 @@
 	#include "math.h"
 	#include "SkillCheck.h"
 	#include "Strategic Pathing.h"
+	#include "Game Event Hook.h"
+	#include "Strategic Event Handler.h"
+	#include "Map Information.h"
+	#include "Strategic Status.h"
+	#include "history.h"
+	#include "Map Screen Interface Map Inventory.h"
+	#include "interface dialogue.h"
 #endif
 
 #include "MilitiaSquads.h"

Strategic/Auto Resolve.cpp

@@ -4,6 +4,7 @@
 	#include "Strategic All.h"
 	#include "GameSettings.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "Auto Resolve.h"
@@ -56,6 +57,15 @@
 	#include "morale.h"
 	#include "Strategic Town Loyalty.h"
 	#include "GameSettings.h"
+	#include "Soldier macros.h"
+	#include "strategicmap.h"
+	#include "Quests.h"
+	#include "meanwhile.h"
+	#include "Inventory Choosing.h"
+	#include "Game Event Hook.h"
+	#include "Assignments.h"
+	#include "cheats.h"
+	#include "Map Information.h"
 #endif
 
 #include "Reinforcement.h"

Strategic/Campaign Init.cpp

@@ -14,6 +14,9 @@
 	#include "Creature Spreading.h"
 	#include "Strategic AI.h"
 	#include "XML.h"
+	#include "expat.h"
+	#include "Debug Control.h"
+	#include "Tactical Save.h"
 #endif
 
 extern BOOLEAN InitStrategicMovementCosts();

Strategic/Creature Spreading.cpp

@@ -27,6 +27,10 @@
 	#include "Map Edgepoints.h"
 	#include "Animation Data.h"
 	#include "opplist.h"
+	#include "meanwhile.h"
+	#include "Strategic AI.h"
+	#include "MessageBoxScreen.h"
+	#include "Map Information.h"
 #endif
 
 #ifdef JA2BETAVERSION

Strategic/Game Clock.cpp

@@ -20,6 +20,11 @@
 	#include "Event Pump.h"
 	#include "Text.h"
 	#include "Interface Control.h"
+	#include "Map Screen Interface Map.h"
+	#include "Map Screen Interface Bottom.h"
+	#include "gamescreen.h"
+	#include "Map Information.h"
+	#include "GameSettings.h"
 #endif
 
 //#define DEBUG_GAME_CLOCK
@@ -68,23 +73,23 @@ extern BOOLEAN fMapScreenBottomDirty;
 
 //These contain all of the information about the game time, rate of time, etc.
 //All of these get saved and loaded.
-INT32			giTimeCompressMode			=	TIME_COMPRESS_X0;
-UINT8			gubClockResolution			= 1;
-BOOLEAN			gfGamePaused				= TRUE;
-BOOLEAN			gfTimeInterrupt				= FALSE;
-BOOLEAN			gfTimeInterruptPause		= FALSE;
-BOOLEAN			fSuperCompression			= FALSE;
+INT32				giTimeCompressMode			=	TIME_COMPRESS_X0;
+UINT8				gubClockResolution			= 1;
+BOOLEAN			gfGamePaused						= TRUE;
+BOOLEAN			gfTimeInterrupt					= FALSE;
+BOOLEAN			gfTimeInterruptPause    = FALSE;
+BOOLEAN			fSuperCompression				= FALSE;
 UINT32			guiGameClock				= gGameExternalOptions.iGameStartingTime;
 UINT32			guiPreviousGameClock = 0;		// used only for error-checking purposes
 UINT32			guiGameSecondsPerRealSecond;
 UINT32			guiTimesThisSecondProcessed = 0;
-INT32			iPausedPopUpBox = -1;
+INT32			  iPausedPopUpBox = -1;
 UINT32			guiDay;
 UINT32			guiHour;
 UINT32			guiMin;
 CHAR16			gswzWorldTimeStr[20];
-INT32			giTimeCompressSpeeds[ NUM_TIME_COMPRESS_SPEEDS ] = { 0, 1, 5 * 60, 30 * 60, 60 * 60 };
-UINT16			usPausedActualWidth;
+INT32				giTimeCompressSpeeds[ NUM_TIME_COMPRESS_SPEEDS ] = { 0, 1, 5 * 60, 30 * 60, 60 * 60 };
+UINT16      usPausedActualWidth;
 UINT16			usPausedActualHeight;
 UINT32			guiTimeOfLastEventQuery = 0;
 BOOLEAN			gfLockPauseState = FALSE;
@@ -95,7 +100,7 @@ UINT32			guiLockPauseStateLastReasonId = 0;
 //***When adding new saved time variables, make sure you remove the appropriate amount from the paddingbytes and
 //   more IMPORTANTLY, add appropriate code in Save/LoadGameClock()!
 #define			TIME_PADDINGBYTES		20
-UINT8			gubUnusedTimePadding[TIME_PADDINGBYTES];
+UINT8				gubUnusedTimePadding[TIME_PADDINGBYTES];
 
 
 

Strategic/Game Clock.h

@@ -201,4 +201,4 @@ void HandlePlayerPauseUnPauseOfGame( void );
 
 void ClearTacticalStuffDueToTimeCompression( void );
 
-#endif
+#endif

Strategic/Game Event Hook.cpp

@@ -37,6 +37,13 @@
 	#include "Strategic AI.h"
 	#include "Merc Contract.h"
 	#include "Strategic Status.h"
+	#include "INIReader.h"
+	#include "GameSettings.h"
+	#include "english.h"
+	#include "Input.h"
+	#include "Soldier Profile.h"
+	#include "laptop.h"
+	#include "Campaign.h"
 #endif
 
 #ifdef JA2BETAVERSION

Strategic/Game Events.cpp

@@ -1,6 +1,7 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "Game Events.h"

Strategic/Game Init.cpp

@@ -47,6 +47,19 @@
 	#include "npc.h"
 	#include "Init.h"
 	#include "GameSettings.h"
+	#include "opplist.h"
+	#include "interface dialogue.h"
+	#include "Map Screen Interface Border.h"
+	#include "Map Screen Helicopter.h"
+	#include "Vehicles.h"
+	#include "Map Screen Interface Map.h"
+	#include "PreBattle Interface.h"
+	#include "Arms Dealer Init.h"
+	#include "bobbyr.h"
+	#include "helpscreen.h"
+	#include "Air Raid.h"
+	#include "Interface.h"
+	#include "cheats.h"
 #endif
 
 // Temp function

Strategic/Hourly Update.cpp

@@ -9,6 +9,15 @@
 	#include "Morale.h"
 	#include "Quests.h"
 	#include "Game Clock.h"
+	#include "Overhead.h"
+	#include "Boxing.h"
+	#include "jascreens.h"
+	#include "screenids.h"
+	#include "Items.h"
+	#include "Random.h"
+	#include "finances.h"
+	#include "history.h"
+	#include "Dialogue Control.h"
 #endif
 
 void HourlyQuestUpdate( void );

Strategic/Map Screen Helicopter.cpp

@@ -28,6 +28,16 @@
 	#include "Squads.h"
 	#include "Player Command.h"
 	#include "Sound Control.h"
+	#include "GameSettings.h"
+	#include "meanwhile.h"
+	#include "Map Screen Interface Border.h"
+	#include "Strategic Event Handler.h"
+	#include "Overhead.h"
+	#include "Soldier Create.h"
+	#include "renderworld.h"
+	#include "soundman.h"
+	#include "Isometric Utils.h"
+	#include "Scheduling.h"
 #endif
 
 

Strategic/Map Screen Interface Border.cpp

@@ -23,6 +23,7 @@
 	#include "Campaign Types.h"
 	#include "Strategic Town Loyalty.h"
 	#include "strategicmap.h"
+	#include "Assignments.h"
 #endif
 
 

Strategic/Map Screen Interface Bottom.cpp

@@ -36,6 +36,20 @@
 	#include "LaptopSave.h"
 	#include "Sound Control.h"
 	#include "Interface Items.h"
+	#include "wordwrap.h"
+	#include "meanwhile.h"
+	#include "Dialogue Control.h"
+	#include "Map Screen Helicopter.h"
+	#include "Map Screen Interface TownMine Info.h"
+	#include "Merc Contract.h"
+	#include "Map Screen Interface Map Inventory.h"
+	#include "Explosion Control.h"
+	#include "Creature Spreading.h"
+	#include "Assignments.h"
+	#include "Soldier macros.h"
+	#include "GameSettings.h"
+	#include "_Ja25EnglishText.h"
+	#include "SaveLoadScreen.h"
 #endif
 
 

Strategic/Map Screen Interface Map Inventory.cpp

@@ -26,6 +26,14 @@
 	#include "english.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "GameSettings.h"
+	#include "Radar Screen.h"
+	#include "message.h"
+	#include "weapons.h"
+	#include "finances.h"
+	#include "Game Clock.h"
+	#include "Sound Control.h"
+	#include "interface panels.h"
+	#include "wordwrap.h"
 #endif
 
 #include "ShopKeeper Interface.h"

Strategic/Map Screen Interface Map.cpp

@@ -41,6 +41,9 @@
 	#include "Town Militia.h"
 	#include "Militia Control.h"
 	#include "GameSettings.h"
+	#include "Tactical Save.h"
+	#include "Map Information.h"
+	#include "Air Raid.h"
 #endif
 
 // zoom x and y coords for map scrolling

Strategic/Map Screen Interface Map.h

@@ -3,6 +3,7 @@
 
 
 #include "Vehicles.h"
+#include "mapscreen.h"
 
 // functions
 void DrawMapIndexBigMap( BOOLEAN fSelectedCursorIsYellow );

Strategic/Map Screen Interface TownMine Info.cpp

@@ -24,6 +24,8 @@
 	#include "video.h"
 	#include "Town Militia.h"
 	#include "HelpScreen.h"
+	#include "Map Screen Helicopter.h"
+	#include "Tactical Save.h"
 #endif
 
 

Strategic/Map Screen Interface.cpp

@@ -38,6 +38,22 @@
 	#include "WordWrap.h"
 	#include "interface control.h"
 	#include "GameSettings.h"
+	#include "Campaign Types.h"
+	#include "Map Screen Interface Map Inventory.h"
+	#include "strategic.h"
+	#include "Keys.h"
+	#include "Soldier macros.h"
+	#include "Militia Control.h"
+	#include "Random.h"
+	#include "Cursor Control.h"
+	#include "renderworld.h"
+	#include "Game Init.h"
+	#include "Strategic Mines.h"
+	#include "finances.h"
+	#include "strategic.h"
+	#include "Air Raid.h"
+	#include "Queen Command.h"
+	#include "Render Fun.h"
 #endif
 
 // inventory pool position on screen

Strategic/Map Screen Interface.h

@@ -5,7 +5,7 @@
 #include "Types.h"
 #include "Soldier Control.h"
 #include "MessageBoxScreen.h"
-
+#include "Font Control.h"
 
 
 typedef struct FASTHELPREGION {

Strategic/Meanwhile.cpp

@@ -21,6 +21,21 @@
 	#include "assignments.h"
 	#include "strategic.h"
 	#include "text.h"
+	#include "interface control.h"
+	#include "Interface Items.h"
+	#include "Map Information.h"
+	#include "Map Screen Interface Map.h"
+	#include "Map Screen Interface.h"
+	#include "Music Control.h"
+	#include "Interface.h"
+	#include "Game Events.h"
+	#include "GameSettings.h"
+	#include "Strategic AI.h"
+	#include "interface dialogue.h"
+	#include "Quests.h"
+	#include "Campaign Types.h"
+	#include "Squads.h"
+	#include "Random.h"
 #endif
 
 #define MAX_MEANWHILE_PROFILES	10

Strategic/Merc Contract.cpp

@@ -1,3 +1,5 @@
+#include "builddefines.h"
+
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -35,6 +37,8 @@
 	#include "Strategic Status.h"
 	#include "mercs.h"
 	#include "insurance contract.h"
+	#include "Vehicles.h"
+	#include "email.h"
 #endif
 
 

Strategic/MilitiaSquads.cpp

@@ -20,6 +20,11 @@
 	#include "squads.h"
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
+	#include "GameSettings.h"
+	#include "Queen Command.h"
+	#include "math.h"
+	#include "Auto Resolve.h"
+	#include "Vehicles.h"
 #endif
 
 #include "MilitiaSquads.h"

Strategic/Player Command.cpp

@@ -15,6 +15,14 @@
 	#include "strategicmap.h"
 	#include "Map Screen Helicopter.h"
 	#include "Game Clock.h"
+	#include "meanwhile.h"
+	#include "email.h"
+	#include "GameSettings.h"
+	#include "Strategic Status.h"
+	#include "Strategic AI.h"
+	#include "PreBattle Interface.h"
+	#include "Map Screen Interface.h"
+	#include "Tactical Save.h"
 #endif
 
 

Strategic/PreBattle Interface.cpp

@@ -1,6 +1,7 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "PreBattle Interface.h"
 	#include "Button System.h"
@@ -32,6 +33,17 @@
 	#include "Random.h"
 	#include "Creature Spreading.h"
 	#include "Multi Language Graphic Utils.h"
+	#include "Map Screen Helicopter.h"
+	#include "Quests.h"
+	#include "Map Screen Interface Border.h"
+	#include "Strategic Status.h"
+	#include "interface control.h"
+	#include "Strategic Town Loyalty.h"
+	#include "Squads.h"
+	#include "Assignments.h"
+	#include "Soldier macros.h"
+	#include "history.h"
+	#include "Cheats.h"
 #endif
 
 extern void InitializeTacticalStatusAtBattleStart();

Strategic/Queen Command.cpp

@@ -26,6 +26,23 @@
 	#include "Soldier Ani.h"
 	#include "Strategic AI.h"
 	#include "GameSettings.h"
+	#include "MessageBoxScreen.h"
+	#include "screenids.h"
+	#include "Strategic Town Loyalty.h"
+	#include "Soldier Profile.h"
+	#include "Quests.h"
+	#include "jascreens.h"
+	#include "Auto Resolve.h"
+	#include "Game Event Hook.h"
+	#include "Animation Data.h"
+	#include "Game Clock.h"
+	#include "renderworld.h"
+	#include "Town Militia.h"
+	#include "Dialogue Control.h"
+	#include "Campaign Init.h"
+	#include "meanwhile.h"
+	#include "Soldier macros.h"
+	#include "Morale.h"	
 #endif
 
 #ifdef JA2BETAVERSION

Strategic/Quest Debug System.cpp

@@ -1,3 +1,5 @@
+#include "builddefines.h"
+
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -37,6 +39,7 @@
 	#include	"Interface Dialogue.h"
 	#include  "SysUtil.h"
 	#include  "Message.h"
+	#include "Random.h"
 #endif
 
 //#ifdef JA2BETAVERSION
@@ -433,7 +436,7 @@ SCROLL_BOX	gItemListBox;				// The Npc Scroll box
 
 SCROLL_BOX	*gpActiveListBox;		// Only 1 scroll box is active at a time, this is set to it.
 
-INT16				gsQdsEnteringGridNo	=0;
+UINT16				gusQdsEnteringGridNo	=0;
 
 
 UINT8				gubTextEntryAction = QD_DROP_DOWN_NO_ACTION;
@@ -1246,11 +1249,11 @@ void		RenderQuestDebugSystem()
 
 void DisplayCurrentGridNo()
 {
-	if( gsQdsEnteringGridNo != 0 )
+	if( gusQdsEnteringGridNo != 0 )
 	{
 		CHAR16	zTemp[512];
 
-		swprintf( zTemp, L"%s:  %d", QuestDebugText[ QUEST_DBS_CURRENT_GRIDNO ], gsQdsEnteringGridNo );
+		swprintf( zTemp, L"%s:  %d", QuestDebugText[ QUEST_DBS_CURRENT_GRIDNO ], gusQdsEnteringGridNo );
 		DrawTextToScreen( zTemp, QUEST_DBS_NPC_CURRENT_GRIDNO_X, QUEST_DBS_NPC_CURRENT_GRIDNO_Y, QUEST_DBS_NUMBER_COL_WIDTH, QUEST_DBS_FONT_DYNAMIC_TEXT, QUEST_DBS_COLOR_DYNAMIC_TEXT, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED	);			
 	}
 }
@@ -2688,7 +2691,7 @@ void BtnQuestDebugStartMercTalkingButtonButtonCallback(GUI_BUTTON *btn,INT32 rea
 //		DoQDSMessageBox( MSG_BOX_BASIC_STYLE, zTemp, QUEST_DEBUG_SCREEN, MSG_BOX_FLAG_OK, NULL );
 
 		//set the initial value
-		gsQdsEnteringGridNo = 0;
+		gusQdsEnteringGridNo = 0;
 
 		TextEntryBox( QuestDebugText[ QUEST_DBS_START_MERC_TALKING_FROM ], StartMercTalkingFromQuoteNum );
 
@@ -2943,7 +2946,7 @@ void InitQuestDebugTextInputBoxes()
 	}
 */
 
-	swprintf( sTemp, L"%d", gsQdsEnteringGridNo );
+	swprintf( sTemp, L"%d", gusQdsEnteringGridNo );
 
 	//Text entry field
 	AddTextInputField( QUEST_DBS_TEB_X+QUEST_DBS_TEB_WIDTH/2-30, QUEST_DBS_TEB_Y+65, 60, 15, MSYS_PRIORITY_HIGH+60, sTemp, QUEST_DBS_TEXT_FIELD_WIDTH, INPUTTYPE_NUMERICSTRICT );
@@ -2986,7 +2989,7 @@ void AddNPCToGridNo( INT32 iGridNo )
 	//Add all the npc in the current sectory the npc array
 	AddNPCsInSectorToArray();
 
-	gsQdsEnteringGridNo = (INT16)iGridNo;
+	gusQdsEnteringGridNo = (INT16)iGridNo;
 }
 
 
@@ -2995,7 +2998,7 @@ void AddItemToGridNo( INT32 iGridNo )
 {
 	OBJECTTYPE		Object;
 
-	gsQdsEnteringGridNo = (INT16)iGridNo;
+	gusQdsEnteringGridNo = (INT16)iGridNo;
 
 
 	if( Item[ gItemListBox.sCurSelectedItem ].usItemClass == IC_KEY )
@@ -3023,7 +3026,7 @@ void AddKeyToGridNo( INT32 iKeyID )
 		CreateKeyObject( &Object, 1, (UINT8)iKeyID );
 
 		//add the item to the world
-		AddItemToPool( gsQdsEnteringGridNo, &Object, -1, 0, 0, 0 );
+		AddItemToPool( gusQdsEnteringGridNo, &Object, -1, 0, 0, 0 );
 	}
 	else
 		gfAddKeyNextPass = TRUE;

Strategic/Quest Debug System.h

@@ -6,7 +6,7 @@
 
 
 extern	BOOLEAN			gfNpcLogButton;
-extern	INT16				gsQdsEnteringGridNo;
+extern	UINT16				gusQdsEnteringGridNo;
 
 
 void NpcRecordLoggingInit( UINT8 ubNpcID, UINT8 ubMercID, UINT8 ubQuoteNum, UINT8 ubApproach );

Strategic/Quests.cpp

@@ -27,6 +27,10 @@
 	#include "GameSettings.h"
 	#include "Arms Dealer Init.h"
 	#include "GameSettings.h"
+	#include "Random.h"
+	#include "Assignments.h"
+	#include "strategic.h"
+	#include "Strategic Event Handler.h"
 #endif
 
 #include "BobbyRMailOrder.h"

Strategic/Quests.h

@@ -2,6 +2,7 @@
 #define __QUESTS_H
 
 #include "FileMan.h"
+#include "strategicmap.h"
 
 //  Quest.ubStatus values
 #define QUESTNOTSTARTED					0

Strategic/Reinforcement.cpp

@@ -20,6 +20,9 @@
 	#include "squads.h"
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
+	#include "Queen Command.h"
+	#include "GameSettings.h"
+	#include "Soldier Init List.h"
 #endif
 
 #include "Reinforcement.h"

Strategic/Scheduling.cpp

@@ -22,6 +22,12 @@
 	#include "Structure Wrap.h"
 	#include "jascreens.h"
 	#include "strategicmap.h"
+	#include "worldman.h"
+	#include "Animation Control.h"
+	#include "Soldier Add.h"
+	#include "Soldier Profile.h"
+	#include "soldier profile type.h"
+	#include "Quests.h"
 #endif
 
 #ifdef JA2EDITOR

Strategic/Strategic AI.cpp

@@ -3,6 +3,7 @@
 	#include "Strategic All.h"
 	#include "GameSettings.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "types.h"
 	#include "Strategic Movement.h"
@@ -20,6 +21,22 @@
 	#include "strategic.h"
 	#include "Explosion Control.h"
 	#include "Town Militia.h"
+	#include "Overhead.h"
+	#include "Squads.h"
+	#include "jascreens.h"
+	#include "screenids.h"
+	#include "MessageBoxScreen.h"
+	#include "Quests.h"
+	#include "Player Command.h"
+	#include "Campaign.h"
+	#include "Campaign Init.h"
+	#include "Game Init.h"
+	#include "PreBattle Interface.h"
+	#include "Quests.h"
+	#include "Soldier Profile.h"
+	#include "Scheduling.h"
+	#include "Map Information.h"
+	#include "interface dialogue.h"
 #endif
 
 #define SAI_VERSION		29

Strategic/Strategic All.h

@@ -3,6 +3,7 @@
 
 #pragma message("GENERATED PCH FOR STRATEGIC PROJECT.")
 
+#include "builddefines.h"
 #include <stdio.h>
 #include "types.h"
 #include "english.h"

Strategic/Strategic Event Handler.cpp

@@ -27,6 +27,10 @@
 	#include "Renderworld.h"
 	#include "Soldier Profile.h"
 	#include "email.h"
+	#include "strategic.h"
+	#include "structure wrap.h"
+	#include "GameSettings.h"
+	#include "history.h"
 #endif
 #include "BobbyRMailOrder.h"
 

Strategic/Strategic Merc Handler.cpp

@@ -36,6 +36,10 @@
 	#include "screenids.h"
 	#include "gameloop.h"
 	#include "jascreens.h"
+	#include "Soldier macros.h"
+	#include "finances.h"
+	#include "GameSettings.h"
+	#include "Quests.h"
 #endif
 
 

Strategic/Strategic Mines.cpp

@@ -17,6 +17,10 @@
 	#include "message.h"
 	#include "Text.h"
 	#include "Game Event Hook.h"
+	#include "GameSettings.h"
+	#include "Strategic AI.h"
+	#include "Campaign Types.h"
+	#include "history.h"
 #endif
 
 

Strategic/Strategic Movement Costs.cpp

@@ -6,6 +6,10 @@
 	#include "Queen Command.h"
 	#include "Strategic Movement.h"
 	#include "XML.h"
+	#include "expat.h"
+	#include "Debug.h"
+	#include "Debug Control.h"
+	#include "Tactical Save.h"
 #endif
 
 typedef enum

Strategic/Strategic Movement.cpp

@@ -1,6 +1,7 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
+	#include "builddefines.h"
 	#include <stdlib.h>
 	#include <memory.h>
 	#include "Strategic Movement.h"
@@ -37,6 +38,15 @@
 	#include "Player Command.h"
 	#include "Strategic AI.h"
 	#include "Town Militia.h"
+	#include "Music Control.h"
+	#include "Campaign.h"
+	#include "Isometric Utils.h"
+	#include "meanwhile.h"
+	#include "Inventory Choosing.h"
+	#include "Map Screen Interface Border.h"
+	#include "Auto Resolve.h"
+	#include "GameSettings.h"
+	#include "Quests.h"
 #endif
 
 #include "MilitiaSquads.h"

Strategic/Strategic Pathing.cpp

@@ -26,6 +26,7 @@
 	#include "english.h"
 	#include "Map Screen Interface.h"
 	#include "Game Event Hook.h"
+	#include "Strategic AI.h"
 #endif
 
 

Strategic/Strategic Status.cpp

@@ -10,6 +10,12 @@
 	#include "Strategic Mines.h"
 	#include "email.h"
 	#include "Game Clock.h"
+	#include "TopicIDs.h"
+	#include "TopicOps.h"
+	#include "Debug.h"
+	#include "GameSettings.h"
+	#include "history.h"
+	#include "Strategic Town Loyalty.h"
 #endif
 
 

Strategic/Strategic Town Loyalty.cpp

@@ -1,3 +1,5 @@
+#include "builddefines.h"
+
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -22,6 +24,15 @@
 	#include "vehicles.h"
 	#include "Game Clock.h"
 	#include "Game Event Hook.h"
+	#include "Morale.h"
+	#include "GameSettings.h"
+	#include "Text.h"
+	#include "MessageBoxScreen.h"
+	#include "Creature Spreading.h"
+	#include "Town Militia.h"
+	#include "history.h"
+	#include "meanwhile.h"
+	#include "Strategic Status.h"
 #endif
 
 

Strategic/Town Militia.cpp

@@ -1,3 +1,5 @@
+#include "builddefines.h"
+
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "GameSettings.h"
@@ -22,6 +24,11 @@
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
 	#include "GameSettings.h"
+	#include "Queen Command.h"
+	#include "PreBattle Interface.h"
+	#include "Map Screen Interface Border.h"
+	#include "interface control.h"
+	#include "Map Screen Interface Map.h"
 #endif
 
 #include "MilitiaSquads.h"

Strategic/XML_Army.cpp

@@ -1,9 +1,15 @@
+#include "builddefines.h"
+
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "XML.h"
 #else
 	#include <stdio.h>
 	#include "XML.h"
+	#include "Strategic AI.h"
+	#include "expat.h"
+	#include "Campaign Types.h"
+	#include "Debug Control.h"
 #endif
 
 #define MAX_CHAR_DATA_LENGTH			500

Strategic/XML_Roaming.cpp

@@ -2,8 +2,15 @@
 	#include "Strategic All.h"
 	#include "XML.h"
 #else
+	#include "builddefines.h"
 	#include <stdio.h>
 	#include "XML.h"
+	#include "expat.h"
+	#include "string.h"
+	#include "Campaign Types.h"
+	#include "FileMan.h"
+	#include "MemMan.h"
+	#include "Debug Control.h"
 #endif
 
 #define MAX_CHAR_DATA_LENGTH			500

Strategic/mapscreen.cpp

@@ -97,6 +97,19 @@
 	#include "Player Command.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "HelpScreen.h"
+	#include "Soldier macros.h"
+	#include "Map Information.h"
+	#include "cheats.h"
+	#include "Strategic Town Loyalty.h"
+	#include "GameSettings.h"
+	#include "_Ja25EnglishText.h"
+	#include "Militia Control.h"
+	#include "Tactical Save.h"
+	#include "Explosion Control.h"
+	#include "Creature Spreading.h"
+	#include "email.h"
+	#include "Strategic Status.h"
+	#include "Soldier Create.h"
 #endif
 
 

Strategic/strategic.cpp

@@ -14,6 +14,8 @@
 	#include "personnel.h"
 	#include "Tactical Save.h"
 	#include "Isometric Utils.h"
+	#include "Vehicles.h"
+	#include "Game Clock.h"
 #endif
 
 StrategicMapElement StrategicMap[MAP_WORLD_X*MAP_WORLD_Y];

Strategic/strategicmap.cpp

@@ -1,3 +1,5 @@
+#include "builddefines.h"
+
 // WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
@@ -88,6 +90,21 @@
 	#include "render dirty.h"
 	#include "Debug Control.h"
 	#include "expat.h"
+	#include "Loading Screen.h"
+	#include "Queen Command.h"
+	#include "Enemy Soldier Save.h"
+	#include "Boxing.h"
+	#include "NPC.h"
+	#include "Strategic Event Handler.h"
+	#include "MessageBoxScreen.h"
+	#include "interface dialogue.h"
+	#include "Map Screen Interface.h"
+	#include "history.h"
+	#include "Bullets.h"
+	#include "physics.h"
+	#include "Explosion Control.h"
+	#include "Auto Resolve.h"
+	#include "cursors.h"
 #endif
 
 #include "SaveLoadGame.h"
@@ -2746,7 +2763,7 @@ void UpdateMercInSector( SOLDIERTYPE *pSoldier, INT16 sSectorX, INT16 sSectorY,
 }
 
 // Get sector ID string makes a string like 'A9 - OMERTA', or just J11 if no town....
-void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , CHAR16 * zString, BOOLEAN fDetailed )
+void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zString, BOOLEAN fDetailed )
 {
 	SECTORINFO *pSector = NULL;
 	UNDERGROUND_SECTORINFO *pUnderground;