From 8822bfcb8f8abdee3e19aa5c7489cdcae93ea42d Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Thu, 11 Mar 2021 20:41:44 +0000 Subject: [PATCH] TileEngine include cleanup (by Asdow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8953 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Ambient Control.cpp | 11 +---- TileEngine/Buildings.cpp | 5 -- TileEngine/Buildings.h | 2 +- TileEngine/Exit Grids.cpp | 7 --- TileEngine/Exit Grids.h | 1 - TileEngine/Explosion Control.cpp | 32 ------------ TileEngine/Fog Of War.cpp | 1 - TileEngine/Fog Of War.h | 4 -- TileEngine/Interactive Tiles.cpp | 23 ++------- TileEngine/Interactive Tiles.h | 1 - TileEngine/Isometric Utils.cpp | 7 --- TileEngine/LightEffects.cpp | 12 ----- TileEngine/Map Edgepoints.cpp | 6 +-- TileEngine/Map Edgepoints.h | 3 -- TileEngine/Radar Screen.cpp | 18 ++----- TileEngine/Radar Screen.h | 1 - TileEngine/Render Dirty.cpp | 20 ++++---- TileEngine/Render Fun.cpp | 10 ---- TileEngine/Render Fun.h | 2 - TileEngine/Render Z.cpp | 2 - TileEngine/Render Z.h | 2 - TileEngine/SmokeEffects.cpp | 1 - TileEngine/Tactical Placement GUI.cpp | 12 +---- TileEngine/Tactical Placement GUI.h | 6 ++- TileEngine/Tile Animation.cpp | 12 +---- TileEngine/Tile Cache.cpp | 13 ++--- TileEngine/Tile Cache.h | 9 ---- TileEngine/Tile Surface.cpp | 9 ---- TileEngine/WorldDat.cpp | 7 --- TileEngine/environment.cpp | 12 ----- TileEngine/lighting.cpp | 17 ------- TileEngine/lighting.h | 3 +- TileEngine/overhead map.cpp | 30 +++++------ TileEngine/phys math.h | 1 - TileEngine/physics.cpp | 57 ++++++++------------- TileEngine/physics.h | 3 -- TileEngine/pits.cpp | 3 -- TileEngine/renderworld.cpp | 71 +++++++++------------------ TileEngine/renderworld.h | 6 +-- TileEngine/sysutil.cpp | 4 -- TileEngine/tiledef.cpp | 6 --- TileEngine/tiledef.h | 1 - TileEngine/worlddef.cpp | 32 +++--------- TileEngine/worlddef.h | 5 +- TileEngine/worldman.cpp | 13 +---- 45 files changed, 100 insertions(+), 403 deletions(-) diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index df0f20e1..6f8ca2fe 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -3,25 +3,16 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include "stdio.h" - #include "sgp.h" - #include "Ambient types.h" - #include "fileman.h" - #include "environment.h" + #include "Ambient Control.h" #include "Sound Control.h" #include "Game Events.h" - #include "Ambient Control.h" #include "lighting.h" #include "Random.h" // sevenfm #include "SmokeEffects.h" - #include "message.h" #include "Overhead.h" - #include "strategicmap.h" #include "Strategic Movement.h" #include "Game Clock.h" - #include "Queen Command.h" - #include "undergroundinit.h" #include "strategic mines.h" #endif diff --git a/TileEngine/Buildings.cpp b/TileEngine/Buildings.cpp index 94ebc5a3..096f2801 100644 --- a/TileEngine/Buildings.cpp +++ b/TileEngine/Buildings.cpp @@ -3,14 +3,9 @@ #else #include "Types.h" #include "Buildings.h" - #include "Isometric Utils.h" #include "Pathai.h" #include "Structure Wrap.h" - #include "Random.h" - #include "Overhead.h" #include "Render Fun.h" - #include "Strategicmap.h" - #include "Sys Globals.h" #include "worldman.h" #endif diff --git a/TileEngine/Buildings.h b/TileEngine/Buildings.h index aad46b8b..998551cc 100644 --- a/TileEngine/Buildings.h +++ b/TileEngine/Buildings.h @@ -2,7 +2,7 @@ #define BUILDING_H -#include "worlddef.h" +class SOLDIERTYPE; // for what it's worth, 2 bytes, we use roof climb spots as 1-based // so the 0th entry is always 0 and can be compared with (and not equal) // NOWHERE or any other location diff --git a/TileEngine/Exit Grids.cpp b/TileEngine/Exit Grids.cpp index 091ded53..28355f18 100644 --- a/TileEngine/Exit Grids.cpp +++ b/TileEngine/Exit Grids.cpp @@ -1,24 +1,17 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include "FileMan.h" #include "debug.h" - #include "types.h" #include "worlddef.h" #include "worldman.h" - #include "smooth.h" #include "Exit Grids.h" #include "Editor Undo.h" #include "StrategicMap.h" #include "Strategic Movement.h" #include "message.h" - #include "Font Control.h" #include "pathai.h" - #include "overhead.h" #include "Animation Control.h" #include "Sys Globals.h" - #include "quests.h" #include "SaveLoadMap.h" #include "Text.h" #endif diff --git a/TileEngine/Exit Grids.h b/TileEngine/Exit Grids.h index 1a35a721..0b8a4362 100644 --- a/TileEngine/Exit Grids.h +++ b/TileEngine/Exit Grids.h @@ -1,7 +1,6 @@ #ifndef __EXIT_GRIDS_H #define __EXIT_GRIDS_H -#include "Fileman.h" #include "Worlddef.h" //dnl ch42 250909 diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index dd241345..8a7c05a4 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -5,62 +5,31 @@ #include "end game.h" #include "Morale.h" #else -#include -#include -#include "stdlib.h" #include "debug.h" -//#include "soldier control.h" #include "weapons.h" -#include "handle items.h" -#include "worlddef.h" #include "worldman.h" -#include "rotting corpses.h" -#include "tile cache.h" -#include "isometric utils.h" -#include "animation control.h" -#include "utilities.h" #include "game clock.h" -#include "soldier create.h" #include "renderworld.h" -#include "soldier add.h" #include "explosion control.h" -#include "tile animation.h" #include "sound control.h" -#include "weapons.h" -#include "handle items.h" -#include "world items.h" #include "structure wrap.h" -#include "tiledef.h" -#include "tiledat.h" #include "interactive tiles.h" #include "SaveLoadMap.h" #include "Message.h" #include "Random.h" #include "smokeeffects.h" -#include "handle ui.h" #include "pathai.h" -#include "campaign Types.h" -#include "strategicmap.h" #include "strategic.h" #include "Action Items.h" -#include "Soldier Profile.h" -#include "Quests.h" #include "Interface Dialogue.h" #include "LightEffects.h" #include "AI.h" #include "Soldier tile.h" -#include "lighting.h" #include "Render Fun.h" #include "Opplist.h" #include "smell.h" -#include "GameSettings.h" -#include "Interface.h" #include "end game.h" -#include "WorldDat.h" -#include "environment.h" #include "Buildings.h" -#include "Keys.h" -#include "Morale.h" #include "fov.h" #include "Map Information.h" #include "Soldier Functions.h"//dnl ch40 200909 @@ -94,7 +63,6 @@ class OBJECTTYPE; class SOLDIERTYPE; //DBrot: More Rooms -//BOOLEAN HookerInRoom( UINT8 ubRoom ); BOOLEAN HookerInRoom( UINT16 usRoom ); // MODULE FOR EXPLOSIONS diff --git a/TileEngine/Fog Of War.cpp b/TileEngine/Fog Of War.cpp index 7e3ad84d..d3cb512f 100644 --- a/TileEngine/Fog Of War.cpp +++ b/TileEngine/Fog Of War.cpp @@ -5,7 +5,6 @@ #include "Fog Of War.h" #include "Isometric Utils.h" #include "Simple Render Utils.h" - #include "Renderworld.h" #include "lighting.h" #endif diff --git a/TileEngine/Fog Of War.h b/TileEngine/Fog Of War.h index a36fe26f..7ac4b40f 100644 --- a/TileEngine/Fog Of War.h +++ b/TileEngine/Fog Of War.h @@ -1,10 +1,6 @@ #ifndef __FOG_OF_WAR_H #define __FOG_OF_WAR_H - -//Called after a map is loaded. By keying on the MAPELEMENT_REVEALED value, we can easily -//determine what is hidden by the fog. -void InitializeFogInWorld(); //Removes and smooths the adjacent tiles. void RemoveFogFromGridNo( INT32 uiGridNo ); diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index 8b51ab1c..92330b82 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -3,42 +3,29 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include - #include "sgp.h" - #include "himage.h" - #include "vsurface.h" #include "sysutil.h" #include "renderworld.h" - #include "interface.h" #include "Sound Control.h" - #include "worlddef.h" #include "Interactive Tiles.h" #include "interface cursors.h" #include "worldman.h" - #include "structure.h" - #include "Animation Control.h" #include "points.h" - #include "overhead.h" #include "structure wrap.h" #include "tile animation.h" #include "tile cache.h" #include "handle doors.h" - #include "Strategicmap.h" - #include "Quests.h" #include "Dialogue Control.h" - #include "Random.h" #include "english.h" - #include "handle items.h" - #include "message.h" - #include "handle ui.h" #include "NPC.h" #include "Explosion Control.h" #include "Text.h" - #include "GameSettings.h" - #include "environment.h" #endif +#ifdef JA2TESTVERSION + #include "message.h" +#endif + + #define MAX_INTTILE_STACK 10 typedef struct diff --git a/TileEngine/Interactive Tiles.h b/TileEngine/Interactive Tiles.h index 51426ff2..01ec0aa3 100644 --- a/TileEngine/Interactive Tiles.h +++ b/TileEngine/Interactive Tiles.h @@ -1,7 +1,6 @@ #ifndef __INTERACTIVE_TILES_H #define __INTERACTIVE_TILES_H -#include "Soldier Control.h" #define INTTILE_DOOR_TILE_ONE 1 diff --git a/TileEngine/Isometric Utils.cpp b/TileEngine/Isometric Utils.cpp index 9f95824d..a89289c2 100644 --- a/TileEngine/Isometric Utils.cpp +++ b/TileEngine/Isometric Utils.cpp @@ -1,22 +1,15 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include #include "debug.h" - #include "mousesystem.h" - #include "jascreens.h" - #include "worlddef.h" #include "renderworld.h" - #include "Isometric Utils.h" #include "interface.h" - #include "math.h" #include "worldman.h" #include "Structure Wrap.h" #include "sys globals.h" #include "overhead.h" #include "Random.h" #include "Pathai.h" - #include "GameSettings.h" // added by Flugente #endif diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index 66cf05ac..91a0669a 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -3,25 +3,13 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include - #include "stdlib.h" #include "debug.h" - //#include "soldier control.h" - #include "weapons.h" - #include "handle items.h" - #include "worlddef.h" #include "animation control.h" - #include "handle items.h" #include "lighteffects.h" - #include "message.h" #include "isometric utils.h" - #include "renderworld.h" - #include "Random.h" #include "lighting.h" #include "Game Clock.h" #include "opplist.h" - #include "Campaign Types.h" #include "Tactical Save.h" #endif diff --git a/TileEngine/Map Edgepoints.cpp b/TileEngine/Map Edgepoints.cpp index 715577fd..f2ef426b 100644 --- a/TileEngine/Map Edgepoints.cpp +++ b/TileEngine/Map Edgepoints.cpp @@ -1,4 +1,4 @@ - #include // added by Flugente + //#include // added by Flugente #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else @@ -7,15 +7,11 @@ #include "pathai.h" #include "ai.h" #include "Map Information.h" - #include "renderworld.h" - #include "Isometric Utils.h" #include "debug.h" #include "Random.h" - #include "strategic.h" #include "Animation Control.h" #include "Render Fun.h" #include "strategicmap.h" - #include "environment.h" #include "worldman.h" #include "PreBattle Interface.h" // added by Flugente #endif diff --git a/TileEngine/Map Edgepoints.h b/TileEngine/Map Edgepoints.h index af8ed123..80d1c04b 100644 --- a/TileEngine/Map Edgepoints.h +++ b/TileEngine/Map Edgepoints.h @@ -1,9 +1,6 @@ #ifndef __MAP_EDGEPOINTS_H #define __MAP_EDGEPOINTS_H -#include "types.h" -#include "Fileman.h" -#include "Overhead Types.h" #include "strategic.h" typedef struct MAPEDGEPOINTINFO diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index 25399e03..9b4c02ed 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -3,40 +3,30 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include #include "sgp.h" #include "Radar Screen.h" + #include "sysutil.h" #include "line.h" #include "renderworld.h" - #include "Isometric Utils.h" - #include "Interface.h" - #include "overhead.h" - #include "Soldier Control.h" #include "lighting.h" #include "wcheck.h" - #include "sysutil.h" #include "render dirty.h" #include "overhead map.h" #include "Squads.h" - #include "mousesystem.h" #include "Text.h" - #include "Font Control.h" - #include "vobject.h" #include "Utilities.h" #include "Interface Control.h" #include "Game Clock.h" #include "Map Screen Interface Map Inventory.h" - #include "meanwhile.h" - #include "strategicmap.h" #include "Animation Data.h" - #include "GameSettings.h" - #include "Map Screen Interface.h" // added by Flugente #endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; class SOLDIERTYPE; +extern std::vector gSquadNameVector; +extern INT8 gbWorldSectorZ; +extern BOOLEAN AreInMeanwhile(); #include "connect.h" extern INT32 iCurrentMapSectorZ; diff --git a/TileEngine/Radar Screen.h b/TileEngine/Radar Screen.h index 4480fb5b..666a7fc2 100644 --- a/TileEngine/Radar Screen.h +++ b/TileEngine/Radar Screen.h @@ -1,7 +1,6 @@ #ifndef __RADAR_SCREEN_H #define __RADAR_SCREEN_H -#include "interface.h" // RADAR MOUSE REGION STUFF void RadarRegionMoveCallback( MOUSE_REGION * pRegion, INT32 iReason ); diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 7519de1c..1ad556d9 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -5,25 +5,27 @@ #include "winfont.h" #else - #include "math.h" - #include - #include - #include "worlddef.h" - #include "renderworld.h" - #include "vsurface.h" #include "Render Dirty.h" #include "sysutil.h" - #include "container.h" - #include "video.h" #include "vobject_blitters.h" - #include "Font Control.h" #endif #ifdef JA2BETAVERSION #include "Message.h" #endif +// Forward Declarations +extern INT16 gsVIEWPORT_START_X; +extern INT16 gsVIEWPORT_START_Y; +extern INT16 gsVIEWPORT_WINDOW_START_Y; +extern INT16 gsVIEWPORT_WINDOW_END_Y; +extern INT16 gsVIEWPORT_END_X; +extern INT16 gsVIEWPORT_END_Y; +extern UINT16* gpZBuffer; +extern BOOLEAN gfScrollInertia; + + #define DIRTY_QUEUES 200 #define BACKGROUND_BUFFERS 1500 //was 500 #define VIDEO_OVERLAYS 100 diff --git a/TileEngine/Render Fun.cpp b/TileEngine/Render Fun.cpp index c77c78bf..f2e198b2 100644 --- a/TileEngine/Render Fun.cpp +++ b/TileEngine/Render Fun.cpp @@ -1,26 +1,16 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include "math.h" - #include - #include - #include "Render Fun.h" - #include "worlddef.h" - #include "input.h" #include "sysutil.h" #include "debug.h" #include "worldman.h" - #include "jascreens.h" #include "Isometric Utils.h" #include "renderworld.h" #include "fov.h" #include "Fog Of War.h" - #include "environment.h" #include "dialogue control.h" #include "Random.h" - #include "gamesettings.h" - #include "Dialogue Control.h" // added by Flugente #endif // Room Information diff --git a/TileEngine/Render Fun.h b/TileEngine/Render Fun.h index 20271161..e3d8ad4c 100644 --- a/TileEngine/Render Fun.h +++ b/TileEngine/Render Fun.h @@ -1,7 +1,6 @@ #ifndef __RENDER_FUN_H #define __RENDER_FUN_H -#include #include "worlddef.h" #define NO_ROOM 0 @@ -10,7 +9,6 @@ #define MAX_ROOMS 65530 extern UINT8 gubWorldRoomHidden[ MAX_ROOMS ]; -//extern UINT8* gubWorldRoomInfo; extern UINT16* gusWorldRoomInfo; BOOLEAN InitRoomDatabase( ); diff --git a/TileEngine/Render Z.cpp b/TileEngine/Render Z.cpp index e428049f..0c21e5e6 100644 --- a/TileEngine/Render Z.cpp +++ b/TileEngine/Render Z.cpp @@ -1,7 +1,5 @@ #include "Render Z.h" -#include "worlddef.h" #include "renderworld.h" -#include "Isometric Utils.h" INT16 gsRScreenCenterX, gsRScreenCenterY; INT16 gsRDistToCenterY, gsRDistToCenterX; diff --git a/TileEngine/Render Z.h b/TileEngine/Render Z.h index 92160d09..91bfd172 100644 --- a/TileEngine/Render Z.h +++ b/TileEngine/Render Z.h @@ -1,6 +1,4 @@ #include "worlddef.h" -#include "renderworld.h" -#include "Isometric Utils.h" INT16 ObjectZLevel( TILE_ELEMENT* TileElem, LEVELNODE* pNode, UINT32 uiTileElemFlags, INT32 sMapX, INT32 sMapY, INT16& sWorldY ); diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index adc00671..5f3b5d08 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -7,7 +7,6 @@ #include #include "stdlib.h" #include "debug.h" - //#include "soldier control.h" #include "weapons.h" #include "handle items.h" #include "worlddef.h" diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 3ac5bdd4..e5fc0a8a 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -8,13 +8,8 @@ #include "vehicles.h" #else //sgp - #include "types.h" - #include "mousesystem.h" - #include "Button System.h" - #include "input.h" #include "english.h" #include "debug.h" - #include "vsurface.h" #include "video.h" #include "vobject_blitters.h" #include "line.h" @@ -24,15 +19,12 @@ #include "Overhead Map.h" #include "strategicmap.h" #include "Interface.h" - #include "Font Control.h" #include "overhead.h" #include "Render Dirty.h" #include "sysutil.h" #include "PreBattle Interface.h" #include "Soldier Profile.h" #include "Map Edgepoints.h" - #include "strategic.h" - #include "strategicmap.h" #include "gameloop.h" #include "message.h" #include "Map Information.h" @@ -40,14 +32,12 @@ #include "cursors.h" #include "Cursor Control.h" #include "MessageBoxScreen.h" - #include "assignments.h" #include "text.h" #include "WordWrap.h" #include "Game Clock.h" + #include "Isometric Utils.h" #endif #include "connect.h" -#include "saveloadscreen.h" -#include "Map Edgepoints.h" #include "renderworld.h"//dnl ch45 051009 #include "merc entering.h" #include "CampaignStats.h" // added by Flugente diff --git a/TileEngine/Tactical Placement GUI.h b/TileEngine/Tactical Placement GUI.h index 2ed54f86..ab25d9e9 100644 --- a/TileEngine/Tactical Placement GUI.h +++ b/TileEngine/Tactical Placement GUI.h @@ -1,8 +1,10 @@ #ifndef __TACTICAL_PLACEMENT_GUI_H #define __TACTICAL_PLACEMENT_GUI_H -#include "Soldier Control.h" -#include "mousesystem.h" +//#include "Soldier Control.h" +//#include "mousesystem.h" +typedef struct _MOUSE_REGION MOUSE_REGION; +extern class SOLDIERTYPE; void InitTacticalPlacementGUI(); void KillTacticalPlacementGUI(); diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 18d0f18e..60b3e63b 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -2,10 +2,7 @@ #include "TileEngine All.h" #else #include "worlddef.h" -#include -#include -#include "stdlib.h" -#include "video.h" +#include "tile animation.h" #include "debug.h" #include "worldman.h" #include "lighting.h" @@ -13,18 +10,11 @@ #include "overhead.h" #include "ai.h" #include "Sound Control.h" -#include "animation control.h" -#include "isometric utils.h" -#include "Font Control.h" -#include "message.h" -#include "tile animation.h" #include "tile cache.h" #include "explosion control.h" -#include "weapons.h" #include "Keys.h" #include "bullets.h" #include "LightEffects.h" -#include "rotting corpses.h" #include "SmokeEffects.h" #endif diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index fb51f3b8..6de109c4 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -3,21 +3,14 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include - #include "stdlib.h" #include "debug.h" - #include "tiledef.h" - #include "Animation Cache.h" - #include "Animation Data.h" - #include "Animation Control.h" - #include "sys globals.h" #include "Debug Control.h" #include "tile surface.h" #include "tile cache.h" - #include "fileman.h" #endif - +#ifdef JA2TESTVERSION + #include "sys globals.h" +#endif UINT32 guiNumTileCacheStructs = 0; UINT32 guiMaxTileCacheSize = 50; diff --git a/TileEngine/Tile Cache.h b/TileEngine/Tile Cache.h index d28ac11c..2d1334d6 100644 --- a/TileEngine/Tile Cache.h +++ b/TileEngine/Tile Cache.h @@ -1,8 +1,6 @@ #ifndef __TILE_CACHE_H #define __TILE_CACHE_H -#include "tiledef.h" -#include "structure.h" #define TILE_CACHE_START_INDEX 36000 @@ -47,11 +45,4 @@ void CheckForAndDeleteTileCacheStructInfo( LEVELNODE *pNode, UINT16 usIndex ); void GetRootName( STR8 pDestStr, const STR8 pSrcStr ); - -// OF COURSE, FOR SPEED, WE EXPORT OUR ARRAY -// ACCESS FUNCTIONS IN RENDERER IS NOT TOO NICE -// ATE - - - #endif \ No newline at end of file diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index cac8e6cd..2b86332f 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -3,17 +3,8 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include "worlddef.h" - #include "worlddat.h" - #include - #include - #include "stdlib.h" - #include "time.h" - #include "video.h" #include "debug.h" #include "sys globals.h" - #include "tiledat.h" - #include "Fileman.h" #endif #include "XML.h" diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index 538a023a..eda152e0 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -3,15 +3,9 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include - #include #include "worlddat.h" - #include "worlddef.h" - #include "tiledef.h" #include "sys globals.h" #include "tile surface.h" - #include "fileMan.h" #include "Debug.h" #endif @@ -19,7 +13,6 @@ #include #include "XML_TileSet.hpp" #include "XMLWriter.h" -#include "GameSettings.h" void ExportTilesets(vfs::Path const& filename); diff --git a/TileEngine/environment.cpp b/TileEngine/environment.cpp index 32ddace0..3543ba99 100644 --- a/TileEngine/environment.cpp +++ b/TileEngine/environment.cpp @@ -2,31 +2,19 @@ #include "TileEngine All.h" #else #include "sgp.h" - #include "lighting.h" #include "environment.h" #include "renderworld.h" #include "Sound Control.h" #include "overhead.h" #include "Game Clock.h" - #include "quests.h" #include "Ambient Control.h" - #include "Strategic Event Handler.h" - #include "BobbyR.h" - #include "mercs.h" - #include "email.h" - #include "Merc Hiring.h" - #include "insurance Contract.h" #include "Game Events.h" #include "message.h" #include "opplist.h" #include "Random.h" - #include "strategicmap.h" - #include "GameSettings.h" #include "Points.h" // added by Flugente #include "Campaign.h" // added by Flugente #include "Isometric Utils.h" // added by Flugente - #include "Strategic Movement.h" // added by Flugente - #include "tiledef.h" // added by Flugente #include "worldman.h" // added by Flugente #include "Dialogue Control.h" // added by Flugente #endif diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index 21a063da..691003f6 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -19,34 +19,17 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include "math.h" - #include - #include - #include "worlddef.h" #include "renderworld.h" - #include "vsurface.h" - #include "input.h" #include "sysutil.h" - #include "wchar.h" - #include "video.h" - #include "vobject_blitters.h" #include "debug.h" #include "wcheck.h" - #include "jascreens.h" - #include "Isometric Utils.h" - #include "line.h" #include "Animation Control.h" - #include "Animation Data.h" #include "Sys Globals.h" - #include "tiledef.h" #include "lighting.h" - #include "Structure Internals.h" #include "structure wrap.h" #include "Shade Table Util.h" #include "rotting corpses.h" - #include "Fileman.h" - #include "environment.h" #include "PATHAI.H" #endif diff --git a/TileEngine/lighting.h b/TileEngine/lighting.h index c7d65a90..d62abbe6 100644 --- a/TileEngine/lighting.h +++ b/TileEngine/lighting.h @@ -1,7 +1,8 @@ #ifndef _LIGHTING_H_ #define _LIGHTING_H_ -#include "Soldier Control.h" +#include "vobject.h" +class SOLDIERTYPE; /**************************************************************************************** * JA2 Lighting Module diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index 89693709..aa77048a 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -3,42 +3,25 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include "stdio.h" - #include "sgp.h" - #include "vobject.h" - #include "tiledef.h" + #include "sysutil.h" #include "utilities.h" - #include "worlddef.h" - #include "isometric utils.h" #include "renderworld.h" - #include "worlddat.h" #include "vobject_blitters.h" #include "overhead map.h" - #include "interface.h" #include "interface control.h" #include "overhead.h" #include "radar screen.h" #include "cursors.h" #include "Sys Globals.h" #include "render dirty.h" - #include "soldier find.h" - #include "font control.h" #include "Game Clock.h" #include "interface panels.h" #include "english.h" #include "line.h" #include "map information.h" #include "Tactical Placement GUI.h" - #include "world items.h" - #include "message.h" - #include "faces.h" - #include "Squads.h" #include "Interactive Tiles.h" #include "gameloop.h" - #include "sysutil.h" - #include "tile surface.h" - #include "GameSettings.h" - #include #include "Action Items.h" // added by Flugente #endif @@ -49,6 +32,15 @@ extern SOLDIERINITNODE *gpSelected; #endif +// Forward declarations +extern INT16 gWorldSectorX; +extern INT16 gWorldSectorY; +extern INT8 gbWorldSectorZ; +extern TILE_IMAGERY* gTileSurfaceArray[NUMBEROFTILETYPES]; +extern INT32 CurrentSquad(); +extern void HandleAutoFaces(); +extern void HandleTalkingAutoFaces(); + typedef struct { @@ -121,7 +113,7 @@ void CopyOverheadDBShadetablesFromTileset( ); void RenderOverheadOverlays(); //dnl ch85 060214 -#include +//#include #define PointToPointDist(X1, Y1, X2, Y2) (sqrtf((FLOAT)((X2-X1)*(X2-X1) + (Y2-Y1)*(Y2-Y1))))// Calculate distance between two points #define PointToLineDist(Xt, Yt, k, l) (sqrtf((FLOAT)((k*Xt-Yt+l) * (k*Xt-Yt+l)) / (k*k + 1)))// Calculate distance between point and line VOID PointFromDist(INT32 Xt, INT32 Yt, INT32 k, INT32 l, FLOAT d, INT32 *Xtnew, INT32 *Ytnew)// Calculate closest point to point (Xt,Yt) which lies at distance from line Y=kx+l and normal define by point (Xt,Yt) diff --git a/TileEngine/phys math.h b/TileEngine/phys math.h index 0b6641c5..de130ed7 100644 --- a/TileEngine/phys math.h +++ b/TileEngine/phys math.h @@ -4,7 +4,6 @@ // explicit dependencies #include // for sqrt -#include typedef float real; diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index 96931429..085f7d1d 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -1,51 +1,34 @@ #include "builddefines.h" #ifdef PRECOMPILEDHEADERS -#include "TileEngine All.h" + #include "TileEngine All.h" #else -#include "physics.h" -#include "wcheck.h" -#include "timer control.h" -#include "isometric utils.h" -#include "los.h" -#include "worldman.h" -#include "event pump.h" -#include "Sound Control.h" -//#include "soldier control.h" -#include "interface.h" -#include "interface items.h" -#include "weapons.h" -#include "explosion control.h" -#include "Debug Control.h" -#include "tile animation.h" -#include "message.h" -#include "weapons.h" -#include "structure wrap.h" -#include "physics.h" -#include "overhead.h" -#include "animation control.h" -#include "text.h" -#include "Random.h" -#include "lighteffects.h" -#include "opplist.h" -#include "World Items.h" -#include "environment.h" -#include "GameSettings.h" -#include "Buildings.h" -#include "Dialogue Control.h" // added by Flugente + #include "physics.h" + #include "wcheck.h" + #include "isometric utils.h" + #include "worldman.h" + #include "Sound Control.h" + #include "interface.h" + #include "interface items.h" + #include "explosion control.h" + #include "Debug Control.h" + #include "message.h" + #include "structure wrap.h" + #include "animation control.h" + #include "text.h" + #include "Random.h" + #include "lighteffects.h" + #include "opplist.h" + #include "Buildings.h" + #include "Dialogue Control.h" // added by Flugente #endif - -#include "Campaign.h" -#include "SkillCheck.h" - #include "connect.h" -#include "GameInitOptionsScreen.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; class SOLDIERTYPE; - +extern INT16 EffectiveDexterity(SOLDIERTYPE* pSoldier, BOOLEAN fTrainer); #define NO_TEST_OBJECT 0 #define TEST_OBJECT_NO_COLLISIONS 1 diff --git a/TileEngine/physics.h b/TileEngine/physics.h index 7fcf3b4a..e27d8aad 100644 --- a/TileEngine/physics.h +++ b/TileEngine/physics.h @@ -2,10 +2,7 @@ #define __PHYSICS_H #include "phys math.h" -#include "sgp.h" #include "worlddef.h" -#include "items.h" -#include "Soldier Control.h" extern UINT32 guiNumObjectSlots; diff --git a/TileEngine/pits.cpp b/TileEngine/pits.cpp index ba1adb2f..2194a51d 100644 --- a/TileEngine/pits.cpp +++ b/TileEngine/pits.cpp @@ -6,13 +6,10 @@ #include "worlddef.h" #include "worldman.h" #include "Simple Render Utils.h" - #include "World Items.h" #include "SaveLoadMap.h" - #include "Exit Grids.h" #include "Sys Globals.h" #include "strategicmap.h" #include "Isometric Utils.h" - #include "overhead.h" #include "Sound Control.h" #include "animation control.h" #include "strategic.h" diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index a2297f6e..d603e2f2 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -1,58 +1,31 @@ #include "builddefines.h" - -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else - #include "math.h" - #include - #include - - #include "worlddef.h" - #include "renderworld.h" - #include "vsurface.h" - #include "input.h" - #include "sysutil.h" - #include "wchar.h" - #include "video.h" - #include "vobject_blitters.h" - #include "debug.h" - #include "wcheck.h" - #include "worldman.h" - #include "jascreens.h" - #include "Isometric Utils.h" - #include "line.h" - #include "Animation Control.h" - #include "Animation Data.h" - #include "Timer Control.h" - #include "Radar Screen.h" - #include "Render Dirty.h" - #include "Font Control.h" - #include "Sys Globals.h" - #include "Render Dirty.h" - #include "lighting.h" - #include "Overhead types.h" - #include "Overhead.h" - #include "weapons.h" - #include "ai.h" - #include "vobject.h" - #include "render fun.h" - #include "los.h" - #include "interactive tiles.h" - #include "rotting corpses.h" - #include "tile cache.h" - #include "tile animation.h" - #include "English.h" - #include "world items.h" - #include "GameSettings.h" - #include "interface control.h" - #include "Sound Control.h" -#endif - /////////////////////////// // C file include here #include "Render Z.h" /////////////////////////// +#ifdef PRECOMPILEDHEADERS + #include "TileEngine All.h" +#else + #include "renderworld.h" + #include "sysutil.h" + #include "vobject_blitters.h" + #include "debug.h" + #include "wcheck.h" + #include "worldman.h" + #include "Radar Screen.h" + #include "Render Dirty.h" + #include "ai.h" + #include "render fun.h" + #include "interactive tiles.h" + #include "tile cache.h" + #include "English.h" + #include "interface control.h" + #include "Sound Control.h" + #include "LogicalBodyTypes/Layers.h" + #include "LogicalBodyTypes/BodyTypeDB.h" +#endif + #include "Utilities.h" UINT32 guiShieldGraphic = 0; diff --git a/TileEngine/renderworld.h b/TileEngine/renderworld.h index e58ba872..140e5d5f 100644 --- a/TileEngine/renderworld.h +++ b/TileEngine/renderworld.h @@ -1,9 +1,6 @@ #ifndef __RENDERWORLD_H #define __RENDERWORLD_H -#include "worlddef.h" -#include "LogicalBodyTypes/Layers.h" -#include "LogicalBodyTypes/BodyTypeDB.h" // TEMP SELECT STUFF #define NO_SELECT 0 @@ -75,7 +72,8 @@ extern UINT8 gubCurScrollSpeedID; #define TILES_DYNAMIC_TOPMOST 0x00000001 - +// Forward declaration +typedef struct TAG_HVOBJECT *HVOBJECT; extern BOOLEAN gfRenderScroll; extern INT16 gsScrollXIncrement; diff --git a/TileEngine/sysutil.cpp b/TileEngine/sysutil.cpp index 2a9af907..10774757 100644 --- a/TileEngine/sysutil.cpp +++ b/TileEngine/sysutil.cpp @@ -1,11 +1,7 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include - #include #include "sgp.h" - #include "himage.h" - #include "vsurface.h" #include "wcheck.h" #include "sysutil.h" #endif diff --git a/TileEngine/tiledef.cpp b/TileEngine/tiledef.cpp index ba8f722e..0a1b9083 100644 --- a/TileEngine/tiledef.cpp +++ b/TileEngine/tiledef.cpp @@ -3,15 +3,9 @@ #else #include "tiledef.h" #include "worlddef.h" - #include - #include #include "wcheck.h" - #include "stdlib.h" - #include "time.h" - #include "video.h" #include "debug.h" #include "worldman.h" - #include "gameloop.h" #include "edit_sys.h" #include "pathai.h" #include "tile surface.h" diff --git a/TileEngine/tiledef.h b/TileEngine/tiledef.h index b49442b8..40056a11 100644 --- a/TileEngine/tiledef.h +++ b/TileEngine/tiledef.h @@ -2,7 +2,6 @@ #define __TILEDEF_H #include "vobject.h" -#include "timer.h" #include "TileDat.h" #include "structure.h" diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 63c31b3c..bd0bc3c5 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -6,50 +6,27 @@ #else #include "worlddef.h" #include "worlddat.h" - #include - #include #include "wcheck.h" - #include "stdlib.h" - #include "time.h" - #include "video.h" #include "debug.h" #include "worldman.h" - #include "mousesystem.h" #include "sys globals.h" - #include "screenids.h" #include "Render Fun.h" - #include "font control.h" #include "lighting.h" - #include "structure.h" - #include "vobject.h" - #include "Soldier Control.h" - #include "isometric utils.h" #include "Interactive Tiles.h" #include "utilities.h" #include "overhead.h" - #include "Event Pump.h" - #include "Handle UI.h" #include "opplist.h" - #include "shading.h" - #include "Animation Control.h" - #include "World Items.h" #include "renderworld.h" #include "Radar Screen.h" - #include "soldier create.h" - #include "Soldier Init List.h" #include "Exit Grids.h" #include "tile surface.h" #include "rotting corpses.h" #include "Keys.h" #include "Map Information.h" - #include "Exit Grids.h" - #include "Summary Info.h" #include "Animated ProgressBar.h" #include "pathai.h" #include "EditorBuildings.h" - #include "FileMan.h" #include "Map Edgepoints.h" - #include "environment.h" #include "Shade Table Util.h" #include "Structure Wrap.h" #include "Scheduling.h" @@ -65,13 +42,20 @@ #include "LoadScreen.h"//dnl ch30 150909 #include "Interface Cursors.h" #include "Simple Render Utils.h"//dnl ch54 111009 + #include "Interface.h" ///ddd #include "gamesettings.h" #include "editscreen.h" - #include "Button Defines.h" #include "Editor Taskbar Utils.h" #endif +#ifdef JA2EDITOR + #include "Summary Info.h" + #include "Button Defines.h" + #include "Animation Data.h" +#endif + + #define SET_MOVEMENTCOST( a, b, c, d ) ( ( gubWorldMovementCosts[ a ][ b ][ c ] < d ) ? ( gubWorldMovementCosts[ a ][ b ][ c ] = d ) : 0 ); #define FORCE_SET_MOVEMENTCOST( a, b, c, d ) ( gubWorldMovementCosts[ a ][ b ][ c ] = d ) #define SET_CURRMOVEMENTCOST( a, b ) SET_MOVEMENTCOST( usGridNo, a, 0, b ) diff --git a/TileEngine/worlddef.h b/TileEngine/worlddef.h index 566198c3..b956ed14 100644 --- a/TileEngine/worlddef.h +++ b/TileEngine/worlddef.h @@ -1,12 +1,10 @@ #ifndef __WORLDDEF_H #define __WORLDDEF_H -#include "vobject.h" -#include "tiledef.h" -//#include "Soldier Control.h" #include "structure.h" #include "Handle Items.h" + #define WORLD_TILE_X 40 #define WORLD_TILE_Y 20 #define CELL_X_SIZE 10 @@ -33,7 +31,6 @@ extern INT32 guiWorldRows; // - //forward declarations of common classes to eliminate includes class OBJECTTYPE; class SOLDIERTYPE; diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index d1de5e23..c8999433 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -2,26 +2,17 @@ #include "TileEngine All.h" #else #include "worlddef.h" - #include - #include - #include "wcheck.h" - #include "stdlib.h" - #include "video.h" - #include "debug.h" #include "worldman.h" + #include "wcheck.h" + #include "debug.h" #include "lighting.h" #include "renderworld.h" - #include "overhead.h" #include "ai.h" #include "animation control.h" - #include "isometric utils.h" - #include "Font Control.h" #include "message.h" #include "tile cache.h" #include "SaveLoadMap.h" #include "random.h" - #include "render fun.h" - #include "GameSettings.h" // sevenfm #include "PATHAI.H" #endif