diff --git a/Credits.cpp b/Credits.cpp index 95f54bcf6..7a1f8d250 100644 --- a/Credits.cpp +++ b/Credits.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Credits.h" - #include "Encrypted File.h" - #include "Language Defines.h" -#else #include "Types.h" #include "Credits.h" #include "Language Defines.h" @@ -26,7 +20,6 @@ #include "english.h" #include "encrypted file.h" #include "Random.h" -#endif //externals extern HVSURFACE ghFrameBuffer; diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp index 69b1a2eba..16bb60b70 100644 --- a/Editor/Cursor Modes.cpp +++ b/Editor/Cursor Modes.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "types.h" #include "Cursor Modes.h" #include "renderworld.h" @@ -22,7 +17,6 @@ #include "Overhead.h" #include "EditorMercs.h" #include "EditorBuildings.h" -#endif #include "Text.h" diff --git a/Editor/Editor All.h b/Editor/Editor All.h deleted file mode 100644 index da876d15c..000000000 --- a/Editor/Editor All.h +++ /dev/null @@ -1,127 +0,0 @@ -#include "BuildDefines.h" - -#ifndef __EDITOR_ALL_H -#define __EDITOR_ALL_H - -#ifdef JA2EDITOR - -#pragma message("GENERATED PCH FOR EDITOR PROJECT.") - -//external -#include "types.h" -#include -#include -#include "Action Items.h" -#include "Button System.h" -#include "debug.h" -#include "english.h" -#include "environment.h" -#include "Exit Grids.h" -#include "font.h" -#include "Font Control.h" -#include "Keys.h" -#include "input.h" -#include "interface.h" -#include "Interface Items.h" -#include "Isometric Utils.h" -#include "interface panels.h" -#include "lighting.h" -#include "Map Information.h" -#include "mousesystem.h" -#include "Overhead.h" -#include "Overhead map.h" -#include "overhead types.h" -#include "pits.h" -#include "random.h" -#include "Render Fun.h" -#include "Render Dirty.h" -#include "renderworld.h" -#include "Simple Render Utils.h" -#include "Soldier Create.h" -#include "Soldier Find.h" -#include "sysutil.h" -#include "Text.h" -#include "Text Input.h" -#include "tiledef.h" -#include "utilities.h" -#include "video.h" -#include "vobject.h" -#include "vobject_blitters.h" -#include "vsurface.h" -#include "wcheck.h" -#include "weapons.h" -#include "wordwrap.h" -#include "WorldDat.h" -#include "worlddef.h" -#include "World Items.h" -#include "worldman.h" -#include "line.h" -#include "Animation Data.h" -#include "Animation Control.h" -#include "Soldier Init List.h" -#include "StrategicMap.h" -#include "Soldier Add.h" -#include "Soldier Control.h" -#include "soldier profile type.h" -#include "Soldier Profile.h" -#include "Inventory Choosing.h" -#include "Scheduling.h" -#include "Timer Control.h" -#include "sgp.h" -#include "screenids.h" -#include "Sys Globals.h" -#include "Interactive Tiles.h" -#include "Handle UI.h" -#include "Event Pump.h" -#include "message.h" -#include "Game Clock.h" -#include "Game Init.h" -#include "Map Edgepoints.h" -#include "Music Control.h" -#include -#include "Item Types.h" -#include "Items.h" -#include "Handle Items.h" -#include "Animated ProgressBar.h" -#include "gameloop.h" -#include -#include "Structure Internals.h" -#include "Cursors.h" -#include "FileMan.h" -#include "Summary Info.h" -#include "time.h" -#include "structure wrap.h" -#include "MessageBoxScreen.h" -#include "GameSettings.h" - - -//internal -#include "Cursor Modes.h" -#include "edit_sys.h" -#include "Editor Callback Prototypes.h" -#include "Editor Modes.h" -#include "Editor Taskbar Creation.h" -#include "Editor Taskbar Utils.h" -#include "Editor Undo.h" -#include "EditorBuildings.h" -#include "EditorDefines.h" -#include "EditorItems.h" -#include "EditorMapInfo.h" -#include "EditorMercs.h" -#include "EditorTerrain.h" -#include "editscreen.h" -#include "Item Statistics.h" -#include "LoadScreen.h" -#include "messagebox.h" -#include "newsmooth.h" -#include "popupmenu.h" -#include "Road Smoothing.h" -#include "Sector Summary.h" -#include "selectwin.h" -#include "SmartMethod.h" -#include "smooth.h" -#include "Smoothing Utils.h" - -#endif - -#endif diff --git a/Editor/Editor Callbacks.cpp b/Editor/Editor Callbacks.cpp index cf6c2d8b9..fd102ba7d 100644 --- a/Editor/Editor Callbacks.cpp +++ b/Editor/Editor Callbacks.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "types.h" #include "Button System.h" #include "EditorDefines.h" @@ -31,7 +26,6 @@ #include "input.h" #include "Map Information.h" #include "EditorMapInfo.h" -#endif #include "LoadScreen.h" #include "Text Input.h" diff --git a/Editor/Editor Modes.cpp b/Editor/Editor Modes.cpp index 8af7fa74f..f8cd90849 100644 --- a/Editor/Editor Modes.cpp +++ b/Editor/Editor Modes.cpp @@ -1,13 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "types.h" #include "Editor Modes.h" #include "Editor Taskbar Utils.h" @@ -23,7 +18,6 @@ #include "worlddef.h" #include "Exit Grids.h" #include "Worldman.h" -#endif BOOLEAN gfShowExitGrids = FALSE; diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp index 808bf5751..1b7f5c50d 100644 --- a/Editor/Editor Taskbar Creation.cpp +++ b/Editor/Editor Taskbar Creation.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS //sgp #include "Button System.h" #include "Font Control.h" @@ -22,7 +17,6 @@ #include "overhead types.h" #include "local.h" #include "Text.h" -#endif //Category tabs of the editor buttons void InitEditorTerrainToolbar(); diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index 538fff4f2..75a77b06d 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "types.h" #include "mousesystem.h" @@ -47,7 +42,6 @@ #include "Keys.h" #include "InterfaceItemImages.h" #include "renderworld.h"//dnl ch78 271113 -#endif void RenderEditorInfo(); diff --git a/Editor/Editor Undo.cpp b/Editor/Editor Undo.cpp index c9481fa8e..370f6e744 100644 --- a/Editor/Editor Undo.cpp +++ b/Editor/Editor Undo.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "worlddef.h" #include "worldman.h" #include "smooth.h" @@ -23,7 +18,6 @@ #include "keys.h" #include "EditorItems.h" #include "EditorMapInfo.h" -#endif /* Kris -- Notes on how the undo code works: diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp index ffacff273..4f343c086 100644 --- a/Editor/EditorBuildings.cpp +++ b/Editor/EditorBuildings.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "tiledef.h" #include "edit_sys.h" #include "sysutil.h" @@ -34,7 +29,6 @@ #include "editscreen.h" #include "EditorItems.h" #include "EditorMapInfo.h" -#endif BOOLEAN fBuildingShowRoofs, fBuildingShowWalls, fBuildingShowRoomInfo; UINT16 usCurrentMode; diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index db7d61cf8..bf756c031 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "tiledef.h" #include "edit_sys.h" @@ -44,7 +39,6 @@ #include "keys.h" #include "InterfaceItemImages.h" #include "Editor Undo.h"//dnl ch86 220214 -#endif #include diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp index 366e1782d..b4335ab38 100644 --- a/Editor/EditorMapInfo.cpp +++ b/Editor/EditorMapInfo.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "tiledef.h" #include "edit_sys.h" @@ -57,7 +52,6 @@ #include "environment.h" #include "Simple Render Utils.h" #include "Text.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp index 478cd4e96..737d3a6fd 100644 --- a/Editor/EditorMercs.cpp +++ b/Editor/EditorMercs.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "tiledef.h" #include "edit_sys.h" @@ -64,7 +59,6 @@ #include "message.h" #include "InterfaceItemImages.h" #include "english.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; class SOLDIERTYPE; diff --git a/Editor/EditorTerrain.cpp b/Editor/EditorTerrain.cpp index 026a1f240..932b44efe 100644 --- a/Editor/EditorTerrain.cpp +++ b/Editor/EditorTerrain.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "tiledef.h" #include "edit_sys.h" @@ -32,7 +27,6 @@ #include "Editor Taskbar Utils.h" #include "Cursor Modes.h" #include "english.h" -#endif BOOLEAN gfShowTerrainTileButtons; UINT8 ubTerrainTileButtonWeight[NUM_TERRAIN_TILE_REGIONS]; diff --git a/Editor/Editor_VS2005.vcproj b/Editor/Editor_VS2005.vcproj index 3fcf3ae12..0938bcd83 100644 --- a/Editor/Editor_VS2005.vcproj +++ b/Editor/Editor_VS2005.vcproj @@ -350,10 +350,6 @@ RelativePath=".\edit_sys.h" > - - diff --git a/Editor/Editor_VS2008.vcproj b/Editor/Editor_VS2008.vcproj index 54b776491..75f9435aa 100644 --- a/Editor/Editor_VS2008.vcproj +++ b/Editor/Editor_VS2008.vcproj @@ -350,10 +350,6 @@ RelativePath="edit_sys.h" > - - diff --git a/Editor/Editor_VS2010.vcxproj b/Editor/Editor_VS2010.vcxproj index c7727cc9c..3bd9c1edb 100644 --- a/Editor/Editor_VS2010.vcxproj +++ b/Editor/Editor_VS2010.vcxproj @@ -25,7 +25,6 @@ - diff --git a/Editor/Editor_VS2010.vcxproj.filters b/Editor/Editor_VS2010.vcxproj.filters index 547bab053..1d55b82ad 100644 --- a/Editor/Editor_VS2010.vcxproj.filters +++ b/Editor/Editor_VS2010.vcxproj.filters @@ -18,7 +18,6 @@ Header Files - Header Files diff --git a/Editor/Editor_VS2013.vcxproj b/Editor/Editor_VS2013.vcxproj index 775c5bc4b..20d17ceee 100644 --- a/Editor/Editor_VS2013.vcxproj +++ b/Editor/Editor_VS2013.vcxproj @@ -25,7 +25,6 @@ - diff --git a/Editor/Editor_VS2013.vcxproj.filters b/Editor/Editor_VS2013.vcxproj.filters index 547bab053..1d55b82ad 100644 --- a/Editor/Editor_VS2013.vcxproj.filters +++ b/Editor/Editor_VS2013.vcxproj.filters @@ -18,7 +18,6 @@ Header Files - Header Files diff --git a/Editor/Editor_VS2017.vcxproj b/Editor/Editor_VS2017.vcxproj index 89c6f7e3c..f8658b467 100644 --- a/Editor/Editor_VS2017.vcxproj +++ b/Editor/Editor_VS2017.vcxproj @@ -25,7 +25,6 @@ - diff --git a/Editor/Editor_VS2019.vcxproj b/Editor/Editor_VS2019.vcxproj index b07929b88..3cba7e832 100644 --- a/Editor/Editor_VS2019.vcxproj +++ b/Editor/Editor_VS2019.vcxproj @@ -45,7 +45,6 @@ - diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index f46ce0cc0..57a1851ba 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include #include "types.h" @@ -31,7 +26,6 @@ #include "PopupMenu.h" #include "pits.h" #include "Text.h" -#endif #include "soldier profile type.h" #include "LuaInitNPCs.h" diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp index 734058c6c..2e0ce9672 100644 --- a/Editor/LoadScreen.cpp +++ b/Editor/LoadScreen.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "Font Control.h" #include "renderworld.h" @@ -45,7 +40,6 @@ #include "MessageBoxScreen.h" #include //dnl ch37 110909 #include "Exit Grids.h"//dnl ch86 190214 -#endif //=========================================================================== diff --git a/Editor/Road Smoothing.cpp b/Editor/Road Smoothing.cpp index 7df8a04b9..5f7376f5e 100644 --- a/Editor/Road Smoothing.cpp +++ b/Editor/Road Smoothing.cpp @@ -1,19 +1,13 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "types.h" #include "Road Smoothing.h" #include "tiledat.h" #include "worlddef.h" #include "worldman.h" #include "Editor Undo.h" -#endif typedef struct MACROSTRUCT diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp index bcce1fdd0..6f1645fc8 100644 --- a/Editor/Sector Summary.cpp +++ b/Editor/Sector Summary.cpp @@ -1,13 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "types.h" #include "Sector Summary.h" @@ -42,7 +37,6 @@ #include "GameSettings.h" #include "EditorTerrain.h"//dnl ch78 261113 #include "Render Dirty.h"//dnl ch78 271113 -#endif #include #include diff --git a/Editor/SmartMethod.cpp b/Editor/SmartMethod.cpp index cc8bc0346..af985cc37 100644 --- a/Editor/SmartMethod.cpp +++ b/Editor/SmartMethod.cpp @@ -1,18 +1,12 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "worlddef.h" //LEVELNODE def #include "worldman.h" //ReplaceStructIndex #include "SmartMethod.h" #include "Smoothing Utils.h" #include "Editor Undo.h" -#endif UINT8 gubDoorUIValue = 0; UINT8 gubWindowUIValue = 0; diff --git a/Editor/Smoothing Utils.cpp b/Editor/Smoothing Utils.cpp index 66a6bf477..b70e54539 100644 --- a/Editor/Smoothing Utils.cpp +++ b/Editor/Smoothing Utils.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "worlddef.h" //for LEVELNODE def #include "worldman.h" //for RemoveXXXX() @@ -17,7 +12,6 @@ #include "EditorDefines.h" #include "edit_sys.h" #include "environment.h" -#endif extern UINT16 PickAWallPiece( UINT16 usWallPieceType ); diff --git a/Editor/XML_ActionItems.cpp b/Editor/XML_ActionItems.cpp index 75ad25368..c089b93d9 100644 --- a/Editor/XML_ActionItems.cpp +++ b/Editor/XML_ActionItems.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else - #include "Editor All.h" #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -11,7 +5,6 @@ #include "Interface.h" #include "Item Statistics.h" #include "LuaInitNPCs.h" -#endif #include "Action Items.h" diff --git a/Editor/edit_sys.cpp b/Editor/edit_sys.cpp index 8f204c9cc..3fa290120 100644 --- a/Editor/edit_sys.cpp +++ b/Editor/edit_sys.cpp @@ -1,13 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "worlddef.h" #include "worldman.h" #include "smooth.h" @@ -32,7 +27,6 @@ #include "Keys.h" #include "EditorMapInfo.h" #include "EditorItems.h" -#endif #include "input.h" diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 0cb7d4c79..beebb1086 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "sgp.h" #include "vobject.h" #include "worlddef.h" @@ -79,7 +74,6 @@ #include "Cursor Control.h"//dnl ch2 210909 #include "maputility.h"//dnl ch49 061009 #include "Text.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Editor/messagebox.cpp b/Editor/messagebox.cpp index aab02a527..522264509 100644 --- a/Editor/messagebox.cpp +++ b/Editor/messagebox.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "vobject.h" #include "video.h" #include "font.h" @@ -14,7 +9,6 @@ #include "messagebox.h" #include "input.h" #include "english.h" -#endif //internal variables. INT32 iMsgBoxNum; diff --git a/Editor/newsmooth.cpp b/Editor/newsmooth.cpp index de95b8a6f..2123937ac 100644 --- a/Editor/newsmooth.cpp +++ b/Editor/newsmooth.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include #include "tiledef.h" #include "worlddef.h" @@ -21,7 +16,6 @@ #include "environment.h" #include "Random.h" #include "Render Fun.h" -#endif BOOLEAN CaveAtGridNo( INT32 iMapIndex ); diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 1746376fb..8d43a90a8 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -10,15 +10,10 @@ //supported. Just remove the commented line of code (search for UNCOMMENT), and it's fixed -- it is //currently disabled. -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "tiledef.h" #include "sysutil.h" #include "font.h" @@ -37,7 +32,6 @@ #include "Scheduling.h" #include "english.h" #include "Item Statistics.h" -#endif CurrentPopupMenuInformation gPopupData; diff --git a/Editor/selectwin.cpp b/Editor/selectwin.cpp index 1d0a6d207..06ee221b7 100644 --- a/Editor/selectwin.cpp +++ b/Editor/selectwin.cpp @@ -1,14 +1,9 @@ // WANNE: EDITOR: todo -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "tiledef.h" #include "vsurface.h" #include "worlddat.h" @@ -18,7 +13,6 @@ #include "selectwin.h" #include "EditorDefines.h" #include "Editor Taskbar Utils.h" -#endif #include "vobject_blitters.h" #include "Text.h" diff --git a/Editor/smooth.cpp b/Editor/smooth.cpp index 623bc3e3f..c835a29a4 100644 --- a/Editor/smooth.cpp +++ b/Editor/smooth.cpp @@ -1,12 +1,7 @@ -#ifdef PRECOMPILEDHEADERS - #include "Editor All.h" -#else #include "builddefines.h" -#endif #ifdef JA2EDITOR -#ifndef PRECOMPILEDHEADERS #include "stdlib.h" #include "FileMan.h" #include "time.h" @@ -21,7 +16,6 @@ #include "structure wrap.h" #include "Exit Grids.h" #include "Editor Undo.h" -#endif INT16 gbSmoothStruct[] = diff --git a/Fade Screen.cpp b/Fade Screen.cpp index 9e7d930ff..f201e7bdb 100644 --- a/Fade Screen.cpp +++ b/Fade Screen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "sgp.h" #include "screenids.h" #include "Timer Control.h" @@ -12,7 +9,6 @@ #include "music control.h" #include "Render Dirty.h" #include "gameloop.h" -#endif #define SQUARE_STEP 8 diff --git a/FeaturesScreen.cpp b/FeaturesScreen.cpp index fca10e4d2..5865c4a29 100644 --- a/FeaturesScreen.cpp +++ b/FeaturesScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "JA2 All.h" -#else #include "Types.h" #include "FeaturesScreen.h" #include "Video.h" @@ -34,7 +31,6 @@ #include "Map Information.h" #include "Sys Globals.h" #include "insurance.h" -#endif #include "connect.h" #include "WorldMan.h" diff --git a/GameInitOptionsScreen.cpp b/GameInitOptionsScreen.cpp index c1ac82f68..1a063ae27 100644 --- a/GameInitOptionsScreen.cpp +++ b/GameInitOptionsScreen.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Intro.h" -#else #include "Types.h" #include "GameInitOptionsScreen.h" #include "GameSettings.h" @@ -22,7 +18,6 @@ #include "Text.h" #include "_Ja25EnglishText.h" #include "Soldier Profile.h" -#endif #include "gameloop.h" #include "connect.h" diff --git a/GameSettings.cpp b/GameSettings.cpp index 684fee826..2c8a2fbef 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1,10 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "HelpScreen.h" - #include "Campaign.h" - #include "Cheats.h" - #include "INIReader.h" -#else #include "Types.h" #include "GameSettings.h" #include "FileMan.h" @@ -36,7 +29,6 @@ #include "Init.h" #include "InterfaceItemImages.h" #include "DynamicDialogue.h" // added by Flugente -#endif #include "KeyMap.h" #include "Timer Control.h" diff --git a/GameVersion.cpp b/GameVersion.cpp index 0260d7b79..02c9e48c1 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "GameVersion.h" -#endif // // Keeps track of the game version diff --git a/HelpScreen.cpp b/HelpScreen.cpp index 47a240af0..dcf0ccc4f 100644 --- a/HelpScreen.cpp +++ b/HelpScreen.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "HelpScreen.h" - #include "HelpScreenText.h" - #include "Line.h" -#else #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" @@ -28,7 +22,6 @@ #include "renderworld.h" #include "Game Init.h" #include "Overhead.h" -#endif extern INT16 gsVIEWPORT_END_Y; extern void PrintDate( void ); diff --git a/Init.cpp b/Init.cpp index d11e33544..207884248 100644 --- a/Init.cpp +++ b/Init.cpp @@ -1,10 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "HelpScreen.h" - #include "Multilingual Text Code Generator.h" - #include "INIReader.h" - -#else #include "builddefines.h" #include #include "sgp.h" @@ -58,7 +51,6 @@ #include "Multilingual Text Code Generator.h" #include "editscreen.h" #include "Arms Dealer Init.h" -#endif #include "MPXmlTeams.hpp" #include "Strategic Mines LUA.h" #include "UndergroundInit.h" diff --git a/Init.h b/Init.h index 39e72319a..fdea441cd 100644 --- a/Init.h +++ b/Init.h @@ -1,7 +1,6 @@ #ifndef _INIT_H #define _INIT_H -#ifndef PRECOMPILEDHEADERS #include "LogicalBodyTypes/BodyTypeDB.h" #include "LogicalBodyTypes/Layers.h" #include "LogicalBodyTypes/AbstractXMLLoader.h" @@ -10,7 +9,6 @@ #include "LogicalBodyTypes/EnumeratorDB.h" #include "LogicalBodyTypes/BodyTypeDB.h" #include "LogicalBodyTypes/PaletteDB.h" -#endif #include #include diff --git a/Intro.cpp b/Intro.cpp index ccf4a471e..928eaeed4 100644 --- a/Intro.cpp +++ b/Intro.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Intro.h" - #include "Cinematics.h" -#else #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" @@ -27,7 +22,6 @@ #include "Soldier Profile.h" #include "Game Init.h" #include "INIReader.h" -#endif #include diff --git a/JA2 All.h b/JA2 All.h deleted file mode 100644 index 8b94935ea..000000000 --- a/JA2 All.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef __JA2_ALL_H -#define __JA2_ALL_H - -#pragma message("GENERATED PCH FOR JA2 PROJECT.") - -#include "builddefines.h" - -#include -#include -#include -#include "sgp.h" -#include "gameloop.h" -#include "himage.h" -#include "vobject.h" -#include "vobject_private.h" -#include "vobject_blitters.h" -#include "Types.h" -#include "wcheck.h" -#include "renderworld.h" -#include "input.h" -#include "screenids.h" -#include "overhead.h" -#include "Isometric Utils.h" -#include "sysutil.h" -#include "Radar Screen.h" -#include "Soldier Control.h" -#include "Animation Control.h" -#include "Animation Data.h" -#include "Event Pump.h" -#include "Timer Control.h" -#include "Render Dirty.h" -#include "Sys Globals.h" -#include "interface.h" -#include "soldier ani.h" -#include -#include -#include "english.h" -#include "Fileman.h" -#include "messageboxscreen.h" -#include "sgp.h" -#include "fade screen.h" -#include "cursor control.h" -#include "music control.h" -#include "GameInitOptionsScreen.h" -#include "GameSettings.h" -#include "Utilities.h" -#include "Font Control.h" -#include "WordWrap.h" -#include "Options Screen.h" -#include "cursors.h" -#include "Screens.h" -#include "init.h" -#include "laptop.h" -#include "mapscreen.h" -#include "Game Clock.h" -#include "LibraryDataBase.h" -#include "Map Screen Interface.h" -#include "Tactical Save.h" -#include "Interface Control.h" -#include "text.h" -#include "Handle UI.h" -#include "Button System.h" -#include "lighting.h" -#include "environment.h" -#include "bullets.h" -#include "message.h" -#include -#include "overhead map.h" -#include "Strategic Exit GUI.h" -#include "strategic movement.h" -#include "Tactical Placement GUI.h" -#include "Air raid.h" -#include "game init.h" -//DEF: Test Code -#ifdef NETWORKED -#include "Networking.h" -#endif -#include "physics.h" -#include "dialogue control.h" -#include "soldier macros.h" -#include "faces.h" -#include "strategicmap.h" -#include "gamescreen.h" -#include "strategic turns.h" -#include "merc entering.h" -#include "soldier create.h" -#include "Soldier Init List.h" -#include "interface panels.h" -#include "Map Information.h" -#include "Squads.h" -#include "interface dialogue.h" -#include "auto bandage.h" -#include "meanwhile.h" -#include "strategic ai.h" -#include "Sound Control.h" -#include "SaveLoadScreen.h" -#include "GameVersion.h" -#include "Debug.h" -#include "Language Defines.h" -#include "mousesystem.h" -#include "worlddef.h" -#include "video.h" -#include "interface items.h" -#include "Maputility.h" -#include "strategic.h" -#include "NPC.h" -#include "MercTextBox.h" -#include "tile cache.h" -#include "Shade Table Util.h" -#include "Exit Grids.h" -#include "Summary Info.h" -#include -#include "font.h" -#include "timer.h" -#include "tiledef.h" -#include "editscreen.h" -#include "jascreens.h" -#include "animation cache.h" -#include "mainmenuscreen.h" -#include "Random.h" -#include "Multi Language Graphic Utils.h" -#include "SaveLoadGame.h" -#include "Text Input.h" -#include "Slider.h" -#include "soundman.h" -#include "Ambient Control.h" -#include "Worlddat.h" -#include "Gap.h" -#include "Soldier Profile.h" -#include "Keys.h" -#include "finances.h" -#include "History.h" -#include "files.h" -#include "Email.h" -#include "Game Events.h" -#include "LaptopSave.h" -#include "Queen Command.h" -#include "Quests.h" -#include "opplist.h" -#include "Merc Hiring.h" -#include "Ai.h" -#include "SmokeEffects.h" -#include "Map Screen Interface Border.h" -#include "Map Screen Interface Bottom.h" -#include "Map Screen Helicopter.h" -#include "Arms Dealer Init.h" -#include "Strategic Mines.h" -#include "Strategic Town Loyalty.h" -#include "Vehicles.h" -#include "Merc Contract.h" -#include "Strategic Pathing.h" -#include "TeamTurns.h" -#include "explosion control.h" -#include "Creature Spreading.h" -#include "Strategic Status.h" -#include "Boxing.h" -#include "Map Screen Interface Map.h" -#include "lighteffects.h" -#include "JA2 Splash.h" -#include "Scheduling.h" -#include "_JA25EnglishText.h" -#include "XML.h" -#include "LogicalBodyTypes/BodyTypeDB.h" -#include "LogicalBodyTypes/Layers.h" -#include "LogicalBodyTypes/AbstractXMLLoader.h" -#include "LogicalBodyTypes/PaletteDB.h" -#include "LogicalBodyTypes/SurfaceDB.h" -#include "LogicalBodyTypes/FilterDB.h" -#include "LogicalBodyTypes/EnumeratorDB.h" -#include "LogicalBodyTypes/BodyTypeDB.h" - -#endif diff --git a/JA2 Splash.cpp b/JA2 Splash.cpp index 73ddc93de..4ef6714a2 100644 --- a/JA2 Splash.cpp +++ b/JA2 Splash.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "vsurface.h" #include "mainmenuscreen.h" @@ -8,7 +5,6 @@ #include "Timer Control.h" #include "Multi Language Graphic Utils.h" #include -#endif UINT32 guiSplashFrameFade = 10; UINT32 guiSplashStartTime = 0; diff --git a/Ja25Update.cpp b/Ja25Update.cpp index 80edcd642..101b1152e 100644 --- a/Ja25Update.cpp +++ b/Ja25Update.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -66,7 +63,6 @@ #include "Strategic Status.h" #include "civ quotes.h" #include "Debug Control.h" -#endif #ifdef JA2UB diff --git a/Laptop/AimArchives.cpp b/Laptop/AimArchives.cpp index 9904f8396..b75d8a23d 100644 --- a/Laptop/AimArchives.cpp +++ b/Laptop/AimArchives.cpp @@ -1,7 +1,4 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimArchives.h" #include "aim.h" @@ -10,7 +7,6 @@ #include "WCheck.h" #include "Encrypted File.h" #include "Text.h" -#endif #include "Soldier Profile.h" diff --git a/Laptop/AimFacialIndex.cpp b/Laptop/AimFacialIndex.cpp index 570bdeb80..60b88e786 100644 --- a/Laptop/AimFacialIndex.cpp +++ b/Laptop/AimFacialIndex.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimFacialIndex.h" #include "WordWrap.h" @@ -16,7 +13,6 @@ #include "GameSettings.h" #include "english.h" #include "sysutil.h" -#endif extern UINT8 gubCurrentSortMode; // symbol already defined in AimSort.cpp (jonathanl) diff --git a/Laptop/AimHistory.cpp b/Laptop/AimHistory.cpp index 8f737d5be..760911f29 100644 --- a/Laptop/AimHistory.cpp +++ b/Laptop/AimHistory.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimHistory.h" #include "aim.h" @@ -9,7 +6,6 @@ #include "WordWrap.h" #include "Encrypted File.h" #include "Text.h" -#endif #include "LocalizedStrings.h" diff --git a/Laptop/AimLinks.cpp b/Laptop/AimLinks.cpp index 79f98b094..b73bc32c9 100644 --- a/Laptop/AimLinks.cpp +++ b/Laptop/AimLinks.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimLinks.h" #include "aim.h" @@ -8,7 +5,6 @@ #include "WordWrap.h" #include "Text.h" #include "Multi Language Graphic Utils.h" -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 6bc2d0c58..d0f0561f7 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "Language Defines.h" -#else #include "email.h" #include "laptop.h" #include "AimMembers.h" @@ -47,7 +43,6 @@ #include "strategicmap.h" #include "Personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item -#endif #include "Strategic Town Loyalty.h" #include "connect.h" diff --git a/Laptop/AimPolicies.cpp b/Laptop/AimPolicies.cpp index 2fa450601..bed0a5ede 100644 --- a/Laptop/AimPolicies.cpp +++ b/Laptop/AimPolicies.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimPolicies.h" #include "aim.h" @@ -10,7 +7,6 @@ #include "Encrypted File.h" #include "Text.h" #include "GameSettings.h" -#endif #include "LocalizedStrings.h" diff --git a/Laptop/AimSort.cpp b/Laptop/AimSort.cpp index 47ed8696b..1b5b0f05b 100644 --- a/Laptop/AimSort.cpp +++ b/Laptop/AimSort.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "AimSort.h" #include "Aim.h" @@ -13,7 +10,6 @@ #include "Multi Language Graphic Utils.h" #include "english.h" #include "sysutil.h" -#endif //#define diff --git a/Laptop/BobbyR.cpp b/Laptop/BobbyR.cpp index 0908fe1a0..fcba33a61 100644 --- a/Laptop/BobbyR.cpp +++ b/Laptop/BobbyR.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyR.h" #include "BobbyRGuns.h" @@ -22,7 +19,6 @@ #include "GameSettings.h" #include "message.h" #include "postalservice.h" -#endif #ifdef JA2TESTVERSION diff --git a/Laptop/BobbyRAmmo.cpp b/Laptop/BobbyRAmmo.cpp index d94c04c0e..8b4b6a530 100644 --- a/Laptop/BobbyRAmmo.cpp +++ b/Laptop/BobbyRAmmo.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRAmmo.h" #include "BobbyRGuns.h" @@ -10,7 +7,6 @@ #include "WordWrap.h" #include "Encrypted File.h" #include "text.h" -#endif UINT32 guiAmmoBackground; UINT32 guiAmmoGrid; diff --git a/Laptop/BobbyRArmour.cpp b/Laptop/BobbyRArmour.cpp index 30a084d82..9c21d4a43 100644 --- a/Laptop/BobbyRArmour.cpp +++ b/Laptop/BobbyRArmour.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRArmour.h" #include "BobbyRGuns.h" @@ -9,7 +6,6 @@ #include "WCheck.h" #include "WordWrap.h" #include "Text.h" -#endif UINT32 guiArmourBackground; diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index 823f35ce6..479a1ef7d 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRGuns.h" #include "BobbyR.h" @@ -23,7 +20,6 @@ // HEADROCK HAM 4 #include "input.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item -#endif #define BOBBYR_DEFAULT_MENU_COLOR 255 diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index 1ab35ca0e..a7610e23a 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRMailOrder.h" #include "BobbyR.h" @@ -27,7 +24,6 @@ #include "postalservice.h" #include "english.h" #include -#endif #include "Strategic Event Handler.h" #include "connect.h" diff --git a/Laptop/BobbyRMisc.cpp b/Laptop/BobbyRMisc.cpp index 7059e4214..a328c5caa 100644 --- a/Laptop/BobbyRMisc.cpp +++ b/Laptop/BobbyRMisc.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRMisc.h" #include "BobbyR.h" @@ -9,7 +6,6 @@ #include "WCheck.h" #include "WordWrap.h" #include "Text.h" -#endif UINT32 guiMiscBackground; diff --git a/Laptop/BobbyRShipments.cpp b/Laptop/BobbyRShipments.cpp index aff5732f4..28f208f36 100644 --- a/Laptop/BobbyRShipments.cpp +++ b/Laptop/BobbyRShipments.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "BobbyRShipments.h" -#else #include "laptop.h" #include "BobbyRShipments.h" #include "bobbyr.h" @@ -17,7 +13,6 @@ #include "PostalService.h" #include "input.h" #include "english.h" -#endif diff --git a/Laptop/BobbyRUsed.cpp b/Laptop/BobbyRUsed.cpp index 8a48c7401..ef3623fd1 100644 --- a/Laptop/BobbyRUsed.cpp +++ b/Laptop/BobbyRUsed.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "BobbyRUsed.h" #include "BobbyR.h" @@ -9,7 +6,6 @@ #include "WCheck.h" #include "WordWrap.h" #include "Text.h" -#endif UINT32 guiUsedBackground; UINT32 guiUsedGrid; diff --git a/Laptop/BriefingRoom.cpp b/Laptop/BriefingRoom.cpp index 43fd32629..dc5c67116 100644 --- a/Laptop/BriefingRoom.cpp +++ b/Laptop/BriefingRoom.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else - #include "Laptop All.h" #include "Utilities.h" #include "WCheck.h" #include "timer control.h" @@ -12,10 +8,15 @@ #include "Game Clock.h" #include "Text.h" #include "soldier profile type.h" -#endif #include "BriefingRoom_Data.h" #include "BriefingRoom.h" +#include "english.h" +#include "laptop.h" +#include "IMP HomePage.h" +#include "line.h" +#include "input.h" +#include "Text Input.h" // Link Images #define BRIEFINGROOM_BUTTON_SIZE_X 205 diff --git a/Laptop/BriefingRoomM.cpp b/Laptop/BriefingRoomM.cpp index 5ee58eef9..69a0c0daa 100644 --- a/Laptop/BriefingRoomM.cpp +++ b/Laptop/BriefingRoomM.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else - #include "Laptop All.h" #include "Utilities.h" #include "WCheck.h" #include "timer control.h" @@ -12,10 +8,16 @@ #include "Game Clock.h" #include "Text.h" #include "soldier profile type.h" -#endif #include "BriefingRoom_Data.h" #include "BriefingRoomM.h" +#include "aim.h" +#include "laptop.h" +#include "IMP HomePage.h" +#include "line.h" +#include "input.h" +#include "Text Input.h" +#include "english.h" // Link Images #define BRIEFINGROOM_MISSION_BUTTON_SIZE_X 121 diff --git a/Laptop/BriefingRoom_Data.cpp b/Laptop/BriefingRoom_Data.cpp index f6e5f2fff..ba9c79f8c 100644 --- a/Laptop/BriefingRoom_Data.cpp +++ b/Laptop/BriefingRoom_Data.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else //#include "Laptop All.h" #include "laptop.h" #include "aim.h" @@ -15,7 +12,6 @@ #include "Quests.h" #include "Tactical Save.h" #include "BriefingRoom_Data.h" -#endif #define MAX_FILTR_LOCATION_BUTTONS 11 diff --git a/Laptop/BrokenLink.cpp b/Laptop/BrokenLink.cpp index c0c15267b..8c6fb1574 100644 --- a/Laptop/BrokenLink.cpp +++ b/Laptop/BrokenLink.cpp @@ -1,14 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "BrokenLink.h" -#else #include "Types.h" #include "font.h" #include "laptop.h" #include "Font Control.h" #include "Text.h" #include "wordwrap.h" -#endif #define BROKEN_LINK__FONT FONT12ARIAL #define BROKEN_LINK__COLOR FONT_MCOLOR_BLACK diff --git a/Laptop/CampaignHistoryMain.cpp b/Laptop/CampaignHistoryMain.cpp index d8f799cbd..e030ff871 100644 --- a/Laptop/CampaignHistoryMain.cpp +++ b/Laptop/CampaignHistoryMain.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -19,7 +16,6 @@ #include "Text.h" #include "Multi Language Graphic Utils.h" #include "CampaignHistoryMain.h" -#endif #define BACKGROUND_WIDTH 125 diff --git a/Laptop/CampaignHistory_Summary.cpp b/Laptop/CampaignHistory_Summary.cpp index f77c4c3a7..b25c868f2 100644 --- a/Laptop/CampaignHistory_Summary.cpp +++ b/Laptop/CampaignHistory_Summary.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "Insurance Text.h" #include "insurance.h" @@ -22,7 +19,6 @@ #include "Game Clock.h" #include "random.h" #include "strategicmap.h" -#endif #define CAMPHIS_SUM_TITLE_Y 52 + LAPTOP_SCREEN_WEB_UL_Y diff --git a/Laptop/CharProfile.cpp b/Laptop/CharProfile.cpp index 481e11dc7..182f4bf7f 100644 --- a/Laptop/CharProfile.cpp +++ b/Laptop/CharProfile.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" -#else #include "laptop.h" #include "cursors.h" #include "CharProfile.h" @@ -35,7 +31,6 @@ #include "IMP Prejudice.h" // added by Flugente #include "IMP Gear Entrance.h" // added by Flugente #include "IMP Gear.h" // added by Flugente -#endif //BOOLEAN fIMPCompletedFlag = FALSE; diff --git a/Laptop/Encyclopedia_Data_new.cpp b/Laptop/Encyclopedia_Data_new.cpp index 3f95602b8..07be98a02 100644 --- a/Laptop/Encyclopedia_Data_new.cpp +++ b/Laptop/Encyclopedia_Data_new.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "Types.h" #include "WCheck.h" #include @@ -30,7 +27,6 @@ #include "Text.h" #include "WordWrap.h" #include "Quests.h" -#endif #ifdef ENCYCLOPEDIA_WORKS /** @ingroup ENCYCLOPEDIA diff --git a/Laptop/Encyclopedia_new.cpp b/Laptop/Encyclopedia_new.cpp index 983d56b9d..f9ae0cf92 100644 --- a/Laptop/Encyclopedia_new.cpp +++ b/Laptop/Encyclopedia_new.cpp @@ -29,9 +29,6 @@ /// uncomment to use just graphic + mouseregion instead of real buttons. No sounds, no button states, just plain 'hyperlinks'. #define ENC_USE_BUTTONSYSTEM -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "Types.h" #include "WCheck.h" #include "DEBUG.H" @@ -54,7 +51,6 @@ //#include "Quests.h" //#include "Tactical Save.h" #include "Encyclopedia_Data_new.h" -#endif #ifdef ENCYCLOPEDIA_WORKS /** @defgroup ENCYCLOPEDIA Encyclopedia diff --git a/Laptop/FacilityProduction.cpp b/Laptop/FacilityProduction.cpp index 3b69b6e23..ea60571de 100644 --- a/Laptop/FacilityProduction.cpp +++ b/Laptop/FacilityProduction.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "WCheck.h" @@ -20,7 +17,6 @@ #include "Strategic Town Loyalty.h" #include "strategic.h" #include "BaseTable.h" -#endif /*#define MERCOMP_FONT_COLOR 2 #define CAMPHIS_FONT_BIG FONT14ARIAL diff --git a/Laptop/IMP AboutUs.cpp b/Laptop/IMP AboutUs.cpp index 37f03670d..991aaca50 100644 --- a/Laptop/IMP AboutUs.cpp +++ b/Laptop/IMP AboutUs.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "IMP AboutUs.h" #include "CharProfile.h" #include "IMPVideoObjects.h" @@ -11,7 +8,6 @@ #include "cursors.h" #include "laptop.h" #include "IMP Text System.h" -#endif // IMP AboutUs buttons INT32 giIMPAboutUsButton[1]; diff --git a/Laptop/IMP Attribute Entrance.cpp b/Laptop/IMP Attribute Entrance.cpp index 50ccb47bd..0ec429661 100644 --- a/Laptop/IMP Attribute Entrance.cpp +++ b/Laptop/IMP Attribute Entrance.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Attribute Entrance.h" #include "IMP MainPage.h" @@ -12,7 +9,6 @@ #include "cursors.h" #include "laptop.h" #include "IMP Text System.h" -#endif // the buttons UINT32 giIMPAttributeEntranceButtonImage[ 1 ]; diff --git a/Laptop/IMP Attribute Finish.cpp b/Laptop/IMP Attribute Finish.cpp index fa45e9632..b87813f13 100644 --- a/Laptop/IMP Attribute Finish.cpp +++ b/Laptop/IMP Attribute Finish.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Attribute Finish.h" #include "IMP MainPage.h" @@ -15,7 +12,6 @@ #include "laptop.h" #include "IMP Text System.h" #include "IMP Attribute Selection.h" -#endif // buttons INT32 giIMPAttributeFinishButtonImage[ 2 ]; diff --git a/Laptop/IMP Attribute Selection.cpp b/Laptop/IMP Attribute Selection.cpp index 7418a1016..6400f0f07 100644 --- a/Laptop/IMP Attribute Selection.cpp +++ b/Laptop/IMP Attribute Selection.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "GameSettings.h" -#else #include "CharProfile.h" #include "IMP Attribute Selection.h" #include "IMP MainPage.h" @@ -25,7 +20,6 @@ #include "IMP Color Choosing.h" #include "IMP Minor Trait.h" -#endif #define STARTING_LEVEL_BOX_POS_X ( 51 ) #define STARTING_LEVEL_BOX_POS_Y ( 296 ) diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 99436dc22..9ea5c40e7 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Background.h" #include "IMP Skill Trait.h" #include "Button System.h" @@ -22,7 +17,6 @@ #include "IMP Compile Character.h" #include "GameSettings.h" #include "Interface.h" -#endif diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index bd65aed0b..c140ee92f 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Begin Screen.h" #include "IMP MainPage.h" @@ -26,7 +23,6 @@ #include "strategic.h" #include "text.h" #include "LaptopSave.h" -#endif #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138 diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index cb605829e..e77032984 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Character Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Character Trait.h" #include "Button System.h" #include "utilities.h" @@ -18,7 +13,6 @@ #include "wordwrap.h" #include "CharProfile.h" #include "GameSettings.h" -#endif //******************************************************************* diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index e694a991f..5cae0c9a4 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Character and Disability Entrance.h" #include "IMP MainPage.h" @@ -14,7 +11,6 @@ #include "IMP Text System.h" #include "text.h" -#endif // IMP personality entrance buttons INT32 giIMPCharacterAndDisabilityEntranceButton[1]; diff --git a/Laptop/IMP Color Choosing.cpp b/Laptop/IMP Color Choosing.cpp index a61e3aa27..310cf62d8 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Color Choosing Skin Hair.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Color Choosing.h" #include "Button System.h" #include "utilities.h" @@ -22,7 +17,6 @@ #include "Animation Data.h" #include "GameSettings.h" #include "Soldier Create.h" // added by Flugente for enums -#endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index 808c03e93..0420b1c4c 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "GameSettings.h" -#else #include "laptop.h" #include "CharProfile.h" #include "Utilities.h" @@ -28,7 +23,6 @@ #include "IMP Color Choosing.h" #include "IMP Minor Trait.h" #include "IMP Voices.h" -#endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index 40340279f..817804620 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP MainPage.h" #include "IMP HomePage.h" @@ -34,7 +31,6 @@ #include "GameSettings.h" #include "IMP Gear.h" // added by Flugente #include "IMP Gear Entrance.h" // added by Flugente -#endif #include #include diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index a940b5d2f..b5a8e1bed 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Disability Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Disability Trait.h" #include "Button System.h" #include "utilities.h" @@ -18,7 +13,6 @@ #include "wordwrap.h" #include "CharProfile.h" #include "GameSettings.h" -#endif //******************************************************************* diff --git a/Laptop/IMP Finish.cpp b/Laptop/IMP Finish.cpp index aeedc2333..f1a8bdbbb 100644 --- a/Laptop/IMP Finish.cpp +++ b/Laptop/IMP Finish.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Finish.h" #include "IMP Portraits.h" @@ -19,7 +16,6 @@ #include "IMP Text System.h" #include "soundman.h" #include "text.h" -#endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Gear Entrance.cpp b/Laptop/IMP Gear Entrance.cpp index 9dc5bd82f..88da8903d 100644 --- a/Laptop/IMP Gear Entrance.cpp +++ b/Laptop/IMP Gear Entrance.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Gear Entrance.h" #include "IMP MainPage.h" @@ -18,7 +15,6 @@ #include "laptop.h" #include "IMP Text System.h" #include "Text.h" -#endif // the buttons UINT32 giIMPGearEntranceButtonImage[2]; diff --git a/Laptop/IMP Gear.cpp b/Laptop/IMP Gear.cpp index fb843ab2f..20fab5f49 100644 --- a/Laptop/IMP Gear.cpp +++ b/Laptop/IMP Gear.cpp @@ -3,11 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#include "IMP Skill Trait.h" -#include "_Ja25Englishtext.h" -#else #include "IMP Gear.h" #include "IMP Skill Trait.h" #include "Button System.h" @@ -34,7 +29,6 @@ #include "IMP Skill Trait.h" #include "IMP Minor Trait.h" #include "IMP Gear Entrance.h" -#endif extern BOOLEAN gfGlowTimerExpired; BOOLEAN fShowIMPItemHighLight = FALSE; diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index da69f506e..b54fa8a32 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Compile Character.h" -#else #include "CharProfile.h" #include "IMP HomePage.h" #include "IMPVideoObjects.h" @@ -27,7 +23,6 @@ // WDS - make number of mercenaries, etc. be configurable #include "Squads.h" #include "Overhead.h" // added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index f0737421a..41acd733f 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "IMP MainPage.h" #include "CharProfile.h" #include "IMPVideoObjects.h" @@ -23,7 +20,6 @@ #include "Soldier Profile.h" #include "Squads.h" #include "Overhead.h" // added by Flugente for OUR_TEAM_SIZE_NO_VEHICLE -#endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index 17ed3eca0..51286ca91 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Minor Trait.h" #include "IMP Skill Trait.h" #include "Button System.h" @@ -22,7 +17,6 @@ #include "IMP Compile Character.h" #include "GameSettings.h" #include "personnel.h" // added by Flugente -#endif diff --git a/Laptop/IMP Personality Entrance.cpp b/Laptop/IMP Personality Entrance.cpp index 9b8f5637b..2402663fa 100644 --- a/Laptop/IMP Personality Entrance.cpp +++ b/Laptop/IMP Personality Entrance.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Personality Entrance.h" #include "IMP MainPage.h" @@ -12,7 +9,6 @@ #include "cursors.h" #include "laptop.h" #include "IMP Text System.h" -#endif // IMP personality entrance buttons INT32 giIMPPersonalityEntranceButton[1]; diff --git a/Laptop/IMP Personality Finish.cpp b/Laptop/IMP Personality Finish.cpp index 3e6200050..cd5a0de54 100644 --- a/Laptop/IMP Personality Finish.cpp +++ b/Laptop/IMP Personality Finish.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Personality Finish.h" #include "IMP MainPage.h" @@ -13,7 +10,6 @@ #include "laptop.h" #include "IMP Text System.h" #include "IMP Compile Character.h" -#endif // this is the amount of time, the player waits until booted back to main profileing screen diff --git a/Laptop/IMP Personality Quiz.cpp b/Laptop/IMP Personality Quiz.cpp index 3ce0ac378..3a1cfe8fe 100644 --- a/Laptop/IMP Personality Quiz.cpp +++ b/Laptop/IMP Personality Quiz.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Personality Quiz.h" #include "IMP MainPage.h" @@ -16,7 +13,6 @@ #include "IMP Text System.h" #include "input.h" #include "english.h" -#endif // Kaiden this line was commented before I screwed with it diff --git a/Laptop/IMP Portraits.cpp b/Laptop/IMP Portraits.cpp index fd1e21b4c..9ba705181 100644 --- a/Laptop/IMP Portraits.cpp +++ b/Laptop/IMP Portraits.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Portraits.h" #include "IMP MainPage.h" @@ -15,7 +12,6 @@ #include "cursors.h" #include "laptop.h" #include "IMP Text System.h" -#endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Prejudice.cpp b/Laptop/IMP Prejudice.cpp index 6c7cc83fb..11712753d 100644 --- a/Laptop/IMP Prejudice.cpp +++ b/Laptop/IMP Prejudice.cpp @@ -3,11 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Prejudice.h" #include "IMP Skill Trait.h" #include "Button System.h" @@ -28,7 +23,6 @@ #include "GameSettings.h" #include "Interface.h" #include "DropDown.h" -#endif //******************************************************************* diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 5da446bb8..eb1e18df6 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "IMP Skill Trait.h" - #include "_Ja25Englishtext.h" -#else #include "IMP Skill Trait.h" #include "Button System.h" #include "utilities.h" @@ -24,7 +19,6 @@ #include "IMP Minor Trait.h" #include "Soldier Profile.h" #include "personnel.h" // added by Flugente -#endif diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index 309d2d686..4fd013b8b 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "WordWrap.h" #include "sgp.h" #include "Encrypted File.h" @@ -41,7 +38,6 @@ #include "GameSettings.h" #endif -#endif #define IMP_SEEK_AMOUNT 5 * 80 * 2 diff --git a/Laptop/IMP Voices.cpp b/Laptop/IMP Voices.cpp index ac759e172..ed2398f76 100644 --- a/Laptop/IMP Voices.cpp +++ b/Laptop/IMP Voices.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "CharProfile.h" #include "IMP Voices.h" #include "IMP MainPage.h" @@ -20,7 +17,6 @@ #include "GameSettings.h" #include "LaptopSave.h" #include "IMP Confirm.h" -#endif INT32 iCurrentVoice = 0; UINT32 iSelectedIMPVoiceSet = 0; diff --git a/Laptop/IMPVideoObjects.cpp b/Laptop/IMPVideoObjects.cpp index 9328119db..57948a69e 100644 --- a/Laptop/IMPVideoObjects.cpp +++ b/Laptop/IMPVideoObjects.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" @@ -10,7 +7,6 @@ #include "laptop.h" #include "Multi Language Graphic Utils.h" #include "IMP Attribute Selection.h" -#endif // globals diff --git a/Laptop/Intelmarket.cpp b/Laptop/Intelmarket.cpp index ee5e691e9..99d3c8390 100644 --- a/Laptop/Intelmarket.cpp +++ b/Laptop/Intelmarket.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -32,7 +29,6 @@ #include "Game Clock.h" #include "LuaInitNPCs.h" #include "Game Event Hook.h" -#endif #define MERCOMP_FONT_COLOR 2 #define CAMPHIS_FONT_COLOR_RED FONT_MCOLOR_RED diff --git a/Laptop/Laptop All.h b/Laptop/Laptop All.h deleted file mode 100644 index c2efeeb91..000000000 --- a/Laptop/Laptop All.h +++ /dev/null @@ -1,145 +0,0 @@ -#ifndef __LAPTOP_ALL_H -#define __LAPTOP_ALL_H - -#pragma message("GENERATED PCH FOR LAPTOP PROJECT.") - -#include "Types.h" -#include "laptop.h" -#include "aim.h" -#include "Utilities.h" -#include "WCheck.h" -#include "Debug.h" -#include "WordWrap.h" -#include "Encrypted File.h" -#include "email.h" -#include "Text.h" -#include "LaptopSave.h" -#include "Multi Language Graphic Utils.h" -#include "AimArchives.h" -#include "AimFacialIndex.h" -#include "stdio.h" -#include "Aim.h" -#include "AimHistory.h" -#include "AimLinks.h" -#include "AimMembers.h" -#include "sysutil.h" -#include "Soldier Control.h" -#include "Interface Items.h" -#include "overhead.h" -#include "finances.h" -#include "vsurface.h" -#include "VObject.h" -#include "Faces.h" -#include "dialogue control.h" -#include "History.h" -#include "Game Event Hook.h" -#include "MercTextBox.h" -#include "Render Dirty.h" -#include "Soldier Add.h" -#include "Merc Hiring.h" -#include "strategic.h" -#include "english.h" -#include "GameSettings.h" -#include "Random.h" -#include "Strategic Status.h" -#include "Merc Contract.h" -#include "Strategic Merc Handler.h" -#include "AimPolicies.h" -#include "AimSort.h" -#include -#include "BobbyR.h" -#include "Arms Dealer Init.h" -#include "ArmsDealerInvInit.h" -#include "BobbyRGuns.h" -#include "Cursors.h" -#include "Weapons.h" -#include "Store Inventory.h" -#include "BobbyRAmmo.h" -#include "BobbyRArmour.h" -#include "BobbyRMailOrder.h" -#include "input.h" -#include "line.h" -#include "Campaign Types.h" -#include "BobbyRMisc.h" -#include "BobbyRUsed.h" -#include "CharProfile.h" -#include "IMP AboutUs.h" -#include "IMP Attribute Entrance.h" -#include "IMP Attribute Finish.h" -#include "IMP MainPage.h" -#include "IMP HomePage.h" -#include "IMPVideoObjects.h" -#include "IMP Text System.h" -#include "IMP Finish.h" -#include "IMP Portraits.h" -#include "IMP Voices.h" -#include "IMP Personality Entrance.h" -#include "IMP Attribute Selection.h" -#include "IMP Personality Quiz.h" -#include "IMP Begin Screen.h" -#include "IMP Personality Finish.h" -#include "IMP Confirm.h" -#include "messageboxscreen.h" -#include "soldier profile.h" -#include "IMP Compile Character.h" -#include "environment.h" -#include -#include "files.h" -#include "Game clock.h" -#include "Strategic Mines.h" -#include "florist.h" -#include "florist Cards.h" -#include "Florist Gallery.h" -#include "florist Order Form.h" -#include "Text Input.h" -#include "funeral.h" -#include "strategicmap.h" -#include "QuestText.h" -#include "Isometric Utils.h" -#include "Timer Control.h" -#include "Soldier Profile Type.h" -#include "Animation Data.h" -#include "soundman.h" -#include "mousesystem.h" -#include "sgp.h" -#include "Sound Control.h" -#include "Insurance Text.h" -#include "insurance.h" -#include "Assignments.h" -#include "insurance Info.h" -#include "insurance Contract.h" -#include "screens.h" -#include "Event Pump.h" -#include "mercs Files.h" -#include "mercs Account.h" -#include "mercs No Account.h" -#include "insurance Comments.h" -#include "sirtech.h" -#include "personnel.h" -#include "Interface Control.h" -#include "Game init.h" -#include "vobject_blitters.h" -#include "LibraryDataBase.h" -#include "music control.h" -#include "SaveLoadGame.h" -#include "RenderWorld.h" -#include "gameloop.h" -#include "Map Screen Interface.h" -#include "ambient control.h" -#include "Message.h" -#include "Map Screen Interface Bottom.h" -#include "Cursor Control.h" -#include "Quests.h" -#include "mercs.h" -#include "Speck Quotes.h" -#include "Font.h" -#include "mapscreen.h" -#include "Map Screen Interface Map.h" -#include "ShopKeeper Interface.h" -#include "Cheats.h" -#include "GameVersion.h" -#include "BriefingRoom_Data.h" -#include "Encyclopedia_new.h" -#include "Encyclopedia_Data_new.h" -#include "Rebel Command.h" -#endif \ No newline at end of file diff --git a/Laptop/Laptop_VS2005.vcproj b/Laptop/Laptop_VS2005.vcproj index 07b50e4b5..4fc2dc25b 100644 --- a/Laptop/Laptop_VS2005.vcproj +++ b/Laptop/Laptop_VS2005.vcproj @@ -634,10 +634,6 @@ RelativePath=".\Intelmarket.h" > - - diff --git a/Laptop/Laptop_VS2008.vcproj b/Laptop/Laptop_VS2008.vcproj index a2aed9bcb..f4453205a 100644 --- a/Laptop/Laptop_VS2008.vcproj +++ b/Laptop/Laptop_VS2008.vcproj @@ -634,10 +634,6 @@ RelativePath="Intelmarket.h" > - - diff --git a/Laptop/Laptop_VS2010.vcxproj b/Laptop/Laptop_VS2010.vcxproj index 15da52cfb..55839fddf 100644 --- a/Laptop/Laptop_VS2010.vcxproj +++ b/Laptop/Laptop_VS2010.vcxproj @@ -97,7 +97,6 @@ - diff --git a/Laptop/Laptop_VS2010.vcxproj.filters b/Laptop/Laptop_VS2010.vcxproj.filters index d05765530..9e1daa278 100644 --- a/Laptop/Laptop_VS2010.vcxproj.filters +++ b/Laptop/Laptop_VS2010.vcxproj.filters @@ -189,7 +189,6 @@ Header Files - Header Files diff --git a/Laptop/Laptop_VS2013.vcxproj b/Laptop/Laptop_VS2013.vcxproj index bd787800e..40e3320be 100644 --- a/Laptop/Laptop_VS2013.vcxproj +++ b/Laptop/Laptop_VS2013.vcxproj @@ -97,7 +97,6 @@ - diff --git a/Laptop/Laptop_VS2013.vcxproj.filters b/Laptop/Laptop_VS2013.vcxproj.filters index 7f7f84a4c..6916c574f 100644 --- a/Laptop/Laptop_VS2013.vcxproj.filters +++ b/Laptop/Laptop_VS2013.vcxproj.filters @@ -180,7 +180,6 @@ Header Files - Header Files diff --git a/Laptop/Laptop_VS2017.vcxproj b/Laptop/Laptop_VS2017.vcxproj index 1603065e5..324d31a6b 100644 --- a/Laptop/Laptop_VS2017.vcxproj +++ b/Laptop/Laptop_VS2017.vcxproj @@ -97,7 +97,6 @@ - diff --git a/Laptop/Laptop_VS2019.vcxproj b/Laptop/Laptop_VS2019.vcxproj index a711fd991..6e88389f5 100644 --- a/Laptop/Laptop_VS2019.vcxproj +++ b/Laptop/Laptop_VS2019.vcxproj @@ -117,7 +117,6 @@ - diff --git a/Laptop/MilitiaWebsite.cpp b/Laptop/MilitiaWebsite.cpp index 662882b7d..67e228934 100644 --- a/Laptop/MilitiaWebsite.cpp +++ b/Laptop/MilitiaWebsite.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -48,7 +45,6 @@ #include "Interface Items.h" #include "InterfaceItemImages.h" #include "CampaignStats.h" -#endif #define MERCOMP_FONT_COLOR 2 diff --git a/Laptop/PMC.cpp b/Laptop/PMC.cpp index f1f30ccb5..652e15c51 100644 --- a/Laptop/PMC.cpp +++ b/Laptop/PMC.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -39,7 +36,6 @@ #include "Town Militia.h" #include "Strategic Town Loyalty.h" #include "MilitiaIndividual.h" -#endif std::vector gPMCHiringEvents; PMCGlobalData gPMCData; diff --git a/Laptop/Store Inventory.cpp b/Laptop/Store Inventory.cpp index f4d0b7205..b21fa9066 100644 --- a/Laptop/Store Inventory.cpp +++ b/Laptop/Store Inventory.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "Types.h" #include "Store Inventory.h" #include "Random.h" @@ -10,7 +7,6 @@ #include "ShopKeeper Interface.h" #include "armsdealerinvinit.h" #include "GameSettings.h" -#endif UINT8 StoreInventory[MAXITEMS][BOBBY_RAY_LISTS]; //= diff --git a/Laptop/WHO.cpp b/Laptop/WHO.cpp index 7ed012143..1b077b9fa 100644 --- a/Laptop/WHO.cpp +++ b/Laptop/WHO.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -29,7 +26,6 @@ #include "Quests.h" #include "finances.h" #include "Game Clock.h" -#endif #define MERCOMP_FONT_COLOR 2 diff --git a/Laptop/XML_AIMAvailability.cpp b/Laptop/XML_AIMAvailability.cpp index fb76224ca..76f7b2c00 100644 --- a/Laptop/XML_AIMAvailability.cpp +++ b/Laptop/XML_AIMAvailability.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "aim.h" -#endif struct { diff --git a/Laptop/XML_BriefingRoom.cpp b/Laptop/XML_BriefingRoom.cpp index 45c78ed9b..d32f9a347 100644 --- a/Laptop/XML_BriefingRoom.cpp +++ b/Laptop/XML_BriefingRoom.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -16,7 +11,6 @@ #include "mercs.h" #include "Encrypted File.h" #include "GameSettings.h" -#endif #include "BriefingRoom_Data.h" diff --git a/Laptop/XML_CampaignStatsEvents.cpp b/Laptop/XML_CampaignStatsEvents.cpp index fc257b16a..938c97bca 100644 --- a/Laptop/XML_CampaignStatsEvents.cpp +++ b/Laptop/XML_CampaignStatsEvents.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "CampaignStats.h" -#endif struct { diff --git a/Laptop/XML_ConditionsForMercAvailability.cpp b/Laptop/XML_ConditionsForMercAvailability.cpp index 929d574f7..cd50b18ce 100644 --- a/Laptop/XML_ConditionsForMercAvailability.cpp +++ b/Laptop/XML_ConditionsForMercAvailability.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "mercs.h" -#endif struct { diff --git a/Laptop/XML_Email.cpp b/Laptop/XML_Email.cpp index dae5a04e2..ba0cd80f5 100644 --- a/Laptop/XML_Email.cpp +++ b/Laptop/XML_Email.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -10,7 +5,6 @@ #include "Interface.h" #include "LuaInitNPCs.h" #include "email.h" -#endif struct { diff --git a/Laptop/XML_EmailMercAvailable.cpp b/Laptop/XML_EmailMercAvailable.cpp index 22b61f35d..1a7412979 100644 --- a/Laptop/XML_EmailMercAvailable.cpp +++ b/Laptop/XML_EmailMercAvailable.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -10,7 +5,6 @@ #include "Interface.h" #include "LuaInitNPCs.h" #include "email.h" -#endif struct { diff --git a/Laptop/XML_EmailMercLevelUp.cpp b/Laptop/XML_EmailMercLevelUp.cpp index 18a66cf0b..c707dbd58 100644 --- a/Laptop/XML_EmailMercLevelUp.cpp +++ b/Laptop/XML_EmailMercLevelUp.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -10,7 +5,6 @@ #include "Interface.h" #include "LuaInitNPCs.h" #include "email.h" -#endif struct { diff --git a/Laptop/XML_History.cpp b/Laptop/XML_History.cpp index 8d182cd4e..9706f980e 100644 --- a/Laptop/XML_History.cpp +++ b/Laptop/XML_History.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -9,7 +6,6 @@ #include "Soldier Profile.h" #include "Text.h" #include "history.h" -#endif struct { diff --git a/Laptop/XML_IMPPortraits.cpp b/Laptop/XML_IMPPortraits.cpp index fd8902f61..d840a5fb0 100644 --- a/Laptop/XML_IMPPortraits.cpp +++ b/Laptop/XML_IMPPortraits.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -8,7 +5,6 @@ #include "Interface.h" #include "IMP Confirm.h" #include "Soldier Profile.h" -#endif struct { diff --git a/Laptop/XML_IMPVoices.cpp b/Laptop/XML_IMPVoices.cpp index 428e97efe..64040f8ea 100644 --- a/Laptop/XML_IMPVoices.cpp +++ b/Laptop/XML_IMPVoices.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "IMP Confirm.h" -#endif struct { diff --git a/Laptop/XML_OldAIMArchive.cpp b/Laptop/XML_OldAIMArchive.cpp index 48ab5633e..4c3b56eac 100644 --- a/Laptop/XML_OldAIMArchive.cpp +++ b/Laptop/XML_OldAIMArchive.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "AimArchives.h" -#endif struct { diff --git a/Laptop/aim.cpp b/Laptop/aim.cpp index 732161f66..a03a80d5f 100644 --- a/Laptop/aim.cpp +++ b/Laptop/aim.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "aim.h" #include "Utilities.h" @@ -17,7 +14,6 @@ #include "GameSettings.h" #include "english.h" #include "sysutil.h" -#endif #include "LocalizedStrings.h" #include "Soldier Profile.h" diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 45ec6cef6..6c12710ff 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -1,7 +1,4 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else - #include "laptop.h" + #include "laptop.h" #include "email.h" #include "Utilities.h" #include "WCheck.h" @@ -23,7 +20,6 @@ #include "faces.h" #include "GameSettings.h" #include -#endif #include "soldier profile type.h" #include "strategicmap.h" diff --git a/Laptop/files.cpp b/Laptop/files.cpp index 08fd96372..feb802715 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "builddefines.h" #include #include @@ -21,7 +18,6 @@ #include "XML.h" #include "expat.h" #include "Debug Control.h" -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index a65f22889..57c8acbaa 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "finances.h" #include "Game clock.h" @@ -23,7 +20,6 @@ #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h" // added by Flugente -#endif // the global defines diff --git a/Laptop/florist Cards.cpp b/Laptop/florist Cards.cpp index 5a37b7184..2d15f995d 100644 --- a/Laptop/florist Cards.cpp +++ b/Laptop/florist Cards.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "florist.h" #include "florist Cards.h" @@ -10,7 +7,6 @@ #include "Cursors.h" #include "Encrypted File.h" #include "Text.h" -#endif diff --git a/Laptop/florist Gallery.cpp b/Laptop/florist Gallery.cpp index 50fdc7325..2734bc75f 100644 --- a/Laptop/florist Gallery.cpp +++ b/Laptop/florist Gallery.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "florist.h" #include "florist Gallery.h" @@ -11,7 +8,6 @@ #include "stdio.h" #include "Encrypted File.h" #include "Text.h" -#endif diff --git a/Laptop/florist Order Form.cpp b/Laptop/florist Order Form.cpp index 6a3b64ded..b62696fbb 100644 --- a/Laptop/florist Order Form.cpp +++ b/Laptop/florist Order Form.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "florist.h" #include "florist Order Form.h" @@ -20,7 +17,6 @@ #include "LaptopSave.h" #include "Random.h" #include "postalservice.h" -#endif #include "meanwhile.h" diff --git a/Laptop/florist.cpp b/Laptop/florist.cpp index 0401461a1..6f9df6f42 100644 --- a/Laptop/florist.cpp +++ b/Laptop/florist.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "florist.h" #include "florist Order Form.h" @@ -12,7 +9,6 @@ #include "florist Cards.h" #include "Text.h" #include "Multi Language Graphic Utils.h" -#endif #define FLORIST_SENTENCE_FONT FONT12ARIAL diff --git a/Laptop/funeral.cpp b/Laptop/funeral.cpp index 1669bb1ce..cf79a381f 100644 --- a/Laptop/funeral.cpp +++ b/Laptop/funeral.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "funeral.h" #include "WCheck.h" @@ -9,7 +6,6 @@ #include "Cursors.h" #include "Text.h" #include "Multi Language Graphic Utils.h" -#endif #define FUNERAL_SENTENCE_FONT FONT12ARIAL diff --git a/Laptop/history.cpp b/Laptop/history.cpp index d47031b4f..558029cac 100644 --- a/Laptop/history.cpp +++ b/Laptop/history.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "History.h" #include "Game clock.h" @@ -16,7 +13,6 @@ #include "text.h" #include "message.h" #include "LaptopSave.h" -#endif #include "connect.h" diff --git a/Laptop/insurance Comments.cpp b/Laptop/insurance Comments.cpp index 2ba410d00..62b7c974d 100644 --- a/Laptop/insurance Comments.cpp +++ b/Laptop/insurance Comments.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "Insurance Text.h" #include "insurance.h" @@ -10,7 +7,6 @@ #include "WordWrap.h" #include "Cursors.h" #include "Text.h" -#endif #define INS_CMNT_TITLE_Y 52 + LAPTOP_SCREEN_WEB_UL_Y diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp index 6c6b5ec08..c85cc1706 100644 --- a/Laptop/insurance Contract.cpp +++ b/Laptop/insurance Contract.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -26,7 +23,6 @@ #include "Assignments.h" #include "Map Screen Interface.h" #include "Interface.h" // added by Flugente -#endif #include #ifdef JA2UB diff --git a/Laptop/insurance Info.cpp b/Laptop/insurance Info.cpp index d281760ca..12792df94 100644 --- a/Laptop/insurance Info.cpp +++ b/Laptop/insurance Info.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "insurance Info.h" #include "insurance.h" @@ -10,7 +7,6 @@ #include "Cursors.h" #include "Insurance Text.h" #include "Text.h" -#endif #define INS_INFO_FRAUD_TEXT_COLOR FONT_MCOLOR_RED diff --git a/Laptop/insurance.cpp b/Laptop/insurance.cpp index 04a3e7cd1..6cb3ce2b7 100644 --- a/Laptop/insurance.cpp +++ b/Laptop/insurance.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -13,7 +10,6 @@ #include "Encrypted File.h" #include "Text.h" #include "Multi Language Graphic Utils.h" -#endif #define INSURANCE_BACKGROUND_WIDTH 125 diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index 60262c7e2..33e95d76d 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "HelpScreen.h" - #include "BrokenLink.h" - #include "BobbyRShipments.h" -#else #include "sgp.h" #include "Utilities.h" #include "WCheck.h" @@ -94,7 +88,6 @@ #include "Intelmarket.h" // added by Flugente #include "FacilityProduction.h" // added by Flugente #include "Rebel Command.h" -#endif #include "connect.h" #include "BriefingRoom_Data.h" diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index 333c0584c..413853d5a 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include "laptop.h" #include "insurance.h" #include "insurance Contract.h" @@ -27,7 +24,6 @@ #include "Overhead.h" #include "Map Screen Interface.h" #include "DynamicDialogue.h" // added by Flugente -#endif #define MERCOMP_FONT_COLOR 2 @@ -1227,4 +1223,4 @@ void SelectMercCompareMatrixRegionCallBack( MOUSE_REGION * pRegion, INT32 iReaso { } } -////////////////////////// MERC COMPARE MATRIX //////////////////////////////// \ No newline at end of file +////////////////////////// MERC COMPARE MATRIX //////////////////////////////// diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index bad6394c4..b312ef2b6 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "mercs Account.h" #include "mercs.h" @@ -19,7 +16,6 @@ #include "Text.h" #include "Speck Quotes.h" #include "Multi Language Graphic Utils.h" -#endif #define MERC_ACCOUNT_TEXT_FONT FONT14ARIAL #define MERC_ACCOUNT_TEXT_COLOR FONT_MCOLOR_WHITE diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index f268ac39a..e13721763 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -1,7 +1,4 @@ // WANNE 3 -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "mercs Files.h" #include "mercs.h" @@ -33,7 +30,6 @@ #include "Personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item #include "mousesystem.h" -#endif #include "Cheats.h" #include "connect.h" diff --git a/Laptop/mercs No Account.cpp b/Laptop/mercs No Account.cpp index 9058f00af..d7e7d2a51 100644 --- a/Laptop/mercs No Account.cpp +++ b/Laptop/mercs No Account.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "mercs No Account.h" #include "mercs.h" @@ -12,7 +9,6 @@ #include "Random.h" #include "Text.h" #include "Speck Quotes.h" -#endif diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index c05fc362e..0f96750ac 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -1,12 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" - #include "GameSettings.h" - -#ifdef JA2UB - #include "Ja25 Strategic Ai.h" -#endif - -#else #include "laptop.h" #include "mercs.h" #include "Utilities.h" @@ -31,7 +22,6 @@ #include "Game Event Hook.h" #include "Quests.h" #include "AimMembers.h" -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 43e4c49b3..beb0e8733 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "personnel.h" #include "Utilities.h" @@ -30,7 +27,6 @@ #include "GameSettings.h" #include "Merc Contract.h" #include "_Ja25Englishtext.h" // added by SANDRO -#endif #include "Soldier Macros.h" #include "InterfaceItemImages.h" diff --git a/Laptop/sirtech.cpp b/Laptop/sirtech.cpp index 82876a254..3709ed6e0 100644 --- a/Laptop/sirtech.cpp +++ b/Laptop/sirtech.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "Laptop All.h" -#else #include "laptop.h" #include "SirTech.h" -#endif void GameInitSirTech() { diff --git a/Loading Screen.cpp b/Loading Screen.cpp index 496ee2595..a0641d3b5 100644 --- a/Loading Screen.cpp +++ b/Loading Screen.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Loading Screen.h" - #include "INIReader.h" -#else #include "vsurface.h" #include "mapscreen.h" #include "Loading Screen.h" @@ -15,7 +10,6 @@ #include "Font Control.h" #include "font.h" #include "render dirty.h" -#endif #include "Strategic Movement.h" #include "UndergroundInit.h" #include diff --git a/MPChatScreen.cpp b/MPChatScreen.cpp index 060f259e2..78ed6a65f 100644 --- a/MPChatScreen.cpp +++ b/MPChatScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "sgp.h" #include "screenids.h" #include "Timer Control.h" @@ -25,7 +22,6 @@ #include "message.h" #include "utilities.h" #include "connect.h" -#endif #define CHATBOX_WIDTH 310 // 350 is the max size, the PrepareMercPopupBox will add the X_MARGIN to both sides #define CHATBOX_Y_MARGIN_NOLOG 25 diff --git a/MPConnectScreen.cpp b/MPConnectScreen.cpp index 3e56d8318..b6a1214ad 100644 --- a/MPConnectScreen.cpp +++ b/MPConnectScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "MPConnectScreen.h" #include "GameSettings.h" @@ -22,7 +19,6 @@ #include "Soldier Profile.h" #include "Animated ProgressBar.h" #include "mainmenuscreen.h" -#endif #include "gameloop.h" #include "Game Init.h" diff --git a/MPHostScreen.cpp b/MPHostScreen.cpp index d93d3e73d..21ec55800 100644 --- a/MPHostScreen.cpp +++ b/MPHostScreen.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Intro.h" -#else #include "Types.h" #include "MPHostScreen.h" #include "GameSettings.h" @@ -22,7 +18,6 @@ #include "Text Input.h" #include "_Ja25EnglishText.h" #include "Soldier Profile.h" -#endif #include "gameloop.h" #include "connect.h" diff --git a/MPJoinScreen.cpp b/MPJoinScreen.cpp index c30ec0354..9eebad5fb 100644 --- a/MPJoinScreen.cpp +++ b/MPJoinScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "MPJoinScreen.h" #include "GameSettings.h" @@ -19,7 +16,6 @@ #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" -#endif #include "gameloop.h" #include "connect.h" diff --git a/MPScoreScreen.cpp b/MPScoreScreen.cpp index 338028648..51d6e1a2d 100644 --- a/MPScoreScreen.cpp +++ b/MPScoreScreen.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Intro.h" -#else #include "Types.h" #include "MPScoreScreen.h" #include "GameSettings.h" @@ -22,7 +18,6 @@ #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" -#endif #include "gameloop.h" #include "Game Init.h" diff --git a/MainMenuScreen.cpp b/MainMenuScreen.cpp index 656e804b0..bcf5e2ea8 100644 --- a/MainMenuScreen.cpp +++ b/MainMenuScreen.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "Encrypted File.h" -#else #include "sgp.h" #include "screenids.h" #include "Timer Control.h" @@ -29,7 +25,6 @@ #include "Encrypted File.h" #include "ja2 splash.h" #include "GameVersion.h" -#endif #include "gamesettings.h" #include "connect.h" diff --git a/MessageBoxScreen.cpp b/MessageBoxScreen.cpp index 90e14c5d0..79f9feb59 100644 --- a/MessageBoxScreen.cpp +++ b/MessageBoxScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "sgp.h" #include "screenids.h" #include "fade screen.h" @@ -24,7 +21,6 @@ #include "DropDown.h" // added by Flugente #include "Utilities.h" // added by Flugente for FilenameForBPP(...) #include "FeaturesScreen.h" -#endif #define MSGBOX_DEFAULT_WIDTH 300 diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index d09db6459..d66e0f8b8 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "strategic.h" -#else #include "builddefines.h" #include "bullets.h" #include @@ -73,7 +69,6 @@ #include "SmokeEffects.h" #include "MPChatScreen.h" #include "sgp_logger.h" -#endif #include "MessageIdentifiers.h" #include "RakNetworkFactory.h" diff --git a/Options Screen.cpp b/Options Screen.cpp index 590962699..43fd9b1f5 100644 --- a/Options Screen.cpp +++ b/Options Screen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "Options Screen.h" #include "Video.h" @@ -37,7 +34,6 @@ #include "Map Information.h" #include "SmokeEffects.h" #include "Sys Globals.h" -#endif #include "Cheats.h" #include "connect.h" diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp index 6811ac800..041547870 100644 --- a/SaveLoadGame.cpp +++ b/SaveLoadGame.cpp @@ -1,14 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "PreBattle Interface.h" - #include "civ quotes.h" - #include "Militia Control.h" - #include "Strategic Event Handler.h" - #include "HelpScreen.h" - #include "Cheats.h" - #include "Animated ProgressBar.h" - #include "Shopkeeper Interface.h" -#else #include "Types.h" #include "Soldier Profile.h" #include "FileMan.h" @@ -119,7 +108,6 @@ #include "ASD.h" // added by Flugente #include "MilitiaIndividual.h" // added by Flugente #include "Rebel Command.h" -#endif #include "BobbyR.h" #include "Imp Portraits.h" diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp index 90e1ee54b..39e367d0f 100644 --- a/SaveLoadScreen.cpp +++ b/SaveLoadScreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Types.h" #include "SaveLoadScreen.h" #include "Video.h" @@ -36,7 +33,6 @@ #include "Multi Language Graphic Utils.h" #include "Campaign Types.h" #include "PostalService.h" -#endif #include "connect.h" diff --git a/Screens.cpp b/Screens.cpp index 61e368008..723e2126d 100644 --- a/Screens.cpp +++ b/Screens.cpp @@ -1,8 +1,4 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "Screens.h" -#endif int iResolution; // INI file int iPlayIntro; diff --git a/Standard Gaming Platform/Bitmap.h b/Standard Gaming Platform/Bitmap.h deleted file mode 100644 index 81bc4b350..000000000 --- a/Standard Gaming Platform/Bitmap.h +++ /dev/null @@ -1,63 +0,0 @@ -//************************************************************************** -// -// Filename : bitmap.h -// -// Purpose : bitmap format -// -// Modification history : -// -// 20nov96:HJH - Creation -// -//************************************************************************** - -#ifndef _bitmap_h -#define _bitmap_h - -//************************************************************************** -// -// Includes -// -//************************************************************************** - -#include "types.h" - -//************************************************************************** -// -// Defines -// -//************************************************************************** - -//************************************************************************** -// -// Typedefs -// -//************************************************************************** - -typedef struct sgpBmHeadertag -{ - UINT32 uiNumBytes; // number of bytes of the bitmap, including the - // memory for all variables in this structure plus - // all the memory in bitmap - UINT32 uiWidth; // width of bitmap in pixels - UINT32 uiHeight; // height of bitmap in pixels - UINT8 uiBitDepth; // 8, 16, 24, or 32 - UINT8 uiNumPalEntries; // if uiBitDepth is 8, non-zero, else 0 -} SGPBmHeader; - -typedef struct sgpBitmaptag -{ - SGPBmHeader header; - UINT8 uiData[1]; // if uiNumPalEntries != 0 - // uiNumPalEntries*3 (rgb) bytes for palette - // if uiBitDepth == 8 - // uiWidth * uiHeight bytes - // else if uiBitDepth == 16 - // uiWidth * uiHeight * 2 bytes - // else if uiBitDepth == 24 - // uiWidth * uiHeight * 3 bytes - // else if uiBitDepth == 32 - // uiWidth * uiHeight * 4 bytes -} SGPBitmap; - -#endif - diff --git a/Standard Gaming Platform/Button Sound Control.cpp b/Standard Gaming Platform/Button Sound Control.cpp index 404fe7184..c677fbc00 100644 --- a/Standard Gaming Platform/Button Sound Control.cpp +++ b/Standard Gaming Platform/Button Sound Control.cpp @@ -1,14 +1,8 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include "Button System.h" #include "Button Sound Control.h" #include "Sound Control.h" #include "jascreens.h" -#endif void SpecifyButtonSoundScheme( INT32 iButtonID, INT8 bSoundScheme ) { diff --git a/Standard Gaming Platform/Button System.cpp b/Standard Gaming Platform/Button System.cpp index ea0796be2..544f431e7 100644 --- a/Standard Gaming Platform/Button System.cpp +++ b/Standard Gaming Platform/Button System.cpp @@ -4,11 +4,6 @@ Rewritten mostly by Kris Morness ***********************************************************************************************/ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include @@ -35,7 +30,6 @@ #else #include "video2.h" #endif -#endif #include diff --git a/Standard Gaming Platform/Compression.cpp b/Standard Gaming Platform/Compression.cpp index 66ae6e911..b9922aae4 100644 --- a/Standard Gaming Platform/Compression.cpp +++ b/Standard Gaming Platform/Compression.cpp @@ -1,12 +1,6 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "MemMan.h" #include "debug.h" #include "zlib.h" -#endif // mem allocation functions for ZLIB's purposes diff --git a/Standard Gaming Platform/Container.cpp b/Standard Gaming Platform/Container.cpp index 56b8845c6..ad140dd54 100644 --- a/Standard Gaming Platform/Container.cpp +++ b/Standard Gaming Platform/Container.cpp @@ -19,11 +19,6 @@ // this crap. DON'T USE THIS -- NO MATTER WHAT!!! //***************************************************************************** -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include @@ -35,7 +30,6 @@ #if _MSC_VER < 1300 //(iostream.h was removed from VC.NET2003) #include #endif -#endif //***************************************************************************** diff --git a/Standard Gaming Platform/Cursor Control.cpp b/Standard Gaming Platform/Cursor Control.cpp index 3e78847d4..93cc87f03 100644 --- a/Standard Gaming Platform/Cursor Control.cpp +++ b/Standard Gaming Platform/Cursor Control.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "Cursor Control.h" #if defined( JA2 ) || defined( UTIL ) @@ -11,7 +6,6 @@ #include "video2.h" #endif -#endif /////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Standard Gaming Platform/DEBUG.cpp b/Standard Gaming Platform/DEBUG.cpp index 9b1bb528c..c5fd69f43 100644 --- a/Standard Gaming Platform/DEBUG.cpp +++ b/Standard Gaming Platform/DEBUG.cpp @@ -29,7 +29,6 @@ #include #include #include "debug.h" - #include "WizShare.h" //Kris addition #ifdef JA2 diff --git a/Standard Gaming Platform/DbMan.cpp b/Standard Gaming Platform/DbMan.cpp deleted file mode 100644 index d4cd1b8ac..000000000 --- a/Standard Gaming Platform/DbMan.cpp +++ /dev/null @@ -1,1038 +0,0 @@ -//************************************************************************** -// -// Filename : DbMan.c -// -// Purpose : function definitions for the database manager -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -//************************************************************************** -// -// Includes -// -//************************************************************************** - -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else - #include "types.h" - #include - #include - #include - #include "windows.h" - #include "FileMan.h" - #include "MemMan.h" - #include "DbMan.h" - #include "Debug.h" -#endif - -//************************************************************************** -// -// Defines -// -//************************************************************************** - -#define FILENAME_LENGTH 600 -#define IM_FILENAME_LENGTH 100 -#define BUCKET_FILENAME_LENGTH 100 -#define INITIAL_NUM_HANDLES 20 -#define NUM_FILES_TO_ADD_AT_A_TIME 20 - -#define CHECKF(exp) if (!(exp)) { return(FALSE); } -#define CHECKV(exp) if (!(exp)) { return; } -#define CHECKN(exp) if (!(exp)) { return(NULL); } -#define CHECKBI(exp) if (!(exp)) { return(-1); } -#define CHECK0(exp) if (!(exp)) { return(0); } - -#define PRINT_DEBUG_INFO FileDebugPrint(); - -#define ExtractFileIndex( exp ) ( (HFILEINDEX)((exp)>>16) ) -#define ExtractDbIndex( exp ) ( (HDBINDEX)((exp)&0x0000FFFF) ) - -//************************************************************************** -// -// Typedefs -// -//************************************************************************** - - -// NOTE: the file format of the index file will be as follows: -// -// UINT32 # - number of entries to follow for filenames starting with '0' -// entry 1 filename -// entry 1 databasename -// entry 2 filename -// entry 2 databasename -// ... -// entry # filename -// entry # databasename -// -// UINT32 # - number of entries to follow for filenames starting with '1' -// entry 1 filename -// entry 1 databasename -// entry 2 filename -// entry 2 databasename -// ... -// entry # filename -// entry # databasename -// -// ... -// -// UINT32 # - number of entries to follow for filenames starting with 'z' -// entry 1 filename -// entry 1 databasename -// entry 2 filename -// entry 2 databasename -// ... -// entry # filename -// entry # databasename -// -// UINT32 #### - offset in file to entries for the letter '0' -// ... -// UINT32 #### - offset in file to entries for the letter '9' -// UINT32 #### - offset in file to entries for the letter 'a' -// ... -// UINT32 #### - offset in file to entries for the letter 'z' -// -// - each set of entries for a letter will comprise a bucket - -typedef struct DbBucketTag -{ - CHAR cFirstLetter; - - CHAR *pstrFilenames; - CHAR *pstrDatabasenames; - UINT32 uiNumNames; -} DbBucket; - -typedef struct DbFileTag -{ - CHAR strFilename[FILENAME_LENGTH]; - INT32 iFileSize; // if 0, this structure is not in use - INT32 iOffsetIntoFile; - INT32 iCurrentPosition; -} DbFile; - -typedef struct DbInfoTag -{ - CHAR strFilename[FILENAME_LENGTH]; - HWFILE hFile; // if 0, this structure is not in use - - DbFile *pOpenFiles; - UINT32 uiNumFiles; -} DbInfo; - -typedef struct DbSystemTag -{ - DbBucket bucket; - CHAR strIndexFilename[FILENAME_LENGTH]; - - DbInfo *pDBFiles; - UINT32 uiNumDBFiles; - - BOOLEAN fDebug; -} DbSystem; - -// this is for reading the database file -typedef struct DbHeaderTag -{ - CHAR strSignature[20]; - INT32 iNumFiles; - INT32 iOffsetToIndex; -} DbHeader; - -// this is for reading the database file -typedef struct IndexMemberTag -{ - CHAR strFilename[IM_FILENAME_LENGTH]; - INT32 iFileSize; - INT32 iOffsetIntoFile; - INT32 time; -} IndexMember; - -//************************************************************************** -// -// Variables -// -//************************************************************************** - -DbSystem gdb; - -//************************************************************************** -// -// Function Prototypes -// -//************************************************************************** - -void DbDebugPrint( void ); -HDBFILE CreateDBFileHandle( HFILEINDEX, HDBINDEX ); -BOOLEAN InitDB( DbInfo *pDBInfo, STR strFilename ); -HDBINDEX OpenDatabaseContainingFile( STR strFilename ); -BOOLEAN InitFile( HWFILE hDBFile, DbFile *pFileInfo, STR strFilename ); -BOOLEAN LoadBucket( CHAR cFirstLetter ); -BOOLEAN GetShortFilename( STR strFilename, STR strPathname ); - -//************************************************************************** -// -// Functions -// -//************************************************************************** - -//************************************************************************** -// -// CreateDBFileHandle -// -// Creates a file handle from two indices. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -HDBFILE CreateDBFileHandle( HFILEINDEX high, HDBINDEX low ) -{ - return( (((LONG)high)<<16)|low ); -} - -//************************************************************************** -// -// DbSystemInit -// -// Starts up the database system. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -BOOLEAN InitializeDatabaseManager( STR strIndexFilename ) -{ - INT32 i; - UINT32 uiSize; - - if ( !FileExistsNoDB( strIndexFilename ) ) - { - return(FALSE); - } - - uiSize = INITIAL_NUM_HANDLES * sizeof(DbInfo); - gdb.fDebug = FALSE; - gdb.pDBFiles = (DbInfo *) MemAlloc( uiSize ); - CHECKF( gdb.pDBFiles ); - - gdb.uiNumDBFiles = INITIAL_NUM_HANDLES; - - for ( i=0 ; icreation -// -//************************************************************************** - -void ShutdownDatabaseManager( void ) -{ - UINT32 i; - - MemFree( gdb.bucket.pstrFilenames ); - MemFree( gdb.bucket.pstrDatabasenames ); - - // close any unclosed files - for ( i=1 ; icreation -// -//************************************************************************** - -void DbDebug( BOOLEAN fFlag ) -{ - gdb.fDebug = fFlag; -} - -//************************************************************************** -// -// DbExists -// -// Checks if a database file exists. -// -// Parameter List : -// -// STR ->name of file to check existence of -// -// Return Value : -// -// BOOLEAN ->TRUE if it exists -// ->FALSE if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -BOOLEAN DbExists( STR strFilename ) -{ - return( FileExists( strFilename ) ); -} - -//************************************************************************** -// -// DbOpen -// -// Opens a database. -// -// Parameter List : -// -// STR ->filename -// -// Return Value : -// -// HDBINDEX ->handle of opened file -// ->0 if unsuccessful -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -HDBINDEX DbOpen( STR strFilename ) -{ - HDBINDEX hDBIndex; - UINT16 i; - CHAR cShortFilename[FILENAME_LENGTH]; - CHAR cShortDBName[FILENAME_LENGTH]; - BOOLEAN fFound; - - fFound = FALSE; - hDBIndex = 0; - - // first, find any already open databases, and make sure that if we're trying to - // open one that's already open, then we just return an index to it - for ( i=1 ; ihandle to database file to close -// -// Return Value : -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -void DbClose( HDBINDEX hFile ) -{ - if ( hFile && gdb.pDBFiles[hFile].hFile ) - { - MemFree( gdb.pDBFiles[hFile].pOpenFiles ); - FileClose( gdb.pDBFiles[hFile].hFile ); - gdb.pDBFiles[hFile].hFile = 0; - - DbgMessage( TOPIC_DATABASE_MANAGER, DBG_LEVEL_2, "Closing Database File" ); - } -} - -//************************************************************************** -// -// DbFileOpen -// -// Opens a file in a database. -// -// Parameter List : -// -// STR ->filename -// UIN32 ->access - read or write, or both -// BOOLEAN ->delete on close -// -// Return Value : -// -// HWFILE ->handle of opened file -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -HDBFILE DbFileOpen( STR strFilename ) -{ - HDBFILE hFile; - HFILEINDEX hFileIndex = 0xffff; - HDBINDEX hDBIndex; - UINT16 i; - - hDBIndex = OpenDatabaseContainingFile( strFilename ); - if ( !hDBIndex ) - return(0); - - for ( i=1 ; ihandle to database file to close -// -// Return Value : -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -void DbFileClose( HDBFILE hDBFile ) -{ - HFILEINDEX hFileIndex; - HDBINDEX hDBIndex; - - hFileIndex = ExtractFileIndex( hDBFile ); - hDBIndex = ExtractDbIndex( hDBFile ); - - if ( hDBIndex >= gdb.uiNumDBFiles ) - return; - - if ( gdb.pDBFiles[hDBIndex].pOpenFiles ) - { - if ( hFileIndex >= gdb.pDBFiles[hDBIndex].uiNumFiles ) - return; - - if ( gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize ) - { - gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize = 0; - } - } -} - -//************************************************************************** -// -// DbFileRead -// -// To read a file in a database. -// -// Parameter List : -// -// HWFILE ->handle to file to read from -// void * ->source buffer -// UINT32 ->num bytes to read -// UINT32 ->num bytes read -// -// Return Value : -// -// BOOLEAN ->TRUE if successful -// ->FALSE if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -BOOLEAN DbFileRead(HDBFILE hDBFile, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead) -{ - HFILEINDEX hFileIndex; - HDBINDEX hDBIndex; - HWFILE hFile; - UINT32 uiStartPos, uiCurPos, uiBytesRead; - - hFileIndex = ExtractFileIndex( hDBFile ); - hDBIndex = ExtractDbIndex( hDBFile ); - - CHECKF( hDBIndex < gdb.uiNumDBFiles ); - CHECKF( gdb.pDBFiles[hDBIndex].pOpenFiles ) - CHECKF( hFileIndex < gdb.pDBFiles[hDBIndex].uiNumFiles ); - CHECKF( gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize ); - - hFile = gdb.pDBFiles[hDBIndex].hFile; - uiStartPos = gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iOffsetIntoFile; - uiCurPos = gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iCurrentPosition; - - CHECKF( hFile ); - - FileSeek( hFile, uiStartPos + uiCurPos, FILE_SEEK_FROM_START ); - FileRead( hFile, pDest, uiBytesToRead, &uiBytesRead ); - - if ( puiBytesRead ) - *puiBytesRead = uiBytesRead; - - gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iCurrentPosition += uiBytesToRead; - - return(TRUE); -} - -//************************************************************************** -// -// DbFileLoad -// -// To open, read, and close a file. -// -// Parameter List : -// -// -// Return Value : -// -// BOOLEAN ->TRUE if successful -// ->FALSE if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -BOOLEAN DbFileLoad(STR filename, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead) -{ - HDBFILE hDBFile; - UINT32 uiBytesRead; - - hDBFile = DbFileOpen( filename ); - CHECKF( hDBFile ); - - DbFileRead( hDBFile, pDest, uiBytesToRead, &uiBytesRead ); - DbFileClose( hDBFile ); - - if ( puiBytesRead ) - *puiBytesRead = uiBytesRead; - - return(TRUE); -} - -//************************************************************************** -// -// DbFileSeek -// -// To seek to a position in a file in a database. -// -// Parameter List : -// -// HWFILE ->handle to file to seek in -// UINT32 ->distance to seek -// UINT8 ->how to seek -// -// Return Value : -// -// BOOLEAN ->TRUE if successful -// ->FALSE if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -BOOLEAN DbFileSeek( HDBFILE hDBFile, UINT32 uiDistance, UINT8 uiHow ) -{ - HFILEINDEX hFileIndex; - HDBINDEX hDBIndex; - UINT32 uiStartPos, uiCurPos, uiSize; - - hFileIndex = ExtractFileIndex( hDBFile ); - hDBIndex = ExtractDbIndex( hDBFile ); - - CHECKF( hDBIndex < gdb.uiNumDBFiles ); - CHECKF( gdb.pDBFiles[hDBIndex].pOpenFiles ) - CHECKF( hFileIndex < gdb.pDBFiles[hDBIndex].uiNumFiles ); - CHECKF( gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize ); - - uiStartPos = gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iOffsetIntoFile; - uiCurPos = gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iCurrentPosition; - uiSize = gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize; - - if ( uiHow == FILE_SEEK_FROM_START ) - uiCurPos = uiDistance; - else if ( uiHow == FILE_SEEK_FROM_END ) - uiCurPos = uiSize - uiDistance; - else if ( uiHow == FILE_SEEK_FROM_CURRENT ) - uiCurPos += uiDistance; - else - return(FALSE); - - return(TRUE); -} - -//************************************************************************** -// -// DbFileGetSize -// -// To get the current position in a file. -// -// Parameter List : -// -// HWFILE ->handle to file -// -// Return Value : -// -// INT32 ->current offset in file if successful -// ->-1 if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -UINT32 DbFileGetPos( HDBFILE hDBFile ) -{ - HFILEINDEX hFileIndex; - HDBINDEX hDBIndex; - - hFileIndex = ExtractFileIndex( hDBFile ); - hDBIndex = ExtractDbIndex( hDBFile ); - - CHECK0( hDBIndex < gdb.uiNumDBFiles ); - CHECK0( gdb.pDBFiles[hDBIndex].pOpenFiles ) - CHECK0( hFileIndex < gdb.pDBFiles[hDBIndex].uiNumFiles ); - CHECK0( gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize ); - - return(gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iCurrentPosition); -} - -//************************************************************************** -// -// DbFileGetSize -// -// To get the current file size. -// -// Parameter List : -// -// HWFILE ->handle to file -// -// Return Value : -// -// INT32 ->file size in file if successful -// ->0 if not -// -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -UINT32 DbFileGetSize( HDBFILE hDBFile ) -{ - HFILEINDEX hFileIndex; - HDBINDEX hDBIndex; - - hFileIndex = ExtractFileIndex( hDBFile ); - hDBIndex = ExtractDbIndex( hDBFile ); - - CHECK0( hDBIndex < gdb.uiNumDBFiles ); - CHECK0( gdb.pDBFiles[hDBIndex].pOpenFiles ) - CHECK0( hFileIndex < gdb.pDBFiles[hDBIndex].uiNumFiles ); - CHECK0( gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize ); - - return(gdb.pDBFiles[hDBIndex].pOpenFiles[hFileIndex].iFileSize); -} - -//************************************************************************** -// -// DbDebugPrint -// -// To print the debug state to output. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 24sep96:HJH ->creation -// -//************************************************************************** - -void DbDebugPrint( void ) -{ -} - -//************************************************************************** -// -// InitDB -// -// To initialize a database info structure. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 15oct96:HJH ->creation -// -//************************************************************************** - -BOOLEAN InitDB( DbInfo *pDBInfo, STR strFilename ) -{ - HWFILE hFile; - INT32 i; - - CHECKF(pDBInfo); - - hFile = FileOpen( strFilename, FILE_ACCESS_READ, FALSE ); - CHECKF( hFile ); - - strcpy( pDBInfo->strFilename, strFilename ); - pDBInfo->hFile = hFile; - pDBInfo->pOpenFiles = (DbFile *) MemAlloc(INITIAL_NUM_HANDLES * sizeof(DbFile)); - - if ( !pDBInfo->pOpenFiles ) - { - FileClose( hFile ); - return(FALSE); - } - - for ( i=0 ; ipOpenFiles[i].iFileSize = 0; - } - pDBInfo->uiNumFiles = INITIAL_NUM_HANDLES; - - return(TRUE); -} - -//************************************************************************** -// -// OpenDatabaseContainingFile -// -// To open, or find the already opened database, containing the given file. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 15oct96:HJH ->creation -// -//************************************************************************** - -HDBINDEX OpenDatabaseContainingFile( STR strFilename ) -{ - CHAR cFirst, cFilename[FILENAME_LENGTH], cCheckname[FILENAME_LENGTH]; - UINT32 i; - HDBINDEX hIndex; - - hIndex = 0; - GetShortFilename( cFilename, strFilename ); - - cFirst = cFilename[0]; - - if ( cFirst != gdb.bucket.cFirstLetter ) - LoadBucket( cFirst ); - - for ( i=0 ; icreation -// -//************************************************************************** - -BOOLEAN InitFile( HWFILE hDBFile, DbFile *pFileInfo, STR strFilename ) -{ - DbHeader header; - IndexMember im; - UINT32 uiBytesRead; - INT32 i; - CHAR cFilename[FILENAME_LENGTH], cShortFilename[FILENAME_LENGTH]; - - CHECKF( pFileInfo ); - CHECKF( strFilename ); - CHECKF( hDBFile ); - - FileSeek( hDBFile, 0, FILE_SEEK_FROM_START ); - FileRead( hDBFile, &header, sizeof(DbHeader), &uiBytesRead ); - CHECKF( uiBytesRead == sizeof(DbHeader) ); - FileSeek( hDBFile, header.iOffsetToIndex, FILE_SEEK_FROM_START ); - - GetShortFilename( cShortFilename, strFilename ); - for ( i=0 ; istrFilename, strFilename ); - pFileInfo->iFileSize = im.iFileSize; - pFileInfo->iOffsetIntoFile = im.iOffsetIntoFile; - pFileInfo->iCurrentPosition = 0; - return(TRUE); - } - } - - return(FALSE); -} - -//************************************************************************** -// -// LoadBucket -// -// To load a bucketfull of file-database name pairs. -// -// Parameter List : -// Return Value : -// Modification history : -// -// 15oct96:HJH ->creation -// -//************************************************************************** - -BOOLEAN LoadBucket( CHAR cFirstLetter ) -{ - HWFILE hFile; - UINT32 i, uiPosition, uiBytesRead, uiNumEntries, uiSize; - CHAR cFilename[FILENAME_LENGTH], cDatabasename[FILENAME_LENGTH]; - - uiNumEntries = 0; - - MemFree( gdb.bucket.pstrFilenames ); - MemFree( gdb.bucket.pstrDatabasenames ); - - hFile = FileOpen( gdb.strIndexFilename, FILE_ACCESS_READ, FALSE ); - CHECKF(hFile); - uiSize = FileGetSize( hFile ); - - if ( cFirstLetter >= 'a' && cFirstLetter <= 'z' ) - uiPosition = 'z' - cFirstLetter + 1; - else - uiPosition = 26 + ('9' - cFirstLetter + 1); - - FileSeek( hFile, sizeof(UINT32)*uiPosition, FILE_SEEK_FROM_END ); - FileRead( hFile, &uiPosition, sizeof(UINT32), &uiBytesRead ); - if ( uiPosition > uiSize ) - { - // error - return(FALSE); - } - - FileSeek( hFile, uiPosition, FILE_SEEK_FROM_START ); - FileRead( hFile, &uiNumEntries, sizeof(UINT32), &uiBytesRead ); - - CHECKF(uiNumEntries); - - gdb.bucket.pstrFilenames = (STR8)MemAlloc( uiNumEntries * FILENAME_LENGTH); - CHECKF(gdb.bucket.pstrFilenames); - - gdb.bucket.pstrDatabasenames = (STR8)MemAlloc( uiNumEntries * FILENAME_LENGTH); - if ( !gdb.bucket.pstrDatabasenames ) - { - MemFree(gdb.bucket.pstrFilenames); - return(FALSE); - } - - - for ( i=0 ; icreation -// -//************************************************************************** - -BOOLEAN GetShortFilename( STR strFilename, STR strPathname ) -{ - CHAR *pcLast; - - pcLast = strrchr( strPathname, '\\' ); - - if ( pcLast ) - { - pcLast = pcLast + 1; - strcpy( strFilename, pcLast ); - } - else - strcpy( strFilename, strPathname ); - - return(TRUE); -} - diff --git a/Standard Gaming Platform/DbMan.h b/Standard Gaming Platform/DbMan.h deleted file mode 100644 index 13af5e63e..000000000 --- a/Standard Gaming Platform/DbMan.h +++ /dev/null @@ -1,87 +0,0 @@ -//************************************************************************** -// -// Filename : DbMan.h -// -// Purpose : prototypes for the database manager -// -// Modification history : -// -// 08oct96:HJH - Creation -// -//************************************************************************** - -#ifndef _DBMAN_H -#define _DBMAN_H - -//************************************************************************** -// -// Includes -// -//************************************************************************** - -#include "types.h" - -//************************************************************************** -// -// Defines -// -//************************************************************************** - -#ifndef FILE_ACCESS_READ -#define FILE_ACCESS_READ 0x01 -#endif - -#ifndef FILE_ACCESS_WRITE -#define FILE_ACCESS_WRITE 0x02 -#endif - -#define FILE_SEEK_FROM_START 0x01 // keep in sync with fileman.h -#define FILE_SEEK_FROM_END 0x02 // keep in sync with fileman.h -#define FILE_SEEK_FROM_CURRENT 0x04 // keep in sync with fileman.h - -//************************************************************************** -// -// Typedefs -// -//************************************************************************** - -typedef UINT8 BYTE; -typedef UINT32 HDBFILE; -typedef UINT16 HFILEINDEX; -typedef UINT16 HDBINDEX; - -//************************************************************************** -// -// Function Prototypes -// -//************************************************************************** - -#ifdef __cplusplus -extern "C" { -#endif - -extern BOOLEAN InitializeDatabaseManager( STR strIndexFilename ); -extern void ShutdownDatabaseManager( void ); -extern void DbDebug( BOOLEAN f ); - -extern BOOLEAN DbExists( STR filename ); - -extern HDBINDEX DbOpen( STR filename ); -extern void DbClose( HDBINDEX ); - -extern HDBFILE DbFileOpen( STR filename ); -extern void DbFileClose( HDBFILE ); - -extern BOOLEAN DbFileRead( HDBFILE hFile, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead ); -extern BOOLEAN DbFileLoad( STR filename, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead ); -extern BOOLEAN DbFileSeek( HDBFILE hFile, UINT32 uiDistance, UINT8 uiHow ); - -extern UINT32 DbFileGetPos( HDBFILE hFile ); -extern UINT32 DbFileGetSize( HDBFILE ); - -#ifdef __cplusplus -} -#endif - - -#endif diff --git a/Standard Gaming Platform/DirectDraw Calls.cpp b/Standard Gaming Platform/DirectDraw Calls.cpp index dc5aa11cc..99fa328f6 100644 --- a/Standard Gaming Platform/DirectDraw Calls.cpp +++ b/Standard Gaming Platform/DirectDraw Calls.cpp @@ -1,15 +1,9 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "DirectX Common.h" #include "DirectDraw Calls.h" #include #include "debug.h" #include "vobject_blitters.h" -#endif // DirectDrawSurface2 Calls void diff --git a/Standard Gaming Platform/DirectX Common.cpp b/Standard Gaming Platform/DirectX Common.cpp index 832d30378..9c6daefb8 100644 --- a/Standard Gaming Platform/DirectX Common.cpp +++ b/Standard Gaming Platform/DirectX Common.cpp @@ -2,17 +2,11 @@ #include #include -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include "DirectX Common.h" #include #include "debug.h" -#endif void DirectXZeroMem ( void* pMemory, int nSize ) { diff --git a/Standard Gaming Platform/English.cpp b/Standard Gaming Platform/English.cpp index 48d360fac..9781fce29 100644 --- a/Standard Gaming Platform/English.cpp +++ b/Standard Gaming Platform/English.cpp @@ -1,10 +1,4 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "english.h" -#endif // The gsKeyTranslationTable is used to return KEY values on the basis of the virtual key code and // SHIFT/ALT/CTRL key states. Range 0-255 is for normal keys, 256-511 is when SHIFT is pressed diff --git a/Standard Gaming Platform/ExceptionHandling.cpp b/Standard Gaming Platform/ExceptionHandling.cpp deleted file mode 100644 index 5e8ff9968..000000000 --- a/Standard Gaming Platform/ExceptionHandling.cpp +++ /dev/null @@ -1,1600 +0,0 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else - #include "Types.h" - #include - #include - #include - #include "FileMan.h" -#endif - - - -#ifdef JA2 -#endif - -//If we are to use exception handling -#ifdef ENABLE_EXCEPTION_HANDLING - - -const int NumCodeBytes = 16; // Number of code bytes to record. -const int MaxStackDump = 2048; // Maximum number of DWORDS in stack dumps. -const int StackColumns = 8; // Number of columns in stack dump. - -#define ONEK 1024 -#define SIXTYFOURK (64*ONEK) -#define ONEM (ONEK*ONEK) -#define ONEG (ONEK*ONEK*ONEK) - -//ppp -void ErrorLog(HWFILE LogFile, STR8 Format, ...); -STR GetExceptionString( DWORD uiExceptionCode ); -void DisplayRegisters( HWFILE hFile, CONTEXT *pContext ); -BOOLEAN GetAndDisplayModuleAndSystemInfo( HWFILE hFile, CONTEXT *pContext ); -BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ); -void RecordModuleList(HWFILE hFile ); -void PrintTime(STR8 output, FILETIME TimeToPrint); -static void ShowModuleInfo(HWFILE hFile, HINSTANCE ModuleHandle); - -static LPTOP_LEVEL_EXCEPTION_FILTER g_pfnOrigFilt = NULL ; - -LONG __stdcall ERCrashDumpExceptionFilter(EXCEPTION_POINTERS* pExPtrs); -LONG __stdcall ERCrashDumpExceptionFilterEx(const char* pAppName, const char* pPath, EXCEPTION_POINTERS* pExPtrs); -static void ERLogModules(HWFILE fdump); - -#if defined(_IMAGEHLP_) && defined(_X86_) -#define MAX_SYMNAME_SIZE 1024 -static CHAR symBuffer[sizeof(IMAGEHLP_SYMBOL)+MAX_SYMNAME_SIZE]; -static PIMAGEHLP_SYMBOL g_sym = (PIMAGEHLP_SYMBOL) symBuffer; -static void ERLogStackWalk(HWFILE fdump, EXCEPTION_POINTERS* pExPtrs); -#endif //defined(_IMAGEHLP_) && defined(_X86_) - - - -INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo ) -{ - EXCEPTION_RECORD Record; - CONTEXT Context; - CHAR8 zFileName[512]; - CHAR8 zDate[512]; - CHAR8 zTime[512]; - HWFILE hFile; - CHAR8 zString[2048]; - SYSTEMTIME SysTime; - CHAR8 zNewLine[] = "\r\n"; - - - //create local copies of the exception info - memcpy( &Record, pExceptInfo->ExceptionRecord , sizeof( EXCEPTION_RECORD ) ); - memcpy( &Context, pExceptInfo->ContextRecord, sizeof( CONTEXT ) ); - - - // - // Open a file to output the current state of the game - // - - // Get the current time - GetLocalTime( &SysTime ); - - //create a date string - sprintf( zDate, "%02d_%02d_%d", SysTime.wDay, SysTime.wMonth, SysTime.wYear ); - - //create a time string - sprintf( zTime, "%02d_%02d", SysTime.wHour, SysTime.wMinute ); - - //create the crash file - sprintf( zFileName, "Crash Report_%s___%s.txt", zDate, zTime ); - - // create the save game file - hFile = FileOpen( zFileName, FILE_ACCESS_WRITE | FILE_OPEN_ALWAYS, FALSE ); - if( !hFile ) - { - FileClose( hFile ); - return( 0 ); - } - - // - // Display the version number - // -#ifdef JA2 - - //Dispay Ja's version number - ErrorLog( hFile, "%S %S: %s. %S",zVersionLabel, zRevisionNumber, czVersionNumber, zTrackingNumber ); - - //Insert a new line - ErrorLog( hFile, zNewLine ); - - //Insert a new line - ErrorLog( hFile, zNewLine ); -#endif - - - - // - // Write out the current state of the system - // - - GetAndDisplayModuleAndSystemInfo( hFile, &Context ); - - - //Insert a new line - ErrorLog( hFile, zNewLine ); - - //Display the address of where the exception occurred - sprintf( zString, "Exception occurred at address: 0x%08x\r\n", Record.ExceptionAddress ); - ErrorLog( hFile, zString ); - - - //if the exception was an access violation, display the offending address - if( Record.ExceptionCode == EXCEPTION_ACCESS_VIOLATION && Record.NumberParameters != 0 ) - { - if( Record.ExceptionInformation[0] != 0 ) - { - //Display the address of where the access violation occurred - sprintf( zString, "\tWrite Access Violation at: 0x%08x\r\n", Record.ExceptionInformation[1] ); - } - else - { - //Display the address of where the access violation occurred - sprintf( zString, "\tWrite Access Violation at: 0x%08x\r\n", Record.ExceptionInformation[1] ); - } - - ErrorLog( hFile, zString ); - } - - - //Insert a new line - ErrorLog( hFile, zNewLine ); - - //Display the exception that caused this - sprintf( zString, "Exact Error Message \r\n \"%s\"\r\n", GetExceptionString( Record.ExceptionCode ) ); - ErrorLog( hFile, zString ); - - //Insert a new line - ErrorLog( hFile, zNewLine ); - - //Dispay if the code 'could' continue - if( Record.ExceptionFlags != 0 ) - sprintf( zString, "%s\r\n", "The game 'can NOT' continue" ); - else - sprintf( zString, "%s\r\n", "The game 'CAN' continue" ); - ErrorLog( hFile, zString ); - - - //Insert a new line - ErrorLog( hFile, zNewLine ); - ErrorLog( hFile, zNewLine ); - - // - // Display the current context information - // - DisplayRegisters( hFile, &Context ); - - ErrorLog( hFile, zNewLine ); - ErrorLog( hFile, zNewLine ); - - // Stack walk if symbles are available - ERLogStackWalk( hFile, pExceptInfo ); - ErrorLog( hFile, zNewLine ); - ErrorLog( hFile, zNewLine ); - - //display the stack ( call stack + local variables ) - DisplayStack( hFile, &Context); - - //Display some spaces - ErrorLog( hFile, zNewLine ); - ErrorLog( hFile, zNewLine ); - - //Display all modules currently loaded - //RecordModuleList(hFile ); - - ERLogModules(hFile); // records version - - //eee - - FileClose( hFile ); - - return( EXCEPTION_EXECUTE_HANDLER ); -} - - - -void ErrorLog( HWFILE hFile, STR8 Format, ...) -{ - char buffer[2000]; // wvsprintf never prints more than one K. - UINT32 uiNumBytesWritten=0; - UINT32 uiStringWidth; - va_list arglist; - va_start( arglist, Format); - wvsprintf(buffer, Format, arglist); - va_end( arglist); - - //WriteFile(LogFile, buffer, lstrlen(buffer), &NumBytes, 0); - - - uiStringWidth = lstrlen(buffer); - - //write out the string - FileWrite( hFile, buffer, uiStringWidth, &uiNumBytesWritten ); - if( uiNumBytesWritten != uiStringWidth ) - { - FileClose( hFile ); - return; - } - -} - -STR GetExceptionString( DWORD uiExceptionCode ) -{ - switch( uiExceptionCode ) - { - case EXCEPTION_ACCESS_VIOLATION: - return( "The thread tried to read from or write to a virtual address for which it does not have the appropriate access."); - break; - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - return( "The thread tried to access an array element that is out of bounds and the underlying hardware supports bounds checking."); - case EXCEPTION_BREAKPOINT: - return( "A breakpoint was encountered."); - case EXCEPTION_DATATYPE_MISALIGNMENT: - return( "The thread tried to read or write data that is misaligned on hardware that does not provide alignment. For example, 16-bit values must be aligned on 2-byte boundaries; 32-bit values on 4-byte boundaries, and so on."); - case EXCEPTION_FLT_DENORMAL_OPERAND: - return( "One of the operands in a floating-point operation is denormal. A denormal value is one that is too small to represent as a standard floating-point value."); - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - return( "The thread tried to divide a floating-point value by a floating-point divisor of zero."); - case EXCEPTION_FLT_INEXACT_RESULT: - return( "The result of a floating-point operation cannot be represented exactly as a decimal fraction."); - case EXCEPTION_FLT_INVALID_OPERATION: - return( "This exception represents any floating-point exception not included in this list."); - case EXCEPTION_FLT_OVERFLOW: - return( "The exponent of a floating-point operation is greater than the magnitude allowed by the corresponding type."); - case EXCEPTION_FLT_STACK_CHECK: - return( "The stack overflowed or underflowed as the result of a floating-point operation."); - case EXCEPTION_FLT_UNDERFLOW: - return( "The exponent of a floating-point operation is less than the magnitude allowed by the corresponding type."); - case EXCEPTION_ILLEGAL_INSTRUCTION: - return( "The thread tried to execute an invalid instruction."); - case EXCEPTION_IN_PAGE_ERROR: - return( "The thread tried to access a page that was not present, and the system was unable to load the page. For example, this exception might occur if a network connection is lost while running a program over the network."); - case EXCEPTION_INT_DIVIDE_BY_ZERO: - return( "The thread tried to divide an integer value by an integer divisor of zero."); - case EXCEPTION_INT_OVERFLOW: - return( "The result of an integer operation caused a carry out of the most significant bit of the result."); - case EXCEPTION_INVALID_DISPOSITION: - return( "An exception handler returned an invalid disposition to the exception dispatcher. Programmers using a high-level language such as C should never encounter this exception."); - case EXCEPTION_NONCONTINUABLE_EXCEPTION: - return( "The thread tried to continue execution after a noncontinuable exception occurred."); - case EXCEPTION_PRIV_INSTRUCTION: - return( "The thread tried to execute an instruction whose operation is not allowed in the current machine mode."); - case EXCEPTION_SINGLE_STEP: - return( "A trace trap or other single-instruction mechanism signaled that one instruction has been executed."); - case EXCEPTION_STACK_OVERFLOW: - return( "The thread used up its stack."); - - default: - return("Exception not in case "); - break; - } -} - - -void DisplayRegisters( HWFILE hFile, CONTEXT *pContext ) -{ - ErrorLog( hFile, "Registers:\r\n"); - ErrorLog( hFile, "\tEAX=%08x CS=%04x EIP=%08x EFLGS=%08x\r\n", - pContext->Eax, pContext->SegCs, pContext->Eip, pContext->EFlags); - ErrorLog( hFile, "\tEBX=%08x SS=%04x ESP=%08x EBP=%08x\r\n", - pContext->Ebx, pContext->SegSs, pContext->Esp, pContext->Ebp); - ErrorLog( hFile, "\tECX=%08x DS=%04x ESI=%08x FS=%04x\r\n", - pContext->Ecx, pContext->SegDs, pContext->Esi, pContext->SegFs); - ErrorLog( hFile, "\tEDX=%08x ES=%04x EDI=%08x GS=%04x\r\n", - pContext->Edx, pContext->SegEs, pContext->Edi, pContext->SegGs); -// ErrorLog( hFile, "Bytes at CS:EIP:\r\n"); -} - -BOOLEAN GetAndDisplayModuleAndSystemInfo( HWFILE hFile, CONTEXT *pContext ) -{ - char zFileName[2048]; - char zString[2048]; - SYSTEM_INFO SystemInfo; - MEMORYSTATUS MemInfo; -// MEMORY_BASIC_INFORMATION MemBasicInfo; - size_t PageSize; - size_t pageNum = 0; - SGP_FILETIME LastWriteTime; - - if( GetModuleFileName(0, zFileName, sizeof(zFileName) ) == 0) - { - return( FALSE ); - } - - MemInfo.dwLength = sizeof(MemInfo); - GlobalMemoryStatus(&MemInfo); - - //Display the filename - ErrorLog( hFile, "File:\r\n\t%s\r\n", zFileName); - - - //Get the time the file was created - if (GetFileManFileTime(hFile, 0, 0, &LastWriteTime)) - { - PrintTime( zString, LastWriteTime); - - ErrorLog( hFile, "\tFile created on: %s\r\n", zString ); - } - - - //Get cpu type and number - GetSystemInfo(&SystemInfo); - ErrorLog( hFile, "\t%d type %d processor.\r\n", SystemInfo.dwNumberOfProcessors, SystemInfo.dwProcessorType ); - - //Get free ram - ErrorLog( hFile, "\tTotal Physical Memory: %d Megs.\r\n", MemInfo.dwTotalPhys/(1024*1024) ); - - - PageSize = SystemInfo.dwPageSize; - - pageNum = 0; - -/* - //Get current instruction pointer - if( VirtualQuery((void *)(pageNum * PageSize), &MemBasicInfo, sizeof(MemBasicInfo) ) ) - { - if (MemBasicInfo.RegionSize > 0) - { - ErrorLog( hFile, "\r\n\r\nJagged is loaded into memory at: 0x%08d.\r\n", MemBasicInfo.AllocationBase ); - } - } -*/ - - ErrorLog( hFile, "Segment( CS:EIP ):\t%04x:%08x.\r\n", pContext->SegCs, pContext->Eip ); - - return( TRUE ); -} - - - -// -// This code for this function is based ( stolen ) from Bruce Dawson's article in Game Developer Magazine Jan 99 -// -BOOLEAN DisplayStack( HWFILE hFile, CONTEXT *pContext ) -{ - int Count = 0; - char buffer[1000] = ""; - const int safetyzone = 50; - STR8 nearend = buffer + sizeof(buffer) - safetyzone; - STR8 output = buffer; - - // Time to print part or all of the stack to the error log. This allows - // us to figure out the call stack, parameters, local variables, etc. - ErrorLog( hFile, "Stack dump:\r\n" ); - - __try - { - // Esp contains the bottom of the stack, or at least the bottom of - // the currently used area. - DWORD* pStack = (DWORD *)pContext->Esp; - DWORD* pStackTop; - __asm - { - // Load the top (highest address) of the stack from the - // thread information block. It will be found there in - // Win9x and Windows NT. - mov eax, fs:[4] - mov pStackTop, eax - } - if (pStackTop > pStack + MaxStackDump) - pStackTop = pStack + MaxStackDump; - - - // Too many calls to WriteFile can take a long time, causing - // confusing delays when programs crash. Therefore I implemented - // simple buffering for the stack dumping code instead of calling - // hprintf directly. - - while (pStack + 1 <= pStackTop) - { - STR8 Suffix = " "; - - if ((Count % StackColumns) == 0) - output += wsprintf(output, "%08x: ", pStack); - - if ((++Count % StackColumns) == 0 || pStack + 2 > pStackTop) - Suffix = "\r\n"; - output += wsprintf(output, "%08x%s", *pStack, Suffix); - pStack++; - - // Check for when the buffer is almost full, and flush it to disk. - if (output > nearend) - { - ErrorLog( hFile, "%s", buffer); - buffer[0] = 0; - output = buffer; - } - } - // Print out any final characters from the cache. - ErrorLog( hFile, "%s", buffer); - } - __except(EXCEPTION_EXECUTE_HANDLER) - { - ErrorLog( hFile, "Exception encountered during stack dump.\r\n"); - } - - return( TRUE ); -} - - -// -// This code for this function is ( stolen :) from Bruce Dawson's article in Game Developer Magazine Jan 99 -// - -// Print the specified FILETIME to output in a human readable format, -// without using the C run time. - -void PrintTime(STR8 output, FILETIME TimeToPrint) -{ - WORD Date, Time; - if (FileTimeToLocalFileTime(&TimeToPrint, &TimeToPrint) && - FileTimeToDosDateTime(&TimeToPrint, &Date, &Time)) - { - // What a silly way to print out the file date/time. Oh well, - // it works, and I'm not aware of a cleaner way to do it. - wsprintf(output, "%02d/%02d/%d %02d:%02d:%02d", - (Date / 32) & 15, Date & 31, (Date / 512) + 1980, - (Time / 2048), (Time / 32) & 63, (Time & 31) * 2); - } - else - output[0] = 0; -} - - - - - - - -// -// This code for this function is ( stolen :) from Bruce Dawson's article in Game Developer Magazine Jan 99 -// - -// Scan memory looking for code modules (DLLs or EXEs). VirtualQuery is used -// to find all the blocks of address space that were reserved or committed, -// and ShowModuleInfo will display module information if they are code -// modules. - - -void RecordModuleList(HWFILE hFile ) -{ - ErrorLog( hFile, "\r\n" - "Module list: names, addresses, sizes, time stamps " - "and file times:\r\n"); - SYSTEM_INFO SystemInfo; - GetSystemInfo(&SystemInfo); - const size_t PageSize = SystemInfo.dwPageSize; - // Set NumPages to the number of pages in the 4GByte address space, - // while being careful to avoid overflowing ints. - const size_t NumPages = 4 * size_t(ONEG / PageSize); - size_t pageNum = 0; - void *LastAllocationBase = 0; - while (pageNum < NumPages) - { - MEMORY_BASIC_INFORMATION MemInfo; - if (VirtualQuery((void *)(pageNum * PageSize), &MemInfo, - sizeof(MemInfo))) - { - if (MemInfo.RegionSize > 0) - { - // Adjust the page number to skip over this block of memory. - pageNum += MemInfo.RegionSize / PageSize; - if (MemInfo.State == MEM_COMMIT && MemInfo.AllocationBase > - LastAllocationBase) - { - // Look for new blocks of committed memory, and try - // recording their module names - this will fail - // gracefully if they aren't code modules. - LastAllocationBase = MemInfo.AllocationBase; - ShowModuleInfo(hFile, (HINSTANCE)LastAllocationBase); - } - } - else - pageNum += SIXTYFOURK / PageSize; - } - else - pageNum += SIXTYFOURK / PageSize; - // If VirtualQuery fails we advance by 64K because that is the - // granularity of address space doled out by VirtualAlloc(). - } -} - - - -// -// This code for this function is ( stolen :) from Bruce Dawson's article in Game Developer Magazine Jan 99 -// -static void ShowModuleInfo(HWFILE hFile, HINSTANCE ModuleHandle) -{ - char ModName[MAX_PATH]; - __try - { - if (GetModuleFileName(ModuleHandle, ModName, sizeof(ModName)) > 0) - { - // If GetModuleFileName returns greater than zero then this must - // be a valid code module address. Therefore we can try to walk - // our way through its structures to find the link time stamp. - IMAGE_DOS_HEADER *DosHeader = (IMAGE_DOS_HEADER*)ModuleHandle; - if (IMAGE_DOS_SIGNATURE != DosHeader->e_magic) - return; - IMAGE_NT_HEADERS *NTHeader = (IMAGE_NT_HEADERS*)((STR8 )DosHeader - + DosHeader->e_lfanew); - if (IMAGE_NT_SIGNATURE != NTHeader->Signature) - return; - // Open the code module file so that we can get its file date - // and size. - HANDLE ModuleFile = CreateFile(ModName, GENERIC_READ, - FILE_SHARE_READ, 0, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, 0); - char TimeBuffer[100] = ""; - DWORD FileSize = 0; - if (ModuleFile != INVALID_HANDLE_VALUE) - { - FileSize = GetFileSize(ModuleFile, 0); - FILETIME LastWriteTime; - if (GetFileTime(ModuleFile, 0, 0, &LastWriteTime)) - { - wsprintf(TimeBuffer, " - file date is "); - PrintTime(TimeBuffer + lstrlen(TimeBuffer), LastWriteTime); - } - CloseHandle(ModuleFile); - } - ErrorLog( hFile, "%-35s, loaded at 0x%08x - %7d bytes - %08x%s\r\n", - ModName, ModuleHandle, FileSize, - NTHeader->FileHeader.TimeDateStamp, TimeBuffer); - } - } - // Handle any exceptions by continuing from this point. - __except(EXCEPTION_EXECUTE_HANDLER) - { - } -} - -////////////////////////////////////////////////////////////////////////// - -/*---------------------------------------------------------------------- -"Debugging Applications" (Microsoft Press) -Copyright (c) 1997-2000 John Robbins -- All rights reserved. -----------------------------------------------------------------------*/ - - -#define _USE_VERSIONING_ -#define _USE_PSAPI_ - -#ifdef _USE_VERSIONING_ -#include -#endif -#define _USE_PSAPI_ -#ifdef _USE_PSAPI_ -// Copied from psapi.h -typedef struct _MODULEINFO { - LPVOID lpBaseOfDll; - DWORD SizeOfImage; - LPVOID EntryPoint; -} MODULEINFO, *LPMODULEINFO; -#endif - -#ifndef _IMAGEHLP64 -// copied from imagehlp.h -typedef struct _ER_IMAGEHLP_LINE64 { - DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64) - PVOID Key; // internal - DWORD LineNumber; // line number in file - PCHAR FileName; // full filename - DWORD64 Address; // first instruction of line -} ER_IMAGEHLP_LINE64, *PER_IMAGEHLP_LINE64; -#endif - -/*---------------------------------------------------------------------- - IsNT - Detect if this is an NT installation -----------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------- -"Debugging Applications" (Microsoft Press) -Copyright (c) 1997-2000 John Robbins -- All rights reserved. -----------------------------------------------------------------------*/ - -BOOL __stdcall IsNT ( void ) -{ - static BOOL s_bHasVersion = FALSE ; // Indicates that the version information is valid. - static BOOL s_bIsNT = TRUE ; // Indicates NT or 95/98. - BOOL bRet; - OSVERSIONINFO stOSVI ; - - if ( TRUE == s_bHasVersion ) - return ( TRUE == s_bIsNT ) ; - - memset ( &stOSVI , 0, sizeof ( OSVERSIONINFO ) ) ; - stOSVI.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO ) ; - - bRet = GetVersionEx ( &stOSVI ) ; - if ( FALSE == bRet ) - return ( FALSE ) ; - - // Check the version and call the appropriate thing. - if ( VER_PLATFORM_WIN32_NT == stOSVI.dwPlatformId ) - s_bIsNT = TRUE ; - else - s_bIsNT = FALSE ; - s_bHasVersion = TRUE ; - return ( TRUE == s_bIsNT ) ; -} - -/*---------------------------------------------------------------------- - Version.dll Wrappers -----------------------------------------------------------------------*/ -#ifdef _USE_VERSIONING_ - -typedef DWORD (__stdcall *FVN_GetFileVersionInfoSize)(LPCTSTR, LPDWORD ); -static FVN_GetFileVersionInfoSize g_GetFileVersionInfoSize = NULL; - -static DWORD __stdcall -ERGetFileVersionInfoSize(LPCTSTR lptstrFilename, LPDWORD lpdwHandle) -{ - if (g_GetFileVersionInfoSize) - { - return (*g_GetFileVersionInfoSize)(lptstrFilename, lpdwHandle); - } - return 0; -} - - -typedef BOOL (__stdcall *FVN_GetFileVersionInfo)(LPCTSTR, DWORD, DWORD, LPVOID); -static FVN_GetFileVersionInfo g_GetFileVersionInfo = NULL; - -static BOOL __stdcall -ERGetFileVersionInfo(LPCTSTR lptstrFilename, DWORD dwHandle, - DWORD dwLen, LPVOID lpData) -{ - if (g_GetFileVersionInfo) - { - return (*g_GetFileVersionInfo)(lptstrFilename, dwHandle, dwLen, lpData); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_VerQueryValue)(const LPVOID, LPTSTR, LPVOID *, PUINT); -static FVN_VerQueryValue g_VerQueryValue = NULL; - -static BOOL __stdcall -ERVerQueryValue(const LPVOID pBlock, LPTSTR lpSubBlock, - LPVOID *lplpBuffer, PUINT puLen) -{ - if (g_VerQueryValue) - { - return (*g_VerQueryValue)(pBlock, lpSubBlock, lplpBuffer, puLen); - } - return 0; -} - -static HMODULE g_VerMod = NULL; -static BOOL ERLoadVersionDLL() -{ - if (!g_VerMod) - { - g_VerMod = LoadLibrary("Version.dll"); - if (g_VerMod) - { - g_GetFileVersionInfoSize = (FVN_GetFileVersionInfoSize)GetProcAddress(g_VerMod, "GetFileVersionInfoSizeA"); - g_GetFileVersionInfo = (FVN_GetFileVersionInfo) GetProcAddress(g_VerMod, "GetFileVersionInfoA"); - g_VerQueryValue = (FVN_VerQueryValue) GetProcAddress(g_VerMod, "VerQueryValueA"); - } - } - if (g_VerMod && g_GetFileVersionInfoSize && g_GetFileVersionInfo && g_VerQueryValue) - return TRUE; - return FALSE; -} - -#endif //_USE_VERSIONING_ - -/*---------------------------------------------------------------------- - imagehlp.dll Wrappers -----------------------------------------------------------------------*/ -#if defined(_IMAGEHLP_) && defined(_X86_) - -typedef BOOL (__stdcall *FVN_SymInitialize)(HANDLE, PSTR, BOOL); -static FVN_SymInitialize g_SymInitialize = NULL; - -static BOOL __stdcall -ERSymInitialize(HANDLE hProcess, PSTR UserSearchPath, BOOL fInvadeProcess) -{ - if (g_SymInitialize) - { - return (*g_SymInitialize)(hProcess, UserSearchPath, fInvadeProcess); - } - return 0; -} - - -typedef BOOL (__stdcall *FVN_SymCleanup)(HANDLE); -static FVN_SymCleanup g_SymCleanup = NULL; - -static BOOL __stdcall ERSymCleanup(HANDLE hProcess) -{ - if (g_SymCleanup) - { - return (*g_SymCleanup)(hProcess); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_StackWalk)(DWORD, HANDLE, HANDLE, LPSTACKFRAME, PVOID, - PREAD_PROCESS_MEMORY_ROUTINE, PFUNCTION_TABLE_ACCESS_ROUTINE , - PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); -static FVN_StackWalk g_StackWalk = NULL; - -static BOOL __stdcall ERStackWalk( - DWORD MachineType, - HANDLE hProcess, - HANDLE hThread, - LPSTACKFRAME StackFrame, - PVOID ContextRecord, - PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine, - PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine, - PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, - PTRANSLATE_ADDRESS_ROUTINE TranslateAddress -) -{ - if (g_StackWalk) - { - return (*g_StackWalk)(MachineType, hProcess, hThread, StackFrame, - ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, - GetModuleBaseRoutine, TranslateAddress - ); - } - return 0; -} - -typedef LPVOID (__stdcall *FVN_SymFunctionTableAccess)(HANDLE, DWORD); -static FVN_SymFunctionTableAccess g_SymFunctionTableAccess = NULL; - -static LPVOID __stdcall -ERSymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) -{ - if (g_SymFunctionTableAccess) - { - return (*g_SymFunctionTableAccess)(hProcess, AddrBase); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_SymGetModuleBase)(HANDLE, DWORD); -static FVN_SymGetModuleBase g_SymGetModuleBase = NULL; - -static DWORD __stdcall -ERSymGetModuleBase(HANDLE hProcess, DWORD dwAddr) -{ - if (g_SymGetModuleBase) - { - return (*g_SymGetModuleBase)(hProcess, dwAddr); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_SymGetModuleInfo)(HANDLE, DWORD, PIMAGEHLP_MODULE); -static FVN_SymGetModuleInfo g_SymGetModuleInfo = NULL; - -static BOOL __stdcall -ERSymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, PIMAGEHLP_MODULE ModuleInfo) -{ - if (g_SymGetModuleInfo) - { - return (*g_SymGetModuleInfo)(hProcess, dwAddr, ModuleInfo); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_SymGetSymFromAddr)(HANDLE, DWORD, PDWORD, PIMAGEHLP_SYMBOL); -static FVN_SymGetSymFromAddr g_SymGetSymFromAddr = NULL; - -static BOOL __stdcall -ERSymGetSymFromAddr(HANDLE hProcess, DWORD Address, PDWORD Displacement, PIMAGEHLP_SYMBOL Symbol) -{ - if (g_SymGetSymFromAddr) - { - return (*g_SymGetSymFromAddr)(hProcess, Address, Displacement, Symbol); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_SymGetLineFromAddr)(HANDLE, DWORD64, PDWORD, PER_IMAGEHLP_LINE64); -static FVN_SymGetLineFromAddr g_SymGetLineFromAddr = NULL; -static BOOL __stdcall - ERSymGetLineFromAddr(HANDLE hProcess, DWORD64 Address, PDWORD Displacement, PER_IMAGEHLP_LINE64 Line) -{ - if (g_SymGetLineFromAddr) - { - return (*g_SymGetLineFromAddr)(hProcess, Address, Displacement, Line); - } - return 0; -} - -typedef BOOL (WINAPI *FVN_MiniDumpWriteDump)( HANDLE hProcess, - DWORD dwPid, - HANDLE hFile, - MINIDUMP_TYPE DumpType, - CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, - CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, - CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam); -static FVN_MiniDumpWriteDump g_MiniDumpWriteDump = NULL; - -static CRITICAL_SECTION g_miniCritSec; - -static BOOL __stdcall - ERMiniDumpWriteDump(HANDLE hProcess, - DWORD dwPid, - HANDLE hFile, - MINIDUMP_TYPE DumpType, - CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, - CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, - CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) -{ - if (g_MiniDumpWriteDump) - { - // DBGHELP.DLL is not thread safe - BOOL result; - EnterCriticalSection(&g_miniCritSec); - result = (*g_MiniDumpWriteDump)(hProcess, dwPid, hFile, DumpType, ExceptionParam, UserStreamParam, CallbackParam); - LeaveCriticalSection(&g_miniCritSec); - return result; - } - return 0; -} - - -static HMODULE g_ImgHlpMod = NULL; -static BOOL ERLoadImageHlpDLL() -{ - if (!g_ImgHlpMod) - { - g_ImgHlpMod = LoadLibrary("dbghelp.dll"); - if (!g_ImgHlpMod) - g_ImgHlpMod = LoadLibrary("Imagehlp.dll"); - - if (g_ImgHlpMod) - { - g_SymInitialize = (FVN_SymInitialize)GetProcAddress(g_ImgHlpMod, "SymInitialize"); - g_SymCleanup = (FVN_SymCleanup)GetProcAddress(g_ImgHlpMod, "SymCleanup"); - g_StackWalk = (FVN_StackWalk)GetProcAddress(g_ImgHlpMod, "StackWalk"); - g_SymFunctionTableAccess = (FVN_SymFunctionTableAccess)GetProcAddress(g_ImgHlpMod, "SymFunctionTableAccess"); - g_SymGetModuleBase = (FVN_SymGetModuleBase)GetProcAddress(g_ImgHlpMod, "SymGetModuleBase"); - g_SymGetModuleInfo = (FVN_SymGetModuleInfo)GetProcAddress(g_ImgHlpMod, "SymGetModuleInfo"); - g_SymGetSymFromAddr = (FVN_SymGetSymFromAddr)GetProcAddress(g_ImgHlpMod, "SymGetSymFromAddr"); - g_SymGetLineFromAddr = (FVN_SymGetLineFromAddr)GetProcAddress(g_ImgHlpMod, "SymGetLineFromAddr64"); - - InitializeCriticalSection(&g_miniCritSec); - g_MiniDumpWriteDump = (FVN_MiniDumpWriteDump)GetProcAddress(g_ImgHlpMod, "MiniDumpWriteDump"); - } - } - if (g_ImgHlpMod && - g_SymInitialize && g_SymCleanup && - g_StackWalk && g_SymFunctionTableAccess && - g_SymGetModuleBase && g_SymGetModuleInfo && - g_SymGetSymFromAddr) - return TRUE; - return FALSE; -} -#endif // defined(_IMAGEHLP_) && defined(_X86_) - - -/*---------------------------------------------------------------------- - Version.dll Wrappers -----------------------------------------------------------------------*/ -#ifdef _USE_PSAPI_ - -typedef BOOL (__stdcall *FVN_EnumProcessModules)(HANDLE, HMODULE *, DWORD , LPDWORD ); -static FVN_EnumProcessModules g_EnumProcessModules = NULL; - -static BOOL __stdcall -EREnumProcessModules(HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded) -{ - if (g_EnumProcessModules) - { - return (*g_EnumProcessModules)(hProcess, lphModule, cb, lpcbNeeded); - } - return 0; -} - -typedef BOOL (__stdcall *FVN_GetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); -static FVN_GetModuleInformation g_GetModuleInformation = NULL; - -static BOOL __stdcall -ERGetModuleInformation(HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb) -{ - if (g_GetModuleInformation) - { - return (*g_GetModuleInformation)(hProcess, hModule, lpmodinfo, cb); - } - return 0; -} - -static HMODULE g_PSAPIMod = NULL; -static BOOL ERLoadPSAPIDLL() -{ - if (!g_PSAPIMod) - { - g_PSAPIMod = LoadLibrary("psapi.dll"); - if (g_PSAPIMod) - { - g_EnumProcessModules = (FVN_EnumProcessModules)GetProcAddress(g_PSAPIMod, "EnumProcessModules"); - g_GetModuleInformation = (FVN_GetModuleInformation)GetProcAddress(g_PSAPIMod, "GetModuleInformation"); - } - } - if (g_PSAPIMod && g_EnumProcessModules && g_GetModuleInformation) - return TRUE; - return FALSE; -} - - -#endif //_USE_PSAPI_ - - -#pragma region Crash MiniDump Handler - -static BOOL ERGetImpersonationToken(HANDLE* phToken) -{ - *phToken = NULL; - if(!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, TRUE, phToken)) - { - if(GetLastError() == ERROR_NO_TOKEN) - { - // No impersonation token for the current thread available - go for the process token - if(!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, phToken)) - { - return FALSE; - } - } - else - { - return FALSE; - } - } - return TRUE; -} - -static BOOL EREnablePriv(LPCTSTR pszPriv, HANDLE hToken, TOKEN_PRIVILEGES* ptpOld) -{ - BOOL bOk = FALSE; - - TOKEN_PRIVILEGES tp; - tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - bOk = LookupPrivilegeValue( 0, pszPriv, &tp.Privileges[0].Luid); - if(bOk) - { - DWORD cbOld = sizeof(*ptpOld); - bOk = AdjustTokenPrivileges(hToken, FALSE, &tp, cbOld, ptpOld, &cbOld); - } - - return (bOk && (ERROR_NOT_ALL_ASSIGNED != GetLastError())); -} - -static BOOL ERRestorePriv(HANDLE hToken, TOKEN_PRIVILEGES* ptpOld) -{ - BOOL bOk = AdjustTokenPrivileges(hToken, FALSE, ptpOld, 0, 0, 0); - return (bOk && (ERROR_NOT_ALL_ASSIGNED != GetLastError())); -} - -static BOOL ERGenerateMiniDump(CHAR *szFileName, PEXCEPTION_POINTERS pExceptionInfo) -{ - BOOL bRet = FALSE; - DWORD dwLastError = 0; - HANDLE hDumpFile = 0; - MINIDUMP_EXCEPTION_INFORMATION stInfo = {0}; - TOKEN_PRIVILEGES tp; - HANDLE hImpersonationToken = NULL; - BOOL bPrivilegeEnabled; - - if(!ERGetImpersonationToken(&hImpersonationToken)) - { - return FALSE; - } - - // Create the dump file - hDumpFile = CreateFileA(szFileName, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_WRITE | FILE_SHARE_READ, - 0, CREATE_ALWAYS, 0, 0); - if(hDumpFile == INVALID_HANDLE_VALUE) - { - CloseHandle(hImpersonationToken); - return FALSE; - } - - // Write the dump - stInfo.ThreadId = GetCurrentThreadId(); - stInfo.ExceptionPointers = pExceptionInfo; - stInfo.ClientPointers = TRUE; - - // We need the SeDebugPrivilege to be able to run MiniDumpWriteDump - bPrivilegeEnabled = EREnablePriv(SE_DEBUG_NAME, hImpersonationToken, &tp); - -// VS 2008 and VS 2010 -#if _MSC_VER >= 1500 - bRet = ERMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hDumpFile - , (MINIDUMP_TYPE)(MiniDumpWithHandleData|MiniDumpWithThreadInfo|MiniDumpWithDataSegs), &stInfo, NULL, NULL); -// VS 2005 -#else - bRet = ERMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hDumpFile - , (MINIDUMP_TYPE)(MiniDumpWithHandleData|MiniDumpWithDataSegs), &stInfo, NULL, NULL); -#endif - - if(bPrivilegeEnabled) - { - // Restore the privilege - ERRestorePriv(hImpersonationToken, &tp); - } - - CloseHandle(hDumpFile); - CloseHandle(hImpersonationToken); - - return bRet; -} - - -/*---------------------------------------------------------------------- - Handler -----------------------------------------------------------------------*/ - -LONG __stdcall ERCrashDumpExceptionFilterEx(const CHAR *pAppName, const CHAR* pPath, EXCEPTION_POINTERS* pExPtrs) -{ - LONG lRet = EXCEPTION_CONTINUE_SEARCH ; - FILE *fdump = NULL; - HANDLE hProc = GetCurrentProcess(); - SYSTEMTIME stTime; - CHAR pszFilename[MAX_PATH], szPathName[_MAX_PATH], szBuffer[_MAX_PATH]; - size_t cbFilename = sizeof(pszFilename) / sizeof(pszFilename[0]) - 1; - if (!ERLoadImageHlpDLL()) - return lRet; - - __try - { - szPathName[0] = 0; - if (pPath && *pPath) - GetFullPathNameA(pPath, MAX_PATH, szPathName, NULL); - if (szPathName[strlen(szPathName)-1] != '\\') - lstrcat(szPathName, "\\"); - - // Create filename - GetLocalTime(&stTime); - - if (pAppName == NULL) - { - GetModuleFileName(NULL, szBuffer, MAX_PATH); - CHAR *pszFilePart = strrchr(szBuffer, '\\'); - pszFilePart = (pszFilePart == NULL) ? szBuffer : pszFilePart+1; - if (CHAR *pExt = strrchr(pszFilePart, '.') ) - *pExt = 0; - pAppName = pszFilePart; - } - - // Filename is composed like this, to avoid collisions; - // \-Crash---YYYYMMDD-HHMMSS.dmp - _snprintf_s(pszFilename, cbFilename, cbFilename, "%s-Crash-%ld-%ld-%04d%02d%02d-%02d%02d%02d", pAppName, GetCurrentProcessId(), GetCurrentThreadId(), stTime.wYear,stTime.wMonth,stTime.wDay,stTime.wHour, stTime.wMinute, stTime.wSecond); - lstrcat(szPathName, pszFilename); - lstrcpy(szPathName, ".dmp"); - - // Generate proper mini dump - ERGenerateMiniDump(szPathName, pExPtrs); - } - __except ( EXCEPTION_EXECUTE_HANDLER ) - { - lRet = EXCEPTION_CONTINUE_SEARCH ; - } - if (hProc != (HANDLE)0xFFFFFFFF) CloseHandle(hProc); - if (fdump) fclose(fdump); - return ( lRet ) ; -} - -LONG __stdcall ERCrashDumpExceptionFilter (EXCEPTION_POINTERS* pExPtrs) -{ - return ERCrashDumpExceptionFilterEx(NULL, NULL, pExPtrs); -} - - -LONG __stdcall ERGetVersionStringA(LPCSTR szModName, LPSTR szVersion, int maxlen) -{ -#ifdef _USE_VERSIONING_ - if (ERLoadVersionDLL()) - { - UINT dwBytes = 0; - LPVOID lpBuffer = 0; - LPVOID lpData; - DWORD dwSize; - - szVersion[0] = 0; - dwSize = ERGetFileVersionInfoSize(szModName, 0); - lpData = alloca(dwSize); - ERGetFileVersionInfo(szModName, 0, dwSize, lpData); - if (ERVerQueryValue(lpData, TEXT("\\"), &lpBuffer, &dwBytes)) - { - VS_FIXEDFILEINFO *lpvs = (VS_FIXEDFILEINFO *)lpBuffer; - if (lpvs->dwFileVersionLS) - { - sprintf_s(szVersion, maxlen, "%d.%d.%d.%d", - HIWORD(lpvs->dwFileVersionMS), LOWORD(lpvs->dwFileVersionMS), - HIWORD(lpvs->dwFileVersionLS), LOWORD(lpvs->dwFileVersionLS) - ); - } - else if (lpvs->dwFileVersionMS) - { - sprintf_s(szVersion, maxlen, "%d.%d", - HIWORD(lpvs->dwFileVersionMS), LOWORD(lpvs->dwFileVersionMS) - ); - } - return strlen(szVersion); - } - } -#endif - return 0; -} - - - -#if defined(_IMAGEHLP_) && defined(_X86_) - -BOOL __stdcall ERReadProcessMemory ( HANDLE hProc, - LPCVOID lpBaseAddress, - LPVOID lpBuffer, - DWORD nSize, - LPDWORD lpNumberOfBytesRead ) -{ - return ( ReadProcessMemory ( GetCurrentProcess ( ) , - lpBaseAddress , - lpBuffer , - nSize , - lpNumberOfBytesRead ) ) ; -} - -static void ERLogStackWalk(HWFILE fdump, EXCEPTION_POINTERS* pExPtrs) -{ - #define SAVE_EBP(f) f.Reserved[0] - #define TRAP_TSS(f) f.Reserved[1] - #define TRAP_EDITED(f) f.Reserved[1] - #define SAVE_TRAP(f) f.Reserved[2] - - CONTEXT Context; - DWORD dwDisplacement = 0; - char *szSymName; - IMAGEHLP_MODULE mi; - STACKFRAME stFrame; - DWORD i; - HANDLE hProc = (HANDLE)GetCurrentProcess(); - - memcpy( &Context, pExPtrs->ContextRecord, sizeof( CONTEXT ) ); - - if (!ERLoadImageHlpDLL()) - return; - - ErrorLog(fdump, "Stack Walk:\r\n"); - - ERSymInitialize(hProc, NULL, TRUE); - - memset(g_sym, 0, MAX_SYMNAME_SIZE + sizeof(IMAGEHLP_SYMBOL) ) ; - g_sym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL); - g_sym->MaxNameLength = MAX_SYMNAME_SIZE; - - - ZeroMemory( &stFrame, sizeof(stFrame) ); - - stFrame.AddrPC.Offset = Context.Eip ; - stFrame.AddrPC.Mode = AddrModeFlat ; - stFrame.AddrStack.Offset = Context.Esp ; - stFrame.AddrStack.Mode = AddrModeFlat ; - stFrame.AddrFrame.Offset = Context.Ebp ; - stFrame.AddrFrame.Mode = AddrModeFlat ; - - ErrorLog(fdump, "FramePtr ReturnAd Param#1 Param#2 Param#3 Param#4 Function Name\r\n"); - - for (i=0; i<15; i++) - { - if (!ERStackWalk( IMAGE_FILE_MACHINE_I386, - hProc, - GetCurrentThread(), - &stFrame, - &Context, - NULL, - ERSymFunctionTableAccess, - ERSymGetModuleBase, - NULL)) - { - break; - } - - if (ERSymGetSymFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, g_sym)) { - szSymName = g_sym->Name; - } - else { - szSymName = ""; - } - ErrorLog(fdump, "%08x %08x %08x %08x %08x %08x ", - stFrame.AddrFrame.Offset, - stFrame.AddrReturn.Offset, - stFrame.Params[0], - stFrame.Params[1], - stFrame.Params[2], - stFrame.Params[3] - ); - - memset(&mi, 0, sizeof(mi)); - mi.SizeOfStruct = sizeof(mi); - if (ERSymGetModuleInfo(hProc, stFrame.AddrPC.Offset, &mi )) { - ErrorLog(fdump, "%s!", mi.ModuleName ); - } - - ErrorLog(fdump, "%s ", szSymName ); - - if (g_sym && (g_sym->Flags & SYMF_OMAP_GENERATED || g_sym->Flags & SYMF_OMAP_MODIFIED)) { - ErrorLog(fdump, "[omap] " ); - } - - if (stFrame.FuncTableEntry) - { - PFPO_DATA pFpoData = (PFPO_DATA)stFrame.FuncTableEntry; - switch (pFpoData->cbFrame) - { - case FRAME_FPO: - if (pFpoData->fHasSEH) - { - ErrorLog(fdump, "(FPO: [SEH])" ); - } else - { - ErrorLog(fdump, " (FPO:" ); - if (pFpoData->fUseBP) - { - ErrorLog(fdump, " [EBP 0x%08x]", SAVE_EBP(stFrame) ); - } - ErrorLog(fdump, " [%d,%d,%d])", pFpoData->cdwParams, - pFpoData->cdwLocals, - pFpoData->cbRegs); - } - break; - case FRAME_NONFPO: - ErrorLog(fdump, "(FPO: Non-FPO [%d,%d,%d])", - pFpoData->cdwParams, - pFpoData->cdwLocals, - pFpoData->cbRegs); - break; - - case FRAME_TRAP: - case FRAME_TSS: - default: - ErrorLog(fdump, "(UNKNOWN FPO TYPE)" ); - break; - } - } - ER_IMAGEHLP_LINE64 lineInfo; - ZeroMemory( &lineInfo, sizeof(lineInfo) ); - lineInfo.SizeOfStruct = sizeof(lineInfo); - dwDisplacement = 0; - if ( ERSymGetLineFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, &lineInfo) ) - ErrorLog(fdump, " \t%s:%d ", lineInfo.FileName, lineInfo.LineNumber); - - ErrorLog(fdump, "\r\n" ); - } - ErrorLog(fdump, "\r\n" ); - - ERSymCleanup(hProc); - - return; -} -#endif //_IMAGEHLP_ - -//************************************ -// Method: ERLogStackWalk -// FullName: ERLogStackWalk -// Access: public static -// Returns: LPCSTR (Free with LocalFree) -// Qualifier: -// Parameter: EXCEPTION_POINTERS * pExPtrs -//************************************ -LPCSTR ERStackWalk(EXCEPTION_POINTERS* pExPtrs) -{ -#if defined(_IMAGEHLP_) && defined(_X86_) - CONTEXT Context; - DWORD dwDisplacement = 0; - char *szSymName; - IMAGEHLP_MODULE mi; - STACKFRAME stFrame; - DWORD i; - HANDLE hProc = (HANDLE)GetCurrentProcess(); - - if (!ERLoadImageHlpDLL()) - return NULL; - - std::stringstream ss; - - HMODULE hModule = GetModuleHandle(NULL); - - memcpy( &Context, pExPtrs->ContextRecord, sizeof( CONTEXT ) ); - - ERSymInitialize(hProc, NULL, TRUE); - - memset(g_sym, 0, MAX_SYMNAME_SIZE + sizeof(IMAGEHLP_SYMBOL) ) ; - g_sym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL); - g_sym->MaxNameLength = MAX_SYMNAME_SIZE; - - ZeroMemory( &stFrame, sizeof(stFrame) ); - - stFrame.AddrPC.Offset = Context.Eip ; - stFrame.AddrPC.Mode = AddrModeFlat ; - stFrame.AddrStack.Offset = Context.Esp ; - stFrame.AddrStack.Mode = AddrModeFlat ; - stFrame.AddrFrame.Offset = Context.Ebp ; - stFrame.AddrFrame.Mode = AddrModeFlat ; - - for (i=0; i<100; i++) - { - if (!ERStackWalk( IMAGE_FILE_MACHINE_I386, - hProc, - GetCurrentThread(), - &stFrame, - &Context, - NULL, - ERSymFunctionTableAccess, - ERSymGetModuleBase, - NULL)) - { - break; - } - - if (ERSymGetSymFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, g_sym)) { - szSymName = g_sym->Name; - } - else { - szSymName = ""; - } - memset(&mi, 0, sizeof(mi)); - mi.SizeOfStruct = sizeof(mi); - if (ERSymGetModuleInfo(hProc, stFrame.AddrPC.Offset, &mi )) { - if (mi.BaseOfImage != (DWORD)hModule) - { - ss << mi.ModuleName << "!"; - } - } - ss << szSymName << " "; - - ER_IMAGEHLP_LINE64 lineInfo; - ZeroMemory( &lineInfo, sizeof(lineInfo) ); - lineInfo.SizeOfStruct = sizeof(lineInfo); - dwDisplacement = 0; - if ( ERSymGetLineFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, &lineInfo) ) - { - LPSTR pFileName = strrchr(lineInfo.FileName, '\\'); - if (pFileName) ++pFileName; - if (!pFileName) pFileName = lineInfo.FileName; - - ss << " \t" << pFileName << ":" << lineInfo.LineNumber << " "; - } - ss << std::endl; - } - ss << std::endl; - - ERSymCleanup(hProc); - - std::string str = ss.str(); - LPSTR lpResult = (LPSTR)LocalAlloc(LPTR, str.length()+1); - strcpy(lpResult, str.c_str()); - return lpResult; -#else - return NULL; -#endif //_IMAGEHLP_ -} - - -//************************************ -// Method: ERGetFirstModuleException -// FullName: ERGetFirstModuleException -// Access: public -// Returns: BOOL -// Qualifier: -// Parameter: EXCEPTION_POINTERS * pExPtrs -// Parameter: HMODULE hModule -// Parameter: LPSTR funcName -// Parameter: INT funcNameLen -// Parameter: LPSTR sourceName -// Parameter: INT sourceNameLen -// Parameter: INT * lpLineNum -//************************************ -BOOL ERGetFirstModuleException( - EXCEPTION_POINTERS* pExPtrs - , HMODULE hModule - , LPSTR funcName, INT funcNameLen - , LPSTR sourceName, INT sourceNameLen - , INT *lpLineNum - ) -{ -#if defined(_IMAGEHLP_) && defined(_X86_) - CONTEXT Context; - DWORD dwDisplacement = 0; - char *szSymName; - IMAGEHLP_MODULE mi; - STACKFRAME stFrame; - DWORD i; - HANDLE hProc = (HANDLE)GetCurrentProcess(); - BOOL bFound = FALSE; - - if (!ERLoadImageHlpDLL()) - return FALSE; - - memcpy( &Context, pExPtrs->ContextRecord, sizeof( CONTEXT ) ); - - if (hModule == NULL) - hModule = GetModuleHandle(NULL); - - ERSymInitialize(hProc, NULL, TRUE); - - memset(g_sym, 0, MAX_SYMNAME_SIZE + sizeof(IMAGEHLP_SYMBOL) ) ; - g_sym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL); - g_sym->MaxNameLength = MAX_SYMNAME_SIZE; - - ZeroMemory( &stFrame, sizeof(stFrame) ); - - stFrame.AddrPC.Offset = Context.Eip ; - stFrame.AddrPC.Mode = AddrModeFlat ; - stFrame.AddrStack.Offset = Context.Esp ; - stFrame.AddrStack.Mode = AddrModeFlat ; - stFrame.AddrFrame.Offset = Context.Ebp ; - stFrame.AddrFrame.Mode = AddrModeFlat ; - - for (i=0; i<15; i++) - { - if (!ERStackWalk( IMAGE_FILE_MACHINE_I386, - hProc, - GetCurrentThread(), - &stFrame, - &Context, - NULL, - ERSymFunctionTableAccess, - ERSymGetModuleBase, - NULL)) - { - break; - } - - if (ERSymGetSymFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, g_sym)) { - szSymName = g_sym->Name; - } - else { - szSymName = ""; - } - memset(&mi, 0, sizeof(mi)); - mi.SizeOfStruct = sizeof(mi); - if (!ERSymGetModuleInfo(hProc, stFrame.AddrPC.Offset, &mi )) - continue; - - if (mi.BaseOfImage != (DWORD)hModule) - continue; - - ER_IMAGEHLP_LINE64 lineInfo; - ZeroMemory( &lineInfo, sizeof(lineInfo) ); - lineInfo.SizeOfStruct = sizeof(lineInfo); - dwDisplacement = 0; - if ( ERSymGetLineFromAddr(hProc, stFrame.AddrPC.Offset, &dwDisplacement, &lineInfo) ) - { - LPSTR pFileName = strrchr(lineInfo.FileName, '\\'); - if (pFileName) ++pFileName; - if (!pFileName) pFileName = lineInfo.FileName; - - if (funcName) lstrcpyn(funcName,szSymName, funcNameLen); - if (sourceName) lstrcpyn(sourceName,pFileName, sourceNameLen); - if (lpLineNum) *lpLineNum = lineInfo.LineNumber; - bFound = TRUE; - break; - } - } - - ERSymCleanup(hProc); - return bFound; -#else - return FALSE; -#endif //_IMAGEHLP_ -} - - -void ERLogModules(HWFILE fdump) -{ -#ifdef _USE_PSAPI_ - if (!ERLoadImageHlpDLL()) - return; - - HANDLE hProc = (HANDLE)GetCurrentProcess(); - ERSymInitialize(hProc, NULL, TRUE); - - if (IsNT()) - { - if (ERLoadPSAPIDLL()) - { - HMODULE hMods[1024]; - DWORD cbNeeded; - unsigned int i; - -#ifdef _USE_VERSIONING_ - BOOL bVerOK = ERLoadVersionDLL(); -#endif - if( EREnumProcessModules(hProc, hMods, sizeof(hMods), &cbNeeded)) - { - for ( i = 0; i < (cbNeeded / sizeof(HMODULE)); i++ ) - { - char szModName[MAX_PATH]; - MODULEINFO mi; - memset(&mi, 0, sizeof(MODULEINFO)); - - ERGetModuleInformation(hProc, hMods[i], &mi, sizeof(MODULEINFO)); - - // Get the full path to the module's file. - if ( GetModuleFileName( hMods[i], szModName, sizeof(szModName))) - { - BOOL bPrintSimple = TRUE; - - // Open the code module file so that we can get its file date - // and size. - HANDLE ModuleFile = CreateFile(szModName, GENERIC_READ, - FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - char TimeBuffer[100] = ""; - DWORD FileSize = 0; - if (ModuleFile != INVALID_HANDLE_VALUE) - { - FileSize = GetFileSize(ModuleFile, 0); - FILETIME LastWriteTime; - if (GetFileTime(ModuleFile, 0, 0, &LastWriteTime)) - { - wsprintf(TimeBuffer, " - file date is "); - PrintTime(TimeBuffer + lstrlen(TimeBuffer), LastWriteTime); - } - CloseHandle(ModuleFile); - } - -#ifdef _USE_VERSIONING_ - if (bVerOK) - { - UINT dwBytes = 0; - LPVOID lpBuffer = 0; - LPVOID lpData; - DWORD dwSize; - - dwSize = ERGetFileVersionInfoSize(szModName, 0); - lpData = alloca(dwSize); - ERGetFileVersionInfo(szModName, 0, dwSize, lpData); - if (ERVerQueryValue(lpData, TEXT("\\"), &lpBuffer, &dwBytes)) - { - VS_FIXEDFILEINFO *lpvs = (VS_FIXEDFILEINFO *)lpBuffer; - - ErrorLog(fdump, "(%.8X - %.8X) %s \t %d.%d.%d.%d \t %d.%d.%d.%d \t %s\r\n", - mi.lpBaseOfDll, ((LPBYTE)(mi.lpBaseOfDll)) + mi.SizeOfImage, - szModName, - HIWORD(lpvs->dwFileVersionMS), LOWORD(lpvs->dwFileVersionMS), - HIWORD(lpvs->dwFileVersionLS), LOWORD(lpvs->dwFileVersionLS), - HIWORD(lpvs->dwProductVersionMS), LOWORD(lpvs->dwProductVersionMS), - HIWORD(lpvs->dwProductVersionLS), LOWORD(lpvs->dwProductVersionLS), - TimeBuffer - ); - bPrintSimple = FALSE; - } - } -#endif - if (bPrintSimple) - { - ErrorLog(fdump, "(%.8X - %.8X) %s \t %s\r\n", - mi.lpBaseOfDll, ((LPBYTE)(mi.lpBaseOfDll)) + mi.SizeOfImage, - szModName, TimeBuffer - ); - } - } - } - } - } - } - ERSymCleanup(hProc); -#endif -} - -#endif diff --git a/Standard Gaming Platform/ExceptionHandling.h b/Standard Gaming Platform/ExceptionHandling.h deleted file mode 100644 index b5ae4a985..000000000 --- a/Standard Gaming Platform/ExceptionHandling.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _EXCEPTION_HANDLING__H_ -#define _EXCEPTION_HANDLING__H_ - -#include - -//uncomment this line if you want Exceptions to be handled -#ifdef JA2 - -#ifndef _DEBUG - #define ENABLE_EXCEPTION_HANDLING -#endif - -#else - //Wizardry -//#define ENABLE_EXCEPTION_HANDLING -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - - - -INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo ); - - -#ifdef __cplusplus -} -#endif - -#endif \ No newline at end of file diff --git a/Standard Gaming Platform/FileMan.cpp b/Standard Gaming Platform/FileMan.cpp index c1630801d..0de5e3d80 100644 --- a/Standard Gaming Platform/FileMan.cpp +++ b/Standard Gaming Platform/FileMan.cpp @@ -24,11 +24,6 @@ // Includes // //************************************************************************** -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "Types.h" #include #include @@ -39,14 +34,12 @@ #include "windows.h" #include "FileMan.h" #include "MemMan.h" - #include "DbMan.h" #include "Debug.h" #include "RegInst.h" #include "Container.h" #include "LibraryDataBase.h" #include "io.h" #include "sgp_logger.h" -#endif using namespace std; @@ -101,7 +94,6 @@ typedef struct FMFileInfoTag UINT8 uiFileAccess; UINT32 uiFilePosition; HANDLE hFileHandle; - HDBFILE hDBFile; } FMFileInfo; // for 'File Manager File Information' diff --git a/Standard Gaming Platform/Font.cpp b/Standard Gaming Platform/Font.cpp index 565aa5cc4..cb26ba578 100644 --- a/Standard Gaming Platform/Font.cpp +++ b/Standard Gaming Platform/Font.cpp @@ -1,9 +1,4 @@ // font.c -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include @@ -29,7 +24,6 @@ #include "vobject_blitters.h" #include -#endif //******************************************************* // // Defines diff --git a/Standard Gaming Platform/Install.cpp b/Standard Gaming Platform/Install.cpp index cb20d068d..672cb7b15 100644 --- a/Standard Gaming Platform/Install.cpp +++ b/Standard Gaming Platform/Install.cpp @@ -16,16 +16,10 @@ // //************************************************************************** -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include "Install.h" #include "RegInst.h" -#endif //************************************************************************** // diff --git a/Standard Gaming Platform/JA2 SGP ALL.H b/Standard Gaming Platform/JA2 SGP ALL.H deleted file mode 100644 index 0d9e6e38f..000000000 --- a/Standard Gaming Platform/JA2 SGP ALL.H +++ /dev/null @@ -1,104 +0,0 @@ -/* - * ChangeLog: - * 10.12.2005 Lesh ripped out everything that refers to MSS - * 10.12.2005 Lesh added fmod.h - */ -#ifndef __JA2_SGP_ALL_H -#define __JA2_SGP_ALL_H - -#pragma message("GENERATED PCH FOR JA2 SGP PROJECT.") - -//#ifndef INITGUID -// #define INITGUID -//#endif - - -#include "WordWrap.h" -#include "video.h" -#include "Button Sound Control.h" -#include "Sound Control.h" -#ifdef _JA2_RENDER_DIRTY - #include "Font Control.h" - #include "Render Dirty.h" - #include "utilities.h" -#endif -#include "input.h" -#include "memman.h" -#include "english.h" -#include "vobject.h" -#include "vobject_blitters.h" -#include "soundman.h" -#include "Button System.h" -#include "line.h" -#include -#include "debug.h" -#ifndef NO_ZLIB_COMPRESSION - #include "zlib.h" - #include "Compression.h" -#endif -#include "types.h" -#include -#include -#include -#include "Container.h" -#if _MSC_VER < 1300 //(iostream.h was removed from VC.NET2003) -#include -#endif -#include "Cursor Control.h" -#include "wcheck.h" -#include "FileMan.h" -#include "DbMan.h" -#include -#include -#include "TopicIDs.h" -#include "TopicOps.h" -#include "WizShare.h" -#include "screenids.h" -#include "Sys Globals.h" -#include "jascreens.h" -#include "gameloop.h" -#include "DirectX Common.h" -#include "DirectDraw Calls.h" -#include "video_private.h" -#include -#include "RegInst.h" -#include "LibraryDataBase.h" -#include "io.h" -#include -#include "sgp.h" -#include "pcx.h" -#include "Font.h" -#include "himage.h" -#include -#include -#include "impTGA.h" -#include "STCI.h" -#include -#include "local.h" -#include -#include -#include "Install.h" -#include "GameSettings.h" -#ifdef _DEBUG - #include -#endif -#include "mousesystem.h" -#include "Random.h" -#include -#include "vobject_private.h" -#include "shading.h" -#include "imgfmt.h" -#include "timer.h" -#include "renderworld.h" -#include "Isometric utils.h" -#include "fade screen.h" -#include "timer control.h" -#include "vsurface.h" -#include "vsurface_private.h" -#include "Timer Control.h" - -// Lesh modifications -#include "fmod.h" -#include "fmod_errors.h" - -#endif diff --git a/Standard Gaming Platform/LibraryDataBase.cpp b/Standard Gaming Platform/LibraryDataBase.cpp index 8d28d1bf1..00a796472 100644 --- a/Standard Gaming Platform/LibraryDataBase.cpp +++ b/Standard Gaming Platform/LibraryDataBase.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "Types.h" #include "windows.h" #include "FileMan.h" @@ -17,7 +12,6 @@ #else #include "video2.h" #endif -#endif //NUMBER_OF_LIBRARIES #ifdef JA2 diff --git a/Standard Gaming Platform/MemMan.cpp b/Standard Gaming Platform/MemMan.cpp index fb18d6920..4719f2274 100644 --- a/Standard Gaming Platform/MemMan.cpp +++ b/Standard Gaming Platform/MemMan.cpp @@ -18,11 +18,6 @@ // //************************************************************************** -//#ifdef JA2_PRECOMPILED_HEADERS -// #include "JA2 SGP ALL.H" -//#elif defined( WIZ8_PRECOMPILED_HEADERS ) -// #include "WIZ8 SGP ALL.H" -//#else #include "types.h" #include #include @@ -35,7 +30,6 @@ #ifdef _DEBUG #include #endif -//#endif #ifdef _DEBUG diff --git a/Standard Gaming Platform/PCX.cpp b/Standard Gaming Platform/PCX.cpp index b23149976..25eb2cb2b 100644 --- a/Standard Gaming Platform/PCX.cpp +++ b/Standard Gaming Platform/PCX.cpp @@ -1,13 +1,7 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include #include "pcx.h" #include "memman.h" #include "fileman.h" -#endif // Local typedefs diff --git a/Standard Gaming Platform/RegInst.cpp b/Standard Gaming Platform/RegInst.cpp index 1a1c34d26..d77a845e1 100644 --- a/Standard Gaming Platform/RegInst.cpp +++ b/Standard Gaming Platform/RegInst.cpp @@ -16,15 +16,9 @@ // //************************************************************************** -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include "RegInst.h" #include "WCheck.h" -#endif //************************************************************************** // diff --git a/Standard Gaming Platform/SGP_VS2005.vcproj b/Standard Gaming Platform/SGP_VS2005.vcproj index 3c294cb12..7bdefe0f8 100644 --- a/Standard Gaming Platform/SGP_VS2005.vcproj +++ b/Standard Gaming Platform/SGP_VS2005.vcproj @@ -394,10 +394,6 @@ RelativePath=".\english.h" > - - @@ -450,10 +446,6 @@ RelativePath=".\Ja2 Libs.h" > - - @@ -664,10 +656,6 @@ RelativePath=".\English.cpp" > - - diff --git a/Standard Gaming Platform/SGP_VS2008.vcproj b/Standard Gaming Platform/SGP_VS2008.vcproj index 3b77d82ea..c8b85ee5c 100644 --- a/Standard Gaming Platform/SGP_VS2008.vcproj +++ b/Standard Gaming Platform/SGP_VS2008.vcproj @@ -394,10 +394,6 @@ RelativePath="english.h" > - - @@ -450,10 +446,6 @@ RelativePath="Ja2 Libs.h" > - - @@ -662,10 +654,6 @@ RelativePath="English.cpp" > - - diff --git a/Standard Gaming Platform/SGP_VS2010.vcxproj b/Standard Gaming Platform/SGP_VS2010.vcxproj index be699a528..41e97b0f5 100644 --- a/Standard Gaming Platform/SGP_VS2010.vcxproj +++ b/Standard Gaming Platform/SGP_VS2010.vcxproj @@ -37,7 +37,6 @@ - @@ -51,7 +50,6 @@ - @@ -105,7 +103,6 @@ - diff --git a/Standard Gaming Platform/SGP_VS2010.vcxproj.filters b/Standard Gaming Platform/SGP_VS2010.vcxproj.filters index b8ed09426..84308defe 100644 --- a/Standard Gaming Platform/SGP_VS2010.vcxproj.filters +++ b/Standard Gaming Platform/SGP_VS2010.vcxproj.filters @@ -54,9 +54,6 @@ Header Files - - Header Files - Header Files @@ -96,7 +93,6 @@ Header Files - Header Files @@ -251,9 +247,6 @@ Source Files - - Source Files - Source Files diff --git a/Standard Gaming Platform/SGP_VS2013.vcxproj b/Standard Gaming Platform/SGP_VS2013.vcxproj index 807239723..20b33a72c 100644 --- a/Standard Gaming Platform/SGP_VS2013.vcxproj +++ b/Standard Gaming Platform/SGP_VS2013.vcxproj @@ -37,7 +37,6 @@ - @@ -51,7 +50,6 @@ - @@ -105,7 +103,6 @@ - diff --git a/Standard Gaming Platform/SGP_VS2013.vcxproj.filters b/Standard Gaming Platform/SGP_VS2013.vcxproj.filters index b8ed09426..84308defe 100644 --- a/Standard Gaming Platform/SGP_VS2013.vcxproj.filters +++ b/Standard Gaming Platform/SGP_VS2013.vcxproj.filters @@ -54,9 +54,6 @@ Header Files - - Header Files - Header Files @@ -96,7 +93,6 @@ Header Files - Header Files @@ -251,9 +247,6 @@ Source Files - - Source Files - Source Files diff --git a/Standard Gaming Platform/SGP_VS2017.vcxproj b/Standard Gaming Platform/SGP_VS2017.vcxproj index 41584cb9d..83710a606 100644 --- a/Standard Gaming Platform/SGP_VS2017.vcxproj +++ b/Standard Gaming Platform/SGP_VS2017.vcxproj @@ -37,7 +37,6 @@ - @@ -51,7 +50,6 @@ - @@ -105,7 +103,6 @@ - diff --git a/Standard Gaming Platform/SGP_VS2019.vcxproj b/Standard Gaming Platform/SGP_VS2019.vcxproj index 6f1613994..6cbc73532 100644 --- a/Standard Gaming Platform/SGP_VS2019.vcxproj +++ b/Standard Gaming Platform/SGP_VS2019.vcxproj @@ -49,7 +49,6 @@ - @@ -57,7 +56,6 @@ - @@ -71,7 +69,6 @@ - @@ -118,14 +115,12 @@ - - diff --git a/Standard Gaming Platform/SGP_VS2019.vcxproj.filters b/Standard Gaming Platform/SGP_VS2019.vcxproj.filters index b12f8ded7..3047fea30 100644 --- a/Standard Gaming Platform/SGP_VS2019.vcxproj.filters +++ b/Standard Gaming Platform/SGP_VS2019.vcxproj.filters @@ -6,14 +6,12 @@ - - @@ -52,7 +50,6 @@ - @@ -60,7 +57,6 @@ - @@ -74,7 +70,6 @@ - diff --git a/Standard Gaming Platform/STCI.cpp b/Standard Gaming Platform/STCI.cpp index 810e90fb4..48e5e91ee 100644 --- a/Standard Gaming Platform/STCI.cpp +++ b/Standard Gaming Platform/STCI.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include #include "MemMan.h" #include "FileMan.h" @@ -11,7 +6,6 @@ #include "Types.h" #include "Debug.h" #include "WCheck.h" -#endif BOOLEAN STCILoadRGB( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader ); BOOLEAN STCILoadIndexed( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader ); diff --git a/Standard Gaming Platform/WizShare.h b/Standard Gaming Platform/WizShare.h deleted file mode 100644 index 73216e572..000000000 --- a/Standard Gaming Platform/WizShare.h +++ /dev/null @@ -1,54 +0,0 @@ -//************************************************************************** -// -// Filename : WizShare.h -// -// Purpose : -// -// Modification history : -// -// 25nov96:HJH - creation -// -//************************************************************************** - -#ifndef _WizShare_h -#define _WizShare_h - -//************************************************************************** -// -// Includes -// -//************************************************************************** - -#include "types.h" - -//************************************************************************** -// -// Defines -// -//************************************************************************** - -#define MAX_MSG_LENGTH 128 -#define NUM_MESSAGES 100 - -//************************************************************************** -// -// Typedefs -// -//************************************************************************** - -#pragma pack(push, 1) - -typedef struct WizSharedtag -{ - BOOLEAN fMessage; - - INT32 iMessageIndex; // index to 1st message - INT32 iNumMessages; // # messages - INT32 iLastIndex; - - CHAR cMessages[NUM_MESSAGES][MAX_MSG_LENGTH]; -} WizShared; - -#pragma pack(pop) - -#endif diff --git a/Standard Gaming Platform/himage.cpp b/Standard Gaming Platform/himage.cpp index 64e202782..cf4884f8e 100644 --- a/Standard Gaming Platform/himage.cpp +++ b/Standard Gaming Platform/himage.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "builddefines.h" #include #include @@ -19,7 +14,6 @@ #include "Compression.h" #include "vobject.h" #include "vobject_blitters.h" -#endif #include diff --git a/Standard Gaming Platform/impTGA.cpp b/Standard Gaming Platform/impTGA.cpp index b9aecb4c9..07f6816b1 100644 --- a/Standard Gaming Platform/impTGA.cpp +++ b/Standard Gaming Platform/impTGA.cpp @@ -16,11 +16,6 @@ // //************************************************************************** -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include "Fileman.h" #include "memman.h" @@ -34,7 +29,6 @@ #include "video2.h" #endif #include "impTGA.h" -#endif //************************************************************************** // diff --git a/Standard Gaming Platform/input.cpp b/Standard Gaming Platform/input.cpp index ebec3b3d4..816413fa4 100644 --- a/Standard Gaming Platform/input.cpp +++ b/Standard Gaming Platform/input.cpp @@ -3,11 +3,6 @@ #define _WIN32_WINNT WINVER #endif -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else //** dd for defines that needed for additional mouse buttons #define _WIN32_WINNT 0x500 @@ -26,7 +21,6 @@ #include "video2.h" #endif #include "local.h" -#endif // Make sure to refer to the translation table which is within one of the following files (depending diff --git a/Standard Gaming Platform/line.cpp b/Standard Gaming Platform/line.cpp index 3b0f3341f..76c344f74 100644 --- a/Standard Gaming Platform/line.cpp +++ b/Standard Gaming Platform/line.cpp @@ -1,10 +1,4 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "line.h" -#endif //************************************************************************** // diff --git a/Standard Gaming Platform/mousesystem.cpp b/Standard Gaming Platform/mousesystem.cpp index e939df135..c755855d7 100644 --- a/Standard Gaming Platform/mousesystem.cpp +++ b/Standard Gaming Platform/mousesystem.cpp @@ -11,11 +11,6 @@ // //================================================================================================= -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include @@ -42,13 +37,7 @@ #include "Button System.h" ///***ddd #include "GameSettings.h" -#endif -#ifdef JA2_PRECOMPILED_HEADERS - #define BASE_REGION_FLAGS (MSYS_REGION_ENABLED | MSYS_SET_CURSOR) -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #define BASE_REGION_FLAGS MSYS_REGION_ENABLED // Wiz doesn't ever want MSYS_SET_CURSOR to be on... -#endif diff --git a/Standard Gaming Platform/sgp.cpp b/Standard Gaming Platform/sgp.cpp index 396573dbd..d291c57e9 100644 --- a/Standard Gaming Platform/sgp.cpp +++ b/Standard Gaming Platform/sgp.cpp @@ -1,12 +1,5 @@ /* $Id: sgp.c,v 1.4 2004/03/19 06:16:04 digicrab Exp $ */ //its test what doeas it do? -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" - #include "JA2 Splash.h" - #include "utilities.h" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #include @@ -31,7 +24,6 @@ #endif #include "LibraryDataBase.h" #include "utilities.h" -#endif #include "GameSettings.h" #include "input.h" diff --git a/Standard Gaming Platform/sgp.h b/Standard Gaming Platform/sgp.h index 6caba4adc..5a247f01f 100644 --- a/Standard Gaming Platform/sgp.h +++ b/Standard Gaming Platform/sgp.h @@ -16,7 +16,6 @@ #include "input.h" #include "memman.h" #include "fileman.h" -#include "dbman.h" #include "soundman.h" #include "pcx.h" #include "line.h" diff --git a/Standard Gaming Platform/shading.cpp b/Standard Gaming Platform/shading.cpp index dc505f4d2..b0c27f043 100644 --- a/Standard Gaming Platform/shading.cpp +++ b/Standard Gaming Platform/shading.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "DirectDraw Calls.h" #include #include "debug.h" @@ -15,7 +10,6 @@ #include "vobject.h" #include "vobject_blitters.h" #include "shading.h" -#endif BOOLEAN ShadesCalculateTables(SGPPaletteEntry *p8BPPPalette); BOOLEAN ShadesCalculatePalette(SGPPaletteEntry *pSrcPalette, SGPPaletteEntry *pDestPalette, UINT16 usRed, UINT16 usGreen, UINT16 usBlue, BOOLEAN fMono); diff --git a/Standard Gaming Platform/soundman.cpp b/Standard Gaming Platform/soundman.cpp index 372163327..f0f1cba17 100644 --- a/Standard Gaming Platform/soundman.cpp +++ b/Standard Gaming Platform/soundman.cpp @@ -6,11 +6,6 @@ * Derek Beland, May 28, 1997 * *********************************************************************************/ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "builddefines.h" #include #include @@ -29,7 +24,6 @@ //#include "input.h" #include #include -#endif // Uncomment this to disable the startup of sound hardware //#define SOUND_DISABLE diff --git a/Standard Gaming Platform/timer.cpp b/Standard Gaming Platform/timer.cpp index b1fb0250c..ccd8d2b72 100644 --- a/Standard Gaming Platform/timer.cpp +++ b/Standard Gaming Platform/timer.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "types.h" #include #if defined( JA2 ) || defined( UTIL ) @@ -11,7 +6,6 @@ #include "video2.h" #endif #include "timer.h" -#endif #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/Standard Gaming Platform/trle.h b/Standard Gaming Platform/trle.h deleted file mode 100644 index aebb607c6..000000000 --- a/Standard Gaming Platform/trle.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __TRLE_H -#define __TRLE_H - - -typedef struct -{ - UINT32 uiOffset; - UINT32 uiWidth; - UINT32 uiOffLen; - INT16 sOffsetX; - INT16 sOffsetY; - -} TRLEObject; - - -typedef struct -{ - UINT32 uiHeightEach; - UINT32 uiTotalElements; - TRLEObject *pTRLEObject; - PTR pPixData; - UINT32 uiSizePixDataElem; - -} TRLEData; - - -BOOLEAN GetTRLEObjectData( UINT32 uiTotalElements, TRLEObject *pTRLEObject, INT16 ssIndex, UINT32 *pWidth, UINT32 *pOffset, UINT32 *pOffLen, UINT16 *pOffsetX, UINT16 *pOffsetY ); - -BOOLEAN SetTRLEObjectOffset( UINT32 uiTotalElements, TRLEObject *pTRLEObject, INT16 ssIndex, INT16 sOffsetX, INT16 sOffsetY ); - -#endif \ No newline at end of file diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp index 265cf4ed3..6104b6792 100644 --- a/Standard Gaming Platform/video.cpp +++ b/Standard Gaming Platform/video.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS -#include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) -#include "WIZ8 SGP ALL.H" -#else #include "types.h" #include "Video.h" #include "vobject_blitters.h" @@ -18,7 +13,6 @@ #include "Input.h" #include "GameSettings.h" #include "sgp_logger.h" -#endif #include "resource.h" #include diff --git a/Standard Gaming Platform/video_private.h b/Standard Gaming Platform/video_private.h deleted file mode 100644 index c2db612e5..000000000 --- a/Standard Gaming Platform/video_private.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef __VIDEO_PRIVATE_ -#define __VIDEO_PRIVATE_ - -// *********************************************************************** -// -// PRIVATE, INTERNAL Header used by other SGP Internal modules -// -// Allows direct access to underlying Direct Draw Implementation -// -// *********************************************************************** - - -LPDIRECTDRAW2 GetDirectDraw2Object( ); -LPDIRECTDRAWSURFACE2 GetPrimarySurfaceInterface( ); -LPDIRECTDRAWSURFACE2 GetBackbufferInterface( ); - -BOOLEAN SetDirectDraw2Object( LPDIRECTDRAW2 pDirectDraw ); -BOOLEAN SetPrimarySurfaceInterface( LPDIRECTDRAWSURFACE2 pSurface ); -BOOLEAN SetBackbufferInterface( LPDIRECTDRAWSURFACE2 pSurface ); - -#endif diff --git a/Standard Gaming Platform/vobject.cpp b/Standard Gaming Platform/vobject.cpp index baf76e853..7f961af7c 100644 --- a/Standard Gaming Platform/vobject.cpp +++ b/Standard Gaming Platform/vobject.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "DirectDraw Calls.h" #include #include "debug.h" @@ -16,7 +11,6 @@ #include "wcheck.h" #include "vobject_blitters.h" #include "sgp.h" -#endif #include diff --git a/Standard Gaming Platform/vobject_blitters.cpp b/Standard Gaming Platform/vobject_blitters.cpp index 7e317eb56..297200d9f 100644 --- a/Standard Gaming Platform/vobject_blitters.cpp +++ b/Standard Gaming Platform/vobject_blitters.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS - #include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) - #include "WIZ8 SGP ALL.H" -#else #include "DirectDraw Calls.h" #include #include "debug.h" @@ -18,7 +13,6 @@ #include "vobject_blitters.h" #include "shading.h" #include "sgp_logger.h" -#endif #include std::map g_SurfaceRectangle; diff --git a/Standard Gaming Platform/vobject_private.h b/Standard Gaming Platform/vobject_private.h deleted file mode 100644 index e02cb3eb3..000000000 --- a/Standard Gaming Platform/vobject_private.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __VOBJECT_PRIVATE_ -#define __VOBJECT_PRIVATE_ - -#endif \ No newline at end of file diff --git a/Standard Gaming Platform/vsurface.cpp b/Standard Gaming Platform/vsurface.cpp index fcb4938cc..2a33825f8 100644 --- a/Standard Gaming Platform/vsurface.cpp +++ b/Standard Gaming Platform/vsurface.cpp @@ -1,8 +1,3 @@ -#ifdef JA2_PRECOMPILED_HEADERS -#include "JA2 SGP ALL.H" -#elif defined( WIZ8_PRECOMPILED_HEADERS ) -#include "WIZ8 SGP ALL.H" -#else #include "DirectDraw Calls.h" #include #include @@ -17,7 +12,6 @@ #include "vsurface_private.h" #include "wcheck.h" #include "vobject_blitters.h" -#endif extern void SetClippingRect(SGPRect *clip); extern void GetClippingRect(SGPRect *clip); diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index 03ca0d074..01203c01d 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -1,9 +1,5 @@ //Strategic AI Viewer -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "INIReader.h" -#else #include "builddefines.h" #include #include "types.h" @@ -38,7 +34,6 @@ #include "Strategic Status.h" #include "wordwrap.h" #include "Town Militia.h" // added by Flugente -#endif #ifdef JA2BETAVERSION diff --git a/Strategic/ASD.cpp b/Strategic/ASD.cpp index ceee99cfa..8c23a6787 100644 --- a/Strategic/ASD.cpp +++ b/Strategic/ASD.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#else #include #include "ASD.h" #include "strategic.h" @@ -53,7 +50,6 @@ #include "renderworld.h" #include "Isometric Utils.h" #include "Rebel Command.h" -#endif extern BOOLEAN gfTacticalDoHeliRun; diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 04dad5007..45ae499e7 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Assignments.h" #include "Strategic.h" #include "Items.h" @@ -77,7 +73,6 @@ #include "Strategic AI.h" #include "MiniEvents.h" #include "Rebel Command.h" -#endif #include #include diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index 2e4da9ed5..087ec7e1a 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "builddefines.h" #include #include "types.h" @@ -73,7 +69,6 @@ #include "DynamicDialogue.h" // added by Flugente #include "MilitiaIndividual.h" // added by Flugente #include "Rebel Command.h" -#endif #include "Reinforcement.h" diff --git a/Strategic/Campaign Init.cpp b/Strategic/Campaign Init.cpp index 333be9286..c3faaa385 100644 --- a/Strategic/Campaign Init.cpp +++ b/Strategic/Campaign Init.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "ASD.h" // added by Flugente #include "types.h" #include "Campaign Init.h" @@ -17,7 +13,6 @@ #include "expat.h" #include "Debug Control.h" #include "Tactical Save.h" -#endif #include "connect.h" #include diff --git a/Strategic/Creature Spreading.cpp b/Strategic/Creature Spreading.cpp index 167cfc6bf..13581a264 100644 --- a/Strategic/Creature Spreading.cpp +++ b/Strategic/Creature Spreading.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "types.h" #include "fileman.h" #include "himage.h" @@ -36,7 +32,6 @@ #include "Isometric Utils.h" // added by Flugente #include "Soldier Create.h" // added by Flugente #include "Player Command.h" // added by Flugente -#endif #include "Strategic Mines.h" #include "connect.h" diff --git a/Strategic/Facilities.cpp b/Strategic/Facilities.cpp index c9203fec9..cf039a447 100644 --- a/Strategic/Facilities.cpp +++ b/Strategic/Facilities.cpp @@ -8,10 +8,6 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Campaign Types.h" #include "Facilities.h" #include "Soldier Control.h" @@ -38,7 +34,6 @@ #include "Isometric Utils.h" #include "MilitiaSquads.h" #include "Tactical Save.h" -#endif INT16 gsSkyriderCostModifier; // HEADROCK HAM 3.6: Strategic info variable, total of income/costs accumulated for the use of facilities today. diff --git a/Strategic/Game Clock.cpp b/Strategic/Game Clock.cpp index c07d43451..6b92c1039 100644 --- a/Strategic/Game Clock.cpp +++ b/Strategic/Game Clock.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "sgp.h" #include "Game Clock.h" #include "Font.h" @@ -25,7 +22,6 @@ #include "gamescreen.h" #include "Map Information.h" #include "GameSettings.h" -#endif #include "LuaInitNPCs.h" diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 261fbd80d..ba2fa54ec 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "InIReader.h" -#else #include "types.h" #include "Game Events.h" #include "soundman.h" @@ -52,7 +48,6 @@ #include "LuaInitNPCs.h" // added by Flugente #include "MiniEvents.h" #include "Rebel Command.h" -#endif #include "connect.h" diff --git a/Strategic/Game Events.cpp b/Strategic/Game Events.cpp index ffcc77b82..48ebbb294 100644 --- a/Strategic/Game Events.cpp +++ b/Strategic/Game Events.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "builddefines.h" #include #include "types.h" @@ -12,7 +9,6 @@ #include "message.h" #include "MiniEvents.h" #include "Text.h" -#endif #ifdef JA2TESTVERSION diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index d3c01cb20..c47c05786 100644 --- a/Strategic/Game Init.cpp +++ b/Strategic/Game Init.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "Language Defines.h" - #include "HelpScreen.h" - #include "GameSettings.h" -#else #include "sgp.h" #include "jascreens.h" #include "laptop.h" @@ -65,7 +59,6 @@ #include "MiniEvents.h" #include "Rebel Command.h" #include "World Items.h" -#endif #include "Vehicles.h" #include "text.h" diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index 876211ad6..d9e0ddfaa 100644 --- a/Strategic/Hourly Update.cpp +++ b/Strategic/Hourly Update.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Assignments.h" #include "Strategic Town Loyalty.h" #include "Strategic Merc Handler.h" @@ -27,7 +24,6 @@ #include "strategic.h" // added by Flugente #include "message.h" // added by Flugente for ScreenMsg(...) #include "Rebel Command.h" -#endif #include "Luaglobal.h" #include "LuaInitNPCs.h" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index 581b54d67..7e97ba217 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "strategicmap.h" #include "strategic.h" #include "Strategic Mines.h" @@ -70,7 +67,6 @@ #include "physics.h" #include "Auto Resolve.h" #include "cursors.h" -#endif #ifdef JA2UB #include "Soldier Init List.h" @@ -2967,4 +2963,4 @@ void AddJA25AIDataToSector( JA25_SECTOR_AI *pSectorAIInfo ) */ } -#endif \ No newline at end of file +#endif diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index ce739e3ff..c379eab2b 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -11,7 +11,6 @@ #include "Game Init.h" #include "interface Dialogue.h" #include "opplist.h" -#include "Strategic All.h" #include "pits.h" #include "Game Event Hook.h" #include "Creature Spreading.h" @@ -40,6 +39,12 @@ #include "soldier profile type.h" #include "history.h" #include "Merc Hiring.h" +#include "Game Events.h" +#include "email.h" +#include "worldman.h" +#include "text.h" +#include "Dialogue Control.h" +#include "Boxing.h" #include "LOS.h" #include "Music Control.h" @@ -75,6 +80,22 @@ extern "C" { #include "BriefingRoom_Data.h" #include "MiniGame.h" // added by Flugente +#include "Campaign.h" +#include "strategic.h" +#include "PreBattle Interface.h" +#include "Strategic Event Handler.h" +#include "files.h" +#include "finances.h" +#include "Sound Control.h" +#include "SaveLoadMap.h" +#include "renderworld.h" +#include "Keys.h" +#include "Render Fun.h" +#include "Soldier Add.h" +#include "gameloop.h" +#include "Merc Contract.h" +#include "message.h" +#include "Town Militia.h" extern UINT8 gubWaitingForAllMercsToExitCode; diff --git a/Strategic/Luaglobal.cpp b/Strategic/Luaglobal.cpp index 82f9401bc..3abb4a73b 100644 --- a/Strategic/Luaglobal.cpp +++ b/Strategic/Luaglobal.cpp @@ -6,7 +6,6 @@ #include "FileMan.h" #include "GameSettings.h" #include "interface Dialogue.h" -#include "Strategic All.h" #include "Luaglobal.h" #include "Boxing.h" #include "LuaInitNPCs.h" @@ -36,6 +35,8 @@ extern "C" { #include "lualib.h" } +#include "strategicmap.h" +#include "Map Screen Interface.h" using namespace std; diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp index 590339413..47fcfd449 100644 --- a/Strategic/Map Screen Helicopter.cpp +++ b/Strategic/Map Screen Helicopter.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Map Screen Helicopter.h" #include "LaptopSave.h" #include "Vehicles.h" @@ -44,7 +41,6 @@ #include "expat.h" #include "merc entering.h" // added by Flugente #include "ASD.h" // added by Flugente -#endif #include "Vehicles.h" #include "NPC.h" diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp index 04fa25c7c..213559d09 100644 --- a/Strategic/Map Screen Interface Border.cpp +++ b/Strategic/Map Screen Interface Border.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Map Screen Interface Border.h" #include "Types.h" #include "vsurface.h" @@ -31,7 +28,6 @@ #include "popup_callback.h" #include "popup_class.h" #include "Queen Command.h" // added by Flugente -#endif #include "connect.h" diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 004a67e4c..7b975bb87 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Map Screen Interface Bottom.h" #include "Map Screen Interface Border.h" #include "Types.h" @@ -48,7 +45,6 @@ #include "Interface Control.h" #include "Sys Globals.h" #include "game init.h" -#endif #ifdef JA2UB #include "Ja25 Strategic Ai.h" diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp index 6900b10a3..c0ab1771a 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/Strategic/Map Screen Interface Map Inventory.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Map Screen Interface Map Inventory.h" #include "Render Dirty.h" #include "vobject.h" @@ -34,7 +30,6 @@ #include "rt time defines.h" #include "Encyclopedia_new.h" //Moa: item visibility #include "Town Militia.h" // added by Flugente -#endif #include "ShopKeeper Interface.h" #include "ArmsDealerInvInit.h" diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 185549d92..ce90cf0df 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Font.h" #include "Font Control.h" #include "mapscreen.h" @@ -50,7 +46,6 @@ #include "LuaInitNPCs.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente #include "Rebel Command.h" -#endif #include "Quests.h" #include "connect.h" diff --git a/Strategic/Map Screen Interface TownMine Info.cpp b/Strategic/Map Screen Interface TownMine Info.cpp index 31a050104..17294d0a9 100644 --- a/Strategic/Map Screen Interface TownMine Info.cpp +++ b/Strategic/Map Screen Interface TownMine Info.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "HelpScreen.h" -#else #include "Map Screen Interface TownMine Info.h" #include "strategicmap.h" #include "popupbox.h" @@ -31,7 +27,6 @@ #include "Overhead.h" // added by Flugente #include "Game Clock.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente -#endif #include "Strategic Mines.h" diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 41111229f..95315861a 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Map Screen Interface.h" #include "string.h" #include "Map Screen Interface Map.h" @@ -56,7 +53,6 @@ #include "Food.h" #include "Personnel.h" #include "mapscreen.h" -#endif #include "connect.h" diff --git a/Strategic/MapScreen Quotes.cpp b/Strategic/MapScreen Quotes.cpp index 0d8f88361..b90be26f2 100644 --- a/Strategic/MapScreen Quotes.cpp +++ b/Strategic/MapScreen Quotes.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Map Screen Interface.h" #include "string.h" #include "Map Screen Interface Map.h" @@ -47,7 +44,6 @@ #include "Air Raid.h" #include "Queen Command.h" #include "Render Fun.h" -#endif #include "connect.h" @@ -477,4 +473,4 @@ BOOLEAN HasJerryAlreadySaidTheMapScreenIntroSequence() } } -#endif \ No newline at end of file +#endif diff --git a/Strategic/Meanwhile.cpp b/Strategic/Meanwhile.cpp index 682cae211..ad9cdb8ac 100644 --- a/Strategic/Meanwhile.cpp +++ b/Strategic/Meanwhile.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "sgp.h" #include "meanwhile.h" #include "PreBattle Interface.h" @@ -36,7 +33,6 @@ #include "Campaign Types.h" #include "Squads.h" #include "Random.h" -#endif #include "GameInitOptionsScreen.h" diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 18e812c38..14e42d7d2 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Types.h" #include "Merc Contract.h" #include "Soldier Profile.h" @@ -38,7 +35,6 @@ #include "Vehicles.h" #include "email.h" #include "Map Screen Helicopter.h" -#endif #include "GameSettings.h" #include "connect.h" diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 963f5b5ae..303ea2836 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Town Militia.h" #include "Militia Control.h" #include "Campaign Types.h" @@ -30,7 +27,6 @@ #include "mapscreen.h" #include "Strategic Pathing.h" #include "GameVersion.h" -#endif #include "connect.h" #include "MilitiaSquads.h" diff --git a/Strategic/MiniEvents.cpp b/Strategic/MiniEvents.cpp index 905a8f9dc..88516ea3e 100644 --- a/Strategic/MiniEvents.cpp +++ b/Strategic/MiniEvents.cpp @@ -9,10 +9,6 @@ Mini events are set up in MiniEvents.lua. This file handles mini event triggers to call into. */ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "MiniEvents.h" #include "Assignments.h" @@ -44,7 +40,6 @@ to call into. #include "Text.h" #include "Town Militia.h" #include "Vehicles.h" -#endif extern "C" { #include "lua.h" diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp index 5da09c713..57378482b 100644 --- a/Strategic/Player Command.cpp +++ b/Strategic/Player Command.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Player Command.h" #include "Queen Command.h" #include "Campaign Types.h" @@ -30,7 +27,6 @@ #include "CampaignStats.h" // added by Flugente #include "Town Militia.h" // added by Flugente #include "LuaInitNPCs.h" // added by Flugente -#endif #include "postalservice.h" diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index d27d0654b..72ec674af 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "builddefines.h" #include #include "PreBattle Interface.h" @@ -50,7 +47,6 @@ #include "CampaignStats.h" // added by Flugente #include "militiasquads.h" // added by Flugente #include "SkillCheck.h" // added by Flugente -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index 497d71b58..c725d71d3 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -1,9 +1,5 @@ //Queen Command.c -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Queen Command.h" #include "Strategic Event Handler.h" #include "Overhead Types.h" @@ -45,7 +41,6 @@ #include "Morale.h" #include "CampaignStats.h" // added by Flugente #include "ASD.h" // added by Flugente -#endif #ifdef JA2BETAVERSION extern BOOLEAN gfClearCreatureQuest; diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 7a92c874c..06d7457f9 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Types.h" #include "Quest Debug System.h" #include "WCheck.h" @@ -39,7 +36,6 @@ #include "SysUtil.h" #include "Message.h" #include "Random.h" -#endif //#ifdef JA2BETAVERSION diff --git a/Strategic/Quests.cpp b/Strategic/Quests.cpp index d8fea66dd..2e0d25d9d 100644 --- a/Strategic/Quests.cpp +++ b/Strategic/Quests.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "sgp.h" #include "message.h" #include "quests.h" @@ -32,7 +28,6 @@ #include "strategic.h" #include "Strategic Event Handler.h" #include "Soldier Control.h" -#endif #include "BobbyRMailOrder.h" #include "connect.h" diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index 181eca14d..f7d257ec8 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -56,10 +56,6 @@ Points of interest: - RebelCommandSaveInfo - pretty much everything important is in here */ -#ifdef PRECOMPILEDHEADERS -#include "Laptop All.h" -#include "Strategic All.h" -#else #include "Rebel Command.h" #include "ASD.h" @@ -103,7 +99,6 @@ Points of interest: #include "Vehicles.h" #include "WCheck.h" #include "WordWrap.h" -#endif #include #include diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index 3840769f8..c5077b8e0 100644 --- a/Strategic/Reinforcement.cpp +++ b/Strategic/Reinforcement.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Town Militia.h" #include "Militia Control.h" #include "Campaign Types.h" @@ -22,7 +19,6 @@ #include "GameSettings.h" #include "Soldier Init List.h" #include "Inventory Choosing.h" -#endif #include "GameInitOptionsScreen.h" diff --git a/Strategic/Scheduling.cpp b/Strategic/Scheduling.cpp index f38438653..7408c37c7 100644 --- a/Strategic/Scheduling.cpp +++ b/Strategic/Scheduling.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include #include "Fileman.h" #include "types.h" @@ -28,7 +25,6 @@ #include "Soldier Profile.h" #include "soldier profile type.h" #include "Quests.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index 573493b77..569dfec6c 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "builddefines.h" #include #include "types.h" @@ -37,7 +33,6 @@ #include "interface dialogue.h" #include "ASD.h" // added by Flugente #include "Rebel Command.h" -#endif #include "GameInitOptionsScreen.h" diff --git a/Strategic/Strategic All.h b/Strategic/Strategic All.h deleted file mode 100644 index f0234cc75..000000000 --- a/Strategic/Strategic All.h +++ /dev/null @@ -1,232 +0,0 @@ -#ifndef __STRATEGIC_ALL_H -#define __STRATEGIC_ALL_H - -#pragma message("GENERATED PCH FOR STRATEGIC PROJECT.") - -#include "builddefines.h" -#include -#include "types.h" -#include "english.h" -#include "Timer Control.h" -#include "vsurface.h" -#include "Button System.h" -#include "Font Control.h" -#include "Simple Render Utils.h" -#include "Editor Taskbar Utils.h" -#include "line.h" -#include "input.h" -#include "vobject_blitters.h" -#include "Text Input.h" -#include "mousesystem.h" -#include "strategicmap.h" -#include "Fileman.h" -#include "Map Information.h" -#include "render dirty.h" -#include "Game Clock.h" -#include "Campaign Types.h" -#include "Campaign Init.h" -#include "cheats.h" -#include "Queen Command.h" -#include "overhead.h" -#include "Strategic Movement.h" -#include "GameSettings.h" -#include "Game Event Hook.h" -#include "Creature Spreading.h" -#include "message.h" -#include "Game Init.h" -#include "Assignments.h" -#include "Soldier Control.h" -#include "Item Types.h" -#include "Strategic.h" -#include "Items.h" -#include -#include "Map Screen Interface.h" -#include "Soldier Profile Type.h" -#include "Soldier Profile.h" -#include "Campaign.h" -#include "Text.h" -#include "dialogue control.h" -#include "NPC.h" -#include "Strategic Town Loyalty.h" -#include "animation control.h" -#include "mapscreen.h" -#include "Squads.h" -#include "Map Screen Helicopter.h" -#include "PopUpBox.h" -#include "Vehicles.h" -#include "Strategic Merc Handler.h" -#include "Merc Contract.h" -#include "Map Screen Interface Map.h" -#include "laptop.h" -#include "Finances.h" -#include "LaptopSave.h" -#include "renderworld.h" -#include "Interface Control.h" -#include "Interface.h" -#include "Soldier Find.h" -#include "ai.h" -#include "utilities.h" -#include "random.h" -#include "Soldier Add.h" -#include "Isometric Utils.h" -#include "Soldier Macros.h" -#include "Explosion Control.h" -#include "SkillCheck.h" -#include "Quests.h" -#include "Town Militia.h" -#include "Map Screen Interface Border.h" -#include "math.h" -#include "Strategic Pathing.h" -#include "Auto Resolve.h" -#include "Music Control.h" -#include "PreBattle Interface.h" -#include "Player Command.h" -#include "gameloop.h" -#include "screenids.h" -#include "vObject.h" -#include "video.h" -#include "gamescreen.h" -#include "sysutil.h" -#include "Soldier Create.h" -#include "Weapons.h" -#include "Sound Control.h" -#include "Tactical Save.h" -#include "Strategic Status.h" -#include "WordWrap.h" -#include "Animation Data.h" -#include "Strategic AI.h" -#include "rt time defines.h" -#include "morale.h" -#include "himage.h" -#include "Soldier Init List.h" -#include "lighting.h" -#include "Strategic Mines.h" -#include "jascreens.h" -#include "Map Edgepoints.h" -#include "opplist.h" -#include "sgp.h" -#include "environment.h" -#include "Game Events.h" -#include "MercTextBox.h" -#include "Event Pump.h" -#include "soundman.h" -#include "Ambient Control.h" -#include "AimMembers.h" -#include "Strategic Event Handler.h" -#include "BobbyR.h" -#include "mercs.h" -#include "email.h" -#include "Merc Hiring.h" -#include "Insurance Contract.h" -#include "Scheduling.h" -#include "BobbyRGuns.h" -#include "Arms Dealer Init.h" -#include "Strategic town reputation.h" -#include "air raid.h" -#include "meanwhile.h" -#include "MemMan.h" -#include "Debug.h" -#include "worlddef.h" -#include "fade screen.h" -#include "history.h" -#include "merc entering.h" -#include -#include "worldman.h" -#include "tiledat.h" -#include "WCheck.h" -#include "Map Screen Interface Map Inventory.h" -#include "Map Screen Interface Bottom.h" -#include "Radar Screen.h" -#include "cursors.h" -#include "Options Screen.h" -#include "Cursor Control.h" -#include "Interface Items.h" -#include "Interface Utils.h" -#include "World Items.h" -#include "Multi Language Graphic Utils.h" -#include "Font.h" -#include "Militia Control.h" -#include "Map Screen Interface TownMine Info.h" -#include "Handle UI.h" -#include "Handle Items.h" -#include -#include -#include "screens.h" -#include -#include -#include "Interface Cursors.h" -#include "Interface Panels.h" -#include "sys globals.h" -#include "faces.h" -#include "strategic turns.h" -#include "Personnel.h" -#include "Animated ProgressBar.h" -#include "GameVersion.h" -#include "SaveLoadScreen.h" -#include "messageboxscreen.h" -#include "rotting corpses.h" -#include "Tactical Placement GUI.h" -#include "Overhead Types.h" -#include "Soldier Ani.h" -#include "Types.h" -#include "Quest Debug System.h" -#include "WCheck.h" -#include "Font Control.h" -#include "Video.h" -#include "Game Clock.h" -#include "Render Dirty.h" -#include "WordWrap.h" -#include "Interface.h" -#include "Cursors.h" -#include "Quests.h" -#include "stdio.h" -#include "QuestText.h" -#include "Soldier Profile.h" -#include "Utilities.h" -#include "Text.h" -#include "Text Input.h" -#include "Soldier Create.h" -#include "strategicmap.h" -#include "soldier add.h" -#include "Opplist.h" -#include "Handle Items.h" -#include "Game Clock.h" -#include "environment.h" -#include "dialogue control.h" -#include "Soldier Control.h" -#include "overhead.h" -#include "AimMembers.h" -#include "MessageBoxScreen.h" -#include "Stdio.h" -#include "english.h" -#include "line.h" -#include "Keys.h" -#include "Interface Dialogue.h" -#include "SysUtil.h" -#include "Message.h" -#include "Interface Dialogue.h" -#include "Render Fun.h" -#include "Boxing.h" -#include -#include "Keys.h" -#include "Structure Wrap.h" -#include "SaveLoadMap.h" -#include "aim.h" -#include -#include "Inventory Choosing.h" -#include "LOS.h" -#include "Tactical Turns.h" -#include -#include "worlddat.h" -#include "Exit Grids.h" -#include "pathai.h" -#include "Shade Table Util.h" -#include "points.h" -#include "Bullets.h" -#include "physics.h" -#include "_JA25EnglishText.h" -#include "Debug Control.h" -#include "expat.h" -#include "MiniEvents.h" -#include "Rebel Command.h" -#endif \ No newline at end of file diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp index a1207084b..4358c0a14 100644 --- a/Strategic/Strategic Event Handler.cpp +++ b/Strategic/Strategic Event Handler.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Strategic Event Handler.h" #include "MemMan.h" #include "message.h" @@ -31,7 +28,6 @@ #include "Campaign.h" // added by Flugente #include "Strategic AI.h" #include "Rebel Command.h" -#endif #include "Luaglobal.h" #include "connect.h" diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 6e131a770..501e2643b 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Types.h" #include "Strategic Merc Handler.h" @@ -47,7 +44,6 @@ // HEADROCK HAM 3.6: And another include, for militia upkeep costs. #include "Town Militia.h" #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinionsDailyRefresh() -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Strategic/Strategic Mines.cpp b/Strategic/Strategic Mines.cpp index 198168710..9e99ae859 100644 --- a/Strategic/Strategic Mines.cpp +++ b/Strategic/Strategic Mines.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include #include "Strategic Mines.h" #include "Finances.h" @@ -24,7 +21,6 @@ #include "Facilities.h" #include "ASD.h" // added by Flugente #include "Rebel Command.h" -#endif #include "GameInitOptionsScreen.h" diff --git a/Strategic/Strategic Movement Costs.cpp b/Strategic/Strategic Movement Costs.cpp index ff6c280e2..4f45414e4 100644 --- a/Strategic/Strategic Movement Costs.cpp +++ b/Strategic/Strategic Movement Costs.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "Campaign Types.h" #include "Queen Command.h" #include "Strategic Movement.h" @@ -10,7 +6,6 @@ #include "Debug.h" #include "Debug Control.h" #include "Tactical Save.h" -#endif #include "Map Screen Interface Map.h" #ifdef JA2UB diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index e06685456..9ed5170b1 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "builddefines.h" #include #include @@ -53,7 +50,6 @@ #include "Creature Spreading.h" // added by Flugente #include "MilitiaIndividual.h" // added by Flugente #include "Rebel Command.h" -#endif #include "MilitiaSquads.h" #include "Vehicles.h" diff --git a/Strategic/Strategic Pathing.cpp b/Strategic/Strategic Pathing.cpp index bed640ab9..f39d47b50 100644 --- a/Strategic/Strategic Pathing.cpp +++ b/Strategic/Strategic Pathing.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include #include #include "types.h" @@ -25,7 +22,6 @@ #include "Game Event Hook.h" #include "Strategic AI.h" #include "Queen Command.h" // added by Flugente -#endif void AddSectorToFrontOfMercPath( PathStPtr *ppMercPath, UINT8 ubSectorX, UINT8 ubSectorY ); diff --git a/Strategic/Strategic Status.cpp b/Strategic/Strategic Status.cpp index e84f9d4a3..0d0d571bd 100644 --- a/Strategic/Strategic Status.cpp +++ b/Strategic/Strategic Status.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Strategic Status.h" #include "Inventory Choosing.h" #include "FileMan.h" @@ -16,7 +13,6 @@ #include "Game Init.h" // added by Flugente #include "GameVersion.h" // added by Flugente #include "SaveLoadGame.h" // added by Flugente -#endif #include "GameInitOptionsScreen.h" diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 8fb982adc..d4542de0c 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Strategic Town Loyalty.h" #include "strategicmap.h" #include "Overhead.h" @@ -39,7 +36,6 @@ #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h" // added by Flugente #include "Rebel Command.h" -#endif #include "Luaglobal.h" #include "LuaInitNPCs.h" diff --git a/Strategic/Strategic Turns.cpp b/Strategic/Strategic Turns.cpp index c708006b0..8feb59e64 100644 --- a/Strategic/Strategic Turns.cpp +++ b/Strategic/Strategic Turns.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "sgp.h" #include "Game Clock.h" #include "Font Control.h" @@ -19,7 +16,6 @@ #include "strategic turns.h" #include "rt time defines.h" #include "assignments.h" -#endif diff --git a/Strategic/Strategic_VS2005.vcproj b/Strategic/Strategic_VS2005.vcproj index 348378c5f..87e22395a 100644 --- a/Strategic/Strategic_VS2005.vcproj +++ b/Strategic/Strategic_VS2005.vcproj @@ -490,10 +490,6 @@ RelativePath=".\Strategic AI.h" > - - diff --git a/Strategic/Strategic_VS2008.vcproj b/Strategic/Strategic_VS2008.vcproj index 5854184c9..a8683b6a1 100644 --- a/Strategic/Strategic_VS2008.vcproj +++ b/Strategic/Strategic_VS2008.vcproj @@ -490,10 +490,6 @@ RelativePath="Strategic AI.h" > - - diff --git a/Strategic/Strategic_VS2010.vcxproj b/Strategic/Strategic_VS2010.vcxproj index 87c89ffe3..1511065cb 100644 --- a/Strategic/Strategic_VS2010.vcxproj +++ b/Strategic/Strategic_VS2010.vcxproj @@ -61,7 +61,6 @@ - diff --git a/Strategic/Strategic_VS2010.vcxproj.filters b/Strategic/Strategic_VS2010.vcxproj.filters index 31cd0018b..830330817 100644 --- a/Strategic/Strategic_VS2010.vcxproj.filters +++ b/Strategic/Strategic_VS2010.vcxproj.filters @@ -117,7 +117,6 @@ Header Files - Header Files diff --git a/Strategic/Strategic_VS2013.vcxproj b/Strategic/Strategic_VS2013.vcxproj index 5f7c10387..6237551ee 100644 --- a/Strategic/Strategic_VS2013.vcxproj +++ b/Strategic/Strategic_VS2013.vcxproj @@ -61,7 +61,6 @@ - diff --git a/Strategic/Strategic_VS2013.vcxproj.filters b/Strategic/Strategic_VS2013.vcxproj.filters index f57584990..235afc5fd 100644 --- a/Strategic/Strategic_VS2013.vcxproj.filters +++ b/Strategic/Strategic_VS2013.vcxproj.filters @@ -111,7 +111,6 @@ Header Files - Header Files diff --git a/Strategic/Strategic_VS2017.vcxproj b/Strategic/Strategic_VS2017.vcxproj index 0995eb006..8b7c1cc68 100644 --- a/Strategic/Strategic_VS2017.vcxproj +++ b/Strategic/Strategic_VS2017.vcxproj @@ -61,7 +61,6 @@ - diff --git a/Strategic/Strategic_VS2019.vcxproj b/Strategic/Strategic_VS2019.vcxproj index 4337e3f21..042b5f69f 100644 --- a/Strategic/Strategic_VS2019.vcxproj +++ b/Strategic/Strategic_VS2019.vcxproj @@ -81,7 +81,6 @@ - diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index 98ce1858b..feaf4aed1 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -1,9 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "GameSettings.h" -#else #include "Town Militia.h" #include "Militia Control.h" #include "Campaign Types.h" @@ -35,7 +31,6 @@ #include "Campaign.h" // added by Flugente #include "message.h" // added by Flugente #include "Rebel Command.h" -#endif // HEADROCK HAM 3: include these files so that a militia trainer's Effective Leadership can be determined. Used // to determine the number of militia trained by this merc per session. In the future may also determine QUALITY diff --git a/Strategic/XML_Army.cpp b/Strategic/XML_Army.cpp index f04dfb2a2..4eb965670 100644 --- a/Strategic/XML_Army.cpp +++ b/Strategic/XML_Army.cpp @@ -1,16 +1,11 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include #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 diff --git a/Strategic/XML_Bloodcats.cpp b/Strategic/XML_Bloodcats.cpp index d1faa1a76..c0d267153 100644 --- a/Strategic/XML_Bloodcats.cpp +++ b/Strategic/XML_Bloodcats.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "builddefines.h" #include #include "XML.h" @@ -12,7 +8,6 @@ #include "MemMan.h" #include "Debug Control.h" #include "mapscreen.h" -#endif #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/XML_CoolnessBySector.cpp b/Strategic/XML_CoolnessBySector.cpp index a51acb8cd..e53b7d8e7 100644 --- a/Strategic/XML_CoolnessBySector.cpp +++ b/Strategic/XML_CoolnessBySector.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "builddefines.h" #include #include "XML.h" @@ -12,7 +8,6 @@ #include "MemMan.h" #include "Debug Control.h" #include "mapscreen.h" -#endif #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/XML_Creatures.cpp b/Strategic/XML_Creatures.cpp index 9fb161d43..d0b482f2f 100644 --- a/Strategic/XML_Creatures.cpp +++ b/Strategic/XML_Creatures.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - -#else #include "expat.h" #include "string.h" #include "Campaign Types.h" @@ -9,7 +5,6 @@ #include "MemMan.h" #include "Debug Control.h" #include "Creature Spreading.h" -#endif // Buggler: creature XML externalization stuff #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/XML_Facilities.cpp b/Strategic/XML_Facilities.cpp index 630b4e8d3..84fcb759d 100644 --- a/Strategic/XML_Facilities.cpp +++ b/Strategic/XML_Facilities.cpp @@ -8,9 +8,6 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -18,7 +15,6 @@ #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" -#endif FACILITYLOCATIONS gFacilityLocations[256][MAX_NUM_FACILITY_TYPES]; UINT16 NUM_FACILITIES; diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp index 4997aa842..33468d388 100644 --- a/Strategic/XML_FacilityTypes.cpp +++ b/Strategic/XML_FacilityTypes.cpp @@ -9,9 +9,6 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -20,7 +17,6 @@ #include "FileMan.h" #include "Campaign Types.h" #include "Facilities.h" -#endif FACILITYTYPE gFacilityTypes[ MAX_NUM_FACILITY_TYPES ]; UINT16 NUM_FACILITY_TYPES = 0; diff --git a/Strategic/XML_Minerals.cpp b/Strategic/XML_Minerals.cpp index eb2b101bf..70d72c0f5 100644 --- a/Strategic/XML_Minerals.cpp +++ b/Strategic/XML_Minerals.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Map Screen Interface Map.h" -#endif struct { diff --git a/Strategic/XML_SectorNames.cpp b/Strategic/XML_SectorNames.cpp index 25e3d3853..f44e6a726 100644 --- a/Strategic/XML_SectorNames.cpp +++ b/Strategic/XML_SectorNames.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "builddefines.h" #include #include "XML.h" @@ -12,7 +8,6 @@ #include "MemMan.h" #include "Debug Control.h" #include "mapscreen.h" -#endif #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/XML_SquadNames.cpp b/Strategic/XML_SquadNames.cpp index 1225da6dd..d41cd8bcc 100644 --- a/Strategic/XML_SquadNames.cpp +++ b/Strategic/XML_SquadNames.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Map Screen Interface.h" #include "overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Strategic/XML_UniformColors.cpp b/Strategic/XML_UniformColors.cpp index 0b1064dbc..442e13124 100644 --- a/Strategic/XML_UniformColors.cpp +++ b/Strategic/XML_UniformColors.cpp @@ -8,10 +8,6 @@ ////////////////////////////////////////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "XML.h" -#else #include "builddefines.h" #include #include "XML.h" @@ -22,7 +18,6 @@ #include "MemMan.h" #include "Debug Control.h" #include "mapscreen.h" -#endif #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 325f557be..78dbc2508 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" - #include "HelpScreen.h" -#else #include "mapscreen.h" #include #include @@ -115,7 +111,6 @@ #include "Food.h" // added by Flugente #include "Drugs And Alcohol.h" // added by Flugente #include "WordWrap.h" -#endif #include "connect.h" //hayden #include "InterfaceItemImages.h" diff --git a/Strategic/strategic town reputation.cpp b/Strategic/strategic town reputation.cpp index 2b7294c94..06cc6a743 100644 --- a/Strategic/strategic town reputation.cpp +++ b/Strategic/strategic town reputation.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "types.h" #include "strategic town reputation.h" #include "soldier profile type.h" @@ -11,7 +8,6 @@ #include "strategic town loyalty.h" #include "Debug.h" #include "message.h" -#endif // init for town reputation at game start diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index ac89cc8cf..09513662f 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Strategic All.h" -#else #include "Strategic.h" #include "Types.h" #include "Squads.h" @@ -21,7 +18,6 @@ #include "message.h" // added by Flugente #include "Text.h" // added by Flugente #include "Queen Command.h" // added by Flugente -#endif #ifdef JA2UB #else diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index dda550d93..3fe5133a7 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -1,11 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS -#include "Strategic All.h" -#include "Loading Screen.h" -#include "Enemy Soldier Save.h" -#include "points.h" -#else #include "strategicmap.h" #include "strategic.h" #include "Strategic Mines.h" @@ -104,7 +98,6 @@ #include "Auto Resolve.h" #include "cursors.h" #include "GameVersion.h" -#endif #include "LuaInitNPCs.h" #include "Luaglobal.h" diff --git a/Sys Globals.cpp b/Sys Globals.cpp index b2eeca5a4..53c710e5f 100644 --- a/Sys Globals.cpp +++ b/Sys Globals.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "builddefines.h" #include #include @@ -9,7 +6,6 @@ #include "screenids.h" #include "Sys Globals.h" #include "gameloop.h" -#endif // External globals diff --git a/Tactical/Air Raid.cpp b/Tactical/Air Raid.cpp index 7fae23baa..20ede367c 100644 --- a/Tactical/Air Raid.cpp +++ b/Tactical/Air Raid.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" -#else #include "sgp.h" #include "air raid.h" #include "game event hook.h" @@ -31,7 +27,6 @@ #include "Map screen helicopter.h" #include "structure wrap.h" #include "meanwhile.h" -#endif #include "GameInitOptionsScreen.h" diff --git a/Tactical/Animation Cache.cpp b/Tactical/Animation Cache.cpp index 8c7bc3301..ec30ff95c 100644 --- a/Tactical/Animation Cache.cpp +++ b/Tactical/Animation Cache.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include @@ -12,7 +9,6 @@ #include "Animation Data.h" #include "Animation Control.h" #include "Debug Control.h" -#endif #define EMPTY_CACHE_ENTRY 65000 diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index dfc19982c..d24eb88df 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -18,7 +15,6 @@ #include "Debug Control.h" #include "Random.h" #include "Soldier Control.h" -#endif #include "connect.h" diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index 892228985..a75feb896 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -17,7 +14,6 @@ #include "utilities.h" #include "worlddef.h" #include "Fileman.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Arms Dealer Init.cpp b/Tactical/Arms Dealer Init.cpp index 4cc5d0834..d20658d74 100644 --- a/Tactical/Arms Dealer Init.cpp +++ b/Tactical/Arms Dealer Init.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Types.h" #include "stdlib.h" #include "Arms Dealer Init.h" @@ -19,7 +16,6 @@ #include "GameSettings.h" #include "Overhead.h" // added by Flugente for MercPtrs[] #include "LuaInitNPCs.h" // added by Flugente -#endif #ifdef JA2UB #include "Explosion Control.h" @@ -2507,4 +2503,4 @@ BOOLEAN CanThisItemBeSoldToSimulatedCustomer( UINT8 ubArmsDealerID, UINT16 usIte return( TRUE ); } -#endif \ No newline at end of file +#endif diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp index df0c9422e..951f556a6 100644 --- a/Tactical/ArmsDealerInvInit.cpp +++ b/Tactical/ArmsDealerInvInit.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Types.h" #include "ArmsDealerInvInit.h" //#include "Item Types.h" @@ -16,7 +13,6 @@ #include "Shopkeeper Interface.h" #include "connect.h" #include "Rebel Command.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Auto Bandage.cpp b/Tactical/Auto Bandage.cpp index b254fb027..0205376bf 100644 --- a/Tactical/Auto Bandage.cpp +++ b/Tactical/Auto Bandage.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "messageboxscreen.h" @@ -28,7 +25,6 @@ #include "cursors.h" #include "English.h" #include "SkillCheck.h" // added by Flugente -#endif #include "Music Control.h" diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp index 6ff8f35d3..02db51b6d 100644 --- a/Tactical/Boxing.cpp +++ b/Tactical/Boxing.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Soldier Control.h" #include "Overhead.h" #include "Boxing.h" @@ -25,7 +22,6 @@ #include "Font Control.h" #include "message.h" #include "GameSettings.h" // added by SANDRO -#endif INT32 gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 }; UINT8 gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY }; diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 770ebc641..3da28dd61 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -37,7 +34,6 @@ #include "Strategic AI.h" #include "interface Dialogue.h" #include "DynamicDialogue.h" -#endif #ifdef JA2UB #include "Explosion Control.h" diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp index 113188734..07753c648 100644 --- a/Tactical/Civ Quotes.cpp +++ b/Tactical/Civ Quotes.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include "Types.h" @@ -32,7 +29,6 @@ #include "NPC.h" #include "Strategic Mines.h" #include "Random.h" -#endif #include "connect.h" // for enemy taunts diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 1c95d70ec..16653ffa9 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" -#else #include "sgp.h" //#include "soldier control.h" #include "Encrypted File.h" @@ -55,7 +51,6 @@ #include "los.h" #include "qarray.h" #include "Soldier Profile.h" -#endif #include #include "Auto Resolve.h" diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp index 34b67dd85..28bb80309 100644 --- a/Tactical/DisplayCover.cpp +++ b/Tactical/DisplayCover.cpp @@ -1,11 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" - #include "DisplayCover.h" - #include "Interface.h" - #include "opplist.h" - #include "_Ja25Englishtext.h" - //#include "Ja25 Strategic Ai.h" -#else #include "builddefines.h" #include "Types.h" #include "Isometric Utils.h" @@ -35,7 +27,6 @@ #include "soldier profile type.h" #include "Interface Cursors.h" // added by Flugente for UICursorDefines #include "Rebel Command.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Drugs And Alcohol.cpp b/Tactical/Drugs And Alcohol.cpp index b16a42ef0..cec2974ce 100644 --- a/Tactical/Drugs And Alcohol.cpp +++ b/Tactical/Drugs And Alcohol.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "soldier control.h" #include "soldier profile.h" @@ -17,7 +14,6 @@ #include "Animation data.h" // added by Flugente for SoldierBodyTypes #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h"// added by Flugente -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp index 93e5da869..95d86d980 100644 --- a/Tactical/End Game.cpp +++ b/Tactical/End Game.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" - #include "Intro.h" -#else #include "Overhead.h" #include "Render Fun.h" @@ -38,7 +33,6 @@ #include "Campaign Types.h" #include "Tactical Save.h" #include "screenids.h" -#endif #ifdef JA2UB #include "email.h" diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp index b5de4fcea..0d11d98a3 100644 --- a/Tactical/Enemy Soldier Save.cpp +++ b/Tactical/Enemy Soldier Save.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Enemy Soldier Save.h" -#else #include "builddefines.h" #include "GameSettings.h" #include @@ -33,7 +29,6 @@ #include "Queen Command.h" #include "Scheduling.h" #include "Soldier macros.h" // added by Flugente -#endif #include "GameVersion.h" //ADB When a savegame is loaded, the enemy and civ stuff needs to be loaded and updated, but this can only happen diff --git a/Tactical/EnemyItemDrops.cpp b/Tactical/EnemyItemDrops.cpp index 8ef5ba5b0..30e615816 100644 --- a/Tactical/EnemyItemDrops.cpp +++ b/Tactical/EnemyItemDrops.cpp @@ -1,10 +1,6 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Types.h" #include "DEbug.h" #include "EnemyItemDrops.h" -#endif WEAPON_DROPS gEnemyWeaponDrops[MAX_DROP_ITEMS]; AMMO_DROPS gEnemyAmmoDrops[MAX_DROP_ITEMS]; diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index f1c8c658b..aad597420 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include "math.h" #include @@ -43,7 +40,6 @@ #include "Food.h" // added by Flugente #include "Queen Command.h" // added by Flugente for FindUnderGroundSector(...) #include "strategic.h" // added by Flugente -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index 2d1e6399d..968c81328 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include "sgp.h" #include "soldier profile.h" @@ -26,7 +23,6 @@ #include "Soldier macros.h" #include "strategicmap.h" #include "DynamicDialogue.h" // added by Flugente -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/GAP.cpp b/Tactical/GAP.cpp index 8a84b648a..0b3cb6675 100644 --- a/Tactical/GAP.cpp +++ b/Tactical/GAP.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include "debug.h" #include "types.h" @@ -10,7 +7,6 @@ #include "soundman.h" #include #include "FileMan.h" -#endif SUBSEQUENTSOUNDS subsequentsounds; diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp index 2c0b4fc86..4d63103be 100644 --- a/Tactical/Handle Doors.cpp +++ b/Tactical/Handle Doors.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "language defines.h" -#else #include "builddefines.h" #include #include @@ -35,7 +31,6 @@ #include "Soldier macros.h" #include "Event Pump.h" #include "GameSettings.h" -#endif #include "fresh_header.h" #include "connect.h" diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 7f2ee4702..9c9b47fca 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -1,7 +1,4 @@ #include "connect.h" -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "items.h" #include "Action Items.h" #include "handle Items.h" @@ -81,7 +78,6 @@ #include "MessageBoxScreen.h" // added by Flugente #include "Map Screen Interface.h" // added by Flugente #include "Map Screen Interface Map.h" // added by Flugente -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Handle UI Plan.cpp b/Tactical/Handle UI Plan.cpp index 8c93f84f7..fbaac284a 100644 --- a/Tactical/Handle UI Plan.cpp +++ b/Tactical/Handle UI Plan.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Handle UI Plan.h" #include "overhead.h" #include "Isometric Utils.h" @@ -13,7 +10,6 @@ #include "message.h" #include "soldier create.h" #include "interface.h" -#endif UINT8 gubNumUIPlannedMoves = 0; SOLDIERTYPE *gpUIPlannedSoldier = NULL; diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index bd72fab86..a438e5005 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -1,9 +1,4 @@ #include "connect.h" -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#include "BuildDefines.h" - -#else #include "builddefines.h" #include #include @@ -86,7 +81,6 @@ #include "Soldier Control.h" #include "DisplayCover.h" #include "english.h" // sevenfm: this is needed for _keydown(SHIFT) to work -#endif #include "teamturns.h" #include "Options Screen.h" diff --git a/Tactical/Interface Control.cpp b/Tactical/Interface Control.cpp index 0960bd08f..343be7a78 100644 --- a/Tactical/Interface Control.cpp +++ b/Tactical/Interface Control.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include @@ -48,7 +45,6 @@ #include "civ quotes.h" #include "GameSettings.h" #include "Explosion Control.h" // added by Flugente -#endif #include "connect.h" #include "Text.h" diff --git a/Tactical/Interface Cursors.cpp b/Tactical/Interface Cursors.cpp index ae647580d..aaae395b6 100644 --- a/Tactical/Interface Cursors.cpp +++ b/Tactical/Interface Cursors.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "sgp.h" @@ -19,7 +16,6 @@ #include "overhead.h" #include "interface items.h" #include "GameSettings.h" -#endif #define DISPLAY_AP_INDEX MOCKFLOOR1 diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index 9644aab34..16a8bfdf3 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" -#else #include "builddefines.h" #include #include "sgp.h" @@ -75,7 +71,6 @@ #include "Cheats.h" #include "Overhead.h" #include "Soldier Control.h" -#endif #include "LuaInitNPCs.h" #include "Text.h" diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index 5554fb9af..871f9e02c 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "language defines.h" -#else #include "builddefines.h" #include #include @@ -57,7 +53,6 @@ #include "los.h" #include "Map Screen Interface Map.h" #include "Food.h" // added by Flugente -#endif #include "Multi Language Graphic Utils.h" diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 9ea7ae757..c993ec667 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "language defines.h" -#else #include "builddefines.h" #include "mapscreen.h" #include @@ -85,7 +81,6 @@ // sevenfm: #include "Soldier Control.h" #include "Sound Control.h" -#endif #include "Multi Language Graphic Utils.h" diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 8f859f37c..456d6c749 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -73,7 +70,6 @@ // HEADROCK HAM 3.6: This is required for Stat Progress Bars #include "Campaign.h" #include "Food.h" // added by Flugente -#endif //legion by Jazz #include "Interface Utils.h" diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp index 46d043aa9..73519abc9 100644 --- a/Tactical/Interface Utils.cpp +++ b/Tactical/Interface Utils.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include "sgp.h" @@ -20,7 +17,6 @@ #include "Vehicles.h" #include "GameSettings.h" #include "Utilities.h" // added by Flugente -#endif #define LIFE_BAR_SHADOW FROMRGB( 108, 12, 12 ) #define LIFE_BAR FROMRGB( 200, 0, 0 ) diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index bf953ebe7..8ac354710 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -65,7 +62,6 @@ #include "SkillCheck.h" // added by Flugente #include "Drugs And Alcohol.h" // sevenfm #include "english.h" // sevenfm -#endif #include "InterfaceItemImages.h" #ifdef JA2UB diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index fe171ffc8..2d9bd7144 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include "Inventory Choosing.h" #include "animation data.h" @@ -21,7 +18,6 @@ #include "Tactical Save.h" // added by Flugente #include "Soldier macros.h" // added by Flugente #include "Rebel Command.h" -#endif extern WorldItems gAllWorldItems; /* diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 8ddaaf695..00ec359e4 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "items.h" #include "Action Items.h" #include "weapons.h" @@ -61,7 +58,6 @@ #include "DisplayCover.h" // added by Flugente #include "Map Information.h" #include "ai.h" // added by Flugente -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp index 850c41611..4893ce491 100644 --- a/Tactical/Ja25_Tactical.cpp +++ b/Tactical/Ja25_Tactical.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "items.h" #include "weapons.h" #include "Soldier Control.h" @@ -36,7 +33,6 @@ #include "utilities.h" #include "english.h" #include "debug control.h" -#endif #ifdef JA2UB #include "worldman.h" diff --git a/Tactical/Keys.cpp b/Tactical/Keys.cpp index 33539dc0a..306a1055c 100644 --- a/Tactical/Keys.cpp +++ b/Tactical/Keys.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -40,7 +37,6 @@ #include "Map Screen Interface.h" #include "GameSettings.h" // added by SANDRO #include "Dialogue Control.h" // added by Flugente -#endif #include "GameVersion.h" diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 36f866b6d..6196e0e2e 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -1,7 +1,4 @@ #include "connect.h" -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "builddefines.h" #include @@ -44,7 +41,6 @@ #include "items.h" #include "Item Types.h" #include "Vehicles.h" -#endif #include "fresh_header.h" #include "WorldDat.h" // HEADROCK HAM 3.6: This must be included, for testing whether Bloodcats and Enemies can see one another. diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp index ad4a0bda4..24c5ff73e 100644 --- a/Tactical/Map Information.cpp +++ b/Tactical/Map Information.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "edit_sys.h" -#else #include #include "fileMan.h" #include "types.h" @@ -20,7 +16,6 @@ #include "environment.h" #include "lighting.h" #include "Animated ProgressBar.h" -#endif //CHRISL: MAJOR_MAP_VERSION information moved to worlddef.h by ADB. We're using these values elsewhere and need them // in the header file diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp index 6a4258788..53e74b169 100644 --- a/Tactical/Merc Entering.cpp +++ b/Tactical/Merc Entering.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -41,7 +38,6 @@ // HEADROCK HAM 3.5: Need this to see if enemies present at starting sector #include "Overhead.h" #include "Map Information.h" // added by Flugente -#endif #ifdef JA2UB #include "ub_config.h" diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index 62cded8b0..002926c7c 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "strategic.h" -#else #include "builddefines.h" #include #include @@ -53,7 +49,6 @@ #include "GameSettings.h" #include "DynamicDialogue.h"// added by Flugente #include "Dialogue Control.h" // added by Flugente -#endif #include "connect.h" #ifdef JA2UB diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index 76331c01d..b69df0418 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" -#else #include "Militia Control.h" #include "Town Militia.h" @@ -33,7 +29,6 @@ #include "MilitiaSquads.h" #include "MilitiaIndividual.h" // added by Flugente #include "CampaignStats.h" // added by Flugente -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp index 131f9b4d3..0783a3f40 100644 --- a/Tactical/Morale.cpp +++ b/Tactical/Morale.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include "Morale.h" #include "Overhead.h" @@ -32,7 +29,6 @@ #include "Soldier Add.h" // added by Flugente for MERC_TYPE__AIM_MERC #include "CampaignStats.h" // added by Flugente for gCurrentIncident #include "DynamicDialogue.h" // added by Flugente -#endif #include "connect.h" #include "fresh_header.h" diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index a7e4326da..0b6c82ebd 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -2,6 +2,7 @@ #define __OVERHEAD_TYPES_H // GLOBAL HEADER FOR DATA, TYPES FOR TACTICAL ENGINE +#include "Types.h" #define REFINE_AIM_1 0 #define REFINE_AIM_MID1 1 diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index ef446769a..81f265f97 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -1,9 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#include "PreBattle Interface.h" -#include "creature spreading.h" -#include "Lua Interpreter.h" -#else #include #include #include "wcheck.h" @@ -118,7 +112,6 @@ #include "MilitiaIndividual.h" // added by Flugente #include "Rebel Command.h" #include "MilitiaSquads.h" -#endif #include "connect.h" #include "Luaglobal.h" diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp index 829fee54a..0ca1e1662 100644 --- a/Tactical/PATHAI.cpp +++ b/Tactical/PATHAI.cpp @@ -8,9 +8,6 @@ Date : 1997-NOV */ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -44,7 +41,6 @@ #include "AIinternals.h" #include "Rotting Corpses.h" #include "Meanwhile.h" -#endif #include "connect.h" #include "LOS.h" //ddd diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 0ca8302b5..53cbe3f14 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "worlddef.h" #include "points.h" @@ -39,7 +36,6 @@ #include "Food.h" // added by Flugente #include "AIInternals.h" //dnl ch69 150913 #include "CampaignStats.h" // added by Flugente -#endif #include "connect.h" #include "GameInitOptionsScreen.h" diff --git a/Tactical/QARRAY.cpp b/Tactical/QARRAY.cpp index 3331e1403..b2b17853b 100644 --- a/Tactical/QARRAY.cpp +++ b/Tactical/QARRAY.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "qarray.h" -#endif QARRAY_VALUES QuoteExp[NUM_PROFILES]; diff --git a/Tactical/Rain.cpp b/Tactical/Rain.cpp index b417bb8d9..fbb80d34d 100644 --- a/Tactical/Rain.cpp +++ b/Tactical/Rain.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "types.h" //#include "soldier control.h" #include "overhead.h" @@ -41,7 +38,6 @@ #include "line.h" #include "overhead map.h" #include "interface dialogue.h" -#endif #include "Rain.h" diff --git a/Tactical/RandomMerc.cpp b/Tactical/RandomMerc.cpp index 885a04aca..bbb323f0d 100644 --- a/Tactical/RandomMerc.cpp +++ b/Tactical/RandomMerc.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -11,7 +8,6 @@ #include "Random.h" #include "Campaign.h" -#endif #include "XML.h" diff --git a/Tactical/Real Time Input.cpp b/Tactical/Real Time Input.cpp index c47476118..b23b93e53 100644 --- a/Tactical/Real Time Input.cpp +++ b/Tactical/Real Time Input.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -65,7 +62,6 @@ #include "Vehicles.h" // anv: for switching from soldier to vehicle #include "VehicleMenu.h" -#endif //forward declarations of common classes to eliminate includes diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 26f476ec8..c58273e7b 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -50,7 +47,6 @@ #include "ai.h" // added by Flugente #include "PreBattle Interface.h" // added by Flugente #include "Strategic Town Loyalty.h" // added by Flugente -#endif #include "Animation Control.h" diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index cc7bc8bb6..32af6e28b 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Types.h" #include "ShopKeeper Interface.h" #include "Utilities.h" @@ -55,7 +52,6 @@ #include "Encyclopedia_new.h" #include "Animation Control.h" // added by Flugente #include "Town Militia.h" // added by Flugente -#endif #ifdef JA2UB #include "Explosion Control.h" diff --git a/Tactical/SkillCheck.cpp b/Tactical/SkillCheck.cpp index e367aaba0..cff7ad4e3 100644 --- a/Tactical/SkillCheck.cpp +++ b/Tactical/SkillCheck.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "SkillCheck.h" #include "Soldier Profile.h" #include "Random.h" @@ -18,7 +15,6 @@ #include "Soldier Control.h" #include "Interface.h" // added by Flugente for zBackground #include "DynamicDialogue.h" // added by Flugente -#endif extern void ReducePointsForHunger( SOLDIERTYPE *pSoldier, UINT32 *pusPoints ); diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp index ebc29b831..40c31c81f 100644 --- a/Tactical/Soldier Add.cpp +++ b/Tactical/Soldier Add.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" @@ -26,7 +23,6 @@ #include "Vehicles.h" // added by Flugente #include "CampaignStats.h" // added by Flugente #include "worldman.h" // added by Flugente for Water(...) -#endif #ifdef JA2UB #include "Ja25 Strategic Ai.h" diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index a615b8638..cf6025fb7 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -67,7 +64,6 @@ #include "Town Militia.h" // added by Flugente #include "PreBattle Interface.h" // added by Flugente #include "Rebel Command.h" -#endif // anv: for enemy taunts #include "Civ Quotes.h" diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index cde0fa8d6..7439c1bdf 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -103,7 +100,6 @@ #include "LuaInitNPCs.h" // added by Flugente #include "SaveLoadMap.h" // added by Flugente #include "qarray.h" // added by Flugente -#endif #include "ub_config.h" #include "../ModularizedTacticalAI/include/Plan.h" // for plan destructor call diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index fc5c6839c..b5769d55a 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" -#include "saveloadgame.h" -#else #include "sgp.h" #include "Soldier Create.h" #include "overhead.h" @@ -48,7 +43,6 @@ #include "Soldier macros.h" // added by Flugente #include "MilitiaIndividual.h" // added by Flugente #include "Rebel Command.h" -#endif #include "connect.h" #include "message.h" diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp index 3d3a699ef..6b9ada5f9 100644 --- a/Tactical/Soldier Find.cpp +++ b/Tactical/Soldier Find.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -43,7 +40,6 @@ #include "Vehicles.h" #include "GameSettings.h" #include "ui cursors.h" -#endif BOOLEAN IsGridNoInScreenRect( INT32 sGridNo, SGPRect *pRect ); diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index ad7193473..15a4e002a 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "builddefines.h" #include #include @@ -46,7 +43,6 @@ #include "screenids.h" #include "SaveLoadScreen.h" #include "Rotting Corpses.h" -#endif #include "connect.h" #include "Map Edgepoints.h" diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index f9fbce1a7..c307da6de 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -52,7 +49,6 @@ #include "drugs and alcohol.h" // added by Flugente #include "Campaign.h" #include "LuaInitNPCs.h" // added by Flugente -#endif #include "aim.h" #include "AimFacialIndex.h" diff --git a/Tactical/Soldier Tile.cpp b/Tactical/Soldier Tile.cpp index 6a9f16d87..306e97cc0 100644 --- a/Tactical/Soldier Tile.cpp +++ b/Tactical/Soldier Tile.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include @@ -49,7 +46,6 @@ #include "Text.h" #include "NPC.h" #include "Soldier macros.h" -#endif extern UINT8 gubWaitingForAllMercsToExitCode; diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 565e727ff..065178519 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "Types.h" #include "Windows.h" //#include "Soldier Control.h" @@ -33,7 +30,6 @@ #include "Map Screen Interface.h" #include "cheats.h" #include "Drugs and Alcohol.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Spread Burst.cpp b/Tactical/Spread Burst.cpp index 5c82e40c3..1f8ae8577 100644 --- a/Tactical/Spread Burst.cpp +++ b/Tactical/Spread Burst.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include #include "stdlib.h" @@ -15,7 +12,6 @@ #include "interface.h" #include "spread burst.h" #include "points.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp index 91ef17775..7fb7c6b30 100644 --- a/Tactical/Squads.cpp +++ b/Tactical/Squads.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Types.h" #include "Squads.h" #include "Strategic Pathing.h" @@ -18,7 +15,6 @@ #include "screenids.h" #include "Soldier macros.h" #include "GameSettings.h" -#endif #include diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index 00274713e..18dcb08fe 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "PreBattle Interface.h" - #include "creature spreading.h" -#else #include "builddefines.h" #include #include "Button System.h" @@ -35,7 +30,6 @@ #include "Quests.h" #include "Creature Spreading.h" #include "Queen Command.h" // added by Flugente -#endif #ifdef JA2UB #include "Explosion Control.h" diff --git a/Tactical/Structure Wrap.cpp b/Tactical/Structure Wrap.cpp index cbf36b96f..3a388897e 100644 --- a/Tactical/Structure Wrap.cpp +++ b/Tactical/Structure Wrap.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include #include "debug.h" #include "worlddef.h" @@ -13,7 +10,6 @@ #include "strategicmap.h" #include "rotting corpses.h" #include "WorldDat.h" // added by Flugente -#endif extern BOOLEAN DoesSAMExistHere( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ, INT32 sGridNo ); diff --git a/Tactical/Tactical All.h b/Tactical/Tactical All.h deleted file mode 100644 index 0f53a3106..000000000 --- a/Tactical/Tactical All.h +++ /dev/null @@ -1,232 +0,0 @@ -#ifndef __TACTICAL_ALL_H -#define __TACTICAL_ALL_H - -#pragma message("GENERATED PCH FOR TACTICAL PROJECT.") - -#include "sgp.h" -#include "air raid.h" -#include "game event hook.h" -#include "game clock.h" -#include "auto bandage.h" -#include "strategicmap.h" -#include "screenids.h" -#include "jascreens.h" -#include "random.h" -#include "overhead types.h" -#include "sound control.h" -#include "timer control.h" -#include "dialogue control.h" -#include "overhead.h" -#include "message.h" -#include "isometric utils.h" -#include "soldier macros.h" -#include "worldman.h" -#include "los.h" -#include "math.h" -#include "explosion control.h" -#include "interface.h" -#include "music control.h" -#include "Campaign Types.h" -#include "GameSettings.h" -#include "text.h" -#include "Morale.h" -#include "Map screen helicopter.h" -#include -#include -#include "types.h" -#include "wcheck.h" -#include -#include "Animation Cache.h" -#include "Animation Data.h" -#include "Animation Control.h" -#include "sys globals.h" -#include "Debug Control.h" -#include "FileMan.h" -#include "weapons.h" -#include "structure.h" -#include "worlddef.h" -#include "rotting corpses.h" -#include "points.h" -#include "Soldier Control.h" -#include "tiledef.h" -#include "utilities.h" -#include "Arms Dealer Init.h" -#include "ArmsDealerInvInit.h" -#include "soldier profile.h" -#include "Handle Items.h" -#include "Item Types.h" -#include "messageboxscreen.h" -#include "Handle UI.h" -#include "items.h" -#include "MercTextBox.h" -#include "renderworld.h" -#include "strategic turns.h" -#include "Event Pump.h" -#include "ai.h" -#include "interface control.h" -#include "Map Screen Interface.h" -#include "Map Screen Interface Bottom.h" -#include "Assignments.h" -#include "WordWrap.h" -#include "cursors.h" -#include "English.h" -#include "Boxing.h" -#include "Render Fun.h" -#include "NPC.h" -#include "Opplist.h" -#include -#include "vsurface.h" -#include "Render Dirty.h" -#include "sysutil.h" -#include "container.h" -#include "video.h" -#include "vobject_blitters.h" -#include "faces.h" -#include "gap.h" -#include "Bullets.h" -#include -#include "MemMan.h" -#include "campaign.h" -#include "Strategic Mines.h" -#include "Strategic Status.h" -#include "Encrypted File.h" -#include "mercs.h" -#include "interface dialogue.h" -#include "squads.h" -#include "interface utils.h" -#include "Quests.h" -#include "gamescreen.h" -#include "ShopKeeper Interface.h" -#include "Merc Contract.h" -#include "history.h" -#include "Town Militia.h" -#include "meanwhile.h" -#include "SkillCheck.h" -#include "finances.h" -#include "drugs and alcohol.h" -#include "teamturns.h" -#include "font control.h" -#include "line.h" -#include "structure wrap.h" -#include "pathai.h" -#include "smell.h" -#include "fov.h" -#include "keys.h" -#include "input.h" -#include "exit grids.h" -#include "environment.h" -#include "Fog Of War.h" -#include "soundman.h" -#include -#include -#include "tile animation.h" -#include "Interactive Tiles.h" -#include "handle doors.h" -#include "Action Items.h" -#include "World items.h" -#include "interface items.h" -#include "physics.h" -#include "interface panels.h" -#include "Strategic Town Loyalty.h" -#include "soldier functions.h" -#include "SaveLoadMap.h" -#include "soldier add.h" -#include "soldier ani.h" -#include "qarray.h" -#include "Handle UI Plan.h" -#include "soldier create.h" -#include "mousesystem.h" -#include "cursor control.h" -#include "interface cursors.h" -#include "UI cursors.h" -#include "Strategic Pathing.h" -#include "strategic movement.h" -#include "strategic.h" -#include "vehicles.h" -#include "gameloop.h" -#include "himage.h" -#include "vobject.h" -#include "Button System.h" -#include "radar screen.h" -#include "lighting.h" -#include "Strategic Exit GUI.h" -#include "PopUpBox.h" -#include "spread burst.h" -#include "Tactical Save.h" -#include "fade screen.h" -#include "Strategic AI.h" -#include "mapscreen.h" -#include "LaptopSave.h" -#include "Map Screen Interface Map.h" -#include "Map Screen Interface Map Inventory.h" -#include "overhead map.h" -#include "Options Screen.h" -#include -#include "Inventory Choosing.h" -#include "Smoothing Utils.h" -#include "tiledat.h" -#include -#include "phys math.h" -#include "Map Information.h" -#include "Soldier Init List.h" -#include "EditorMercs.h" -#include "ja2.h" -#include "Road Smoothing.h" -#include "tile cache.h" -#include "merc entering.h" -#include "Merc Hiring.h" -#include "Strategic Merc Handler.h" -#include "Militia Control.h" -#include "Queen Command.h" -#include "editscreen.h" -#include "soldier tile.h" -#ifdef NETWORKED - #include "Networking.h" - #include "NetworkEvent.h" -#endif -#include "Player Command.h" -#include "Game Init.h" -#include "Buildings.h" -#include "rt time defines.h" -#include "GameSettings.h" -#include "Text Input.h" -#include "ShopKeeper Quotes.h" -#include "Personnel.h" -#include "pits.h" -#include "Win util.h" -#include "smokeeffects.h" -#include "SaveLoadGame.h" -#include "Scheduling.h" -#include "Auto Resolve.h" -#include "soldier find.h" -#include "aim.h" -#include "strategic town reputation.h" -#include "Tactical Turns.h" -#include "lighteffects.h" -#include "timer.h" -#include "Soldier Profile Type.h" -#include "AIList.h" -#include "QuestDebug.h" -#include "Game Events.h" -#include "BobbyR.h" - -#include "EnemyItemDrops.h" - -#ifdef JA2BETAVERSION - #include "Quest Debug System.h" -#endif - -#include "GameVersion.h" -#include "SaveLoadScreen.h" -#include "Cheats.h" -#include "Animated ProgressBar.h" -#include "civ quotes.h" -#include "AimMembers.h" -#include "BobbyRMailOrder.h" -#include "end game.h" -#include "DisplayCover.h" -#include "expat.h" -#include "spread burst.h" -#include "XML.h" - -#endif \ No newline at end of file diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp index a4fcf7173..c58a3459c 100644 --- a/Tactical/Tactical Save.cpp +++ b/Tactical/Tactical Save.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Enemy Soldier Save.h" -#else #include "Types.h" #include "MemMan.h" #include "message.h" @@ -46,7 +42,6 @@ #include "screenids.h" #include "Queen Command.h" #include "Map Screen Interface Map Inventory.h" -#endif #include "Animation Control.h" #include BOOLEAN gfWasInMeanwhile = FALSE; diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp index 42fd6adf7..9816d8a77 100644 --- a/Tactical/Tactical Turns.cpp +++ b/Tactical/Tactical Turns.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Game Clock.h" #include "Font Control.h" @@ -28,7 +25,6 @@ #include "Random.h" #include "Explosion Control.h" #include "Dialogue Control.h" // added by Flugente -#endif #include "Reinforcement.h" diff --git a/Tactical/Tactical_VS2005.vcproj b/Tactical/Tactical_VS2005.vcproj index f80ffd15d..71e858aa5 100644 --- a/Tactical/Tactical_VS2005.vcproj +++ b/Tactical/Tactical_VS2005.vcproj @@ -654,10 +654,6 @@ RelativePath=".\Structure Wrap.h" > - - diff --git a/Tactical/Tactical_VS2008.vcproj b/Tactical/Tactical_VS2008.vcproj index 9e5bcdac0..391d9000d 100644 --- a/Tactical/Tactical_VS2008.vcproj +++ b/Tactical/Tactical_VS2008.vcproj @@ -658,10 +658,6 @@ RelativePath="Structure Wrap.h" > - - diff --git a/Tactical/Tactical_VS2010.vcxproj b/Tactical/Tactical_VS2010.vcxproj index 39d827aca..d7a95fa3d 100644 --- a/Tactical/Tactical_VS2010.vcxproj +++ b/Tactical/Tactical_VS2010.vcxproj @@ -115,7 +115,6 @@ - diff --git a/Tactical/Tactical_VS2010.vcxproj.filters b/Tactical/Tactical_VS2010.vcxproj.filters index 58cbd2da8..017e3fb51 100644 --- a/Tactical/Tactical_VS2010.vcxproj.filters +++ b/Tactical/Tactical_VS2010.vcxproj.filters @@ -237,7 +237,6 @@ Header Files - Header Files diff --git a/Tactical/Tactical_VS2013.vcxproj b/Tactical/Tactical_VS2013.vcxproj index 0740bc05a..339a5c780 100644 --- a/Tactical/Tactical_VS2013.vcxproj +++ b/Tactical/Tactical_VS2013.vcxproj @@ -115,7 +115,6 @@ - diff --git a/Tactical/Tactical_VS2013.vcxproj.filters b/Tactical/Tactical_VS2013.vcxproj.filters index 649d9c805..f19311ab6 100644 --- a/Tactical/Tactical_VS2013.vcxproj.filters +++ b/Tactical/Tactical_VS2013.vcxproj.filters @@ -231,7 +231,6 @@ Header Files - Header Files diff --git a/Tactical/Tactical_VS2017.vcxproj b/Tactical/Tactical_VS2017.vcxproj index 431932734..76546a8f7 100644 --- a/Tactical/Tactical_VS2017.vcxproj +++ b/Tactical/Tactical_VS2017.vcxproj @@ -115,7 +115,6 @@ - diff --git a/Tactical/Tactical_VS2017.vcxproj.filters b/Tactical/Tactical_VS2017.vcxproj.filters index 50989116c..61f133f16 100644 --- a/Tactical/Tactical_VS2017.vcxproj.filters +++ b/Tactical/Tactical_VS2017.vcxproj.filters @@ -231,7 +231,6 @@ Header Files - Header Files diff --git a/Tactical/Tactical_VS2019.vcxproj b/Tactical/Tactical_VS2019.vcxproj index 9b6f28740..92b05d412 100644 --- a/Tactical/Tactical_VS2019.vcxproj +++ b/Tactical/Tactical_VS2019.vcxproj @@ -115,7 +115,6 @@ - diff --git a/Tactical/Tactical_VS2019.vcxproj.filters b/Tactical/Tactical_VS2019.vcxproj.filters index 649d9c805..f19311ab6 100644 --- a/Tactical/Tactical_VS2019.vcxproj.filters +++ b/Tactical/Tactical_VS2019.vcxproj.filters @@ -231,7 +231,6 @@ Header Files - Header Files diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp index d299f2cc9..ddf9e4430 100644 --- a/Tactical/TeamTurns.cpp +++ b/Tactical/TeamTurns.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "types.h" #include "overhead.h" #include "animation control.h" @@ -45,7 +42,6 @@ #include "Soldier Profile.h" #include "NPC.h" #include "drugs and alcohol.h" // added by Flugente -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index d7c2d0047..e906847b1 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -1,12 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#include "Language Defines.h" -#include "HelpScreen.h" -#include "Prebattle Interface.h" -#include "ambient control.h" -#include "DisplayCover.h" -#include "_Ja25Englishtext.h" -#else #include "builddefines.h" #include #include @@ -108,7 +99,6 @@ #include "Ambient Control.h" #include "Strategic AI.h" #include "VehicleMenu.h" -#endif #include "Quest Debug System.h" #include "connect.h" diff --git a/Tactical/UI Cursors.cpp b/Tactical/UI Cursors.cpp index 3e035934f..ab2bb5ab7 100644 --- a/Tactical/UI Cursors.cpp +++ b/Tactical/UI Cursors.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "items.h" #include "weapons.h" #include "Interface Cursors.h" @@ -32,7 +29,6 @@ #include "SkillCheck.h" // added by SANDRO #include "message.H" //ddd #include "english.h" // added by Flugente -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index d16281c30..c0075dbe3 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "Vehicles.h" #include "String.h" #include "Strategic Pathing.h" @@ -39,7 +36,6 @@ #include "Soldier ani.h" #include "GameSettings.h" #include "Queen Command.h" -#endif #include "Points.h" #include "Init.h" diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 59dac7180..b635debed 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "Sound Control.h" @@ -54,7 +51,6 @@ #include "environment.h" // added by silversurfer // sevenfm #include "buildings.h" // SameBuilding -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index 8feac68c2..c097a3bf6 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "items.h" #include "handle Items.h" #include "overhead.h" @@ -27,7 +24,6 @@ #include "message.h" #include "map screen interface map inventory.h" // added by Flugente #include "connect.h" -#endif #ifdef JA2EDITOR//dnl ch84 290114 #include "Item Statistics.h" #endif diff --git a/Tactical/XML_AdditionalTileProperties.cpp b/Tactical/XML_AdditionalTileProperties.cpp index 3100f2593..dc0e9ab38 100644 --- a/Tactical/XML_AdditionalTileProperties.cpp +++ b/Tactical/XML_AdditionalTileProperties.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif #include "tiledef.h" diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp index e93aabaf5..65ea633b9 100644 --- a/Tactical/XML_AmmoStrings.cpp +++ b/Tactical/XML_AmmoStrings.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "overhead.h" @@ -8,7 +5,6 @@ #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_AmmoTypes.cpp b/Tactical/XML_AmmoTypes.cpp index aafa417fd..04dfa7540 100644 --- a/Tactical/XML_AmmoTypes.cpp +++ b/Tactical/XML_AmmoTypes.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "weapons.h" #include "overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif // Flugente: remember how many ammotypes we read UINT32 gMAXAMMOTYPES_READ = 0; diff --git a/Tactical/XML_Armour.cpp b/Tactical/XML_Armour.cpp index 7d444d515..316b517a7 100644 --- a/Tactical/XML_Armour.cpp +++ b/Tactical/XML_Armour.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "weapons.h" #include "overhead.h" @@ -8,7 +5,6 @@ #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_AttachmentInfo.cpp b/Tactical/XML_AttachmentInfo.cpp index abe948b3a..7bd8a0bf3 100644 --- a/Tactical/XML_AttachmentInfo.cpp +++ b/Tactical/XML_AttachmentInfo.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_AttachmentSlots.cpp b/Tactical/XML_AttachmentSlots.cpp index fa03b4727..80e76a494 100644 --- a/Tactical/XML_AttachmentSlots.cpp +++ b/Tactical/XML_AttachmentSlots.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif UINT16 LAST_SLOT_INDEX = 0; diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp index edda40d17..7eaa89362 100644 --- a/Tactical/XML_Attachments.cpp +++ b/Tactical/XML_Attachments.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "gamesettings.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Background.cpp b/Tactical/XML_Background.cpp index 001d3d178..347f14428 100644 --- a/Tactical/XML_Background.cpp +++ b/Tactical/XML_Background.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp index e532dd4ee..8e140deb3 100644 --- a/Tactical/XML_BurstSounds.cpp +++ b/Tactical/XML_BurstSounds.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "Sound Control.h" @@ -36,7 +33,6 @@ #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_CivGroupNames.cpp b/Tactical/XML_CivGroupNames.cpp index 79a860817..97926ae49 100644 --- a/Tactical/XML_CivGroupNames.cpp +++ b/Tactical/XML_CivGroupNames.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_Clothes.cpp b/Tactical/XML_Clothes.cpp index b051effc9..319aa9a30 100644 --- a/Tactical/XML_Clothes.cpp +++ b/Tactical/XML_Clothes.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_ComboMergeInfo.cpp b/Tactical/XML_ComboMergeInfo.cpp index e907e8fea..52e4d7b22 100644 --- a/Tactical/XML_ComboMergeInfo.cpp +++ b/Tactical/XML_ComboMergeInfo.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_CompatibleFaceItems.cpp b/Tactical/XML_CompatibleFaceItems.cpp index fc1d6bd25..195749fc6 100644 --- a/Tactical/XML_CompatibleFaceItems.cpp +++ b/Tactical/XML_CompatibleFaceItems.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Disease.cpp b/Tactical/XML_Disease.cpp index 921809cee..a64f75a11 100644 --- a/Tactical/XML_Disease.cpp +++ b/Tactical/XML_Disease.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Disease.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Drugs.cpp b/Tactical/XML_Drugs.cpp index c70113158..2f59756aa 100644 --- a/Tactical/XML_Drugs.cpp +++ b/Tactical/XML_Drugs.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Drugs And Alcohol.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_EnemyAmmoDrops.cpp b/Tactical/XML_EnemyAmmoDrops.cpp index 4da8facb3..7642dd9be 100644 --- a/Tactical/XML_EnemyAmmoDrops.cpp +++ b/Tactical/XML_EnemyAmmoDrops.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_EnemyArmourDrops.cpp b/Tactical/XML_EnemyArmourDrops.cpp index 402c9c128..0e5fc4901 100644 --- a/Tactical/XML_EnemyArmourDrops.cpp +++ b/Tactical/XML_EnemyArmourDrops.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_EnemyExplosiveDrops.cpp b/Tactical/XML_EnemyExplosiveDrops.cpp index 564b96c4a..206ffd8ca 100644 --- a/Tactical/XML_EnemyExplosiveDrops.cpp +++ b/Tactical/XML_EnemyExplosiveDrops.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_EnemyItemChoice.cpp b/Tactical/XML_EnemyItemChoice.cpp index 193ad0ab6..df4ed87da 100644 --- a/Tactical/XML_EnemyItemChoice.cpp +++ b/Tactical/XML_EnemyItemChoice.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "Inventory Choosing.h" -#endif struct { diff --git a/Tactical/XML_EnemyMiscDrops.cpp b/Tactical/XML_EnemyMiscDrops.cpp index 83066dbea..b9fff0d89 100644 --- a/Tactical/XML_EnemyMiscDrops.cpp +++ b/Tactical/XML_EnemyMiscDrops.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "EnemyItemDrops.h" -#endif struct { diff --git a/Tactical/XML_EnemyNames.cpp b/Tactical/XML_EnemyNames.cpp index 8eb16beb5..f98596651 100644 --- a/Tactical/XML_EnemyNames.cpp +++ b/Tactical/XML_EnemyNames.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_EnemyRank.cpp b/Tactical/XML_EnemyRank.cpp index b72d412d9..b5dde3661 100644 --- a/Tactical/XML_EnemyRank.cpp +++ b/Tactical/XML_EnemyRank.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_EnemyWeaponChoice.cpp b/Tactical/XML_EnemyWeaponChoice.cpp index 861c9b89a..241b4d0ad 100644 --- a/Tactical/XML_EnemyWeaponChoice.cpp +++ b/Tactical/XML_EnemyWeaponChoice.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "Inventory Choosing.h" -#endif struct { diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp index d0fe44480..1ac0d6ad8 100644 --- a/Tactical/XML_EnemyWeaponDrops.cpp +++ b/Tactical/XML_EnemyWeaponDrops.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "overhead.h" @@ -34,7 +31,6 @@ #include "expat.h" #include "XML.h" #include "EnemyItemDrops.h" -#endif struct { diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp index ff097431c..eed422259 100644 --- a/Tactical/XML_Explosive.cpp +++ b/Tactical/XML_Explosive.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Food.cpp b/Tactical/XML_Food.cpp index 92eb00e70..fac80524d 100644 --- a/Tactical/XML_Food.cpp +++ b/Tactical/XML_Food.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_FoodOpinions.cpp b/Tactical/XML_FoodOpinions.cpp index 2480267de..8846743bd 100644 --- a/Tactical/XML_FoodOpinions.cpp +++ b/Tactical/XML_FoodOpinions.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_HiddenNames.cpp b/Tactical/XML_HiddenNames.cpp index b072905bd..a3382066d 100644 --- a/Tactical/XML_HiddenNames.cpp +++ b/Tactical/XML_HiddenNames.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_IMPItemChoices.cpp b/Tactical/XML_IMPItemChoices.cpp index 210c76584..fe639f179 100644 --- a/Tactical/XML_IMPItemChoices.cpp +++ b/Tactical/XML_IMPItemChoices.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_IncompatibleAttachments.cpp b/Tactical/XML_IncompatibleAttachments.cpp index e888a6606..65103d78c 100644 --- a/Tactical/XML_IncompatibleAttachments.cpp +++ b/Tactical/XML_IncompatibleAttachments.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif // Flugente: in order not to loop over MAXATTACHMENTS entries in IncompatibleAttachments[] if we only have a few thousand, remember the actual number read in UINT32 gINCOMPATIBLEATTACHMENTS_READ = 0; diff --git a/Tactical/XML_InteractiveTiles.cpp b/Tactical/XML_InteractiveTiles.cpp index 088e3e2d2..e7145446c 100644 --- a/Tactical/XML_InteractiveTiles.cpp +++ b/Tactical/XML_InteractiveTiles.cpp @@ -3,9 +3,6 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -13,7 +10,6 @@ #include "XML.h" #include "FileMan.h" #include "Handle Items.h" -#endif INTERACTIVE_STRUCTURE gInteractiveStructure[INTERACTIVE_STRUCTURE_MAX]; UINT32 gMaxInteractiveStructureRead = 0; diff --git a/Tactical/XML_ItemAdjustments.cpp b/Tactical/XML_ItemAdjustments.cpp index 7eef606c8..82ba287a9 100644 --- a/Tactical/XML_ItemAdjustments.cpp +++ b/Tactical/XML_ItemAdjustments.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -9,7 +6,6 @@ #include "gamesettings.h" #include "XML.h" #include "Item Types.h" -#endif struct { diff --git a/Tactical/XML_Keys.cpp b/Tactical/XML_Keys.cpp index 281dade4e..dcaeb715b 100644 --- a/Tactical/XML_Keys.cpp +++ b/Tactical/XML_Keys.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Keys.h" -#endif struct diff --git a/Tactical/XML_LBEPocket.cpp b/Tactical/XML_LBEPocket.cpp index 30202c606..29ee6b1f6 100644 --- a/Tactical/XML_LBEPocket.cpp +++ b/Tactical/XML_LBEPocket.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "GameSettings.h" -#endif struct { diff --git a/Tactical/XML_LBEPocketPopup.cpp b/Tactical/XML_LBEPocketPopup.cpp index a9462abe5..bcf2ed491 100644 --- a/Tactical/XML_LBEPocketPopup.cpp +++ b/Tactical/XML_LBEPocketPopup.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "popup_class.h" #include "popup_definition.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "GameSettings.h" -#endif // namespace'd because of name collision with POPUP class def namespace POPUP_PARSE { diff --git a/Tactical/XML_Launchable.cpp b/Tactical/XML_Launchable.cpp index 80bef4c19..bec05f339 100644 --- a/Tactical/XML_Launchable.cpp +++ b/Tactical/XML_Launchable.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_LoadBearingEquipment.cpp b/Tactical/XML_LoadBearingEquipment.cpp index c2f6a96e9..f89cb67ba 100644 --- a/Tactical/XML_LoadBearingEquipment.cpp +++ b/Tactical/XML_LoadBearingEquipment.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_LoadScreenHints.cpp b/Tactical/XML_LoadScreenHints.cpp index f3c2297b2..8393d6391 100644 --- a/Tactical/XML_LoadScreenHints.cpp +++ b/Tactical/XML_LoadScreenHints.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Animated ProgressBar.h" -#endif struct { diff --git a/Tactical/XML_Locks.cpp b/Tactical/XML_Locks.cpp index cf181061d..ff252fd0e 100644 --- a/Tactical/XML_Locks.cpp +++ b/Tactical/XML_Locks.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Keys.h" -#endif struct diff --git a/Tactical/XML_Magazine.cpp b/Tactical/XML_Magazine.cpp index 73d298924..5c9899204 100644 --- a/Tactical/XML_Magazine.cpp +++ b/Tactical/XML_Magazine.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_MercStartingGear.cpp b/Tactical/XML_MercStartingGear.cpp index 35c8b4202..e24301710 100644 --- a/Tactical/XML_MercStartingGear.cpp +++ b/Tactical/XML_MercStartingGear.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" #include "Soldier Profile.h" -#endif struct { diff --git a/Tactical/XML_Merchants.cpp b/Tactical/XML_Merchants.cpp index 7eda77fd8..b43c32b41 100644 --- a/Tactical/XML_Merchants.cpp +++ b/Tactical/XML_Merchants.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Arms Dealer Init.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp index 192dc54e0..eee7b4047 100644 --- a/Tactical/XML_Merge.cpp +++ b/Tactical/XML_Merge.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "gamesettings.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_MilitiaIndividual.cpp b/Tactical/XML_MilitiaIndividual.cpp index 877762a31..c00201cc1 100644 --- a/Tactical/XML_MilitiaIndividual.cpp +++ b/Tactical/XML_MilitiaIndividual.cpp @@ -3,15 +3,11 @@ * @author Flugente (bears-pit.com) */ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "MilitiaIndividual.h" -#endif struct { diff --git a/Tactical/XML_NewFaceGear.cpp b/Tactical/XML_NewFaceGear.cpp index 467c81490..b941e746b 100644 --- a/Tactical/XML_NewFaceGear.cpp +++ b/Tactical/XML_NewFaceGear.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Faces.h" -#endif struct { diff --git a/Tactical/XML_Opinions.cpp b/Tactical/XML_Opinions.cpp index 74768a05f..5c8084410 100644 --- a/Tactical/XML_Opinions.cpp +++ b/Tactical/XML_Opinions.cpp @@ -10,16 +10,12 @@ // in this file, following my example. /////////////////////////////////////////////////////////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "gamesettings.h" #include "XML.h" #include "Soldier Profile.h" -#endif //#define MAX_PROFILE_NAME_LENGTH 30 diff --git a/Tactical/XML_Profiles.cpp b/Tactical/XML_Profiles.cpp index da9753012..ba3aafbb3 100644 --- a/Tactical/XML_Profiles.cpp +++ b/Tactical/XML_Profiles.cpp @@ -10,16 +10,12 @@ // in this file, following my example. /////////////////////////////////////////////////////////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "gamesettings.h" #include "XML.h" #include "Soldier Profile.h" -#endif #include "Soldier Profile.h" //#define MAX_PROFILE_NAME_LENGTH 30 diff --git a/Tactical/XML_Qarray.cpp b/Tactical/XML_Qarray.cpp index f6c06a0ac..da806bcbb 100644 --- a/Tactical/XML_Qarray.cpp +++ b/Tactical/XML_Qarray.cpp @@ -1,14 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "qarray.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "qarray.h" -#endif struct diff --git a/Tactical/XML_RPCFacesSmall.cpp b/Tactical/XML_RPCFacesSmall.cpp index b0b3946b9..0ff4d3c4c 100644 --- a/Tactical/XML_RPCFacesSmall.cpp +++ b/Tactical/XML_RPCFacesSmall.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "faces.h" -#endif struct { diff --git a/Tactical/XML_RandomItem.cpp b/Tactical/XML_RandomItem.cpp index 2cdee1981..335d1096e 100644 --- a/Tactical/XML_RandomItem.cpp +++ b/Tactical/XML_RandomItem.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Item Types.h" -#endif RANDOM_ITEM_CHOICE_TYPE gRandomItemClass[RANDOM_ITEM_MAX_CATEGORIES]; diff --git a/Tactical/XML_RandomStats.cpp b/Tactical/XML_RandomStats.cpp index ba11da107..b1531b23e 100644 --- a/Tactical/XML_RandomStats.cpp +++ b/Tactical/XML_RandomStats.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif #include "soldier profile type.h" #include "Soldier Profile.h" diff --git a/Tactical/XML_SectorLoadscreens.cpp b/Tactical/XML_SectorLoadscreens.cpp index 74b376c77..99a11c1b1 100644 --- a/Tactical/XML_SectorLoadscreens.cpp +++ b/Tactical/XML_SectorLoadscreens.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -8,7 +5,6 @@ #include "expat.h" #include "XML.h" // #include "SectorLoadscreens.h" -#endif struct { diff --git a/Tactical/XML_SoldierProfiles.cpp b/Tactical/XML_SoldierProfiles.cpp index a6ec7ff85..4b2a6c5e7 100644 --- a/Tactical/XML_SoldierProfiles.cpp +++ b/Tactical/XML_SoldierProfiles.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_Sounds.cpp b/Tactical/XML_Sounds.cpp index 26150aa4f..23cf868b9 100644 --- a/Tactical/XML_Sounds.cpp +++ b/Tactical/XML_Sounds.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include #include "sgp.h" #include "Sound Control.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif extern char szSoundEffects[MAX_SAMPLES][255]; diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp index fec411437..5d5732aaf 100644 --- a/Tactical/XML_SpreadPatterns.cpp +++ b/Tactical/XML_SpreadPatterns.cpp @@ -1,7 +1,4 @@ //zilpin: pellet spread patterns externalized in XML -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "Soldier Control.h" @@ -36,7 +33,6 @@ #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif #define LIST_BUFFER_LEN (32) #define LIST_BUFFER_SIZE (LIST_BUFFER_LEN * sizeof(t_SpreadPattern)) diff --git a/Tactical/XML_StructureConstruct.cpp b/Tactical/XML_StructureConstruct.cpp index f9bd42c3b..4a8b31880 100644 --- a/Tactical/XML_StructureConstruct.cpp +++ b/Tactical/XML_StructureConstruct.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_StructureDeconstruct.cpp b/Tactical/XML_StructureDeconstruct.cpp index 8412a06c7..d1128481a 100644 --- a/Tactical/XML_StructureDeconstruct.cpp +++ b/Tactical/XML_StructureDeconstruct.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif struct { diff --git a/Tactical/XML_Structure_Move.cpp b/Tactical/XML_Structure_Move.cpp index dd2d2d4d5..9d06e5583 100644 --- a/Tactical/XML_Structure_Move.cpp +++ b/Tactical/XML_Structure_Move.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS -#include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" -#endif STRUCTURE_MOVEPOSSIBLE gStructureMovePossible[STRUCTURE_MOVEPOSSIBLE_MAX]; diff --git a/Tactical/XML_Taunts.cpp b/Tactical/XML_Taunts.cpp index bd59aa953..329f945a6 100644 --- a/Tactical/XML_Taunts.cpp +++ b/Tactical/XML_Taunts.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" -#endif struct { diff --git a/Tactical/XML_TonyInventory.cpp b/Tactical/XML_TonyInventory.cpp index f9160522f..60336809d 100644 --- a/Tactical/XML_TonyInventory.cpp +++ b/Tactical/XML_TonyInventory.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead.h" #include "weapons.h" @@ -11,7 +8,6 @@ #include "Font Control.h" #include "WordWrap.h" #include "soldier profile type.h" -#endif struct { diff --git a/Tactical/XML_Vehicles.cpp b/Tactical/XML_Vehicles.cpp index dff98eeee..73236aeca 100644 --- a/Tactical/XML_Vehicles.cpp +++ b/Tactical/XML_Vehicles.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Vehicles.h" -#endif struct { diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp index e9b8fda91..f8b47ea2d 100644 --- a/Tactical/bullets.cpp +++ b/Tactical/bullets.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "builddefines.h" #include "math.h" #include @@ -26,7 +23,6 @@ #include "FileMan.h" #include "lighting.h" #include "Buildings.h" -#endif // Defines // HEADROCK HAM 5: Increasing... with the hope of making spectacular fragmenting explosives. diff --git a/Tactical/fov.cpp b/Tactical/fov.cpp index 12a99df74..7aa7bdba1 100644 --- a/Tactical/fov.cpp +++ b/Tactical/fov.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Isometric Utils.h" #include "worlddef.h" @@ -27,7 +24,6 @@ #include "opplist.h" #include "lighting.h" #include "Soldier macros.h" -#endif #include "connect.h" #include "GameSettings.h" diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index a4fb07cba..6164964a6 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" //#include "ai.h" #include "Isometric Utils.h" @@ -49,7 +46,6 @@ #include "Interface.h" #include "Explosion Control.h"//dnl ch40 200909 #include "Vehicles.h" -#endif #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/TacticalAI/AI All.h b/TacticalAI/AI All.h deleted file mode 100644 index ce939c803..000000000 --- a/TacticalAI/AI All.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef __AI_ALL_H -#define __AI_ALL_H - -#pragma message("GENERATED PCH FOR TACTICAL AI PROJECT.") - -#include "AIList.h" -#include "Overhead.h" -#include "debug.h" -#include "AIInternals.h" -#include "wcheck.h" -#include "sgp.h" -#include "ai.h" -#include "Isometric Utils.h" -#include "math.h" -#include "Event Pump.h" -#include "Overhead Types.h" -#include "sys globals.h" -#include "opplist.h" -#include "animation control.h" -#include "font control.h" -#include "interface.h" -#include "screenids.h" -#include "worldman.h" -#include "pathai.h" -#include "points.h" -#include "weapons.h" -#include "items.h" -#include "Handle Items.h" -#include "animation data.h" -#include "los.h" -#include "message.h" -#include "TeamTurns.h" -#include "NPC.h" -#include "Dialogue Control.h" -#include "Soldier Profile.h" -#include "strategicmap.h" -#include "Tactical Save.h" -#include "Soldier Create.h" -#include "Explosion Control.h" -#include "Interactive Tiles.h" -#include "interface dialogue.h" -#include "Vehicles.h" -#include "renderworld.h" -#include "assignments.h" -#include "Soldier Functions.h" -#include "GameSettings.h" -#include "Buildings.h" -#include "Physics.h" -#include "Bullets.h" -#include "Spread Burst.h" -#include "SkillCheck.h" -#include "types.h" -#include "soldier control.h" -#include "Rotting Corpses.h" -#include "soldier add.h" -#include "Scheduling.h" -#include "Structure Wrap.h" -#include "Keys.h" -#include "Render Fun.h" -#include "Boxing.h" -#include -#include "World Items.h" -#include "Map Edgepoints.h" -#include "Text.h" -#include "video.h" -#include "Smell.h" -#include "mapscreen.h" -#include "strategic.h" -#include "Strategic Pathing.h" -#include "Quests.h" -#include "Game Clock.h" -#include "FileMan.h" -#include "Random.h" -#include "QuestDebug.h" -#include "soldier macros.h" -#include "Strategic Town Loyalty.h" -#include "Timer Control.h" -#include "Soldier Tile.h" -#include "meanwhile.h" -#include "Campaign Types.h" -#ifdef JA2TESTVERSION - #include "Quest Debug System.h" - #include "QuestText.h" -#endif - -#include "stdarg.h" -#include -#include "Soldier Profile Type.h" -#include "finances.h" -#include "Civ Quotes.h" -#include "Arms Dealer Init.h" -#include "Interface Panels.h" -#include "Soldier Ani.h" -#include "Queen Command.h" -#include "Lighting.h" -#include "environment.h" -#include "Sound Control.h" - -#endif \ No newline at end of file diff --git a/TacticalAI/AIList.cpp b/TacticalAI/AIList.cpp index 8dc6f568c..fef94af55 100644 --- a/TacticalAI/AIList.cpp +++ b/TacticalAI/AIList.cpp @@ -10,9 +10,6 @@ * */ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "AIList.h" #include "Overhead.h" #include "debug.h" @@ -21,7 +18,6 @@ #include "opplist.h" #include "Interface.h" #include "Tactical Save.h" -#endif #define AI_LIST_SIZE TOTAL_SOLDIERS diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index 50342612a..ee36d5137 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "AI All.h" -#include "sound control.h" -#include "Debug Control.h" -#else #include "sgp.h" #include "ai.h" #include "Isometric Utils.h" @@ -54,7 +49,6 @@ #include "Soldier Functions.h" // added by SANDRO #include "Text.h" // sevenfm #include "english.h" // sevenfm: for ESC key -#endif #include "connect.h" // needed to use the modularized tactical AI: diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index c577b7626..6096beeaf 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "ai.h" #include "Weapons.h" #include "opplist.h" @@ -28,7 +25,6 @@ #include "Rotting Corpses.h" // sevenfm #include "wcheck.h" // sevenfm #include "SmokeEffects.h" // sevenfm -#endif #include "GameInitOptionsScreen.h" diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp index b3fee1144..2b77b69f8 100644 --- a/TacticalAI/Attacks.cpp +++ b/TacticalAI/Attacks.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "AI All.h" -#else #include "ai.h" #include "Weapons.h" #include "opplist.h" @@ -34,7 +31,6 @@ #include "Render Fun.h" #include "worldman.h" #include "WCheck.h" -#endif // anv: for enemy taunts #include "Civ Quotes.h" diff --git a/TacticalAI/CreatureDecideAction.cpp b/TacticalAI/CreatureDecideAction.cpp index fe0ac6f55..bb74c226e 100644 --- a/TacticalAI/CreatureDecideAction.cpp +++ b/TacticalAI/CreatureDecideAction.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "types.h" //#include "soldier control.h" #include "ai.h" @@ -9,7 +6,6 @@ #include "Items.h" #include "Rotting Corpses.h" #include "soldier add.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp index 5732115df..3415fc4d8 100644 --- a/TacticalAI/DecideAction.cpp +++ b/TacticalAI/DecideAction.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "AI All.h" -#else #include "ai.h" #include "AIInternals.h" #include "Isometric utils.h" @@ -32,7 +29,6 @@ #include "rotting corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" -#endif #include "connect.h" #include "Text.h" #include "Exit Grids.h" // added by Flugente diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp index 5cc98c7c3..b78bff215 100644 --- a/TacticalAI/FindLocations.cpp +++ b/TacticalAI/FindLocations.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include #include "Isometric Utils.h" #include "ai.h" @@ -30,7 +27,6 @@ #include "GameSettings.h" #include "Soldier Profile.h" #include "rotting corpses.h" // sevenfm -#endif //////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/TacticalAI/Knowledge.cpp b/TacticalAI/Knowledge.cpp index f6c34fa56..c6e93a1fb 100644 --- a/TacticalAI/Knowledge.cpp +++ b/TacticalAI/Knowledge.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "ai.h" #include "AIInternals.h" #include "opplist.h" @@ -10,7 +7,6 @@ #include "Quests.h" #include "Render Fun.h" #include "Soldier macros.h" -#endif extern SECTOR_EXT_DATA SectorExternalData[256][4]; diff --git a/TacticalAI/Medical.cpp b/TacticalAI/Medical.cpp index 86bf9eb81..41b896729 100644 --- a/TacticalAI/Medical.cpp +++ b/TacticalAI/Medical.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "types.h" #include "Soldier Functions.h" @@ -17,7 +14,6 @@ // added by SANDRO #include "Soldier Profile.h" #include "GameSettings.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TacticalAI/Movement.cpp b/TacticalAI/Movement.cpp index aeb2bbfed..ec5daaaf2 100644 --- a/TacticalAI/Movement.cpp +++ b/TacticalAI/Movement.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "ai.h" #include "AIInternals.h" #include "Isometric Utils.h" @@ -17,7 +14,6 @@ #include "Soldier macros.h" #include "Render Fun.h" #include "Soldier Functions.h" // added by Flugente -#endif #include "connect.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp index 3a501194b..cf8d86c48 100644 --- a/TacticalAI/NPC.cpp +++ b/TacticalAI/NPC.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" - #include "interface items.h" - -#else #include "types.h" #include "wcheck.h" #include "overhead.h" @@ -48,7 +43,6 @@ #include "GameSettings.h" // added by SANDRO #include "Soldier Profile.h" #include "GameVersion.h" -#endif #include "Soldier Profile.h" #include "BriefingRoom_Data.h" diff --git a/TacticalAI/PanicButtons.cpp b/TacticalAI/PanicButtons.cpp index 970879b90..b673c8d47 100644 --- a/TacticalAI/PanicButtons.cpp +++ b/TacticalAI/PanicButtons.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "AIInternals.h" #include "ai.h" #include "pathai.h" @@ -10,7 +7,6 @@ #include "Map Screen Interface Map.h" #include "Soldier Profile.h" #include "Quests.h" -#endif #include "Queen Command.h" diff --git a/TacticalAI/QuestDebug.cpp b/TacticalAI/QuestDebug.cpp index 82ce571b5..046991f34 100644 --- a/TacticalAI/QuestDebug.cpp +++ b/TacticalAI/QuestDebug.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "FileMan.h" #include "QuestDebug.h" #include "stdarg.h" #include "stdio.h" #include "Debug.h" #include "Message.h" -#endif #define QUEST_DEBUG_FILE "QuestDebug.txt" diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp index 4898bb2c6..aba2b524c 100644 --- a/TacticalAI/Realtime.cpp +++ b/TacticalAI/Realtime.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "AI All.h" -#else #include "ai.h" #include "AIInternals.h" #include "Isometric utils.h" @@ -15,7 +12,6 @@ #include "Render Fun.h" #include "Quests.h" #include "GameSettings.h" -#endif // needed to use the modularized tactical AI: #include "ModularizedTacticalAI/include/Plan.h" #include "ModularizedTacticalAI/include/PlanFactoryLibrary.h" diff --git a/TacticalAI/TacticalAI_VS2005.vcproj b/TacticalAI/TacticalAI_VS2005.vcproj index aa9100f99..41d806db8 100644 --- a/TacticalAI/TacticalAI_VS2005.vcproj +++ b/TacticalAI/TacticalAI_VS2005.vcproj @@ -338,10 +338,6 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > - - diff --git a/TacticalAI/TacticalAI_VS2008.vcproj b/TacticalAI/TacticalAI_VS2008.vcproj index d0ea4376b..348732615 100644 --- a/TacticalAI/TacticalAI_VS2008.vcproj +++ b/TacticalAI/TacticalAI_VS2008.vcproj @@ -338,10 +338,6 @@ - - diff --git a/TacticalAI/TacticalAI_VS2010.vcxproj b/TacticalAI/TacticalAI_VS2010.vcxproj index 6d85a4038..72843a93e 100644 --- a/TacticalAI/TacticalAI_VS2010.vcxproj +++ b/TacticalAI/TacticalAI_VS2010.vcxproj @@ -23,7 +23,6 @@ - diff --git a/TacticalAI/TacticalAI_VS2010.vcxproj.filters b/TacticalAI/TacticalAI_VS2010.vcxproj.filters index 2e680ac79..5c7581f27 100644 --- a/TacticalAI/TacticalAI_VS2010.vcxproj.filters +++ b/TacticalAI/TacticalAI_VS2010.vcxproj.filters @@ -9,7 +9,6 @@ - Header Files diff --git a/TacticalAI/TacticalAI_VS2013.vcxproj b/TacticalAI/TacticalAI_VS2013.vcxproj index 7de0cbd7f..6505f3023 100644 --- a/TacticalAI/TacticalAI_VS2013.vcxproj +++ b/TacticalAI/TacticalAI_VS2013.vcxproj @@ -23,7 +23,6 @@ - diff --git a/TacticalAI/TacticalAI_VS2013.vcxproj.filters b/TacticalAI/TacticalAI_VS2013.vcxproj.filters index 2e680ac79..5c7581f27 100644 --- a/TacticalAI/TacticalAI_VS2013.vcxproj.filters +++ b/TacticalAI/TacticalAI_VS2013.vcxproj.filters @@ -9,7 +9,6 @@ - Header Files diff --git a/TacticalAI/TacticalAI_VS2017.vcxproj b/TacticalAI/TacticalAI_VS2017.vcxproj index 65b962ce5..834cdcddd 100644 --- a/TacticalAI/TacticalAI_VS2017.vcxproj +++ b/TacticalAI/TacticalAI_VS2017.vcxproj @@ -23,7 +23,6 @@ - diff --git a/TacticalAI/TacticalAI_VS2019.vcxproj b/TacticalAI/TacticalAI_VS2019.vcxproj index bea469a70..861d906c2 100644 --- a/TacticalAI/TacticalAI_VS2019.vcxproj +++ b/TacticalAI/TacticalAI_VS2019.vcxproj @@ -43,7 +43,6 @@ - diff --git a/TacticalAI/ZombieDecideAction.cpp b/TacticalAI/ZombieDecideAction.cpp index 9ed67fb8a..16c7f321f 100644 --- a/TacticalAI/ZombieDecideAction.cpp +++ b/TacticalAI/ZombieDecideAction.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "AI All.h" -#else #include "ai.h" #include "AIInternals.h" #include "Isometric utils.h" @@ -32,7 +29,6 @@ #include "rotting corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" -#endif #include "connect.h" #include "Text.h" diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index 3014ca3ac..321ebcdc8 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "Ambient Control.h" #include "Sound Control.h" #include "Game Events.h" @@ -14,7 +11,6 @@ #include "Strategic Movement.h" #include "Game Clock.h" #include "strategic mines.h" -#endif AMBIENTDATA_STRUCT gAmbData[ MAX_AMBIENT_SOUNDS ]; INT16 gsNumAmbData = 0; diff --git a/TileEngine/Buildings.cpp b/TileEngine/Buildings.cpp index 096f28013..ef40eee3b 100644 --- a/TileEngine/Buildings.cpp +++ b/TileEngine/Buildings.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "Types.h" #include "Buildings.h" #include "Pathai.h" #include "Structure Wrap.h" #include "Render Fun.h" #include "worldman.h" -#endif #include "AIInternals.h" diff --git a/TileEngine/Exit Grids.cpp b/TileEngine/Exit Grids.cpp index 28355f18a..4ada6bb00 100644 --- a/TileEngine/Exit Grids.cpp +++ b/TileEngine/Exit Grids.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "debug.h" #include "worlddef.h" #include "worldman.h" @@ -14,7 +11,6 @@ #include "Sys Globals.h" #include "SaveLoadMap.h" #include "Text.h" -#endif #if 0//dnl ch86 180214 BOOLEAN gfLoadingExitGrids = FALSE; diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index b4fbfb45d..6ab1ad6ca 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1,10 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS -#include "TileEngine All.h" -#include "end game.h" -#include "Morale.h" -#else #include "debug.h" #include "weapons.h" #include "worldman.h" @@ -39,7 +34,6 @@ #include "Points.h" // added by Flugente #include "Interface Control.h" // added by Flugente for DrawExplosionWarning(...) #include "SkillMenu.h" -#endif #include "Soldier Macros.h" #include "connect.h" diff --git a/TileEngine/Fog Of War.cpp b/TileEngine/Fog Of War.cpp index d3cb512fd..63d9580e6 100644 --- a/TileEngine/Fog Of War.cpp +++ b/TileEngine/Fog Of War.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "types.h" #include "Fog Of War.h" #include "Isometric Utils.h" #include "Simple Render Utils.h" #include "lighting.h" -#endif //When line of sight reaches a gridno, and there is a light there, it turns it on. //This is only done in the cave levels. diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index 71a445e3e..550df2ae4 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "sysutil.h" #include "renderworld.h" #include "Sound Control.h" @@ -19,7 +16,6 @@ #include "NPC.h" #include "Explosion Control.h" #include "Text.h" -#endif #ifdef JA2TESTVERSION #include "message.h" diff --git a/TileEngine/Isometric Utils.cpp b/TileEngine/Isometric Utils.cpp index 6decb8001..1315070b9 100644 --- a/TileEngine/Isometric Utils.cpp +++ b/TileEngine/Isometric Utils.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "debug.h" #include "renderworld.h" #include "interface.h" @@ -10,7 +7,6 @@ #include "overhead.h" #include "Random.h" #include "Pathai.h" -#endif #include "Map Information.h" #include "meanwhile.h" #include "strategicmap.h" diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index 91a0669aa..a229f4a63 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "debug.h" #include "animation control.h" #include "lighteffects.h" @@ -11,7 +8,6 @@ #include "Game Clock.h" #include "opplist.h" #include "Tactical Save.h" -#endif #include "SaveLoadGame.h" #include "GameVersion.h" // added by Flugente diff --git a/TileEngine/Map Edgepoints.cpp b/TileEngine/Map Edgepoints.cpp index afd3c2512..42106638a 100644 --- a/TileEngine/Map Edgepoints.cpp +++ b/TileEngine/Map Edgepoints.cpp @@ -1,7 +1,4 @@ //#include // added by Flugente -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "Map Edgepoints.h" #include "pathai.h" @@ -15,7 +12,6 @@ #include "worldman.h" #include "PreBattle Interface.h" // added by Flugente #include "Rebel Command.h" -#endif #include "connect.h" diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index c949f0290..b2bcb1a6c 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "sgp.h" #include "Radar Screen.h" #include "sysutil.h" @@ -19,7 +16,6 @@ #include "Game Clock.h" #include "Map Screen Interface Map Inventory.h" #include "Animation Data.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index a35f70998..f90b3d255 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -1,15 +1,9 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" - #include "winfont.h" - -#else #include "worlddef.h" #include "Render Dirty.h" #include "sysutil.h" #include "vobject_blitters.h" -#endif #ifdef JA2BETAVERSION #include "Message.h" diff --git a/TileEngine/Render Fun.cpp b/TileEngine/Render Fun.cpp index f2e198b2f..6248840c7 100644 --- a/TileEngine/Render Fun.cpp +++ b/TileEngine/Render Fun.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "Render Fun.h" #include "sysutil.h" #include "debug.h" @@ -11,7 +8,6 @@ #include "Fog Of War.h" #include "dialogue control.h" #include "Random.h" -#endif // Room Information //UINT8 gubWorldRoomInfo[ WORLD_MAX ]; diff --git a/TileEngine/SaveLoadMap.cpp b/TileEngine/SaveLoadMap.cpp index 0379157c3..0931fe915 100644 --- a/TileEngine/SaveLoadMap.cpp +++ b/TileEngine/SaveLoadMap.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "Types.h" #include "SaveLoadMap.h" #include "OverHead.h" @@ -18,7 +15,6 @@ #include "Message.h" #include "GameSettings.h" #include "Smell.h" -#endif #include //SB: make size of gpRevealedMap dependable from variable tactical map dimensions diff --git a/TileEngine/Shade Table Util.cpp b/TileEngine/Shade Table Util.cpp index 2956a5ef7..f802fa443 100644 --- a/TileEngine/Shade Table Util.cpp +++ b/TileEngine/Shade Table Util.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include #include "types.h" #include "lighting.h" @@ -10,7 +7,6 @@ #include "video.h" #include "WorldDat.h" #include "Fileman.h" -#endif #include diff --git a/TileEngine/Simple Render Utils.cpp b/TileEngine/Simple Render Utils.cpp index d7d3e8626..d58e62e75 100644 --- a/TileEngine/Simple Render Utils.cpp +++ b/TileEngine/Simple Render Utils.cpp @@ -1,10 +1,6 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "types.h" #include "Isometric Utils.h" #include "renderworld.h" -#endif void MarkMapIndexDirty( INT32 iMapIndex ) { diff --git a/TileEngine/Smell.cpp b/TileEngine/Smell.cpp index c52e8df50..45f75140c 100644 --- a/TileEngine/Smell.cpp +++ b/TileEngine/Smell.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "worlddef.h" #include "Random.h" #include "Smell.h" @@ -14,7 +11,6 @@ #include "Game Clock.h" #include "Overhead.h" #include "debug control.h" -#endif /* * Smell & Blood system diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index 798d84883..8d6bce9c2 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include #include #include "stdlib.h" @@ -28,7 +25,6 @@ // sevenfm #include "environment.h" #include "Render Fun.h" -#endif #include "SaveLoadGame.h" #include "debug control.h" diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 787eba223..7b6c1daa0 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -2,11 +2,6 @@ // WANNE 2 -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" - #include "PreBattle Interface.h" - #include "vehicles.h" -#else //sgp #include "english.h" #include "debug.h" @@ -36,7 +31,6 @@ #include "WordWrap.h" #include "Game Clock.h" #include "Isometric Utils.h" -#endif #include "connect.h" #include "renderworld.h"//dnl ch45 051009 #include "merc entering.h" diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 7bc6a31d4..266bd856b 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS -#include "TileEngine All.h" -#else #include "worlddef.h" #include "tile animation.h" #include "debug.h" @@ -16,7 +13,6 @@ #include "bullets.h" #include "LightEffects.h" #include "SmokeEffects.h" -#endif ANITILE *pAniTileHead = NULL; diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index 69cc42c5c..ae94e395b 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -1,13 +1,9 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "debug.h" #include "Debug Control.h" #include "tile surface.h" #include "tile cache.h" -#endif #ifdef JA2TESTVERSION #include "sys globals.h" #endif diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 2b86332fe..9f14fcec7 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -1,11 +1,7 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "debug.h" #include "sys globals.h" -#endif #include "XML.h" diff --git a/TileEngine/TileDat.cpp b/TileEngine/TileDat.cpp index 5673e0456..d46e8a2c7 100644 --- a/TileEngine/TileDat.cpp +++ b/TileEngine/TileDat.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "tiledef.h" #include "worlddef.h" -#endif #include "GameSettings.h" diff --git a/TileEngine/TileEngine All.h b/TileEngine/TileEngine All.h deleted file mode 100644 index 86b3557cc..000000000 --- a/TileEngine/TileEngine All.h +++ /dev/null @@ -1,158 +0,0 @@ -#ifndef __TILEENGINE_ALL_H -#define __TILEENGINE_ALL_H - -#pragma message("GENERATED PCH FOR TILEENGINE PROJECT.") - -#include -#include "sgp.h" -#include "Ambient types.h" -#include "fileman.h" -#include "environment.h" -#include "Sound Control.h" -#include "Game Events.h" -#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 "lighting.h" -#include "renderworld.h" -#include "Game Clock.h" -#include "quests.h" -#include "Ambient Control.h" -#include "AimMembers.h" -#include "Strategic Event Handler.h" -#include "BobbyR.h" -#include "mercs.h" -#include "email.h" -#include "Merc Hiring.h" -#include "insurance Contract.h" -#include "Strategic Merc Handler.h" -#include "message.h" -#include "opplist.h" -#include "debug.h" -#include "worlddef.h" -#include "worldman.h" -#include "smooth.h" -#include "Exit Grids.h" -#include "Editor Undo.h" -#include "Strategic Movement.h" -#include "Font Control.h" -#include "SaveLoadMap.h" -#include -#include "wcheck.h" -#include "soldier control.h" -#include "weapons.h" -#include "handle items.h" -#include "rotting corpses.h" -#include "tile cache.h" -#include "animation control.h" -#include "utilities.h" -#include "soldier create.h" -#include "soldier add.h" -#include "explosion control.h" -#include "tile animation.h" -#include "world items.h" -#include "tiledef.h" -#include "tiledat.h" -#include "interactive tiles.h" -#include "Handle Doors.h" -#include "smokeeffects.h" -#include "handle ui.h" -#include "pits.h" -#include "campaign Types.h" -#include "strategic.h" -#include "Action Items.h" -#include "Soldier Profile.h" -#include "Interface Dialogue.h" -#include "LightEffects.h" -#include "AI.h" -#include "Soldier tile.h" -#include "smell.h" -#include "GameSettings.h" -#include "Fog Of War.h" -#include "Simple Render Utils.h" -#include -#include -#include "himage.h" -#include "vsurface.h" -#include "vsurface_private.h" -#include "sysutil.h" -#include "interface.h" -#include "interface cursors.h" -#include "structure.h" -#include "points.h" -#include "Dialogue Control.h" -#include "english.h" -#include "mousesystem.h" -#include "jascreens.h" -#include "math.h" -#include -#include -#include "input.h" -#include "video.h" -#include "vobject_blitters.h" -#include "edit_sys.h" -#include "line.h" -#include "Animation Data.h" -#include "Timer Control.h" -#include "Radar Screen.h" -#include "Render Dirty.h" -#include "Structure Internals.h" -#include "Shade Table Util.h" -#include -#include "Map Edgepoints.h" -#include "Map Information.h" -#include "vobject.h" -#include "worlddat.h" -#include "overhead map.h" -#include "interface control.h" -#include "cursors.h" -#include "soldier find.h" -#include "interface panels.h" -#include "Tactical Placement GUI.h" -#include "phys math.h" -#include "physics.h" -#include "los.h" -#include "event pump.h" -#include "interface items.h" -#include "Debug Control.h" -#include "text.h" -#include "Squads.h" -#include "Map Screen Interface Map Inventory.h" -//#include "container.h" -#include "fov.h" -#include "Overhead types.h" -#include "Tactical Save.h" -#include "MemMan.h" -#include "font.h" -#include "Button System.h" -#include "gameloop.h" -#include "Cursor Control.h" -#include "MessageBoxScreen.h" -#include "assignments.h" -#include "WordWrap.h" -#include "time.h" -#include "Keys.h" -#include "bullets.h" -#include "Animation Cache.h" -#include "tile surface.h" -#include -#include "screenids.h" -#include "shading.h" -#include "Soldier Init List.h" -#include "Summary Info.h" -#include "Animated ProgressBar.h" -#include "EditorBuildings.h" -#include "music control.h" -#include "Scheduling.h" -#include "EditorMapInfo.h" -#include "Smoothing Utils.h" -#include "Meanwhile.h" - -#endif \ No newline at end of file diff --git a/TileEngine/TileEngine_VS2005.vcproj b/TileEngine/TileEngine_VS2005.vcproj index 69af221ca..42a07063c 100644 --- a/TileEngine/TileEngine_VS2005.vcproj +++ b/TileEngine/TileEngine_VS2005.vcproj @@ -478,10 +478,6 @@ RelativePath=".\tiledef.h" > - - diff --git a/TileEngine/TileEngine_VS2008.vcproj b/TileEngine/TileEngine_VS2008.vcproj index 04da8b1b0..6688f6a9e 100644 --- a/TileEngine/TileEngine_VS2008.vcproj +++ b/TileEngine/TileEngine_VS2008.vcproj @@ -478,10 +478,6 @@ RelativePath="tiledef.h" > - - diff --git a/TileEngine/TileEngine_VS2010.vcxproj b/TileEngine/TileEngine_VS2010.vcxproj index 90df87c76..f73b0ee95 100644 --- a/TileEngine/TileEngine_VS2010.vcxproj +++ b/TileEngine/TileEngine_VS2010.vcxproj @@ -58,7 +58,6 @@ - diff --git a/TileEngine/TileEngine_VS2010.vcxproj.filters b/TileEngine/TileEngine_VS2010.vcxproj.filters index 838f0b83e..3046b9b1c 100644 --- a/TileEngine/TileEngine_VS2010.vcxproj.filters +++ b/TileEngine/TileEngine_VS2010.vcxproj.filters @@ -114,7 +114,6 @@ Header Files - Header Files diff --git a/TileEngine/TileEngine_VS2013.vcxproj b/TileEngine/TileEngine_VS2013.vcxproj index 595991b8a..1c0e361e3 100644 --- a/TileEngine/TileEngine_VS2013.vcxproj +++ b/TileEngine/TileEngine_VS2013.vcxproj @@ -58,7 +58,6 @@ - diff --git a/TileEngine/TileEngine_VS2013.vcxproj.filters b/TileEngine/TileEngine_VS2013.vcxproj.filters index 838f0b83e..3046b9b1c 100644 --- a/TileEngine/TileEngine_VS2013.vcxproj.filters +++ b/TileEngine/TileEngine_VS2013.vcxproj.filters @@ -114,7 +114,6 @@ Header Files - Header Files diff --git a/TileEngine/TileEngine_VS2017.vcxproj b/TileEngine/TileEngine_VS2017.vcxproj index efb54e8a7..27e9fa0c4 100644 --- a/TileEngine/TileEngine_VS2017.vcxproj +++ b/TileEngine/TileEngine_VS2017.vcxproj @@ -58,7 +58,6 @@ - diff --git a/TileEngine/TileEngine_VS2019.vcxproj b/TileEngine/TileEngine_VS2019.vcxproj index 0bd7088f3..8ee6a7466 100644 --- a/TileEngine/TileEngine_VS2019.vcxproj +++ b/TileEngine/TileEngine_VS2019.vcxproj @@ -58,7 +58,6 @@ - diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index eda152e0c..5e9a15805 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -1,13 +1,9 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "worlddat.h" #include "sys globals.h" #include "tile surface.h" #include "Debug.h" -#endif #include #include diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index 060791095..5d3218dfd 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -1,16 +1,12 @@ // Lesh: #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include #include #include "explosion control.h" #include "Debug.h" #include "FileMan.h" #include "Debug Control.h" -#endif #include "expat.h" #include "XML.h" diff --git a/TileEngine/environment.cpp b/TileEngine/environment.cpp index b3650af68..54aff33df 100644 --- a/TileEngine/environment.cpp +++ b/TileEngine/environment.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "sgp.h" #include "environment.h" #include "renderworld.h" @@ -17,7 +14,6 @@ #include "Isometric Utils.h" // added by Flugente #include "worldman.h" // added by Flugente #include "Dialogue Control.h" // added by Flugente -#endif #include "Text.h" #include "connect.h" diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index 691003f67..b2f01d3ba 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -16,9 +16,6 @@ * Written by Derek Beland, April 14, 1997 * ***************************************************************************************/ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "worlddef.h" #include "renderworld.h" #include "sysutil.h" @@ -31,7 +28,6 @@ #include "Shade Table Util.h" #include "rotting corpses.h" #include "PATHAI.H" -#endif #define LVL1_L1_PER (50) #define LVL1_L2_PER (50) diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index ddad42f9f..8f42f1923 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "sysutil.h" #include "utilities.h" #include "renderworld.h" @@ -24,7 +21,6 @@ #include "gameloop.h" #include "Action Items.h" // added by Flugente #include "Rebel Command.h" -#endif #include "connect.h" diff --git a/TileEngine/phys math.cpp b/TileEngine/phys math.cpp index d362e2523..4cfd06652 100644 --- a/TileEngine/phys math.cpp +++ b/TileEngine/phys math.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "phys math.h" #include -#endif vector_3 VSetEqual( vector_3 *a ) { diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index b3a157116..da184a9b6 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -1,8 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "physics.h" #include "wcheck.h" #include "isometric utils.h" @@ -22,7 +19,6 @@ #include "Buildings.h" #include "Dialogue Control.h" // added by Flugente #include "Map Information.h" // added by Shadooow -#endif #include "connect.h" #include "PATHAI.H" diff --git a/TileEngine/pits.cpp b/TileEngine/pits.cpp index 2194a51d8..59478dc6e 100644 --- a/TileEngine/pits.cpp +++ b/TileEngine/pits.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "types.h" #include "pits.h" #include "worlddef.h" @@ -14,7 +11,6 @@ #include "animation control.h" #include "strategic.h" #include "Action Items.h" -#endif //used by editor BOOLEAN gfShowPits = FALSE; diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index a69835feb..a2fd01fbe 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -4,9 +4,6 @@ #include "Render Z.h" /////////////////////////// -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "renderworld.h" #include "sysutil.h" #include "vobject_blitters.h" @@ -24,7 +21,6 @@ #include "Sound Control.h" #include "LogicalBodyTypes/Layers.h" #include "LogicalBodyTypes/BodyTypeDB.h" -#endif #include "Utilities.h" diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp index 1b2fb1353..7f8a33c06 100644 --- a/TileEngine/structure.cpp +++ b/TileEngine/structure.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include #include "types.h" #include "wcheck.h" @@ -50,7 +47,6 @@ #include "Soldier Ani.h" #include "ASD.h" // added by Flugente #include "renderworld.h" // added by Flugente for SetRenderFlags( RENDER_FLAG_FULL ); -#endif #ifdef COUNT_PATHS extern UINT32 guiSuccessfulPathChecks; diff --git a/TileEngine/sysutil.cpp b/TileEngine/sysutil.cpp index 10774757e..e3090125d 100644 --- a/TileEngine/sysutil.cpp +++ b/TileEngine/sysutil.cpp @@ -1,10 +1,6 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "sgp.h" #include "wcheck.h" #include "sysutil.h" -#endif UINT32 guiBOTTOMPANEL = 0; UINT32 guiRIGHTPANEL = 0; diff --git a/TileEngine/tiledef.cpp b/TileEngine/tiledef.cpp index 0af327523..8318ed462 100644 --- a/TileEngine/tiledef.cpp +++ b/TileEngine/tiledef.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "tiledef.h" #include "worlddef.h" #include "wcheck.h" @@ -10,7 +7,6 @@ #include "pathai.h" #include "tile surface.h" #include "Tactical Save.h" -#endif //#include "editscreen.h" diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index bd0bc3c58..a311df9c4 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -1,9 +1,5 @@ #include "builddefines.h" -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" - #include "PreBattle Interface.h" -#else #include "worlddef.h" #include "worlddat.h" #include "wcheck.h" @@ -47,7 +43,6 @@ #include "gamesettings.h" #include "editscreen.h" #include "Editor Taskbar Utils.h" -#endif #ifdef JA2EDITOR #include "Summary Info.h" diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index 688806903..cfba1961b 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "TileEngine All.h" -#else #include "worlddef.h" #include "worldman.h" #include "wcheck.h" @@ -15,7 +12,6 @@ #include "random.h" // sevenfm #include "PATHAI.H" -#endif extern BOOLEAN gfBasement; diff --git a/Utils/Animated ProgressBar.cpp b/Utils/Animated ProgressBar.cpp index 923bb72ec..652d5f05e 100644 --- a/Utils/Animated ProgressBar.cpp +++ b/Utils/Animated ProgressBar.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "types.h" #include "Animated ProgressBar.h" #include "MemMan.h" @@ -17,7 +14,6 @@ #include "WordWrap.h" #include "Message.h" #include "Text.h" -#endif double rStart, rEnd; double rActual; diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index 7d0f1272b..28c083c7d 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "interface items.h" -#else #include "builddefines.h" #include #include "sgp.h" @@ -18,7 +14,6 @@ #include "Sound Control.h" // HEADROCK HAM B2.6: included this here to allow toggling the CTH bars. #include "GameSettings.h" -#endif //aim extern UINT8 gubShowActionPointsInRed; diff --git a/Utils/Debug Control.cpp b/Utils/Debug Control.cpp index 3b0e87713..b1fa6fa75 100644 --- a/Utils/Debug Control.cpp +++ b/Utils/Debug Control.cpp @@ -1,10 +1,6 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "types.h" #include "Debug Control.h" #include "stdio.h" -#endif #include "sgp_logger.h" diff --git a/Utils/Encrypted File.cpp b/Utils/Encrypted File.cpp index fcfd06124..4238886b5 100644 --- a/Utils/Encrypted File.cpp +++ b/Utils/Encrypted File.cpp @@ -1,10 +1,6 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Encrypted File.h" #include "FileMan.h" #include "Debug.h" -#endif #include "Language Defines.h" // anv: for selecting random line diff --git a/Utils/Event Manager.cpp b/Utils/Event Manager.cpp index 1de04b5f1..edd39c59c 100644 --- a/Utils/Event Manager.cpp +++ b/Utils/Event Manager.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include #include #include "sgp.h" @@ -8,7 +5,6 @@ #include "wcheck.h" #include "Event Manager.h" #include "Timer Control.h" -#endif HLIST hEventQueue = NULL; HLIST hDelayEventQueue = NULL; diff --git a/Utils/Event Pump.cpp b/Utils/Event Pump.cpp index c3ef49433..da01372d4 100644 --- a/Utils/Event Pump.cpp +++ b/Utils/Event Pump.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include #include #include "sgp.h" @@ -14,7 +11,6 @@ #include "Animation Control.h" #include "opplist.h" #include "Tactical Save.h" -#endif #ifdef NETWORKED #include "Networking.h" diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp index c1d7cf9fc..a419c6f17 100644 --- a/Utils/Font Control.cpp +++ b/Utils/Font Control.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "winfont.h" -#else #include #include #include "sgp.h" @@ -9,7 +5,6 @@ #include "vsurface.h" #include "wcheck.h" #include "Font Control.h" -#endif INT32 giCurWinFont = 0; //BOOLEAN gfUseWinFonts = FALSE; diff --git a/Utils/KeyMap.cpp b/Utils/KeyMap.cpp index 4a835c7a8..5f0402767 100644 --- a/Utils/KeyMap.cpp +++ b/Utils/KeyMap.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS -#include "Utils All.h" -#else #include "KeyMap.h" #include -#endif #include "text.h" static Str8EnumLookupType gKeyTable[] = diff --git a/Utils/MapUtility.cpp b/Utils/MapUtility.cpp index d4af42af3..baf030a8c 100644 --- a/Utils/MapUtility.cpp +++ b/Utils/MapUtility.cpp @@ -1,8 +1,4 @@ -#ifdef PRECOMPILEDHEADERS -#include "Utils All.h" -#else #include "sgp.h" -#endif #ifdef JA2EDITOR #include "Screens.h" diff --git a/Utils/MercTextBox.cpp b/Utils/MercTextBox.cpp index 9102816ee..395376154 100644 --- a/Utils/MercTextBox.cpp +++ b/Utils/MercTextBox.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "MercTextBox.h" #include "WCheck.h" #include "renderworld.h" @@ -9,7 +6,6 @@ #include "WordWrap.h" #include "vobject_blitters.h" #include "Message.h" -#endif #define TEXT_POPUP_WINDOW_TEXT_OFFSET_X 8 diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp index 4de91843f..0371e72e2 100644 --- a/Utils/Multi Language Graphic Utils.cpp +++ b/Utils/Multi Language Graphic Utils.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS -#include "Utils All.h" -#else #include "builddefines.h" #include "stdio.h" #include "Windows.h" #include "Types.h" #include "Multi Language Graphic Utils.h" -#endif #include "Language Defines.h" //SB diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp index e436ff89d..c657f62bf 100644 --- a/Utils/Music Control.cpp +++ b/Utils/Music Control.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "types.h" #include "Music Control.h" #include "soundman.h" @@ -9,7 +6,6 @@ #include "overhead.h" #include "timer control.h" #include "strategicmap.h" -#endif #include "Overhead Types.h" //extern int iScreenMode; diff --git a/Utils/PopUpBox.cpp b/Utils/PopUpBox.cpp index 26480dd17..9643fd029 100644 --- a/Utils/PopUpBox.cpp +++ b/Utils/PopUpBox.cpp @@ -1,9 +1,5 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "PopUpBox.h" #include "sysutil.h" -#endif #define BORDER_WIDTH 16 diff --git a/Utils/STIConvert.cpp b/Utils/STIConvert.cpp index 49e9acf56..09018200f 100644 --- a/Utils/STIConvert.cpp +++ b/Utils/STIConvert.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "builddefines.h" #include #include @@ -14,7 +11,6 @@ #include "pcx.h" #include "impTGA.h" #include "wcheck.h" -#endif //CONVERT_TO_16_BIT BOOLEAN ConvertToETRLE( UINT8 ** ppDest, UINT32 * puiDestLen, UINT8 ** ppSubImageBuffer, UINT16 * pusNumberOfSubImages, UINT8 * p8BPPBuffer, UINT16 usWidth, UINT16 usHeight, UINT32 fFlags ); diff --git a/Utils/Slider.cpp b/Utils/Slider.cpp index 817c2edf3..5b7383b88 100644 --- a/Utils/Slider.cpp +++ b/Utils/Slider.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Types.h" #include "WordWrap.h" #include "Render Dirty.h" @@ -9,7 +6,6 @@ #include "Slider.h" #include "SysUtil.h" #include "Line.h" -#endif diff --git a/Utils/Sound Control.cpp b/Utils/Sound Control.cpp index 3c7f549da..71ea2e72e 100644 --- a/Utils/Sound Control.cpp +++ b/Utils/Sound Control.cpp @@ -1,8 +1,5 @@ // MODULE FOR SOUND SYSTEM -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "sgp.h" #include "Sound Control.h" #include "soundman.h" @@ -11,7 +8,6 @@ #include "renderworld.h" #include "GameSettings.h" #include "math.h" -#endif #define SOUND_FAR_VOLUME_MOD 25 diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index 8784ade9a..4b50981ea 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "builddefines.h" #include #include @@ -18,7 +15,6 @@ #include "vobject_blitters.h" #include "Font Control.h" #include "Sound Control.h" -#endif STR16 szClipboard; diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index 93bb693c7..f3d156be7 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "text.h" #include "Fileman.h" #include "GameSettings.h" // sevenfm #include #include -#endif BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString ) { diff --git a/Utils/Timer Control.cpp b/Utils/Timer Control.cpp index 06617cbd7..ae6ee36cb 100644 --- a/Utils/Timer Control.cpp +++ b/Utils/Timer Control.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "interface control.h" -#else #include #include #include @@ -14,7 +10,6 @@ #include "renderworld.h" #include "interface control.h" #include "keymap.h" -#endif #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/Utils/Utilities.cpp b/Utils/Utilities.cpp index 8183aca90..8b6836c75 100644 --- a/Utils/Utilities.cpp +++ b/Utils/Utilities.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "types.h" #include #include @@ -14,7 +11,6 @@ #include "overhead types.h" #include "wcheck.h" #include "sys globals.h" -#endif extern BOOLEAN GetCDromDriveLetter( STR8 pString ); diff --git a/Utils/Utils_VS2005.vcproj b/Utils/Utils_VS2005.vcproj index ec8b66eca..2f38f3fe6 100644 --- a/Utils/Utils_VS2005.vcproj +++ b/Utils/Utils_VS2005.vcproj @@ -507,10 +507,6 @@ RelativePath=".\Utilities.h" > - - diff --git a/Utils/Utils_VS2008.vcproj b/Utils/Utils_VS2008.vcproj index e06e8af40..e24576334 100644 --- a/Utils/Utils_VS2008.vcproj +++ b/Utils/Utils_VS2008.vcproj @@ -509,10 +509,6 @@ RelativePath="Utilities.h" > - - diff --git a/Utils/Utils_VS2010.vcxproj b/Utils/Utils_VS2010.vcxproj index 25cd06ca3..60965db27 100644 --- a/Utils/Utils_VS2010.vcxproj +++ b/Utils/Utils_VS2010.vcxproj @@ -58,7 +58,6 @@ - diff --git a/Utils/Utils_VS2010.vcxproj.filters b/Utils/Utils_VS2010.vcxproj.filters index e7e715a33..03086d9fe 100644 --- a/Utils/Utils_VS2010.vcxproj.filters +++ b/Utils/Utils_VS2010.vcxproj.filters @@ -117,7 +117,6 @@ Header Files - Header Files diff --git a/Utils/Utils_VS2013.vcxproj b/Utils/Utils_VS2013.vcxproj index b6b8f9541..dc648abc2 100644 --- a/Utils/Utils_VS2013.vcxproj +++ b/Utils/Utils_VS2013.vcxproj @@ -58,7 +58,6 @@ - diff --git a/Utils/Utils_VS2013.vcxproj.filters b/Utils/Utils_VS2013.vcxproj.filters index e7e715a33..03086d9fe 100644 --- a/Utils/Utils_VS2013.vcxproj.filters +++ b/Utils/Utils_VS2013.vcxproj.filters @@ -117,7 +117,6 @@ Header Files - Header Files diff --git a/Utils/Utils_VS2017.vcxproj b/Utils/Utils_VS2017.vcxproj index 5abfce81e..0cf0160a2 100644 --- a/Utils/Utils_VS2017.vcxproj +++ b/Utils/Utils_VS2017.vcxproj @@ -58,7 +58,6 @@ - diff --git a/Utils/Utils_VS2019.vcxproj b/Utils/Utils_VS2019.vcxproj index 837a2c3aa..9760a8f00 100644 --- a/Utils/Utils_VS2019.vcxproj +++ b/Utils/Utils_VS2019.vcxproj @@ -78,7 +78,6 @@ - diff --git a/Utils/WordWrap.cpp b/Utils/WordWrap.cpp index e42d27f81..3368c2f97 100644 --- a/Utils/WordWrap.cpp +++ b/Utils/WordWrap.cpp @@ -1,14 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "winfont.h" -#else - #include "WordWrap.h" + #include "WordWrap.h" #include "sgp.h" #include "Render Dirty.h" #include "Font Control.h" #include "Stdio.h" #include "WinFont.h" -#endif #define SINGLE_CHARACTER_WORD_FOR_WORDWRAP diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 39b92f3f8..ce4cac81f 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "overhead types.h" #include "Soldier Control.h" @@ -36,7 +33,6 @@ #include "XML.h" #include "utilities.h" #include "store inventory.h" -#endif // Flugente: in order not to loop over MAXITEMS items if we only have a few thousand, remember the actual number of items in the xml UINT32 gMAXITEMS_READ = 0; diff --git a/Utils/XML_Language.cpp b/Utils/XML_Language.cpp index dc787c6cb..0c79cfc54 100644 --- a/Utils/XML_Language.cpp +++ b/Utils/XML_Language.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" - #include "Editor All.h" - #include "LuaInitNPCs.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -16,7 +11,6 @@ #include "Encrypted File.h" #include "GameSettings.h" #include "Text.h" -#endif #include "XML_Language.h" diff --git a/Utils/XML_SenderNameList.cpp b/Utils/XML_SenderNameList.cpp index f181ca7d4..e0bedaee9 100644 --- a/Utils/XML_SenderNameList.cpp +++ b/Utils/XML_SenderNameList.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Text.h" -#endif struct { diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 1b0f7b628..bf3a913f4 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("CHINESE") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( CHINESE ) #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_ChineseText_public_symbol(void){;} @@ -12153,4 +12149,4 @@ STR16 ChineseSpecString10 = L"%s [%d%％(%d%％)]\n%s %d%％ (%d/%d)\n%s %d%％\ STR16 ChineseSpecString11 = L"%s (%s) [%d%％(%d%％)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s"; // added by Flugente STR16 ChineseSpecString12 = L"%s (%s) [%d%％]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%"; // added by Flugente -#endif //CHINESE \ No newline at end of file +#endif //CHINESE diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 1afaa83e1..97a534ed2 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("DUTCH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( DUTCH ) #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_DutchText_public_symbol(void){;} diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 7ff18a08d..d56f2cbf0 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("ENGLISH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( ENGLISH ) #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_EnglishText_public_symbol(void); diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 1f264bd3f..07bacfb1f 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("FRENCH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #ifdef FRENCH #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_FrenchText_public_symbol(void){;} diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 059f894f2..ccfa579f9 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("GERMAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #ifdef GERMAN #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_GermanText_public_symbol(void){;} diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 4acaaf5d2..9e3f0ded4 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("ITALIAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( ITALIAN ) #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_ItalianText_public_symbol(void){;} diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index 8c3cf6890..6c60c9724 100644 --- a/Utils/_Ja25ChineseText.cpp +++ b/Utils/_Ja25ChineseText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("CHINESE") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Englishtext.h" -#else #include "Language Defines.h" #ifdef CHINESE #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25ChineseText_public_symbol(void){;} diff --git a/Utils/_Ja25DutchText.cpp b/Utils/_Ja25DutchText.cpp index 91e542483..4548c46eb 100644 --- a/Utils/_Ja25DutchText.cpp +++ b/Utils/_Ja25DutchText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("DUTCH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Dutchtext.h" -#else #include "Language Defines.h" #ifdef DUTCH #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25DutchText_public_symbol(void){;} diff --git a/Utils/_Ja25EnglishText.cpp b/Utils/_Ja25EnglishText.cpp index fac56fb65..63eb232a5 100644 --- a/Utils/_Ja25EnglishText.cpp +++ b/Utils/_Ja25EnglishText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("ENGLISH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Englishtext.h" -#else #include "Language Defines.h" #ifdef ENGLISH #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25EnglishText_public_symbol(void); diff --git a/Utils/_Ja25FrenchText.cpp b/Utils/_Ja25FrenchText.cpp index 0707be3be..290158fcd 100644 --- a/Utils/_Ja25FrenchText.cpp +++ b/Utils/_Ja25FrenchText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("FRENCH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Frenchtext.h" -#else #include "Language Defines.h" #ifdef FRENCH #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25FrenchText_public_symbol(void){;} diff --git a/Utils/_Ja25GermanText.cpp b/Utils/_Ja25GermanText.cpp index d5a4474cb..c1e9666e8 100644 --- a/Utils/_Ja25GermanText.cpp +++ b/Utils/_Ja25GermanText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("GERMAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25GermanText.h" -#else #include "Language Defines.h" #ifdef GERMAN #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25GermanText_public_symbol(void){;} diff --git a/Utils/_Ja25ItalianText.cpp b/Utils/_Ja25ItalianText.cpp index 2ab565f19..5bd9c7900 100644 --- a/Utils/_Ja25ItalianText.cpp +++ b/Utils/_Ja25ItalianText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("ITALIAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Italiantext.h" -#else #include "Language Defines.h" #ifdef ITALIAN #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25ItalianText_public_symbol(void){;} diff --git a/Utils/_Ja25PolishText.cpp b/Utils/_Ja25PolishText.cpp index 32c8f6a67..506e37c1c 100644 --- a/Utils/_Ja25PolishText.cpp +++ b/Utils/_Ja25PolishText.cpp @@ -2,16 +2,11 @@ // WANNE: Yes we need this here exclusivly in Polish version, because we do not have a codepage in the code like for other versions. //#pragma setlocale("POLISH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25Polishtext.h" -#else #include "Language Defines.h" #ifdef POLISH #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25PolishText_public_symbol(void){;} diff --git a/Utils/_Ja25RussianText.cpp b/Utils/_Ja25RussianText.cpp index 4ae1adcb0..022b1f59f 100644 --- a/Utils/_Ja25RussianText.cpp +++ b/Utils/_Ja25RussianText.cpp @@ -1,16 +1,11 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("RUSSIAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "_Ja25RussianText.h" -#else #include "Language Defines.h" #ifdef RUSSIAN #include "text.h" #include "Fileman.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_Ja25RussianText_public_symbol(void){;} diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index ceed1a17c..5ebff373c 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -2,9 +2,6 @@ // WANNE: Yes we need this here exclusivly in Polish version, because we do not have a codepage in the code like for other versions. //#pragma setlocale("POLISH") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( POLISH ) #include "text.h" @@ -13,7 +10,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_PolishText_public_symbol(void){;} diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 76308a088..4078205f2 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -1,9 +1,6 @@ // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build! //#pragma setlocale("RUSSIAN") -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" -#else #include "Language Defines.h" #if defined( RUSSIAN ) #include "text.h" @@ -12,7 +9,6 @@ #include "EditorMercs.h" #include "Item Statistics.h" #endif -#endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible void this_is_the_RussianText_public_symbol(void){;} diff --git a/Utils/dsutil.cpp b/Utils/dsutil.cpp index efa89fb7b..d4a4ecee1 100644 --- a/Utils/dsutil.cpp +++ b/Utils/dsutil.cpp @@ -1,17 +1,10 @@ // THIS MODULE IS TEMPORARY - USED FOR OUR SOUND SYSTEM INTIL IT IS IMPLEMENTED FOR THE SGP // TAKEN FROM MS SAMPLES FOR DirectSound -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include - #include - #include -#else #include "types.h" #include #include #include -#endif #define WIN32_LEAN_AND_MEAN diff --git a/Utils/message.cpp b/Utils/message.cpp index 3d5909bde..f77a941be 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -1,7 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Utils All.h" - #include "Game Clock.h" -#else #include "sgp.h" #include "font.h" #include "types.h" @@ -24,7 +20,6 @@ #include "Game Clock.h" #include "GameSettings.h" #include "sgp_logger.h" -#endif typedef struct { diff --git a/XML_DifficultySettings.cpp b/XML_DifficultySettings.cpp index 02a68ab3c..bc5620645 100644 --- a/XML_DifficultySettings.cpp +++ b/XML_DifficultySettings.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" @@ -8,7 +5,6 @@ #include "Interface.h" #include "Text.h" #include "GameInitOptionsScreen.h" -#endif struct { diff --git a/XML_IntroFiles.cpp b/XML_IntroFiles.cpp index 967d03a99..605bb1aa6 100644 --- a/XML_IntroFiles.cpp +++ b/XML_IntroFiles.cpp @@ -1,13 +1,9 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "Interface.h" #include "Intro.h" -#endif struct { diff --git a/XML_Layout_MainMenu.cpp b/XML_Layout_MainMenu.cpp index 8d7d44518..2e80f5247 100644 --- a/XML_Layout_MainMenu.cpp +++ b/XML_Layout_MainMenu.cpp @@ -1,12 +1,8 @@ -#ifdef PRECOMPILEDHEADERS - #include "Tactical All.h" -#else #include "sgp.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" #include "mainmenuscreen.h" -#endif struct { diff --git a/aniviewscreen.cpp b/aniviewscreen.cpp index 63ce73090..8f05104d0 100644 --- a/aniviewscreen.cpp +++ b/aniviewscreen.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "builddefines.h" #include #include @@ -29,7 +26,6 @@ #include "english.h" #include "Fileman.h" #include "messageboxscreen.h" -#endif //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/gameloop.cpp b/gameloop.cpp index ffea043ba..d65f7dae2 100644 --- a/gameloop.cpp +++ b/gameloop.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "HelpScreen.h" - #include "Prebattle Interface.h" -#else #include #include #include "sgp.h" @@ -32,7 +27,6 @@ #include "World Items.h"//dnl ch77 191113 #include "Overhead.h" // added by Flugente #include "Ambient Control.h" // sevenfm -#endif #include "SaveLoadScreen.h" diff --git a/gamescreen.cpp b/gamescreen.cpp index a6a05c8a6..67e70d99f 100644 --- a/gamescreen.cpp +++ b/gamescreen.cpp @@ -1,8 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" - #include "HelpScreen.h" - #include "PreBattle Interface.h" -#else #include "builddefines.h" #include #include @@ -84,7 +79,6 @@ #include "editscreen.h" #include "Scheduling.h" #include "Animated ProgressBar.h" -#endif #include "connect.h" diff --git a/ja2_VS2005.vcproj b/ja2_VS2005.vcproj index 70fa9e5b8..2a853c5f4 100644 --- a/ja2_VS2005.vcproj +++ b/ja2_VS2005.vcproj @@ -638,10 +638,6 @@ RelativePath=".\Intro.h" > - - diff --git a/ja2_VS2008.vcproj b/ja2_VS2008.vcproj index 81067948e..81dcad27b 100644 --- a/ja2_VS2008.vcproj +++ b/ja2_VS2008.vcproj @@ -480,10 +480,6 @@ RelativePath="Intro.h" > - - diff --git a/ja2_VS2010.vcxproj b/ja2_VS2010.vcxproj index e166add29..c453f339e 100644 --- a/ja2_VS2010.vcxproj +++ b/ja2_VS2010.vcxproj @@ -282,7 +282,6 @@ - diff --git a/ja2_VS2010.vcxproj.filters b/ja2_VS2010.vcxproj.filters index c72b50a61..5fddb27a6 100644 --- a/ja2_VS2010.vcxproj.filters +++ b/ja2_VS2010.vcxproj.filters @@ -173,7 +173,6 @@ Header Files - Header Files diff --git a/ja2_VS2013.vcxproj b/ja2_VS2013.vcxproj index 55d10d4c1..d73753cab 100644 --- a/ja2_VS2013.vcxproj +++ b/ja2_VS2013.vcxproj @@ -296,7 +296,6 @@ - diff --git a/ja2_VS2013.vcxproj.filters b/ja2_VS2013.vcxproj.filters index aeb0eb5d0..2379adbe6 100644 --- a/ja2_VS2013.vcxproj.filters +++ b/ja2_VS2013.vcxproj.filters @@ -173,7 +173,6 @@ Header Files - Header Files diff --git a/ja2_VS2017.vcxproj b/ja2_VS2017.vcxproj index b7734d38a..bc43741d5 100644 --- a/ja2_VS2017.vcxproj +++ b/ja2_VS2017.vcxproj @@ -288,7 +288,6 @@ - diff --git a/ja2_VS2019.vcxproj b/ja2_VS2019.vcxproj index 6140ccaf9..8eb5ef8c5 100644 --- a/ja2_VS2019.vcxproj +++ b/ja2_VS2019.vcxproj @@ -528,7 +528,6 @@ - diff --git a/jascreens.cpp b/jascreens.cpp index 8b0a3f4bd..2704b0720 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -1,6 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "JA2 All.h" -#else #include "builddefines.h" #include #include @@ -50,7 +47,6 @@ #include "text.h" #include "Language Defines.h" #include "IniReader.h" -#endif #include "sgp_logger.h" diff --git a/legion cfg.cpp b/legion cfg.cpp index a0bbc5a75..2004c497e 100644 --- a/legion cfg.cpp +++ b/legion cfg.cpp @@ -1,23 +1,4 @@ //legion 2 -#ifdef PRECOMPILEDHEADERS - #include "Types.h" - #include "types.h" - #include "Strategic All.h" - #include "XML.h" - #include "INIReader.h" - #include "GameSettings.h" - #include "Soldier Profile.h" - #include "XML.h" - #include "Item Types.h" - #include "Items.h" - #include "Game Event Hook.h" - #include "faces.h" - #include "Language Defines.h" - #include "Types.h" - #include "Map Screen Interface Map.h" - #include "legion cfg.h" //legion2 - //#include "XMLWriter.h" -#else #include "Types.h" #include "types.h" #include "Random.h" @@ -67,7 +48,6 @@ #include "Items.h" #include "text.h" #include "GameSettings.h" -#endif #ifdef JA2UB #include "Ja25 Strategic Ai.h" diff --git a/ub_config.cpp b/ub_config.cpp index 6a6b57759..edf55ca02 100644 --- a/ub_config.cpp +++ b/ub_config.cpp @@ -1,21 +1,3 @@ -#ifdef PRECOMPILEDHEADERS - #include "Types.h" - #include "types.h" - #include "Strategic All.h" - #include "XML.h" - #include "INIReader.h" - #include "GameSettings.h" - #include "Soldier Profile.h" - #include "XML.h" - #include "Item Types.h" - #include "Items.h" - #include "Game Event Hook.h" - #include "faces.h" - #include "Language Defines.h" - #include "Types.h" - #include "Map Screen Interface Map.h" - #include "ub_config.h" //legion2 -#else #include "Types.h" #include "types.h" #include "Random.h" @@ -65,7 +47,6 @@ #include "Items.h" #include "text.h" #include "GameSettings.h" -#endif #ifdef JA2UB #include "Ja25 Strategic Ai.h"