diff --git a/CMakeLists.txt b/CMakeLists.txt index 9be4f1c6e..4201e90fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ include_directories( "${CMAKE_SOURCE_DIR}/Strategic" "${CMAKE_SOURCE_DIR}/sgp" "${CMAKE_SOURCE_DIR}/Ja2/Res" - "${CMAKE_SOURCE_DIR}/Lua" + "${CMAKE_SOURCE_DIR}/lua" "${CMAKE_SOURCE_DIR}/Laptop" "${CMAKE_SOURCE_DIR}/Multiplayer" "${CMAKE_SOURCE_DIR}/Editor" diff --git a/Console/Cursors.cpp b/Console/Cursors.cpp index 56579caef..88b9087cf 100644 --- a/Console/Cursors.cpp +++ b/Console/Cursors.cpp @@ -27,7 +27,7 @@ // Cursors.h - cursor classes //#include "stdafx.h" -#include +#include #include #include "Cursors.h" diff --git a/Console/Dialogs.cpp b/Console/Dialogs.cpp index 0ffc2f200..18574e048 100644 --- a/Console/Dialogs.cpp +++ b/Console/Dialogs.cpp @@ -29,7 +29,7 @@ // About dialog class, etc... //#include "stdafx.h" -#include +#include #include "resource.h" #include "Console.h" diff --git a/Console/FileStream.cpp b/Console/FileStream.cpp index c78c00289..2e56aedd6 100644 --- a/Console/FileStream.cpp +++ b/Console/FileStream.cpp @@ -33,7 +33,7 @@ //#include "stdafx.h" //#include -#include +#include #include #include "FileStream.h" diff --git a/Editor/Button Defines.h b/Editor/Button Defines.h index 677aa6ce6..991bb93cd 100644 --- a/Editor/Button Defines.h +++ b/Editor/Button Defines.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __BUTTON_DEFINES_H diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp index 16bb60b70..a4f609790 100644 --- a/Editor/Cursor Modes.cpp +++ b/Editor/Cursor Modes.cpp @@ -7,7 +7,7 @@ #include "renderworld.h" #include "random.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" #include "Isometric Utils.h" #include "editscreen.h" #include "EditorDefines.h" diff --git a/Editor/Cursor Modes.h b/Editor/Cursor Modes.h index c49941852..82bd3a70c 100644 --- a/Editor/Cursor Modes.h +++ b/Editor/Cursor Modes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __CURSOR_MODES_H @@ -40,4 +40,4 @@ extern BOOLEAN gfCurrentSelectionWithRightButton; #endif -#endif +#endif diff --git a/Editor/Editor Callback Prototypes.h b/Editor/Editor Callback Prototypes.h index 3cb2ff607..3794ab358 100644 --- a/Editor/Editor Callback Prototypes.h +++ b/Editor/Editor Callback Prototypes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_CALLBACK_PROTOTYPES_H diff --git a/Editor/Editor Modes.cpp b/Editor/Editor Modes.cpp index f8cd90849..81d23d080 100644 --- a/Editor/Editor Modes.cpp +++ b/Editor/Editor Modes.cpp @@ -17,7 +17,7 @@ #include "environment.h" #include "worlddef.h" #include "Exit Grids.h" - #include "Worldman.h" + #include "worldman.h" BOOLEAN gfShowExitGrids = FALSE; diff --git a/Editor/Editor Modes.h b/Editor/Editor Modes.h index 3eae76965..352ab723c 100644 --- a/Editor/Editor Modes.h +++ b/Editor/Editor Modes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_MODES_H @@ -14,4 +14,4 @@ void ShowExitGrids(); void HideExitGrids(); #endif -#endif +#endif diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp index 1b7f5c50d..15f746418 100644 --- a/Editor/Editor Taskbar Creation.cpp +++ b/Editor/Editor Taskbar Creation.cpp @@ -5,7 +5,7 @@ //sgp #include "Button System.h" #include "Font Control.h" - #include "debug.h" + #include "DEBUG.H" //editor #include "EditorDefines.h" #include "Editor Callback Prototypes.h" @@ -14,7 +14,7 @@ #include "EditorMapInfo.h" //tactical #include "Soldier Create.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "local.h" #include "Text.h" diff --git a/Editor/Editor Taskbar Creation.h b/Editor/Editor Taskbar Creation.h index ca645a7e8..200410e67 100644 --- a/Editor/Editor Taskbar Creation.h +++ b/Editor/Editor Taskbar Creation.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_CREATION_H @@ -7,4 +7,4 @@ void CreateEditorTaskbarInternal(); #endif -#endif +#endif diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index 75a77b06d..a3944735d 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -11,13 +11,13 @@ #include "WorldDat.h" #include "Render Dirty.h" #include "sysutil.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "environment.h" #include "Interface Items.h" #include "Soldier Find.h" #include "World Items.h" #include "Text.h" - #include "Overhead map.h" + #include "overhead map.h" #include "Cursor Modes.h" #include "editscreen.h" #include "EditorTerrain.h" diff --git a/Editor/Editor Taskbar Utils.h b/Editor/Editor Taskbar Utils.h index 563452e6d..a931b1e00 100644 --- a/Editor/Editor Taskbar Utils.h +++ b/Editor/Editor Taskbar Utils.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_UTILS_H @@ -67,4 +67,4 @@ extern UINT32 guiMercTempBuffer; extern INT32 giEditMercImage[2]; #endif -#endif +#endif diff --git a/Editor/Editor Undo.cpp b/Editor/Editor Undo.cpp index 0d09d8b97..642d4833d 100644 --- a/Editor/Editor Undo.cpp +++ b/Editor/Editor Undo.cpp @@ -6,7 +6,7 @@ #include "worldman.h" #include "smooth.h" #include "input.h" - #include "debug.h" + #include "DEBUG.H" #include "Isometric Utils.h" #include "editscreen.h" @@ -15,7 +15,7 @@ #include "Cursor Modes.h" #include "Exit Grids.h" //dnl ch86 110214 - #include "keys.h" + #include "Keys.h" #include "EditorItems.h" #include "EditorMapInfo.h" diff --git a/Editor/Editor Undo.h b/Editor/Editor Undo.h index c7b470a47..e399eba41 100644 --- a/Editor/Editor Undo.h +++ b/Editor/Editor Undo.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_UNDO_H diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp index fd7f9c29c..d6ecccf23 100644 --- a/Editor/EditorBuildings.cpp +++ b/Editor/EditorBuildings.cpp @@ -18,7 +18,7 @@ #include "Editor Modes.h" #include "Smoothing Utils.h" #include "Text Input.h" - #include "keys.h" + #include "Keys.h" #include "environment.h" #include "selectwin.h" #include "Simple Render Utils.h" diff --git a/Editor/EditorBuildings.h b/Editor/EditorBuildings.h index bfeb0a8f5..4fe900f42 100644 --- a/Editor/EditorBuildings.h +++ b/Editor/EditorBuildings.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORBUILDINGS_H diff --git a/Editor/EditorDefines.h b/Editor/EditorDefines.h index 28f400816..053c33487 100644 --- a/Editor/EditorDefines.h +++ b/Editor/EditorDefines.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORDEFINES_H #define __EDITORDEFINES_H -#include "Types.h" +#include "types.h" #include "Button Defines.h" diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index 7c0b3364d..d5fc7dd50 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -9,34 +9,34 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "text.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Text.h" + #include "Utilities.h" #include "Action Items.h" #include "World Items.h" #include "EditorDefines.h" #include "EditorItems.h" #include "EditorMercs.h" - #include "weapons.h" + #include "Weapons.h" #include "Editor Taskbar Utils.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Item Statistics.h" #include "Simple Render Utils.h" #include "worldman.h" #include "random.h" #include "Pits.h" - #include "keys.h" + #include "Keys.h" #include "InterfaceItemImages.h" #include "Editor Undo.h"//dnl ch86 220214 diff --git a/Editor/EditorItems.h b/Editor/EditorItems.h index e56fbfdfa..04aff1dc1 100644 --- a/Editor/EditorItems.h +++ b/Editor/EditorItems.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORITEMS_H diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp index b4335ab38..adec58703 100644 --- a/Editor/EditorMapInfo.cpp +++ b/Editor/EditorMapInfo.cpp @@ -9,23 +9,23 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "line.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Utilities.h" #include "World Items.h" #include "worldman.h" - #include "overhead.h" //GetSoldier + #include "Overhead.h" //GetSoldier #include "renderworld.h" #include "Animation Data.h" #include "Animation Control.h" @@ -37,11 +37,11 @@ #include "Soldier Init List.h" #include "strategicmap.h" #include "Soldier Add.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Text Input.h" - #include "Random.h" - #include "wordwrap.h" + #include "random.h" + #include "WordWrap.h" #include "EditorItems.h" #include "Editor Taskbar Utils.h" #include "Exit Grids.h" diff --git a/Editor/EditorMapInfo.h b/Editor/EditorMapInfo.h index b9cbdf7a7..03f93db3d 100644 --- a/Editor/EditorMapInfo.h +++ b/Editor/EditorMapInfo.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORMAPINFO_H diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp index 737d3a6fd..f91421bd1 100644 --- a/Editor/EditorMercs.cpp +++ b/Editor/EditorMercs.cpp @@ -9,24 +9,24 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "line.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "text.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Text.h" + #include "Utilities.h" #include "World Items.h" #include "worldman.h" - #include "overhead.h" //GetSoldier + #include "Overhead.h" //GetSoldier #include "renderworld.h" #include "Animation Data.h" #include "Animation Control.h" @@ -39,11 +39,11 @@ #include "Soldier Init List.h" #include "strategicmap.h" #include "Soldier Add.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Text Input.h" - #include "Random.h" - #include "wordwrap.h" + #include "random.h" + #include "WordWrap.h" #include "EditorItems.h" #include "Editor Taskbar Utils.h" #include "Exit Grids.h" diff --git a/Editor/EditorMercs.h b/Editor/EditorMercs.h index 71e66ccdd..64dc4a9ee 100644 --- a/Editor/EditorMercs.h +++ b/Editor/EditorMercs.h @@ -1,6 +1,6 @@ #pragma once -#include "BuildDefines.h" +#include "builddefines.h" //----------------------------------------------- // diff --git a/Editor/EditorTerrain.cpp b/Editor/EditorTerrain.cpp index 932b44efe..14560d0cd 100644 --- a/Editor/EditorTerrain.cpp +++ b/Editor/EditorTerrain.cpp @@ -9,18 +9,18 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Utilities.h" #include "World Items.h" #include "EditorDefines.h" #include "EditorTerrain.h" diff --git a/Editor/EditorTerrain.h b/Editor/EditorTerrain.h index 5b48ff0d2..8be6a062a 100644 --- a/Editor/EditorTerrain.h +++ b/Editor/EditorTerrain.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORTERRAIN_H diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index 57a1851ba..77472298a 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -7,7 +7,7 @@ #include "types.h" #include "mousesystem.h" #include "Button System.h" - #include "font control.h" + #include "Font Control.h" #include "EditorDefines.h" #include "Editor Taskbar Utils.h" #include "EditorMercs.h" @@ -20,7 +20,7 @@ #include "Weapons.h" #include "Items.h" #include "editscreen.h" - #include "Random.h" + #include "random.h" #include "Handle Items.h" #include "World Items.h" #include "PopupMenu.h" diff --git a/Editor/Item Statistics.h b/Editor/Item Statistics.h index 63b80a6cd..be19922dc 100644 --- a/Editor/Item Statistics.h +++ b/Editor/Item Statistics.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifndef __ITEM_STATISTICS_H #define __ITEM_STATISTICS_H diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp index cba550c2c..53b4472d7 100644 --- a/Editor/LoadScreen.cpp +++ b/Editor/LoadScreen.cpp @@ -5,7 +5,7 @@ #include #include "Font Control.h" #include "renderworld.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "loadscreen.h" #include "selectwin.h" #include "EditorDefines.h" diff --git a/Editor/LoadScreen.h b/Editor/LoadScreen.h index 245181949..f52160288 100644 --- a/Editor/LoadScreen.h +++ b/Editor/LoadScreen.h @@ -1,5 +1,5 @@ -#include "BuildDefines.h" -#include "Fileman.h" +#include "builddefines.h" +#include "FileMan.h" #define FILENAME_BUFLEN (30 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213 diff --git a/Editor/Road Smoothing.cpp b/Editor/Road Smoothing.cpp index 267875096..9c26abcde 100644 --- a/Editor/Road Smoothing.cpp +++ b/Editor/Road Smoothing.cpp @@ -4,7 +4,7 @@ #include "types.h" #include "Road Smoothing.h" - #include "tiledat.h" + #include "TileDat.h" #include "worlddef.h" #include "worldman.h" #include "Editor Undo.h" diff --git a/Editor/Road Smoothing.h b/Editor/Road Smoothing.h index f1b899d9a..a9f60b0e3 100644 --- a/Editor/Road Smoothing.h +++ b/Editor/Road Smoothing.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR @@ -61,4 +61,4 @@ void InitializeRoadMacros(); #endif -#endif +#endif diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp index 9c328cfaa..5d42fd5bb 100644 --- a/Editor/Sector Summary.cpp +++ b/Editor/Sector Summary.cpp @@ -19,18 +19,18 @@ #include "Text Input.h" #include "mousesystem.h" #include "strategicmap.h" - #include "Fileman.h" + #include "FileMan.h" #include "Exit Grids.h" #include "Map Information.h" #include "Summary Info.h" #include "Animated ProgressBar.h" #include "worlddef.h" - #include "worlddat.h" + #include "WorldDat.h" #include "EditorDefines.h" #include "editscreen.h" #include "english.h" #include "World Items.h" - #include "text.h" + #include "Text.h" #include "Soldier Create.h" #include "GameVersion.h" #include "Campaign Types.h" diff --git a/Editor/Sector Summary.h b/Editor/Sector Summary.h index c1c977589..943960273 100644 --- a/Editor/Sector Summary.h +++ b/Editor/Sector Summary.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SECTOR_SUMMARY_H @@ -35,4 +35,4 @@ void GetSectorFromFileName(STR16 szFileName, INT16& sSectorX, INT16& sSectorY, I void ResetCustomFileSectorSummary(void);//dnl ch30 150909 #endif -#endif +#endif diff --git a/Editor/SmartMethod.h b/Editor/SmartMethod.h index 09aedce90..7717e4a4b 100644 --- a/Editor/SmartMethod.h +++ b/Editor/SmartMethod.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMARTMETHOD_H diff --git a/Editor/Smoothing Utils.h b/Editor/Smoothing Utils.h index 7da296285..5713b442e 100644 --- a/Editor/Smoothing Utils.h +++ b/Editor/Smoothing Utils.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTHING_UTILS_H @@ -62,4 +62,4 @@ UINT16 GetHorizontalWallClass( INT32 iMapIndex ); BOOLEAN ValidDecalPlacement( INT32 iMapIndex ); #endif -#endif +#endif diff --git a/Editor/Summary Info.h b/Editor/Summary Info.h index 9aae39739..e8ee9be51 100644 --- a/Editor/Summary Info.h +++ b/Editor/Summary Info.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SUMMARY_INFO_H #define __SUMMARY_INFO_H -#include "Types.h" +#include "types.h" //dnl ch28 #define GLOBAL_SUMMARY_VERSION 15 diff --git a/Editor/edit_sys.h b/Editor/edit_sys.h index b7c5693b2..a4f702be3 100644 --- a/Editor/edit_sys.h +++ b/Editor/edit_sys.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDIT_SYS_H diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 563561ed9..e7f12fe6c 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -12,22 +12,22 @@ #include "edit_sys.h" #include "screenids.h" #include "editscreen.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "SmartMethod.h" #include "selectwin.h" #include "Interface.h" #include "lighting.h" #include "Interactive Tiles.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Overhead.h" #include "Handle UI.h" #include "Event Pump.h" #include "world items.h" #include "loadscreen.h" - #include "render dirty.h" - #include "isometric utils.h" + #include "Render Dirty.h" + #include "Isometric Utils.h" #include "message.h" - #include "render fun.h" + #include "Render Fun.h" #include "popupmenu.h" #include "overhead map.h" #include "EditorDefines.h" @@ -39,7 +39,7 @@ #include "newsmooth.h" #include "Smoothing Utils.h" #include "messagebox.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "Soldier Create.h" #include "Soldier Init List.h" #include "Text Input.h" @@ -70,7 +70,7 @@ #include "GameSettings.h" #include "Summary Info.h" #include "connect.h"//dnl - #include "cursors.h"//dnl ch2 210909 + #include "Cursors.h"//dnl ch2 210909 #include "Cursor Control.h"//dnl ch2 210909 #include "maputility.h"//dnl ch49 061009 #include "Text.h" diff --git a/Editor/editscreen.h b/Editor/editscreen.h index 1f3c591a0..c28c617bc 100644 --- a/Editor/editscreen.h +++ b/Editor/editscreen.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef EDITSCREEN_H diff --git a/Editor/messagebox.cpp b/Editor/messagebox.cpp index 522264509..5e3221fcb 100644 --- a/Editor/messagebox.cpp +++ b/Editor/messagebox.cpp @@ -4,7 +4,7 @@ #include "vobject.h" #include "video.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "messagebox.h" #include "input.h" diff --git a/Editor/messagebox.h b/Editor/messagebox.h index 9f0a57fac..f43e06821 100644 --- a/Editor/messagebox.h +++ b/Editor/messagebox.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __MESSAGEBOX_H diff --git a/Editor/newsmooth.cpp b/Editor/newsmooth.cpp index 2123937ac..bbfc694b4 100644 --- a/Editor/newsmooth.cpp +++ b/Editor/newsmooth.cpp @@ -14,7 +14,7 @@ #include "Editor Undo.h" #include "Structure Internals.h" #include "environment.h" - #include "Random.h" + #include "random.h" #include "Render Fun.h" diff --git a/Editor/newsmooth.h b/Editor/newsmooth.h index 640b7f22d..b2889a82c 100644 --- a/Editor/newsmooth.h +++ b/Editor/newsmooth.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __NEWSMOOTH_H diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 8d43a90a8..34feabd65 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -16,18 +16,18 @@ #include "tiledef.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "line.h" - #include "worlddat.h" + #include "WorldDat.h" #include "selectwin.h" #include "popupmenu.h" #include "EditorDefines.h" - #include "render dirty.h" - #include "debug.h" + #include "Render Dirty.h" + #include "DEBUG.H" #include "mousesystem.h" - #include "cursors.h" - #include "overhead types.h" + #include "Cursors.h" + #include "Overhead Types.h" #include "EditorMercs.h" #include "Scheduling.h" #include "english.h" diff --git a/Editor/popupmenu.h b/Editor/popupmenu.h index 94c2ec3f8..fe5ffb19b 100644 --- a/Editor/popupmenu.h +++ b/Editor/popupmenu.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR //popupmenu.h diff --git a/Editor/selectwin.cpp b/Editor/selectwin.cpp index baf826a40..6eeb97cd8 100644 --- a/Editor/selectwin.cpp +++ b/Editor/selectwin.cpp @@ -6,7 +6,7 @@ #include "tiledef.h" #include "vsurface.h" - #include "worlddat.h" + #include "WorldDat.h" #include "random.h" #include "sysutil.h" #include "Font Control.h" diff --git a/Editor/selectwin.h b/Editor/selectwin.h index 7d9c8981c..c5fb53888 100644 --- a/Editor/selectwin.h +++ b/Editor/selectwin.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef _SELECTION_WIN_H_ #define _SELECTION_WIN_H_ -#include "Types.h" +#include "types.h" #include "vobject.h" #include "mousesystem.h" diff --git a/Editor/smooth.cpp b/Editor/smooth.cpp index c835a29a4..b94004019 100644 --- a/Editor/smooth.cpp +++ b/Editor/smooth.cpp @@ -5,15 +5,15 @@ #include "stdlib.h" #include "FileMan.h" #include "time.h" - #include "debug.h" + #include "DEBUG.H" #include "tiledef.h" #include "worlddef.h" #include "worldman.h" #include "smooth.h" #include "editscreen.h" #include "selectwin.h" - #include "isometric utils.h" - #include "structure wrap.h" + #include "Isometric Utils.h" + #include "Structure Wrap.h" #include "Exit Grids.h" #include "Editor Undo.h" diff --git a/Editor/smooth.h b/Editor/smooth.h index 4637d1792..9201ef7c1 100644 --- a/Editor/smooth.h +++ b/Editor/smooth.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTH_H diff --git a/Ja2/Credits.cpp b/Ja2/Credits.cpp index f2d1fdeb8..24a8b6aae 100644 --- a/Ja2/Credits.cpp +++ b/Ja2/Credits.cpp @@ -1,24 +1,24 @@ - #include "Types.h" + #include "types.h" #include "Credits.h" #include "vsurface.h" #include "mousesystem.h" #include "Text.h" - #include "wordwrap.h" - #include "Video.h" - #include "render dirty.h" + #include "WordWrap.h" + #include "video.h" + #include "Render Dirty.h" #include "local.h" - #include "utilities.h" + #include "Utilities.h" #include "WCheck.h" #include "screenids.h" #include "Font Control.h" - #include "cursors.h" - #include "font.h" - #include "wordwrap.h" + #include "Cursors.h" + #include "Font.h" + #include "WordWrap.h" #include "sysutil.h" - #include "Input.h" + #include "input.h" #include "english.h" - #include "encrypted file.h" - #include "Random.h" + #include "Encrypted File.h" + #include "random.h" //externals extern HVSURFACE ghFrameBuffer; diff --git a/Ja2/Fade Screen.cpp b/Ja2/Fade Screen.cpp index 2f44de734..635f9b298 100644 --- a/Ja2/Fade Screen.cpp +++ b/Ja2/Fade Screen.cpp @@ -1,12 +1,12 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "sys globals.h" - #include "fade screen.h" + #include "Sys Globals.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "cursor control.h" - #include "music control.h" + #include "Cursor Control.h" + #include "Music Control.h" #include "Render Dirty.h" #include "gameloop.h" diff --git a/Ja2/FeaturesScreen.cpp b/Ja2/FeaturesScreen.cpp index 50535f97b..34ce1f746 100644 --- a/Ja2/FeaturesScreen.cpp +++ b/Ja2/FeaturesScreen.cpp @@ -1,6 +1,6 @@ -#include "Types.h" +#include "types.h" #include "FeaturesScreen.h" -#include "Video.h" +#include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Text Input.h" @@ -10,29 +10,29 @@ #include "WordWrap.h" #include "WCheck.h" #include "Utilities.h" -#include "Debug.h" +#include "DEBUG.H" #include "Sound Control.h" #include "Ambient Control.h" -#include "Worlddat.h" -#include "Worlddef.h" +#include "WorldDat.h" +#include "worlddef.h" #include "GameSettings.h" #include "Game Init.h" -#include "English.h" +#include "english.h" #include "Overhead.h" -#include "Gap.h" +#include "GAP.H" #include "Cursors.h" -#include "SysUtil.h" +#include "sysutil.h" #include "Exit Grids.h" #include "Text.h" #include "Interface Control.h" -#include "Message.h" +#include "message.h" #include "Multi Language Graphic Utils.h" #include "Map Information.h" #include "Sys Globals.h" #include "insurance.h" #include "connect.h" -#include "WorldMan.h" +#include "worldman.h" #include "Init.h" #include "Game Events.h" diff --git a/Ja2/GameInitOptionsScreen.cpp b/Ja2/GameInitOptionsScreen.cpp index b2eb22164..08ebadbf3 100644 --- a/Ja2/GameInitOptionsScreen.cpp +++ b/Ja2/GameInitOptionsScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "GameInitOptionsScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "_Ja25EnglishText.h" @@ -21,7 +21,7 @@ #include "gameloop.h" #include "connect.h" -#include "saveloadscreen.h" +#include "SaveLoadScreen.h" #ifdef JA2UB #include "ub_config.h" diff --git a/Ja2/GameSettings.cpp b/Ja2/GameSettings.cpp index c437d5429..3d3b6531c 100644 --- a/Ja2/GameSettings.cpp +++ b/Ja2/GameSettings.cpp @@ -1,7 +1,7 @@ - #include "Types.h" + #include "types.h" #include "GameSettings.h" #include "FileMan.h" - #include "String.h" + #include "string.h" #include "Sound Control.h" #include "SaveLoadScreen.h" #include "Music Control.h" @@ -9,19 +9,19 @@ #include "Overhead.h" #include "GameVersion.h" #include "LibraryDataBase.h" - #include "Debug.h" + #include "DEBUG.H" #include "HelpScreen.h" #include "INIReader.h" #include "Shade Table Util.h" #include "soldier profile type.h" - #include "Random.h" + #include "random.h" #include "SaveLoadGame.h" #include "sgp.h" #include "screenids.h" #include "Font Control.h" #include "message.h" #include "Campaign.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "strategicmap.h" #include "Queen Command.h" #include "Game Clock.h" diff --git a/Ja2/GameSettings.h b/Ja2/GameSettings.h index 1aeb3404e..55e96bdf0 100644 --- a/Ja2/GameSettings.h +++ b/Ja2/GameSettings.h @@ -1,7 +1,7 @@ #ifndef _GAME_SETTINGS__H_ #define _GAME_SETTINGS__H_ -#include "Types.h" +#include "types.h" #include "Strategic Status.h" #include "Morale.h" #include "GameInitOptionsScreen.h" diff --git a/Ja2/GameVersion.cpp b/Ja2/GameVersion.cpp index d91a7c510..6a38c8a5c 100644 --- a/Ja2/GameVersion.cpp +++ b/Ja2/GameVersion.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "GameVersion.h" // diff --git a/Ja2/GameVersion.h b/Ja2/GameVersion.h index f85ee0169..e1924e78c 100644 --- a/Ja2/GameVersion.h +++ b/Ja2/GameVersion.h @@ -76,7 +76,7 @@ extern CHAR16 zBuildInformation[256]; #define MORE_ROOMS 134 // changed room numbers from 8 to 16 bit by DBrot #define FOOD_CHANGES 133 // changes for food system #define ZOMBIE_CHANGES 132 // Included some changes for Zombies -#define JA25_UB_INTEGRATION 131 // Before this, the JA25 Unfinished Business code was not integrated (see "Builddefines.h" JA2UB) +#define JA25_UB_INTEGRATION 131 // Before this, the JA25 Unfinished Business code was not integrated (see "builddefines.h" JA2UB) #define IMPROVED_INTERRUPT_SYSTEM 130 #define ENCYCLOPEDIA_SAVEGAME_CHANGE 129 // Added encyclopedia #define HIDDENTOWN_DATATYPE_CHANGE 128 diff --git a/Ja2/HelpScreen.cpp b/Ja2/HelpScreen.cpp index dcf0ccc4f..9583b1022 100644 --- a/Ja2/HelpScreen.cpp +++ b/Ja2/HelpScreen.cpp @@ -1,19 +1,19 @@ #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "wcheck.h" - #include "cursors.h" - #include "font control.h" - #include "cursor control.h" - #include "render dirty.h" + #include "WCheck.h" + #include "Cursors.h" + #include "Font Control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "HelpScreen.h" #include "HelpScreenText.h" - #include "Line.h" + #include "line.h" #include "Game Clock.h" #include "GameSettings.h" #include "laptop.h" diff --git a/Ja2/Init.cpp b/Ja2/Init.cpp index a80bf2170..ca6840c57 100644 --- a/Ja2/Init.cpp +++ b/Ja2/Init.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" #include #include "sgp.h" - #include "Gameloop.h" + #include "gameloop.h" #include "Screens.h" #include "INIReader.h" #include "vobject_blitters.h" @@ -10,7 +10,7 @@ #include "sysutil.h" #include "worlddef.h" #include "Animation Data.h" - #include "overhead.h" + #include "Overhead.h" #include "Font Control.h" #include "Button System.h" #include "Timer Control.h" @@ -21,18 +21,18 @@ #include "Event Pump.h" #include "lighting.h" #include "Cursor Control.h" - #include "music control.h" + #include "Music Control.h" #include "video.h" #include "mapscreen.h" - #include "interface items.h" - #include "Maputility.h" + #include "Interface Items.h" + #include "maputility.h" #include "strategic.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Text.h" #include "laptop.h" #include "NPC.h" #include "MercTextBox.h" - #include "tile cache.h" + #include "Tile Cache.h" #include "strategicmap.h" #include "Map Information.h" #include "Shade Table Util.h" @@ -44,7 +44,7 @@ #include "jascreens.h" #include "XML.h" #include "SaveLoadGame.h" - #include "weapons.h" + #include "Weapons.h" #include "Strategic Movement.h" #include "Vehicles.h" #include "Multilingual Text Code Generator.h" diff --git a/Ja2/Intro.cpp b/Ja2/Intro.cpp index 113873cd0..6244590fc 100644 --- a/Ja2/Intro.cpp +++ b/Ja2/Intro.cpp @@ -1,14 +1,14 @@ #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "font control.h" - #include "cursor control.h" - #include "render dirty.h" + #include "Font Control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" - #include "text.h" - #include "Line.h" + #include "Text.h" + #include "line.h" #include "Intro.h" #include "Cinematics.h" #include "Cinematics Bink.h" @@ -307,7 +307,6 @@ UINT32 IntroScreenInit( void ) // BF: If NO_DEFAULT_VALUES is set to true, then only the explicitely used videos will be shown. BOOLEAN no_defaults = inireader.ReadBoolean("INTRO", "NO_DEFAULT_VALUES", false); - s_VFN[INTRO_REBEL_CRDT] = inireader.ReadString("INTRO_BEGINNING", "INTRO_REBEL_CRDT", no_defaults ? "" : "INTRO\\Rebel_cr"); s_VFN[INTRO_OMERTA] = inireader.ReadString("INTRO_BEGINNING", "INTRO_OMERTA", no_defaults ? "" : "INTRO\\Omerta"); s_VFN[INTRO_PRAGUE_CRDT] = inireader.ReadString("INTRO_BEGINNING", "INTRO_PRAGUE_CRDT", no_defaults ? "" : "INTRO\\Prague_cr"); @@ -322,7 +321,6 @@ UINT32 IntroScreenInit( void ) s_VFN[INTRO_SPLASH_SCREEN] = inireader.ReadString("INTRO_SPLASH","INTRO_SPLASH_SCREEN", no_defaults ? "" : "INTRO\\SplashScreen"); s_VFN[INTRO_SPLASH_TALONSOFT] = inireader.ReadString("INTRO_SPLASH","INTRO_SPLASH_TALONSOFT", no_defaults ? "" : "INTRO\\TalonSoftid_endhold"); - //UB #ifdef JA2UB s_VFN[INTRO_HELI_CRASH_SCENE_1] = inireader.ReadString("INTRO_BEGINNING","INTRO_HELI_CRASH_SCENE", no_defaults ? "" : "INTRO\\Intro"); diff --git a/Ja2/JA2 Splash.cpp b/Ja2/JA2 Splash.cpp index c7d9634da..6aab7b97b 100644 --- a/Ja2/JA2 Splash.cpp +++ b/Ja2/JA2 Splash.cpp @@ -1,7 +1,7 @@ -#include "Types.h" +#include "types.h" #include "vsurface.h" #include "mainmenuscreen.h" -#include "Video.h" +#include "video.h" #include "Timer Control.h" #include "Multi Language Graphic Utils.h" #include diff --git a/Ja2/Ja25Update.cpp b/Ja2/Ja25Update.cpp index 4fd737e10..a038c64e0 100644 --- a/Ja2/Ja25Update.cpp +++ b/Ja2/Ja25Update.cpp @@ -4,7 +4,7 @@ #include #include "Render Fun.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" //#include "Soldier Control.h" @@ -12,21 +12,21 @@ #include "Animation Data.h" #include "Animation Control.h" #include -#include "pathai.h" -#include "Random.h" +#include "PATHAI.H" +#include "random.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" -#include "weapons.h" +#include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" -#include "Event pump.h" +#include "Event Pump.h" #include "ai.h" -#include "interface.h" +#include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "english.h" #include "Squads.h" @@ -34,33 +34,33 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "items.h" -#include "Soundman.h" -#include "utilities.h" -#include "Strategic.h" +#include "Items.h" +#include "soundman.h" +#include "Utilities.h" +#include "strategic.h" #include "soldier tile.h" #include "Smell.h" #include "Keys.h" -#include "dialogue control.h" -#include "soldier functions.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" #include "Exit Grids.h" #include "Quests.h" #include "message.h" #include "SkillCheck.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "GameSettings.h" #include "ShopKeeper Interface.h" -#include "vehicles.h" +#include "Vehicles.h" #include "strategicmap.h" -#include "morale.h" -#include "drugs and alcohol.h" +#include "Morale.h" +#include "Drugs And Alcohol.h" #include "SkillCheck.h" #include "Map Information.h" #include "Buildings.h" #include "Text.h" #include "Campaign Types.h" #include "Strategic Status.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Debug Control.h" #ifdef JA2UB diff --git a/Ja2/Ja25Update.h b/Ja2/Ja25Update.h index a2edef1c2..d9948a297 100644 --- a/Ja2/Ja25Update.h +++ b/Ja2/Ja25Update.h @@ -1,7 +1,7 @@ #ifndef JA25UPDATE__C_ #define JA25UPDATE__C_ -#include "Types.h" +#include "types.h" #ifdef JA2UB diff --git a/Ja2/Loading Screen.cpp b/Ja2/Loading Screen.cpp index 2650cc9fb..0ade7191f 100644 --- a/Ja2/Loading Screen.cpp +++ b/Ja2/Loading Screen.cpp @@ -4,12 +4,12 @@ #include "Campaign Types.h" #include "Game Clock.h" #include "GameSettings.h" - #include "Random.h" - #include "Debug.h" + #include "random.h" + #include "DEBUG.H" #include "local.h" #include "Font Control.h" - #include "font.h" - #include "render dirty.h" + #include "Font.h" + #include "Render Dirty.h" #include "Strategic Movement.h" #include "UndergroundInit.h" #include diff --git a/Ja2/MPChatScreen.cpp b/Ja2/MPChatScreen.cpp index 78ed6a65f..5742e3bfa 100644 --- a/Ja2/MPChatScreen.cpp +++ b/Ja2/MPChatScreen.cpp @@ -1,26 +1,26 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "font control.h" + #include "Cursors.h" + #include "Font Control.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "GameSettings.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "laptop.h" - #include "text.h" + #include "Text.h" #include "Text Input.h" #include "overhead map.h" #include "MPChatScreen.h" #include "WordWrap.h" #include "message.h" -#include "utilities.h" +#include "Utilities.h" #include "connect.h" #define CHATBOX_WIDTH 310 // 350 is the max size, the PrepareMercPopupBox will add the X_MARGIN to both sides diff --git a/Ja2/MPConnectScreen.cpp b/Ja2/MPConnectScreen.cpp index b6a1214ad..a07c64b8e 100644 --- a/Ja2/MPConnectScreen.cpp +++ b/Ja2/MPConnectScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "MPConnectScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" @@ -25,8 +25,8 @@ #include "connect.h" #include "network.h" // for client name #include "message.h" -#include "init.h" -#include "xml.h" +#include "Init.h" +#include "XML.h" //////////////////////////////////////////// diff --git a/Ja2/MPHostScreen.cpp b/Ja2/MPHostScreen.cpp index 21ec55800..15a7025d7 100644 --- a/Ja2/MPHostScreen.cpp +++ b/Ja2/MPHostScreen.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "MPHostScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "Text Input.h" @@ -22,7 +22,7 @@ #include "gameloop.h" #include "connect.h" #include "network.h" -#include "saveloadscreen.h" +#include "SaveLoadScreen.h" #include "GameInitOptionsScreen.h" @@ -31,9 +31,9 @@ #include #include #include "MPJoinScreen.h" -#include "MainMenuScreen.h" +#include "mainmenuscreen.h" #include "Init.h" -#include "xml.h" +#include "XML.h" //////////////////////////////////////////// // diff --git a/Ja2/MPJoinScreen.cpp b/Ja2/MPJoinScreen.cpp index 9eebad5fb..9670f37ff 100644 --- a/Ja2/MPJoinScreen.cpp +++ b/Ja2/MPJoinScreen.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "MPJoinScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" @@ -20,15 +20,15 @@ #include "gameloop.h" #include "connect.h" #include "network.h" // for client name -#include "saveloadscreen.h" -#include "game init.h" +#include "SaveLoadScreen.h" +#include "Game Init.h" #include #include #include #include -#include "Random.h" +#include "random.h" //////////////////////////////////////////// // diff --git a/Ja2/MPScoreScreen.cpp b/Ja2/MPScoreScreen.cpp index 51d6e1a2d..6a2812db6 100644 --- a/Ja2/MPScoreScreen.cpp +++ b/Ja2/MPScoreScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "MPScoreScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "Text Input.h" diff --git a/Ja2/MainMenuScreen.cpp b/Ja2/MainMenuScreen.cpp index 22d2a2663..522ccd700 100644 --- a/Ja2/MainMenuScreen.cpp +++ b/Ja2/MainMenuScreen.cpp @@ -4,35 +4,35 @@ #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "font control.h" + #include "Cursors.h" + #include "Font Control.h" #include "mainmenuscreen.h" - #include "cursor control.h" - #include "render dirty.h" - #include "music control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" + #include "Music Control.h" #include "GameSettings.h" #include "SaveLoadScreen.h" #include "SaveLoadGame.h" #include "Options Screen.h" - #include "English.h" - #include "Gameloop.h" + #include "english.h" + #include "gameloop.h" #include "Game Init.h" #include "Utilities.h" #include "WordWrap.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "Multi Language Graphic Utils.h" #include "Encrypted File.h" - #include "ja2 splash.h" + #include "JA2 Splash.h" #include "GameVersion.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "connect.h" #include "strategic.h" -#include "strategic movement.h" -#include "overhead.h" -#include "init.h" -#include "xml.h" +#include "Strategic Movement.h" +#include "Overhead.h" +#include "Init.h" +#include "XML.h" #include #include @@ -831,27 +831,27 @@ void RenderMainMenu() } #ifdef TESTFOREIGNFONTS - DrawTextToScreen( L"LARGEFONT1: "/*gzCopyrightText[ 0 ]*/, 0, 105, 640, LARGEFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"SMALLFONT1: "/*gzCopyrightText[ 0 ]*/, 0, 125, 640, SMALLFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"TINYFONT1: "/*gzCopyrightText[ 0 ]*/, 0, 145, 640, TINYFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT12POINT1: "/*gzCopyrightText[ 0 ]*/, 0, 165, 640, FONT12POINT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"COMPFONT: "/*gzCopyrightText[ 0 ]*/, 0, 185, 640, COMPFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"SMALLCOMPFONT: "/*gzCopyrightText[ 0 ]*/, 0, 205, 640, SMALLCOMPFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT10ROMAN: "/*gzCopyrightText[ 0 ]*/, 0, 225, 640, FONT10ROMAN, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT12ROMAN: "/*gzCopyrightText[ 0 ]*/, 0, 245, 640, FONT12ROMAN, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT14SANSERIF: "/*gzCopyrightText[ 0 ]*/, 0, 255, 640, FONT14SANSERIF, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"MILITARYFONT: "/*gzCopyrightText[ 0 ]*/, 0, 265, 640, MILITARYFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT10ARIAL: "/*gzCopyrightText[ 0 ]*/, 0, 285, 640, FONT10ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT14ARIAL: "/*gzCopyrightText[ 0 ]*/, 0, 305, 640, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT12ARIAL: "/*gzCopyrightText[ 0 ]*/, 0, 325, 640, FONT12ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT10ARIALBOLD: "/*gzCopyrightText[ 0 ]*/, 0, 345, 640, FONT10ARIALBOLD, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"BLOCKFONT: "/*gzCopyrightText[ 0 ]*/, 0, 365, 640, BLOCKFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"BLOCKFONT2: "/*gzCopyrightText[ 0 ]*/, 0, 385, 640, BLOCKFONT2, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"BLOCKFONT3: "/*gzCopyrightText[ 0 ]*/, 0, 385, 640, BLOCKFONT3, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT12ARIALFIXEDWIDTH: "/*gzCopyrightText[ 0 ]*/, 0, 405, 640, FONT12ARIALFIXEDWIDTH, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT16ARIAL: "/*gzCopyrightText[ 0 ]*/, 0, 425, 640, FONT16ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"BLOCKFONTNARROW: "/*gzCopyrightText[ 0 ]*/, 0, 445, 640, BLOCKFONTNARROW, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); - DrawTextToScreen( L"FONT14HUMANIST: "/*gzCopyrightText[ 0 ]*/, 0, 465, 640, FONT14HUMANIST, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"LARGEFONT1: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 105, 640, LARGEFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"SMALLFONT1: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 125, 640, SMALLFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"TINYFONT1: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 145, 640, TINYFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT12POINT1: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 165, 640, FONT12POINT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"COMPFONT: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 185, 640, COMPFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"SMALLCOMPFONT: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 205, 640, SMALLCOMPFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT10ROMAN: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 225, 640, FONT10ROMAN, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT12ROMAN: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 245, 640, FONT12ROMAN, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT14SANSERIF: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 255, 640, FONT14SANSERIF, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"MILITARYFONT: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 265, 640, MILITARYFONT1, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT10ARIAL: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 285, 640, FONT10ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT14ARIAL: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 305, 640, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT12ARIAL: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 325, 640, FONT12ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT10ARIALBOLD: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 345, 640, FONT10ARIALBOLD, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"BLOCKFONT: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 365, 640, BLOCKFONT, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"BLOCKFONT2: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 385, 640, BLOCKFONT2, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"BLOCKFONT3: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 385, 640, BLOCKFONT3, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT12ARIALFIXEDWIDTH: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 405, 640, FONT12ARIALFIXEDWIDTH, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT16ARIAL: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 425, 640, FONT16ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"BLOCKFONTNARROW: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 445, 640, BLOCKFONTNARROW, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( L"FONT14HUMANIST: ÄÀÁÂÇËÈÉÊÏÖÒÓÔÜÙÚÛäàáâçëèéêïöòóôüùúûÌÎìî"/*gzCopyrightText[ 0 ]*/, 0, 465, 640, FONT14HUMANIST, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); #else CHAR16 text[128]; swprintf(text, L"%s: %s %S %s", pMessageStrings[ MSG_VERSION ], zProductLabel, czVersionString, zBuildInformation ); diff --git a/Ja2/MessageBoxScreen.cpp b/Ja2/MessageBoxScreen.cpp index 79f9feb59..5166fb3fd 100644 --- a/Ja2/MessageBoxScreen.cpp +++ b/Ja2/MessageBoxScreen.cpp @@ -1,21 +1,21 @@ #include "sgp.h" #include "screenids.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "messageboxscreen.h" - #include "font control.h" + #include "Cursors.h" + #include "MessageBoxScreen.h" + #include "Font Control.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "GameSettings.h" #include "Interface Control.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "laptop.h" - #include "text.h" + #include "Text.h" #include "Text Input.h" #include "overhead map.h" #include "DropDown.h" // added by Flugente diff --git a/Ja2/Options Screen.cpp b/Ja2/Options Screen.cpp index 6a9ce3d1c..bd57e8bf3 100644 --- a/Ja2/Options Screen.cpp +++ b/Ja2/Options Screen.cpp @@ -1,6 +1,6 @@ - #include "Types.h" + #include "types.h" #include "Options Screen.h" - #include "Video.h" + #include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Text Input.h" @@ -11,24 +11,24 @@ #include "WCheck.h" #include "Utilities.h" #include "Slider.h" - #include "Debug.h" + #include "DEBUG.H" #include "Music Control.h" #include "Sound Control.h" #include "soundman.h" #include "Ambient Control.h" - #include "Worlddat.h" - #include "Worlddef.h" + #include "WorldDat.h" + #include "worlddef.h" #include "GameSettings.h" #include "Game Init.h" - #include "English.h" + #include "english.h" #include "Overhead.h" - #include "Gap.h" + #include "GAP.H" #include "Cursors.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Exit Grids.h" #include "Text.h" #include "Interface Control.h" - #include "Message.h" + #include "message.h" #include "Multi Language Graphic Utils.h" #include "Map Information.h" #include "SmokeEffects.h" @@ -36,7 +36,7 @@ #include "Cheats.h" #include "connect.h" -#include "WorldMan.h" +#include "worldman.h" #include "Init.h" #include "Game Events.h" #include "PostalService.h" diff --git a/Ja2/SaveLoadGame.cpp b/Ja2/SaveLoadGame.cpp index 4208cb56f..72f7251a2 100644 --- a/Ja2/SaveLoadGame.cpp +++ b/Ja2/SaveLoadGame.cpp @@ -1,32 +1,32 @@ - #include "Types.h" + #include "types.h" #include "Soldier Profile.h" #include "FileMan.h" #include #include - #include "Debug.h" - #include "OverHead.h" + #include "DEBUG.H" + #include "Overhead.h" #include "Keys.h" #include "finances.h" - #include "History.h" + #include "history.h" #include "files.h" - #include "Laptop.h" - #include "iniReader.h" - #include "Email.h" - #include "Strategicmap.h" + #include "laptop.h" + #include "INIReader.h" + #include "email.h" + #include "strategicmap.h" #include "Game Events.h" #include "Game Clock.h" #include "Soldier Create.h" - #include "WorldDef.h" + #include "worlddef.h" #include "LaptopSave.h" #include "strategicmap.h" #include "Queen Command.h" #include "SaveLoadGame.h" #include "Tactical Save.h" #include "Squads.h" - #include "Environment.h" - #include "Lighting.h" + #include "environment.h" + #include "lighting.h" #include "Strategic Movement.h" - #include "Strategic.h" + #include "strategic.h" #include "Isometric Utils.h" #include "Quests.h" #include "opplist.h" @@ -38,17 +38,17 @@ #include "GameSettings.h" #include "Music Control.h" #include "Options Screen.h" - #include "Ai.h" - #include "RenderWorld.h" + #include "ai.h" + #include "renderworld.h" #include "SmokeEffects.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Interface.h" #include "Map Screen Helicopter.h" - #include "Environment.h" + #include "environment.h" #include "Arms Dealer Init.h" #include "Tactical Placement GUI.h" @@ -57,43 +57,43 @@ #include "Vehicles.h" #include "Merc Contract.h" #include "Bullets.h" - #include "air raid.h" + #include "Air Raid.h" #include "physics.h" #include "Strategic Pathing.h" #include "TeamTurns.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Creature Spreading.h" #include "Strategic Status.h" - #include "Prebattle Interface.h" + #include "PreBattle Interface.h" #include "Boxing.h" #include "Strategic AI.h" #include "Map Screen Interface Map.h" #include "Meanwhile.h" - #include "dialogue control.h" - #include "text.h" - #include "Map Screen Interface.h" - #include "lighteffects.h" + #include "Dialogue Control.h" + #include "Text.h" + #include "Map Screen Interface.h" + #include "LightEffects.h" #include "HelpScreen.h" #include "Animated ProgressBar.h" - #include "merctextbox.h" - #include "render dirty.h" + #include "MercTextBox.h" + #include "Render Dirty.h" #include "Map Information.h" #include "Interface Items.h" #include "Civ Quotes.h" #include "Scheduling.h" #include "Animation Data.h" #include "Game Init.h" - #include "cheats.h" + #include "Cheats.h" #include "Strategic Event Handler.h" - #include "interface panels.h" - #include "interface dialogue.h" + #include "Interface Panels.h" + #include "interface Dialogue.h" #include "Assignments.h" #include "Interface Items.h" - #include "Shopkeeper Interface.h" - #include "postalservice.h" + #include "ShopKeeper Interface.h" + #include "PostalService.h" // HEADROCK HAM B1: Additional Include for HAM #include "MilitiaSquads.h" // HEADROCK HAM 3.5: Another include for HAM @@ -110,17 +110,17 @@ #include "Rebel Command.h" #include "BobbyR.h" -#include "Imp Portraits.h" +#include "IMP Portraits.h" #include "Loading Screen.h" #include "Interface Utils.h" #include "Squads.h" #include "IMP Confirm.h" #include "Enemy Soldier Save.h" #include "BobbyRMailOrder.h" -#include "Mercs.h" +#include "mercs.h" #include "INIReader.h" #include "mercs.h" -#include "soldier Profile.h" +#include "Soldier Profile.h" #ifdef JA2UB #include "Ja25 Strategic Ai.h" #include "Ja25_Tactical.h" diff --git a/Ja2/SaveLoadScreen.cpp b/Ja2/SaveLoadScreen.cpp index e5442659f..a1a30800f 100644 --- a/Ja2/SaveLoadScreen.cpp +++ b/Ja2/SaveLoadScreen.cpp @@ -1,34 +1,34 @@ - #include "Types.h" + #include "types.h" #include "SaveLoadScreen.h" - #include "Video.h" + #include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Render Dirty.h" #include "Text Input.h" #include "SaveLoadGame.h" - #include "Stdio.h" + #include "stdio.h" #include "WordWrap.h" - #include "StrategicMap.h" - #include "Finances.h" + #include "strategicmap.h" + #include "finances.h" #include "WCheck.h" #include "Utilities.h" #include "Cursors.h" - #include "VObject.h" + #include "vobject.h" #include "Merc Hiring.h" #include "LaptopSave.h" #include "Options Screen.h" #include "GameVersion.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Tactical Save.h" - #include "OverHead.h" + #include "Overhead.h" #include "gamescreen.h" #include "GameSettings.h" - #include "fade screen.h" - #include "English.h" - #include "Gameloop.h" + #include "Fade Screen.h" + #include "english.h" + #include "gameloop.h" #include "Game Init.h" #include "Text.h" - #include "Message.h" + #include "message.h" #include "Map Screen Interface.h" #include "Multi Language Graphic Utils.h" #include "Campaign Types.h" diff --git a/Ja2/Screens.h b/Ja2/Screens.h index f94c05c83..ca5cc0947 100644 --- a/Ja2/Screens.h +++ b/Ja2/Screens.h @@ -1,8 +1,8 @@ #ifndef __SCREEN_MANAGER #define __SCREEN_MANAGER -#include "Types.h" -#include "ScreenIds.h" +#include "types.h" +#include "screenids.h" // Each screen in the game comes with a Status flag (what was the last thing the screen was doing), an Initialization // function (which loads up the screen if necessary), a Handler function which is called while the screen is showing and @@ -34,4 +34,4 @@ extern Screens GameScreens[MAX_SCREENS]; #include "jascreens.h" -#endif +#endif diff --git a/Ja2/TimeLogging.h b/Ja2/TimeLogging.h index 7caab2898..2478faa24 100644 --- a/Ja2/TimeLogging.h +++ b/Ja2/TimeLogging.h @@ -1,5 +1,5 @@ #pragma once -#include "Types.h" +#include "types.h" void TimingLogInitialize(const CHAR8* filename); void TimingLog(const CHAR8* logEvent, int n); diff --git a/Ja2/aniviewscreen.cpp b/Ja2/aniviewscreen.cpp index 638e67a2d..6cf3a7b8a 100644 --- a/Ja2/aniviewscreen.cpp +++ b/Ja2/aniviewscreen.cpp @@ -9,9 +9,9 @@ #include "worlddef.h" #include "renderworld.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "overhead.h" + #include "Overhead.h" #include "sysutil.h" #include "Font Control.h" #include "Animation Control.h" @@ -23,8 +23,8 @@ #include #include #include "english.h" - #include "Fileman.h" - #include "messageboxscreen.h" + #include "FileMan.h" + #include "MessageBoxScreen.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Ja2/builddefines.h b/Ja2/builddefines.h index eb71defee..9391b6c37 100644 --- a/Ja2/builddefines.h +++ b/Ja2/builddefines.h @@ -77,6 +77,6 @@ #define _CRT_NON_CONFORMING_SWPRINTFS #define _SCL_SECURE_NO_WARNINGS -#include "Profiler.h" +#include "profiler.h" #endif diff --git a/Ja2/gameloop.cpp b/Ja2/gameloop.cpp index d65f7dae2..56a8493f3 100644 --- a/Ja2/gameloop.cpp +++ b/Ja2/gameloop.cpp @@ -1,17 +1,17 @@ #include #include #include "sgp.h" - #include "Gameloop.h" + #include "gameloop.h" #include "Screens.h" - #include "cursors.h" - #include "init.h" - #include "music control.h" - #include "sys globals.h" + #include "Cursors.h" + #include "Init.h" + #include "Music Control.h" + #include "Sys Globals.h" #include "laptop.h" #include "mapscreen.h" #include "Game Clock.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "LibraryDataBase.h" #include "Map Screen Interface.h" #include "Tactical Save.h" @@ -19,7 +19,7 @@ #include "GameSettings.h" #include "mapscreen.h" #include "Interface Control.h" - #include "text.h" + #include "Text.h" #include "HelpScreen.h" #include "PreBattle Interface.h" #include "Tactical Placement GUI.h"//dnl ch45 071009 diff --git a/Ja2/gameloop.h b/Ja2/gameloop.h index 6c5d2357a..1f4fe3eaa 100644 --- a/Ja2/gameloop.h +++ b/Ja2/gameloop.h @@ -1,7 +1,7 @@ #ifndef __GAMELOOP_ #define __GAMELOOP_ -#include "Types.h" +#include "types.h" // main game loop systems #define INIT_SYSTEM 0 diff --git a/Ja2/gamescreen.cpp b/Ja2/gamescreen.cpp index ba3ceb80a..b3028c8b9 100644 --- a/Ja2/gamescreen.cpp +++ b/Ja2/gamescreen.cpp @@ -6,10 +6,10 @@ #include "vobject.h" #include "worlddef.h" #include "renderworld.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "screens.h" - #include "overhead.h" + #include "Screens.h" + #include "Overhead.h" #include "Isometric Utils.h" #include "sysutil.h" #include "input.h" @@ -22,60 +22,60 @@ #include "Handle UI.h" #include #include - #include "cursors.h" + #include "Cursors.h" #include "vobject_blitters.h" #include "Button System.h" #include "lighting.h" #include "renderworld.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "environment.h" - #include "bullets.h" + #include "Bullets.h" #include "Assignments.h" #include "message.h" #include #include "overhead map.h" #include "Strategic Exit GUI.h" - #include "strategic movement.h" + #include "Strategic Movement.h" #include "Tactical Placement GUI.h" - #include "Air raid.h" + #include "Air Raid.h" #include "Game Clock.h" - #include "game init.h" + #include "Game Init.h" //DEF: Test Code #ifdef NETWORKED #include "Networking.h" #endif - #include "interface control.h" - #include "game clock.h" + #include "Interface Control.h" + #include "Game Clock.h" #include "physics.h" - #include "fade screen.h" - #include "dialogue control.h" - #include "soldier macros.h" + #include "Fade Screen.h" + #include "Dialogue Control.h" + #include "Soldier macros.h" #include "faces.h" #include "strategicmap.h" #include "gamescreen.h" - #include "interface.h" - #include "cursor control.h" - #include "strategic turns.h" + #include "Interface.h" + #include "Cursor Control.h" + #include "Strategic Turns.h" #include "merc entering.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "interface panels.h" + #include "Interface Panels.h" #include "Map Information.h" #include "environment.h" #include "Squads.h" - #include "interface dialogue.h" - #include "auto bandage.h" - #include "meanwhile.h" - #include "strategic ai.h" + #include "interface Dialogue.h" + #include "Auto Bandage.h" + #include "Meanwhile.h" + #include "Strategic AI.h" #include "HelpScreen.h" #include "PreBattle Interface.h" #include "Sound Control.h" #include "MessageBoxScreen.h" #include "Text.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "editscreen.h" #include "Scheduling.h" #include "Animated ProgressBar.h" diff --git a/Ja2/gamescreen.h b/Ja2/gamescreen.h index de0696a42..d9f311d0f 100644 --- a/Ja2/gamescreen.h +++ b/Ja2/gamescreen.h @@ -2,7 +2,7 @@ #define _GAMESCREEN_H -#include "fade screen.h" +#include "Fade Screen.h" #define ARE_IN_FADE_IN( ) ( gfFadeIn || gfFadeInitialized ) @@ -41,4 +41,4 @@ void InitHelicopterEntranceByMercs( void ); void InternalLeaveTacticalScreen( UINT32 uiNewScreen ); -#endif +#endif diff --git a/Ja2/jascreens.cpp b/Ja2/jascreens.cpp index 9e7df4839..7fec7bab8 100644 --- a/Ja2/jascreens.cpp +++ b/Ja2/jascreens.cpp @@ -6,13 +6,13 @@ #include "himage.h" #include "vobject.h" #include "vobject_blitters.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "timer.h" #include "mousesystem.h" #include "screenids.h" - #include "screens.h" + #include "Screens.h" #include "Font Control.h" #include "sysutil.h" #include "tiledef.h" @@ -22,30 +22,30 @@ #include #include "Timer Control.h" #include "Sys Globals.h" - #include "interface.h" - #include "overhead.h" - #include "utilities.h" - #include "render dirty.h" + #include "Interface.h" + #include "Overhead.h" + #include "Utilities.h" + #include "Render Dirty.h" #include "jascreens.h" #include "gameloop.h" #include "Event Pump.h" - #include "animation cache.h" + #include "Animation Cache.h" #include "lighting.h" #include "mainmenuscreen.h" #include "Game Init.h" - #include "init.h" - #include "cursor control.h" - #include "utilities.h" + #include "Init.h" + #include "Cursor Control.h" + #include "Utilities.h" #include "GameVersion.h" - #include "game clock.h" + #include "Game Clock.h" #include "gamescreen.h" #include "english.h" - #include "Random.h" + #include "random.h" #include "WordWrap.h" #include "Sound Control.h" #include "WordWrap.h" - #include "text.h" - #include "IniReader.h" + #include "Text.h" + #include "INIReader.h" #include "sgp_logger.h" #include diff --git a/Ja2/jascreens.h b/Ja2/jascreens.h index 1822b3774..9833b48bf 100644 --- a/Ja2/jascreens.h +++ b/Ja2/jascreens.h @@ -2,7 +2,7 @@ #define __JASCREENS_H_ #include "sgp.h" -#include "ScreenIds.h" +#include "screenids.h" #include "mousesystem.h" #include "Button System.h" #include @@ -184,4 +184,4 @@ extern std::list g_ExceptionList; void PrintExceptionList(); -#endif +#endif diff --git a/Ja2/legion cfg.cpp b/Ja2/legion cfg.cpp index 2004c497e..a5a8807f0 100644 --- a/Ja2/legion cfg.cpp +++ b/Ja2/legion cfg.cpp @@ -1,10 +1,10 @@ //legion 2 - #include "Types.h" #include "types.h" - #include "Random.h" + #include "types.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" @@ -17,36 +17,36 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" - #include "soldier create.h" + #include "Game Init.h" + #include "Animation Data.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "Squads.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Quests.h" #include "Strategic AI.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "GameSettings.h" #include "INIReader.h" #include "Soldier Profile.h" #include "XML.h" #include "Item Types.h" #include "Items.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" #ifdef JA2UB @@ -274,4 +274,4 @@ void LoadGameLegionOptions() gGameLegionOptions.LaptopLinkFuneral = iniReader.ReadBoolean("Laptop Settings","LINK_FUNERAL", TRUE); gGameLegionOptions.LaptopLinkBobby = iniReader.ReadBoolean("Laptop Settings","LINK_BOBBY", FALSE); gGameLegionOptions.fBobbyRSite = iniReader.ReadBoolean("Laptop Settings","BOBBY_SITE_ACCESSED", FALSE); -} +} diff --git a/Ja2/ub_config.cpp b/Ja2/ub_config.cpp index 908f75844..d16ff60c4 100644 --- a/Ja2/ub_config.cpp +++ b/Ja2/ub_config.cpp @@ -1,9 +1,9 @@ - #include "Types.h" #include "types.h" - #include "Random.h" + #include "types.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" @@ -16,36 +16,36 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" - #include "soldier create.h" + #include "Game Init.h" + #include "Animation Data.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "Squads.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Quests.h" #include "Strategic AI.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "GameSettings.h" #include "INIReader.h" #include "Soldier Profile.h" #include "XML.h" #include "Item Types.h" #include "Items.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" #ifdef JA2UB diff --git a/Laptop/AimFacialIndex.cpp b/Laptop/AimFacialIndex.cpp index 60b88e786..e6230f516 100644 --- a/Laptop/AimFacialIndex.cpp +++ b/Laptop/AimFacialIndex.cpp @@ -4,11 +4,11 @@ #include "Utilities.h" #include "WCheck.h" #include "stdio.h" - #include "Aim.h" + #include "aim.h" #include "Soldier Profile.h" #include "email.h" #include "Text.h" - #include "aimsort.h" + #include "AimSort.h" #include "Assignments.h" #include "GameSettings.h" #include "english.h" diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 490d0a633..e5485db09 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -1,30 +1,30 @@ #include "email.h" #include "laptop.h" #include "AimMembers.h" - #include "Aim.h" + #include "aim.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "stdio.h" #include "sysutil.h" #include "Soldier Profile.h" #include "Soldier Control.h" - #include "InterFace Items.h" - #include "overhead.h" + #include "Interface Items.h" + #include "Overhead.h" #include "WordWrap.h" #include "finances.h" #include "vsurface.h" - #include "VObject.h" + #include "vobject.h" #include "Game Clock.h" - #include "overhead.h" - #include "Faces.h" - #include "dialogue control.h" - #include "text.h" - #include "History.h" + #include "Overhead.h" + #include "faces.h" + #include "Dialogue Control.h" + #include "Text.h" + #include "history.h" #include "Game Event Hook.h" #include "MercTextBox.h" #include "Render Dirty.h" - #include "weapons.h" + #include "Weapons.h" #include "Soldier Add.h" #include "Merc Hiring.h" #include "strategic.h" @@ -32,7 +32,7 @@ #include "LaptopSave.h" #include "english.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Strategic Status.h" #include "Merc Contract.h" #include "Strategic Merc Handler.h" @@ -40,7 +40,7 @@ #include "Sound Control.h" #include "Quests.h" #include "strategicmap.h" - #include "Personnel.h" + #include "personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item #include "Strategic Town Loyalty.h" diff --git a/Laptop/AimSort.cpp b/Laptop/AimSort.cpp index 1b5b0f05b..3652bf56b 100644 --- a/Laptop/AimSort.cpp +++ b/Laptop/AimSort.cpp @@ -1,6 +1,6 @@ #include "laptop.h" #include "AimSort.h" - #include "Aim.h" + #include "aim.h" #include "WCheck.h" #include "Utilities.h" #include "WordWrap.h" diff --git a/Laptop/BobbyR.cpp b/Laptop/BobbyR.cpp index fcba33a61..504ce3032 100644 --- a/Laptop/BobbyR.cpp +++ b/Laptop/BobbyR.cpp @@ -5,20 +5,20 @@ #include "WCheck.h" #include "WordWrap.h" #include "Cursors.h" - #include "interface items.h" + #include "Interface Items.h" #include "Weapons.h" #include "Store Inventory.h" #include "Game Event Hook.h" #include "Game Clock.h" #include "LaptopSave.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "Multi Language Graphic Utils.h" // #include "Utility.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "GameSettings.h" #include "message.h" - #include "postalservice.h" + #include "PostalService.h" #ifdef JA2TESTVERSION diff --git a/Laptop/BobbyRAmmo.cpp b/Laptop/BobbyRAmmo.cpp index 8b4b6a530..162932b89 100644 --- a/Laptop/BobbyRAmmo.cpp +++ b/Laptop/BobbyRAmmo.cpp @@ -6,7 +6,7 @@ #include "WCheck.h" #include "WordWrap.h" #include "Encrypted File.h" - #include "text.h" + #include "Text.h" UINT32 guiAmmoBackground; UINT32 guiAmmoGrid; diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index c8ae1e61e..0bce8e8bb 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -5,12 +5,12 @@ #include "WCheck.h" #include "WordWrap.h" #include "Cursors.h" - #include "interface items.h" + #include "Interface Items.h" #include "Encrypted File.h" - #include "text.h" + #include "Text.h" #include "Store Inventory.h" #include "LaptopSave.h" - #include "Finances.h" + #include "finances.h" #include "Overhead.h" #include "Weapons.h" #include "GameSettings.h" @@ -20,7 +20,7 @@ // HEADROCK HAM 4 #include "input.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item - #include + #include #define BOBBYR_DEFAULT_MENU_COLOR 255 @@ -369,9 +369,9 @@ static BOOLEAN DecorateAppendString(STR16 target, size_t targetCapacity, STR16 s size_t decoratorLen = wcslen(DECORATOR0) * frontDecoratorsCnt; if (wcslen(target) + decoratorLen + wcslen(source) + 1 < targetCapacity) - { - for (UINT32 i = 0; i < frontDecoratorsCnt; i++) - wcscat(target, DECORATOR0); + { + for (UINT32 i = 0; i < frontDecoratorsCnt; i++) + wcscat(target, DECORATOR0); wcscat(target, source); result = TRUE; } diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index a145c7a72..b52436361 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -10,7 +10,7 @@ #include "finances.h" #include "Game Clock.h" #include "Game Event Hook.h" - #include "Random.h" + #include "random.h" #include "LaptopSave.h" #include "Soldier Profile.h" #include "input.h" @@ -20,8 +20,8 @@ #include "Multi Language Graphic Utils.h" #include "strategic.h" #include "strategicmap.h" - #include "isometric utils.h" - #include "postalservice.h" + #include "Isometric Utils.h" + #include "PostalService.h" #include "english.h" #include diff --git a/Laptop/BobbyRShipments.cpp b/Laptop/BobbyRShipments.cpp index 28f208f36..dc8db902e 100644 --- a/Laptop/BobbyRShipments.cpp +++ b/Laptop/BobbyRShipments.cpp @@ -1,13 +1,13 @@ #include "laptop.h" #include "BobbyRShipments.h" - #include "bobbyr.h" - #include "utilities.h" + #include "BobbyR.h" + #include "Utilities.h" #include "WCheck.h" #include "Text.h" #include "BobbyRGuns.h" - #include "cursors.h" + #include "Cursors.h" #include "BobbyRMailOrder.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "strategic.h" #include "strategicmap.h" #include "PostalService.h" diff --git a/Laptop/BriefingRoom.cpp b/Laptop/BriefingRoom.cpp index dc5c67116..b209eb9e2 100644 --- a/Laptop/BriefingRoom.cpp +++ b/Laptop/BriefingRoom.cpp @@ -1,7 +1,7 @@ #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/BriefingRoomM.cpp b/Laptop/BriefingRoomM.cpp index 69a0c0daa..511eff63d 100644 --- a/Laptop/BriefingRoomM.cpp +++ b/Laptop/BriefingRoomM.cpp @@ -1,7 +1,7 @@ #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/BrokenLink.cpp b/Laptop/BrokenLink.cpp index 8c6fb1574..4bcdc6968 100644 --- a/Laptop/BrokenLink.cpp +++ b/Laptop/BrokenLink.cpp @@ -1,9 +1,9 @@ - #include "Types.h" - #include "font.h" + #include "types.h" + #include "Font.h" #include "laptop.h" #include "Font Control.h" #include "Text.h" - #include "wordwrap.h" + #include "WordWrap.h" #define BROKEN_LINK__FONT FONT12ARIAL #define BROKEN_LINK__COLOR FONT_MCOLOR_BLACK diff --git a/Laptop/CampaignHistoryMain.cpp b/Laptop/CampaignHistoryMain.cpp index e030ff871..9d13a13e0 100644 --- a/Laptop/CampaignHistoryMain.cpp +++ b/Laptop/CampaignHistoryMain.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" - #include "Line.h" + #include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/CampaignStats.cpp b/Laptop/CampaignStats.cpp index bfc4e91d8..2acae08b0 100644 --- a/Laptop/CampaignStats.cpp +++ b/Laptop/CampaignStats.cpp @@ -11,7 +11,7 @@ #include "Game Clock.h" #include "Soldier macros.h" #include "Text.h" -#include "Laptop.h" +#include "laptop.h" #include "LaptopSave.h" #include "email.h" #include "DynamicDialogue.h" diff --git a/Laptop/CharProfile.cpp b/Laptop/CharProfile.cpp index 182f4bf7f..92b16ebc4 100644 --- a/Laptop/CharProfile.cpp +++ b/Laptop/CharProfile.cpp @@ -1,5 +1,5 @@ #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "CharProfile.h" #include "IMP AboutUs.h" #include "IMP Attribute Entrance.h" @@ -19,7 +19,7 @@ #include "IMP Personality Finish.h" #include "IMPVideoObjects.h" #include "IMP Confirm.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "LaptopSave.h" // These 5 added - SANDRO #include "IMP Character and Disability Entrance.h" diff --git a/Laptop/Encyclopedia_Data_new.cpp b/Laptop/Encyclopedia_Data_new.cpp index 2dff5b827..e488c1d0f 100644 --- a/Laptop/Encyclopedia_Data_new.cpp +++ b/Laptop/Encyclopedia_Data_new.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "WCheck.h" #include #include "GameSettings.h" diff --git a/Laptop/Encyclopedia_new.cpp b/Laptop/Encyclopedia_new.cpp index 08596e8c5..5122d4ef2 100644 --- a/Laptop/Encyclopedia_new.cpp +++ b/Laptop/Encyclopedia_new.cpp @@ -29,7 +29,7 @@ /// uncomment to use just graphic + mouseregion instead of real buttons. No sounds, no button states, just plain 'hyperlinks'. #define ENC_USE_BUTTONSYSTEM - #include "Types.h" + #include "types.h" #include "WCheck.h" #include "DEBUG.H" #include "GameSettings.h" diff --git a/Laptop/FacilityProduction.cpp b/Laptop/FacilityProduction.cpp index ea60571de..e195b14ed 100644 --- a/Laptop/FacilityProduction.cpp +++ b/Laptop/FacilityProduction.cpp @@ -8,7 +8,7 @@ #include "WCheck.h" #include "Utilities.h" #include "WordWrap.h" -#include "Line.h" +#include "line.h" #include "Text.h" #include "FacilityProduction.h" #include "Map Screen Interface.h" diff --git a/Laptop/IMP AboutUs.cpp b/Laptop/IMP AboutUs.cpp index 991aaca50..eceef0d62 100644 --- a/Laptop/IMP AboutUs.cpp +++ b/Laptop/IMP AboutUs.cpp @@ -2,10 +2,10 @@ #include "CharProfile.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Attribute Entrance.cpp b/Laptop/IMP Attribute Entrance.cpp index 0ec429661..16fa7de34 100644 --- a/Laptop/IMP Attribute Entrance.cpp +++ b/Laptop/IMP Attribute Entrance.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Attribute Finish.cpp b/Laptop/IMP Attribute Finish.cpp index b87813f13..80689bc44 100644 --- a/Laptop/IMP Attribute Finish.cpp +++ b/Laptop/IMP Attribute Finish.cpp @@ -5,10 +5,10 @@ #include "Utilities.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Attribute Selection.h" diff --git a/Laptop/IMP Attribute Selection.cpp b/Laptop/IMP Attribute Selection.cpp index 6400f0f07..0a720b402 100644 --- a/Laptop/IMP Attribute Selection.cpp +++ b/Laptop/IMP Attribute Selection.cpp @@ -6,14 +6,14 @@ #include "input.h" #include "Isometric Utils.h" #include "IMP Skill Trait.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Compile Character.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" // Added these 3 - SANDRO #include "IMP Disability Trait.h" diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 14b30fa4f..577bd094e 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -1,17 +1,17 @@ #include "IMP Background.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Background.h b/Laptop/IMP Background.h index ffd1dce95..9c8a5e1e1 100644 --- a/Laptop/IMP Background.h +++ b/Laptop/IMP Background.h @@ -1,7 +1,7 @@ #ifndef __IMP_BACKGROUND__H_ #define __IMP_BACKGROUND__H_ -#include "Types.h" +#include "types.h" #include "mousesystem.h" void EnterIMPBackground( void ); diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index 3037f6b69..3d1f134e9 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -5,23 +5,23 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "Timer Control.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Finish.h" #include "IMP Text System.h" #include "Text Input.h" - #include "messageboxscreen.h" - #include "Soldier Profile Type.h" + #include "MessageBoxScreen.h" + #include "soldier profile type.h" #include "IMP Portraits.h" #include "IMP Attribute Selection.h" #include "english.h" #include "line.h" #include "Merc Hiring.h" #include "strategic.h" - #include "text.h" + #include "Text.h" #include "LaptopSave.h" #include @@ -560,7 +560,7 @@ if(g_lang == i18n::Lang::ru) { if( layout == 0x419 ) // Russian { unsigned char TranslationTable[] = - " #########-.0123456789#,###_#ڨ "; + " #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#ÔÈÑÂÓÀÏÐØÎËÄÜÒÙÇÉÊÛÅÃÌÖ×Íßõ#ú#_¸ôèñâóàïðøîëäüòùçéêûåãìö÷íÿÕ#Ú¨ "; uiKey = TranslateKey( uiKey, TranslationTable ); uiKey = GetCyrillicUnicodeChar( uiKey ); @@ -568,7 +568,7 @@ if(g_lang == i18n::Lang::ru) { else if( layout == 0x423 ) // Belarussian { unsigned char TranslationTable[] = - " #########-.0123456789#,#Բҡ#'#_#' "; + " #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#Ô²ÑÂÓÀÏÐØÎËÄÜÒ¡ÇÉÊÛÅÃÌÖ×Íßõ#'#_¸ô³ñâóàïðøîëäüò¢çéêûåãìö÷íÿÕ#'¨ "; uiKey = TranslateKey( uiKey, TranslationTable ); uiKey = GetCyrillicUnicodeChar( uiKey ); @@ -664,31 +664,31 @@ if(g_lang == i18n::Lang::ru) { UINT32 GetCyrillicUnicodeChar( UINT32 uiKey ) { - // - + // À - ÿ if (uiKey >= 192 && uiKey <= 255) uiKey += 0x0350; - // + // ¨ if (uiKey == 168) uiKey = 0x0401; - // + // ¸ if (uiKey == 184) uiKey = 0x0451; - // + // ¡ if (uiKey == 161) uiKey = 0x040E; - // + // ¢ if (uiKey == 162) uiKey = 0x045E; - // + // ² if (uiKey == 178) uiKey = 0x0406; - // + // ³ if (uiKey == 179) uiKey = 0x0456; diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index e77032984..cf2e85ce0 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Character Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "GameSettings.h" diff --git a/Laptop/IMP Character Trait.h b/Laptop/IMP Character Trait.h index 06ed97474..df46f8a73 100644 --- a/Laptop/IMP Character Trait.h +++ b/Laptop/IMP Character Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_CHARACTER_TRAIT__H_ #define __IMP_CHARACTER_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPCharacterTrait( void ); void RenderIMPCharacterTrait( void ); diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index 5cae0c9a4..c61a5ec93 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -3,13 +3,13 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" - #include "text.h" + #include "Text.h" // IMP personality entrance buttons diff --git a/Laptop/IMP Color Choosing.cpp b/Laptop/IMP Color Choosing.cpp index 310cf62d8..2a239ba59 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -1,15 +1,15 @@ #include "IMP Color Choosing.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Portraits.h" diff --git a/Laptop/IMP Color Choosing.h b/Laptop/IMP Color Choosing.h index 162d9de32..bc4868727 100644 --- a/Laptop/IMP Color Choosing.h +++ b/Laptop/IMP Color Choosing.h @@ -1,7 +1,7 @@ #ifndef __IMP_COLOR_CHOOSING_SKIN_HAIR__H_ #define __IMP_COLOR_CHOOSING_SKIN_HAIR__H_ -#include "Types.h" +#include "types.h" void EnterIMPColorChoice( void ); void RenderIMPColorChoice( void ); diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index 0420b1c4c..ea7ae8262 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -1,7 +1,7 @@ #include "laptop.h" #include "CharProfile.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "GameSettings.h" @@ -12,7 +12,7 @@ #include "IMP Attribute Selection.h" #include "IMP Portraits.h" #include "IMP Compile Character.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Animation Data.h" #include "random.h" diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index b5a0ac1a9..8a9572d24 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -3,10 +3,10 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Compile Character.h" #include "soldier profile type.h" @@ -14,7 +14,7 @@ #include "IMP Confirm.h" #include "finances.h" #include "Soldier Profile.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Control.h" #include "IMP Portraits.h" #include "Overhead.h" @@ -25,8 +25,8 @@ #include "Game Event Hook.h" #include "LaptopSave.h" #include "strategic.h" - #include "weapons.h" - #include "Random.h" + #include "Weapons.h" + #include "random.h" #include "GameVersion.h" #include "GameSettings.h" #include "IMP Gear.h" // added by Flugente diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index b5a8e1bed..944cdd246 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Disability Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "GameSettings.h" diff --git a/Laptop/IMP Disability Trait.h b/Laptop/IMP Disability Trait.h index 58ffd66ae..1022c8963 100644 --- a/Laptop/IMP Disability Trait.h +++ b/Laptop/IMP Disability Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_DISABILITY_TRAIT__H_ #define __IMP_DISABILITY_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPDisabilityTrait( void ); void RenderIMPDisabilityTrait( void ); diff --git a/Laptop/IMP Finish.cpp b/Laptop/IMP Finish.cpp index f1a8bdbbb..60c2d71ff 100644 --- a/Laptop/IMP Finish.cpp +++ b/Laptop/IMP Finish.cpp @@ -7,15 +7,15 @@ #include "Utilities.h" #include "WCheck.h" #include "Timer Control.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" #include "soundman.h" - #include "text.h" + #include "Text.h" #include "IMP Confirm.h" diff --git a/Laptop/IMP Gear Entrance.cpp b/Laptop/IMP Gear Entrance.cpp index 88da8903d..a1f7c0577 100644 --- a/Laptop/IMP Gear Entrance.cpp +++ b/Laptop/IMP Gear Entrance.cpp @@ -8,10 +8,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" -#include "Debug.h" +#include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" -#include "cursors.h" +#include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "Text.h" diff --git a/Laptop/IMP Gear Entrance.h b/Laptop/IMP Gear Entrance.h index 1a73e253d..7bcb4c224 100644 --- a/Laptop/IMP Gear Entrance.h +++ b/Laptop/IMP Gear Entrance.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" void EnterIMPGearEntrance( void ); void RenderIMPGearEntrance( void ); diff --git a/Laptop/IMP Gear.cpp b/Laptop/IMP Gear.cpp index 0d84fb2f5..a969e7b0c 100644 --- a/Laptop/IMP Gear.cpp +++ b/Laptop/IMP Gear.cpp @@ -6,17 +6,17 @@ #include "IMP Gear.h" #include "IMP Skill Trait.h" #include "Button System.h" -#include "utilities.h" -#include "Debug.h" +#include "Utilities.h" +#include "DEBUG.H" #include "Text.h" #include "Font Control.h" -#include "font.h" +#include "Font.h" #include "laptop.h" -#include "cursors.h" +#include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" -#include "wordwrap.h" +#include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Gear.h b/Laptop/IMP Gear.h index 01d1971d0..3cca01aeb 100644 --- a/Laptop/IMP Gear.h +++ b/Laptop/IMP Gear.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" #include "soldier profile type.h" void EnterIMPGear( void ); diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index b54fa8a32..65c8568f2 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -2,11 +2,11 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "IMP Compile Character.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "Timer Control.h" diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index 41acd733f..026067bf1 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -3,10 +3,10 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index 848b4c497..c7f053c2e 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -1,17 +1,17 @@ #include "IMP Minor Trait.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Minor Trait.h b/Laptop/IMP Minor Trait.h index 14d2501c5..43bb0b919 100644 --- a/Laptop/IMP Minor Trait.h +++ b/Laptop/IMP Minor Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_MINOR_TRAIT__H_ #define __IMP_MINOR_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPMinorTrait( void ); void RenderIMPMinorTrait( void ); diff --git a/Laptop/IMP Personality Entrance.cpp b/Laptop/IMP Personality Entrance.cpp index 2402663fa..ea88eabe5 100644 --- a/Laptop/IMP Personality Entrance.cpp +++ b/Laptop/IMP Personality Entrance.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Personality Finish.cpp b/Laptop/IMP Personality Finish.cpp index cd5a0de54..61794594d 100644 --- a/Laptop/IMP Personality Finish.cpp +++ b/Laptop/IMP Personality Finish.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Personality Quiz.cpp b/Laptop/IMP Personality Quiz.cpp index 3a1cfe8fe..ed30843f1 100644 --- a/Laptop/IMP Personality Quiz.cpp +++ b/Laptop/IMP Personality Quiz.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Compile Character.h" #include "soldier profile type.h" diff --git a/Laptop/IMP Portraits.cpp b/Laptop/IMP Portraits.cpp index 9ba705181..8ad0de12e 100644 --- a/Laptop/IMP Portraits.cpp +++ b/Laptop/IMP Portraits.cpp @@ -6,10 +6,10 @@ #include "WCheck.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Prejudice.cpp b/Laptop/IMP Prejudice.cpp index 11712753d..0b5b3fe62 100644 --- a/Laptop/IMP Prejudice.cpp +++ b/Laptop/IMP Prejudice.cpp @@ -6,17 +6,17 @@ #include "IMP Prejudice.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Prejudice.h b/Laptop/IMP Prejudice.h index 572f24bc6..8bdcf304d 100644 --- a/Laptop/IMP Prejudice.h +++ b/Laptop/IMP Prejudice.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" void EnterIMPPrejudice( void ); void RenderIMPPrejudice( void ); diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 93fab856c..fbfd0e393 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Skill Trait.h b/Laptop/IMP Skill Trait.h index 7f5372138..8eda49cf7 100644 --- a/Laptop/IMP Skill Trait.h +++ b/Laptop/IMP Skill Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_SKILL_TRAIT__H_ #define __IMP_SKILL_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPSkillTrait( void ); void RenderIMPSkillTrait( void ); diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index 9555ef806..06fd15d4d 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -12,24 +12,24 @@ #include "IMP Confirm.h" #include "GameSettings.h" #include "Text.h" - #include "_Ja25Englishtext.h" + #include "_Ja25EnglishText.h" #ifdef JA2UB #include "laptop.h" #include "email.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" - #include "soldier profile.h" + #include "Cursors.h" + #include "Soldier Profile.h" #include "IMP Compile Character.h" #include "IMP Voices.h" #include "IMP Portraits.h" #include "Game Clock.h" #include "environment.h" #include "AimMembers.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "LaptopSave.h" #include "finances.h" diff --git a/Laptop/IMP Voices.cpp b/Laptop/IMP Voices.cpp index ed2398f76..dda39cfdc 100644 --- a/Laptop/IMP Voices.cpp +++ b/Laptop/IMP Voices.cpp @@ -5,14 +5,14 @@ #include "Utilities.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "Sound Control.h" #include "IMP Text System.h" - #include "text.h" + #include "Text.h" #include "soldier profile type.h" #include "GameSettings.h" #include "LaptopSave.h" diff --git a/Laptop/IMPVideoObjects.cpp b/Laptop/IMPVideoObjects.cpp index 57948a69e..63198d6ee 100644 --- a/Laptop/IMPVideoObjects.cpp +++ b/Laptop/IMPVideoObjects.cpp @@ -1,7 +1,7 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "laptop.h" diff --git a/Laptop/Intelmarket.cpp b/Laptop/Intelmarket.cpp index 99d3c8390..8a2d62f46 100644 --- a/Laptop/Intelmarket.cpp +++ b/Laptop/Intelmarket.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/MilitiaWebsite.cpp b/Laptop/MilitiaWebsite.cpp index 16104a7e8..556da551e 100644 --- a/Laptop/MilitiaWebsite.cpp +++ b/Laptop/MilitiaWebsite.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,7 +32,7 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" @@ -835,4 +835,4 @@ template<> void TestTableTemplate<3>::Init( UINT16 sX, UINT16 sY, UINT16 sX_End AddColumnDataProvider( itemnamecol );*/ TestTable::Init( sX, sY, sX_End, sY_End ); -} +} diff --git a/Laptop/PMC.cpp b/Laptop/PMC.cpp index aac3c86fa..7b8527a45 100644 --- a/Laptop/PMC.cpp +++ b/Laptop/PMC.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,7 +32,7 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" #include "MilitiaIndividual.h" @@ -851,4 +851,4 @@ BOOLEAN LoadPMC( HWFILE hwFile ) } return TRUE; -} +} diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp index b1fbf9f7e..5081540f4 100644 --- a/Laptop/PostalService.cpp +++ b/Laptop/PostalService.cpp @@ -1,11 +1,11 @@ #include "SaveLoadMap.h" #include "Structure Wrap.h" #include "Tactical Save.h" -#include "postalservice.h" +#include "PostalService.h" #include "strategic.h" #include "strategicmap.h" #include "random.h" -#include "game clock.h" +#include "Game Clock.h" #include "GameSettings.h" #include #include diff --git a/Laptop/PostalService.h b/Laptop/PostalService.h index dfd4df5ce..168baebd3 100644 --- a/Laptop/PostalService.h +++ b/Laptop/PostalService.h @@ -4,12 +4,12 @@ #include "SaveLoadMap.h" #include "Structure Wrap.h" #include "Tactical Save.h" -#include "laptopsave.h" -#include "postalservice.h" -#include "isometric utils.h" -#include "debug.h" -#include "game event hook.h" -#include "game events.h" +#include "LaptopSave.h" +#include "PostalService.h" +#include "Isometric Utils.h" +#include "DEBUG.H" +#include "Game Event Hook.h" +#include "Game Events.h" #include #include #include @@ -254,4 +254,4 @@ class CPostalService protected: }; -#endif +#endif diff --git a/Laptop/Store Inventory.cpp b/Laptop/Store Inventory.cpp index b21fa9066..cdf7be052 100644 --- a/Laptop/Store Inventory.cpp +++ b/Laptop/Store Inventory.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "Store Inventory.h" - #include "Random.h" + #include "random.h" #include "Weapons.h" - #include "Debug.h" + #include "DEBUG.H" #include "LaptopSave.h" #include "ShopKeeper Interface.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "GameSettings.h" diff --git a/Laptop/WHO.cpp b/Laptop/WHO.cpp index 1b077b9fa..ff5f498a7 100644 --- a/Laptop/WHO.cpp +++ b/Laptop/WHO.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/XML_DeliveryMethods.cpp b/Laptop/XML_DeliveryMethods.cpp index 07751b225..186d16693 100644 --- a/Laptop/XML_DeliveryMethods.cpp +++ b/Laptop/XML_DeliveryMethods.cpp @@ -1,7 +1,7 @@ #include "sgp.h" -#include "overhead types.h" -#include "overhead.h" -#include "text.h" +#include "Overhead Types.h" +#include "Overhead.h" +#include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" @@ -268,4 +268,4 @@ BOOLEAN ReadInDeliveryMethods(STR fileName) return( TRUE ); -} +} diff --git a/Laptop/XML_ShippingDestinations.cpp b/Laptop/XML_ShippingDestinations.cpp index e17b76ea3..f37fb5e49 100644 --- a/Laptop/XML_ShippingDestinations.cpp +++ b/Laptop/XML_ShippingDestinations.cpp @@ -1,7 +1,7 @@ #include "sgp.h" -#include "overhead types.h" -#include "overhead.h" -#include "text.h" +#include "Overhead Types.h" +#include "Overhead.h" +#include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" @@ -236,4 +236,4 @@ BOOLEAN ReadInShippingDestinations(STR fileName, BOOLEAN localizedVersion) XML_ParserFree(parser); return( TRUE ); -} +} diff --git a/Laptop/aim.cpp b/Laptop/aim.cpp index a03a80d5f..e5c50446d 100644 --- a/Laptop/aim.cpp +++ b/Laptop/aim.cpp @@ -2,8 +2,8 @@ #include "aim.h" #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 6c12710ff..433055439 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -2,17 +2,17 @@ #include "email.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" - #include "soldier profile.h" + #include "Cursors.h" + #include "Soldier Profile.h" #include "CharProfile.h" #include "IMP Compile Character.h" #include "IMP Portraits.h" #include "Game Clock.h" #include "AimMembers.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "LaptopSave.h" #include "finances.h" diff --git a/Laptop/files.cpp b/Laptop/files.cpp index 3de647b97..d37055237 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -3,15 +3,15 @@ #include #include "laptop.h" #include "files.h" - #include "Game clock.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "email.h" - #include "text.h" + #include "Text.h" // HEADROCK PROFEX: This is required to display the proper facial image. #include "Soldier Profile.h" #include "GameSettings.h" diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index ac542863f..e785f1a3b 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -1,12 +1,12 @@ #include "laptop.h" #include "finances.h" - #include "Game clock.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "Text.h" #include "Strategic Mines.h" diff --git a/Laptop/florist Order Form.cpp b/Laptop/florist Order Form.cpp index b62696fbb..1bba206ab 100644 --- a/Laptop/florist Order Form.cpp +++ b/Laptop/florist Order Form.cpp @@ -10,15 +10,15 @@ #include "Encrypted File.h" #include "florist Cards.h" #include "Text Input.h" - #include "Finances.h" - #include "Game clock.h" + #include "finances.h" + #include "Game Clock.h" #include "english.h" #include "Text.h" #include "LaptopSave.h" - #include "Random.h" - #include "postalservice.h" + #include "random.h" + #include "PostalService.h" -#include "meanwhile.h" +#include "Meanwhile.h" #define FLOWER_ORDER_TINY_FONT FONT10ARIAL diff --git a/Laptop/history.cpp b/Laptop/history.cpp index 3ca4a8c47..428802425 100644 --- a/Laptop/history.cpp +++ b/Laptop/history.cpp @@ -1,16 +1,16 @@ #include "laptop.h" - #include "History.h" - #include "Game clock.h" + #include "history.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "strategicmap.h" #include "QuestText.h" - #include "text.h" + #include "Text.h" #include "message.h" #include "LaptopSave.h" diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp index c85cc1706..441c40d23 100644 --- a/Laptop/insurance Contract.cpp +++ b/Laptop/insurance Contract.cpp @@ -13,12 +13,12 @@ #include "Soldier Add.h" #include "Game Clock.h" #include "finances.h" - #include "History.h" + #include "history.h" #include "Game Event Hook.h" #include "LaptopSave.h" #include "english.h" #include "Text.h" - #include "Random.h" + #include "random.h" #include "Strategic Status.h" #include "Assignments.h" #include "Map Screen Interface.h" @@ -27,7 +27,7 @@ #ifdef JA2UB #include "ub_config.h" -#include "quests.h" +#include "Quests.h" #endif #define INS_CTRCT_ORDER_GRID_WIDTH 132 diff --git a/Laptop/insurance.cpp b/Laptop/insurance.cpp index 6cb3ce2b7..8fc7c3262 100644 --- a/Laptop/insurance.cpp +++ b/Laptop/insurance.cpp @@ -5,7 +5,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" - #include "Line.h" + #include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index 00c2f1615..e6da5bcbd 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -3,8 +3,8 @@ #include "WCheck.h" #include "Render Dirty.h" #include "sysutil.h" - #include "screens.h" - #include "cursors.h" + #include "Screens.h" + #include "Cursors.h" #include "Event Pump.h" #include "laptop.h" #include "aim.h" @@ -45,26 +45,26 @@ #include "Interface Control.h" #include "Game Event Hook.h" #include "WordWrap.h" - #include "Game init.h" + #include "Game Init.h" #include "Game Clock.h" #include "vobject_blitters.h" #include "Soldier Profile.h" #include "Overhead.h" #include "environment.h" #include "LibraryDataBase.h" - #include "music control.h" + #include "Music Control.h" #include "SaveLoadGame.h" #include "LaptopSave.h" - #include "RenderWorld.h" + #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "random.h" #include "Merc Hiring.h" #include "Map Screen Interface.h" - #include "ambient control.h" + #include "Ambient Control.h" #include "Sound Control.h" - #include "text.h" - #include "Message.h" + #include "Text.h" + #include "message.h" #include "Map Screen Interface Bottom.h" #include "Cursor Control.h" #include "Quests.h" @@ -72,8 +72,8 @@ #include "BrokenLink.h" #include "BobbyRShipments.h" #include "Dialogue Control.h" - #include "helpscreen.h" - #include "cheats.h" + #include "HelpScreen.h" + #include "Cheats.h" #include "Strategic Status.h" #include "Arms Dealer Init.h" #include "GameSettings.h" @@ -81,7 +81,7 @@ #include "Encyclopedia_Data_new.h" #include "CampaignHistoryMain.h" // added by Flugente #include "CampaignHistory_Summary.h" // added by Flugente - #include "MercCompare.h" // added by Flugente + #include "merccompare.h" // added by Flugente #include "WHO.h" // added by Flugente #include "PMC.h" // added by Flugente #include "MilitiaWebsite.h" // added by Flugente diff --git a/Laptop/laptop.h b/Laptop/laptop.h index a558dd1ba..f02f4b6d4 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -4,7 +4,7 @@ #include "types.h" #include "sgp.h" #include "Font Control.h" -#include "messageboxscreen.h" +#include "MessageBoxScreen.h" diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index 413853d5a..03b6d9fb4 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index b312ef2b6..a67487215 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -10,8 +10,8 @@ #include "Game Clock.h" #include "Soldier Add.h" #include "Overhead.h" - #include "History.h" - #include "Email.h" + #include "history.h" + #include "email.h" #include "LaptopSave.h" #include "Text.h" #include "Speck Quotes.h" diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index a32a7a7cf..b9e8efe41 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -10,10 +10,10 @@ #include "stdio.h" #include "Encrypted File.h" #include "AimMembers.h" - #include "InterFace Items.h" + #include "Interface Items.h" #include "Game Clock.h" #include "Soldier Add.h" - #include "OverHead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "Font.h" @@ -23,11 +23,11 @@ #include "Multi Language Graphic Utils.h" #include "Quests.h" #include "Assignments.h" - #include "Input.h" + #include "input.h" #include "english.h" #include "finances.h" #include "GameSettings.h" - #include "Personnel.h" + #include "personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item #include "mousesystem.h" diff --git a/Laptop/mercs No Account.cpp b/Laptop/mercs No Account.cpp index d7e7d2a51..ad659ff29 100644 --- a/Laptop/mercs No Account.cpp +++ b/Laptop/mercs No Account.cpp @@ -6,7 +6,7 @@ #include "WordWrap.h" #include "Cursors.h" #include "LaptopSave.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "Speck Quotes.h" diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index 0f96750ac..c3378a06c 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -6,13 +6,13 @@ #include "Cursors.h" #include "Overhead.h" #include "Soldier Add.h" - #include "Email.h" + #include "email.h" #include "Game Clock.h" - #include "Faces.h" - #include "dialogue control.h" + #include "faces.h" + #include "Dialogue Control.h" #include "MercTextBox.h" #include "Merc Hiring.h" - #include "Random.h" + #include "random.h" #include "LaptopSave.h" #include "GameSettings.h" #include "Text.h" diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 935b5cf00..6fcdb6df5 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -2,10 +2,10 @@ #include "personnel.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Overhead.h" #include "Soldier Profile.h" #include "Text.h" @@ -26,9 +26,9 @@ #include "strategicmap.h" #include "GameSettings.h" #include "Merc Contract.h" - #include "_Ja25Englishtext.h" // added by SANDRO + #include "_Ja25EnglishText.h" // added by SANDRO -#include "Soldier Macros.h" +#include "Soldier macros.h" #include "InterfaceItemImages.h" #include "IMP Skill Trait.h" // added by Flugente @@ -814,7 +814,7 @@ void RenderPersonnelStats( INT32 iId, INT32 iSlot ) // ID -> fortlaufende ID, und nicht die mercID // -> bei aktuellen Merc passt es -// -> bei departed Merc wird die MercId anstatt der fortlaufenden ID bergeben!! +// -> bei departed Merc wird die MercId anstatt der fortlaufenden ID �bergeben!! void RenderPersonnelFace(INT32 iId, INT32 iSlot, BOOLEAN fDead, BOOLEAN fFired, BOOLEAN fOther ) { // Get the profile id (from profileId or slotId) @@ -2738,7 +2738,7 @@ void DisplayFaceOfDisplayedMerc( ) DisplayHighLightBox(); - // Hier drfte der Aufruf falsch sein + // Hier d�rfte der Aufruf falsch sein RenderPersonnelFace( GetIdOfPastMercInSlot( iCurrentPersonSelectedId ), 0, IsPastMercDead( iCurrentPersonSelectedId ), IsPastMercFired( iCurrentPersonSelectedId ), IsPastMercOther( iCurrentPersonSelectedId ) ); DisplayDepartedCharName( GetIdOfPastMercInSlot( iCurrentPersonSelectedId ), 0, GetTheStateOfDepartedMerc( GetIdOfPastMercInSlot( iCurrentPersonSelectedId ) ) ); diff --git a/Laptop/personnel.h b/Laptop/personnel.h index 5b48dccd5..f6a62c1f8 100644 --- a/Laptop/personnel.h +++ b/Laptop/personnel.h @@ -2,7 +2,7 @@ #define __PERSONNEL_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" diff --git a/Laptop/sirtech.cpp b/Laptop/sirtech.cpp index 3709ed6e0..b9c79358a 100644 --- a/Laptop/sirtech.cpp +++ b/Laptop/sirtech.cpp @@ -1,5 +1,5 @@ #include "laptop.h" - #include "SirTech.h" + #include "sirtech.h" void GameInitSirTech() { diff --git a/ModularizedTacticalAI/src/LegacyAIPlan.cpp b/ModularizedTacticalAI/src/LegacyAIPlan.cpp index d672870e8..e687ed259 100644 --- a/ModularizedTacticalAI/src/LegacyAIPlan.cpp +++ b/ModularizedTacticalAI/src/LegacyAIPlan.cpp @@ -9,7 +9,7 @@ #include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE #include "../../TacticalAI/NPC.h" // NPCReachedDestination #include "../../Tactical/Animation Control.h" // defines ANIM_... -#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT +#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT #include "../../Tactical/opplist.h" // EndMuzzleFlash #include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty #include "../../TileEngine/Isometric Utils.h" // defines NOWHERE diff --git a/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp b/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp index a71e8be53..e8c29a831 100644 --- a/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp +++ b/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp @@ -13,7 +13,7 @@ #include "../../TacticalAI/AIInternals.h" // DEBUGAIMSG #include "../../Tactical/Soldier Control.h" // For SOLDIERTYPE definition #include "../../Tactical/Animation Data.h" // For the definition of, wait for it... BLOODCAT! -#include "soldier macros.h" +#include "Soldier macros.h" #include diff --git a/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp b/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp index 7d0112d32..1141b5070 100644 --- a/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp +++ b/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp @@ -5,7 +5,7 @@ #include "../include/LegacyArmedVehiclePlan.h" #include "Soldier Control.h" // definition of SOLDIERTYPE -#include "aiinternals.h" +#include "AIInternals.h" namespace AI { diff --git a/ModularizedTacticalAI/src/Plan.cpp b/ModularizedTacticalAI/src/Plan.cpp index ce08b2200..8c3efb4e9 100644 --- a/ModularizedTacticalAI/src/Plan.cpp +++ b/ModularizedTacticalAI/src/Plan.cpp @@ -4,7 +4,7 @@ #include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE #include "../../TacticalAI/NPC.h" // NPCReachedDestination #include "../../Tactical/Animation Control.h" // defines ANIM_... -#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT +#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT #include "../../Tactical/opplist.h" // EndMuzzleFlash #include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty #include "../../TileEngine/Isometric Utils.h" // defines NOWHERE @@ -12,7 +12,7 @@ #include "../../Utils/Font Control.h" // ScreenMsg about deadlock #include "../../Utils/message.h" // ditto #include "../../TileEngine/Render Fun.h" // defines InARoom -#include "../../Strategic/quests.h" // IN_BROTHEL +#include "../../Strategic/Quests.h" // IN_BROTHEL void HandleAITacticalTraversal(SOLDIERTYPE* pSoldier); // defined in TacticalAI/AIMain.cpp diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 05803259d..b2494545c 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1,10 +1,10 @@ #include "builddefines.h" - #include "bullets.h" + #include "Bullets.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -19,27 +19,27 @@ #include "Render Fun.h" #include "Render Dirty.h" #include "mousesystem.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "points.h" - #include "Random.h" + #include "Points.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" + #include "Soldier Ani.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Merc Hiring.h" #include "Game Event Hook.h" #include "message.h" #include "strategicmap.h" #include "strategic.h" - #include "items.h" + #include "Items.h" #include "Soldier Add.h" - #include "History.h" + #include "history.h" #include "Squads.h" #include "Strategic Merc Handler.h" #include "Dialogue Control.h" @@ -47,7 +47,7 @@ #include "Map Screen Interface Map.h" #include "screenids.h" #include "jascreens.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "LaptopSave.h" #include "personnel.h" @@ -55,12 +55,12 @@ #include "Map Screen Interface Bottom.h" #include "Quests.h" #include "GameSettings.h" - #include "Mercs.h" + #include "mercs.h" #include "Handle Doors.h" #include "Campaign Types.h" #include "Tactical Save.h" #include "BobbyRMailOrder.h" - #include "Finances.h" + #include "finances.h" #include "TeamTurns.h" #include "gameloop.h" #include "Options Screen.h" @@ -89,15 +89,15 @@ #include #include #include -#include "music control.h" -#include "map edgepoints.h" +#include "Music Control.h" +#include "Map Edgepoints.h" #include "fresh_header.h" #include "network.h" #include "opplist.h" -#include "tactical placement gui.h" -#include "prebattle interface.h" +#include "Tactical Placement GUI.h" +#include "PreBattle Interface.h" #include "mapscreen.h" #include "MessageBoxScreen.h" @@ -110,25 +110,25 @@ #include #include "transfer_rules.h" -#include "keys.h" +#include "Keys.h" #include "new.h" -#include "Types.h" +#include "types.h" #include "connect.h" #include "message.h" -#include "Event pump.h" +#include "Event Pump.h" #include "Soldier Init List.h" #include "Overhead.h" -#include "weapons.h" +#include "Weapons.h" #include "Merc Hiring.h" -#include "soldier profile.h" +#include "Soldier Profile.h" #include "environment.h" #include "lighting.h" #include "laptop.h" -#include "interface panels.h" -#include "game init.h" +#include "Interface Panels.h" +#include "Game Init.h" #include "Debug Control.h" #include "MPConnectScreen.h" -#include "IniReader.h" +#include "INIReader.h" #include "Map Screen Interface Border.h" extern CHAR16 gzFileTransferDirectory[100]; diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h index d1d94f10c..f5eff4510 100644 --- a/Multiplayer/connect.h +++ b/Multiplayer/connect.h @@ -3,7 +3,7 @@ #include "Soldier Init List.h" #include "Merc Hiring.h" -#include "event pump.h" +#include "Event Pump.h" #include "Bullets.h" #include "builddefines.h" diff --git a/Multiplayer/raknet/Gen_RPC8.h b/Multiplayer/raknet/Gen_RPC8.h index 1f6f98bcb..1a35d1826 100644 --- a/Multiplayer/raknet/Gen_RPC8.h +++ b/Multiplayer/raknet/Gen_RPC8.h @@ -12,7 +12,7 @@ #endif #include //#define ASSEMBLY_BLOCK asm -//#include "Types.h" +//#include "types.h" #include "BitStream.h" // #define AUTO_RPC_NO_ASM diff --git a/Multiplayer/server.cpp b/Multiplayer/server.cpp index c1829415b..e7b748f0a 100644 --- a/Multiplayer/server.cpp +++ b/Multiplayer/server.cpp @@ -21,18 +21,18 @@ #include #include "connect.h" #include "types.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "message.h" #include "FileMan.h" -#include "IniReader.h" +#include "INIReader.h" #include #include "transfer_rules.h" #include "MPJoinScreen.h" -#include "game init.h" -#include "text.h" +#include "Game Init.h" +#include "Text.h" #include "network.h" #include "message.h" -#include "overhead.h" +#include "Overhead.h" #include "fresh_header.h" #include "Debug Control.h" #include "MPXmlTeams.hpp" @@ -881,7 +881,7 @@ void start_server (void) // Read from ja2_mp.ini // ---------------------------- - CIniReader iniReader(JA2MP_INI_FILENAME); // Wird nur fr Strings gebraucht + CIniReader iniReader(JA2MP_INI_FILENAME); // Wird nur f�r Strings gebraucht strncpy(cServerName, iniReader.ReadString(JA2MP_INI_INITIAL_SECTION, JA2MP_SERVER_NAME, "My JA2 Server"), 30 ); strncpy(gKitBag, iniReader.ReadString(JA2MP_INI_INITIAL_SECTION,JA2MP_KIT_BAG, ""), 100); diff --git a/Multiplayer/transfer_rules.cpp b/Multiplayer/transfer_rules.cpp index aac4e2fbd..761ec4edc 100644 --- a/Multiplayer/transfer_rules.cpp +++ b/Multiplayer/transfer_rules.cpp @@ -1,5 +1,5 @@ #include "transfer_rules.h" -#include "Debug.h" +#include "DEBUG.H" #include #include #include diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index 01203c01d..f7a4e5fea 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -15,13 +15,13 @@ #include "Text Input.h" #include "mousesystem.h" #include "strategicmap.h" - #include "Fileman.h" + #include "FileMan.h" #include "Map Information.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Game Clock.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "GameSettings.h" #include "Game Event Hook.h" @@ -32,7 +32,7 @@ #include "Campaign.h" #include "Auto Resolve.h" #include "Strategic Status.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Town Militia.h" // added by Flugente #ifdef JA2BETAVERSION diff --git a/Strategic/ASD.cpp b/Strategic/ASD.cpp index 41bad7199..bc42caa66 100644 --- a/Strategic/ASD.cpp +++ b/Strategic/ASD.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -27,10 +27,10 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" -#include "map information.h" +#include "Map Information.h" #include "Campaign.h" #include "random.h" diff --git a/Strategic/ASD.h b/Strategic/ASD.h index 62cd5b185..530c611c7 100644 --- a/Strategic/ASD.h +++ b/Strategic/ASD.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" /** Flugente: Arulco special division decision code * diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 3645f2966..1590e5824 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -1,22 +1,22 @@ #include "Assignments.h" - #include "Strategic.h" + #include "strategic.h" #include "Items.h" #include "Overhead.h" #include "Game Clock.h" #include "stdlib.h" - #include "Message.h" + #include "message.h" #include "Font Control.h" #include "Map Screen Interface.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Campaign.h" #include "Queen Command.h" #include "strategicmap.h" #include "Text.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "NPC.h" #include "Strategic Town Loyalty.h" - #include "animation control.h" + #include "Animation Control.h" #include "mapscreen.h" #include "Squads.h" #include "Map Screen Helicopter.h" @@ -26,20 +26,20 @@ #include "Map Screen Interface Map.h" #include "Strategic Movement.h" #include "laptop.h" - #include "Finances.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 "Utilities.h" #include "random.h" #include "line.h" #include "Soldier Add.h" #include "GameSettings.h" #include "Isometric Utils.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "Explosion Control.h" #include "SkillCheck.h" #include "Quests.h" @@ -54,7 +54,7 @@ #include "Strategic Status.h" #include "history.h" #include "Map Screen Interface Map Inventory.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" // added by SANDRO #include "AIInternals.h" #include "Morale.h" diff --git a/Strategic/Assignments.h b/Strategic/Assignments.h index 61d59e051..681d33598 100644 --- a/Strategic/Assignments.h +++ b/Strategic/Assignments.h @@ -3,7 +3,7 @@ // header for assignment manipulation/updating for characters -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "mousesystem.h" #include "Strategic Movement.h" @@ -592,4 +592,4 @@ UINT8 CalcSoldierNeedForSleep( SOLDIERTYPE *pSoldier ); // Flugente: administration assignment FLOAT GetAdministrationPercentage( INT16 sX, INT16 sY ); -#endif +#endif diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index 3820ddf4f..a64aa84d4 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -16,8 +16,8 @@ #include "video.h" #include "input.h" #include "gamescreen.h" - #include "render dirty.h" - #include "vObject_Blitters.h" + #include "Render Dirty.h" + #include "vobject_blitters.h" #include "sysutil.h" #include "Font Control.h" #include "Soldier Create.h" @@ -32,10 +32,10 @@ #include "Tactical Save.h" #include "Strategic Status.h" #include "Map Screen Interface.h" - #include "text.h" + #include "Text.h" #include "WordWrap.h" #include "Squads.h" - #include "Random.h" + #include "random.h" #include "line.h" #include "english.h" #include "Strategic Pathing.h" @@ -48,17 +48,17 @@ #include "Strategic AI.h" #include "SkillCheck.h" #include "rt time defines.h" - #include "morale.h" + #include "Morale.h" #include "Strategic Town Loyalty.h" #include "GameSettings.h" #include "Soldier macros.h" #include "strategicmap.h" #include "Quests.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Inventory Choosing.h" #include "Game Event Hook.h" #include "Assignments.h" - #include "cheats.h" + #include "Cheats.h" #include "Map Information.h" #include "MilitiaSquads.h" // #include "Strategic AI.h" diff --git a/Strategic/Campaign Init.cpp b/Strategic/Campaign Init.cpp index 0da5809b6..cc6477ae2 100644 --- a/Strategic/Campaign Init.cpp +++ b/Strategic/Campaign Init.cpp @@ -1,10 +1,10 @@ #include "ASD.h" // added by Flugente #include "types.h" #include "Campaign Init.h" - #include "Random.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" diff --git a/Strategic/Creature Spreading.cpp b/Strategic/Creature Spreading.cpp index fac95c5ac..ff0fa113b 100644 --- a/Strategic/Creature Spreading.cpp +++ b/Strategic/Creature Spreading.cpp @@ -1,12 +1,12 @@ #include "types.h" - #include "fileman.h" + #include "FileMan.h" #include "himage.h" #include "Creature Spreading.h" #include "Campaign Types.h" #include "Strategic Movement.h" #include "Game Event Hook.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "message.h" #include "Font Control.h" #include "Soldier Init List.h" @@ -23,7 +23,7 @@ #include "Map Edgepoints.h" #include "Animation Data.h" #include "opplist.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Strategic AI.h" #include "MessageBoxScreen.h" #include "Map Information.h" @@ -2422,4 +2422,4 @@ void ResetCreatureAttackVariables() gubAdultFemalesAttackingTown = 0; gubCreatureBattleCode = CREATURE_BATTLE_CODE_NONE; gubSectorIDOfCreatureAttack = 0; -} +} diff --git a/Strategic/Facilities.cpp b/Strategic/Facilities.cpp index 52975d1a8..aa7f0b770 100644 --- a/Strategic/Facilities.cpp +++ b/Strategic/Facilities.cpp @@ -21,7 +21,7 @@ #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "SkillCheck.h" - #include "Random.h" + #include "random.h" #include "strategicmap.h" #include "Game Clock.h" #include "Campaign.h" diff --git a/Strategic/Facilities.h b/Strategic/Facilities.h index 887e4344f..f40cd088d 100644 --- a/Strategic/Facilities.h +++ b/Strategic/Facilities.h @@ -1,7 +1,7 @@ #ifndef _FACILITIES_H #define _FACILITIES_H -#include "campaign types.h" +#include "Campaign Types.h" #include "Soldier Control.h" // Get a specific modifier for a specific assignment at a specific facility. Includes Ambient (non-assignment based) @@ -80,4 +80,4 @@ INT32 GetTotalFacilityHourlyCosts( BOOLEAN fPositive ); void InitFacilities(); -#endif +#endif diff --git a/Strategic/Game Clock.cpp b/Strategic/Game Clock.cpp index 6b92c1039..bb3d38c78 100644 --- a/Strategic/Game Clock.cpp +++ b/Strategic/Game Clock.cpp @@ -1,17 +1,17 @@ #include "sgp.h" #include "Game Clock.h" #include "Font.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "environment.h" #include "Game Clock.h" #include "message.h" #include "Game Events.h" - #include "assignments.h" + #include "Assignments.h" #include "MercTextBox.h" - #include "Renderworld.h" - #include "Lighting.h" + #include "renderworld.h" + #include "lighting.h" #include "Map Screen Interface.h" #include "PreBattle Interface.h" #include "Event Pump.h" diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 6a64799af..a268b3fa6 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -12,21 +12,21 @@ #include "email.h" #include "Game Clock.h" #include "Merc Hiring.h" - #include "Insurance Contract.h" + #include "insurance Contract.h" #include "Strategic Merc Handler.h" #include "Strategic Movement.h" #include "Assignments.h" #include "Strategic Mines.h" #include "Strategic Town Loyalty.h" - #include "Message.h" + #include "message.h" #include "Map Screen Interface.h" #include "Map Screen Helicopter.h" #include "Scheduling.h" #include "Arms Dealer Init.h" - #include "Strategic town reputation.h" - #include "air raid.h" - #include "meanwhile.h" - #include "overhead.h" + #include "strategic town reputation.h" + #include "Air Raid.h" + #include "Meanwhile.h" + #include "Overhead.h" #include "random.h" #include "Creature Spreading.h" #include "Strategic AI.h" @@ -35,7 +35,7 @@ #include "INIReader.h" #include "GameSettings.h" #include "english.h" - #include "Input.h" + #include "input.h" #include "Soldier Profile.h" #include "laptop.h" #include "Campaign.h" diff --git a/Strategic/Game Events.cpp b/Strategic/Game Events.cpp index d6fc6d9bb..b78a61724 100644 --- a/Strategic/Game Events.cpp +++ b/Strategic/Game Events.cpp @@ -4,7 +4,7 @@ #include "Game Events.h" #include "Game Clock.h" #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include "Font Control.h" #include "message.h" #include "MiniEvents.h" diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index c47c05786..d4dc7cd28 100644 --- a/Strategic/Game Init.cpp +++ b/Strategic/Game Init.cpp @@ -3,15 +3,15 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" #include "Game Clock.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" + #include "Game Init.h" + #include "Animation Data.h" #include "finances.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "history.h" @@ -21,32 +21,32 @@ #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Creature Spreading.h" #include "Quests.h" #include "Strategic AI.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "AimMembers.h" - #include "dialogue control.h" - #include "npc.h" + #include "Dialogue Control.h" + #include "NPC.h" #include "GameSettings.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Map Screen Interface Border.h" #include "Map Screen Helicopter.h" #include "Vehicles.h" #include "Map Screen Interface Map.h" #include "PreBattle Interface.h" - #include "bobbyr.h" - #include "helpscreen.h" + #include "BobbyR.h" + #include "HelpScreen.h" #include "Air Raid.h" #include "Interface.h" - #include "cheats.h" + #include "Cheats.h" #include "Interface Panels.h" // HEADROCK HAM 3.6: Include for adding facility debt reset #include "Facilities.h" @@ -61,7 +61,7 @@ #include "World Items.h" #include "Vehicles.h" -#include "text.h" +#include "Text.h" #include "connect.h" #include "XML.h" #include "mercs.h" diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index f6e3386ee..2d573827c 100644 --- a/Strategic/Hourly Update.cpp +++ b/Strategic/Hourly Update.cpp @@ -10,7 +10,7 @@ #include "jascreens.h" #include "screenids.h" #include "Items.h" - #include "Random.h" + #include "random.h" #include "finances.h" #include "history.h" #include "Dialogue Control.h" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index 7e97ba217..b6b40938e 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -12,61 +12,61 @@ #include "jascreens.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" #include "worlddef.h" - #include "worlddat.h" - #include "text.h" - #include "Soldier add.h" - #include "soldier macros.h" + #include "WorldDat.h" + #include "Text.h" + #include "Soldier Add.h" + #include "Soldier macros.h" #include "Strategic Pathing.h" - #include "soldier create.h" - #include "handle UI.h" + #include "Soldier Create.h" + #include "Handle UI.h" #include "faces.h" #include "renderworld.h" #include "Map Information.h" #include "Assignments.h" #include "message.h" #include "Game Events.h" - #include "quests.h" + #include "Quests.h" #include "FileMan.h" - #include "animated progressbar.h" + #include "Animated ProgressBar.h" #include "Strategic Movement.h" #include "Campaign Types.h" #include "Exit Grids.h" #include "Tactical Save.h" - #include "animation control.h" - #include "squads.h" + #include "Animation Control.h" + #include "Squads.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Queen Command.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "PreBattle Interface.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "ai.h" - #include "keys.h" + #include "Keys.h" #include "Tactical Placement GUI.h" #include "Map Screen Helicopter.h" #include "Player Command.h" #include "Event Pump.h" - #include "air raid.h" + #include "Air Raid.h" #include "Strategic Mines.h" #include "SaveLoadMap.h" #include "Militia Control.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "Town Militia.h" #include "sysutil.h" #include "Debug Control.h" #include "Queen Command.h" #include "Strategic Event Handler.h" #include "MessageBoxScreen.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Map Screen Interface.h" #include "Bullets.h" #include "physics.h" #include "Auto Resolve.h" - #include "cursors.h" + #include "Cursors.h" #ifdef JA2UB #include "Soldier Init List.h" @@ -246,7 +246,7 @@ void InitJa25StrategicAi() gStrategicStatus.ubHighestProgress = CurrentPlayerProgressPercentage(); - //InitJohnKulbaInitialSector(); // wyczone, skrypt lua + //InitJohnKulbaInitialSector(); // wy��czone, skrypt lua } @@ -374,10 +374,10 @@ void InitJa25InitialEnemiesInSector() // // Set the number of enemies in each of the sectors // - //InitNumberOfEnemiesInAboveGroundSectors( ); //wyczono, skrypt lua + //InitNumberOfEnemiesInAboveGroundSectors( ); //wy��czono, skrypt lua //Below Ground - //InitNumberOfEnemiesInUnderGroundSectors( ); //wyczono, skrypt lua + //InitNumberOfEnemiesInUnderGroundSectors( ); //wy��czono, skrypt lua } void InitJa25UnderGroundSectors() diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index 721a5a44e..8ce8aa3b6 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -42,7 +42,7 @@ #include "Game Events.h" #include "email.h" #include "worldman.h" -#include "text.h" +#include "Text.h" #include "Dialogue Control.h" #include "Boxing.h" diff --git a/Strategic/LuaInitNPCs.h b/Strategic/LuaInitNPCs.h index cd663eded..95d8ec270 100644 --- a/Strategic/LuaInitNPCs.h +++ b/Strategic/LuaInitNPCs.h @@ -1,7 +1,7 @@ #ifndef _LUAINITNPCS_H #define _LUAINITNPCS_H -#include "Types.h" +#include "types.h" typedef struct { diff --git a/Strategic/Luaglobal.h b/Strategic/Luaglobal.h index ec602857d..ca87b0ff8 100644 --- a/Strategic/Luaglobal.h +++ b/Strategic/Luaglobal.h @@ -1,7 +1,7 @@ #ifndef _LUAGLOBAL_H #define _LUAGLOBAL_H -#include "Types.h" +#include "types.h" extern "C" { #include "lua.h" diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp index 8ba308f9a..23f9f31fb 100644 --- a/Strategic/Map Screen Helicopter.cpp +++ b/Strategic/Map Screen Helicopter.cpp @@ -1,17 +1,17 @@ #include "Map Screen Helicopter.h" #include "LaptopSave.h" #include "Vehicles.h" - #include "Finances.h" + #include "finances.h" #include "Quests.h" #include "Game Clock.h" #include "strategic.h" #include "Queen Command.h" #include "Strategic Pathing.h" - #include "Random.h" + #include "random.h" #include "Game Event Hook.h" - #include "String.h" + #include "string.h" #include "Dialogue Control.h" - #include "Message.h" + #include "message.h" #include "Strategic Movement.h" #include "Soldier Profile.h" #include "Assignments.h" @@ -19,14 +19,14 @@ #include "strategicmap.h" #include "worlddef.h" #include "worldman.h" - #include "tiledat.h" + #include "TileDat.h" #include "Map Screen Interface.h" #include "Text.h" #include "Squads.h" #include "Player Command.h" #include "Sound Control.h" #include "GameSettings.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Map Screen Interface Border.h" #include "Strategic Event Handler.h" #include "Overhead.h" diff --git a/Strategic/Map Screen Helicopter.h b/Strategic/Map Screen Helicopter.h index 05c8e7bf8..360143c3a 100644 --- a/Strategic/Map Screen Helicopter.h +++ b/Strategic/Map Screen Helicopter.h @@ -1,7 +1,7 @@ #ifndef __MAP_SCREEN_HELICOPTER_H #define __MAP_SCREEN_HELICOPTER_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // costs of flying through sectors @@ -310,4 +310,4 @@ BOOLEAN SoldierAboardAirborneHeli( SOLDIERTYPE *pSoldier ); UINT8 MoveAllInHelicopterToFootMovementGroup( INT8 bNewSquad = 0 ); -#endif +#endif diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp index 4155783dd..c538d8ab6 100644 --- a/Strategic/Map Screen Interface Border.cpp +++ b/Strategic/Map Screen Interface Border.cpp @@ -1,5 +1,5 @@ #include "Map Screen Interface Border.h" - #include "Types.h" + #include "types.h" #include "vsurface.h" #include "mousesystem.h" #include "Button System.h" diff --git a/Strategic/Map Screen Interface Border.h b/Strategic/Map Screen Interface Border.h index 1447b4614..0b3869e33 100644 --- a/Strategic/Map Screen Interface Border.h +++ b/Strategic/Map Screen Interface Border.h @@ -1,7 +1,7 @@ #ifndef __MAP_INTERFACE_BORDER_H #define __MAP_INTERFACE_BORDER_H -#include "Types.h" +#include "types.h" //#define MAP_BORDER_START_X 261 //#define MAP_BORDER_START_Y 0 @@ -107,4 +107,4 @@ void InitMapBorderButtonCoordinates(); void DisableMapBorderButtons(void); void EnableMapBorderButtons(void); -#endif +#endif diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 49ee8f290..bb60945ab 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -1,6 +1,6 @@ #include "Map Screen Interface Bottom.h" #include "Map Screen Interface Border.h" - #include "Types.h" + #include "types.h" #include "vsurface.h" #include "mousesystem.h" #include "Button System.h" @@ -9,16 +9,16 @@ #include "message.h" #include "mapscreen.h" #include "strategicmap.h" - #include "font control.h" + #include "Font Control.h" #include "Radar Screen.h" - #include "game clock.h" + #include "Game Clock.h" #include "sysutil.h" #include "Render Dirty.h" #include "Map Screen Interface.h" #include "Map Screen Interface Map.h" #include "Text.h" #include "Overhead.h" - #include "Prebattle Interface.h" + #include "PreBattle Interface.h" #include "Options Screen.h" #include "Cursor Control.h" #include "gameloop.h" @@ -26,11 +26,11 @@ #include "Tactical Save.h" #include "Campaign Types.h" #include "Air Raid.h" - #include "Finances.h" + #include "finances.h" #include "LaptopSave.h" #include "Interface Items.h" - #include "wordwrap.h" - #include "meanwhile.h" + #include "WordWrap.h" + #include "Meanwhile.h" #include "Dialogue Control.h" #include "Map Screen Helicopter.h" #include "Map Screen Interface TownMine Info.h" @@ -44,7 +44,7 @@ #include "SaveLoadScreen.h" #include "Interface Control.h" #include "Sys Globals.h" -#include "game init.h" +#include "Game Init.h" #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 9f2b21a4d..35d25da57 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/Strategic/Map Screen Interface Map Inventory.cpp @@ -20,12 +20,12 @@ #include "GameSettings.h" #include "Radar Screen.h" #include "message.h" - #include "weapons.h" + #include "Weapons.h" #include "finances.h" #include "Game Clock.h" #include "Sound Control.h" - #include "interface panels.h" - #include "wordwrap.h" + #include "Interface Panels.h" + #include "WordWrap.h" #include "Soldier macros.h" #include "rt time defines.h" #include "Encyclopedia_new.h" //Moa: item visibility diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index dc705df50..14a98c0c1 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -17,7 +17,7 @@ #include "WCheck.h" #include "Assignments.h" #include "Squads.h" - #include "Message.h" + #include "message.h" #include "Soldier Profile.h" #include "Player Command.h" #include "Strategic Movement.h" @@ -1201,7 +1201,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Map Screen1"); if( gTownLoyalty[ bTown ].fStarted && gfTownUsesLoyalty[ bTown ]) { if ( g_lang == i18n::Lang::zh ) { - swprintf( sStringA, L"%d%%% %s", gTownLoyalty[ bTown ].ubRating, gsLoyalString[ 0 ]); + swprintf( sStringA, L"%d%£¥%% %s", gTownLoyalty[ bTown ].ubRating, gsLoyalString[ 0 ]); } else { swprintf( sStringA, L"%d%%%% %s", gTownLoyalty[ bTown ].ubRating, gsLoyalString[ 0 ]); } @@ -4875,7 +4875,7 @@ void BlitMineText( INT16 sMapX, INT16 sMapY ) if (GetMaxPeriodicRemovalFromMine(ubMineIndex) > 0) { if ( g_lang == i18n::Lang::zh ) { - swprintf( wSubString, L" (%d%%%)", (PredictDailyIncomeFromAMine(ubMineIndex, TRUE) * 100 ) / GetMaxDailyRemovalFromMine(ubMineIndex) ); + swprintf( wSubString, L" (%d%£¥%%)", (PredictDailyIncomeFromAMine(ubMineIndex, TRUE) * 100 ) / GetMaxDailyRemovalFromMine(ubMineIndex) ); } else { swprintf( wSubString, L" (%d%%%%)", (PredictDailyIncomeFromAMine(ubMineIndex, TRUE) * 100 ) / GetMaxDailyRemovalFromMine(ubMineIndex) ); } diff --git a/Strategic/Map Screen Interface TownMine Info.cpp b/Strategic/Map Screen Interface TownMine Info.cpp index 17294d0a9..d1b7a12b0 100644 --- a/Strategic/Map Screen Interface TownMine Info.cpp +++ b/Strategic/Map Screen Interface TownMine Info.cpp @@ -1,6 +1,6 @@ #include "Map Screen Interface TownMine Info.h" #include "strategicmap.h" - #include "popupbox.h" + #include "PopUpBox.h" #include "Map Screen Interface.h" #include "Queen Command.h" #include "Player Command.h" @@ -15,7 +15,7 @@ #include "Strategic Mines.h" #include "finances.h" #include "Map Screen Interface Map Inventory.h" - #include "Strategic.h" + #include "strategic.h" #include "Utilities.h" #include "video.h" #include "Town Militia.h" @@ -23,7 +23,7 @@ #include "Map Screen Helicopter.h" #include "Tactical Save.h" #include "GameSettings.h" - #include "debug.h" + #include "DEBUG.H" #include "Overhead.h" // added by Flugente #include "Game Clock.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente diff --git a/Strategic/Map Screen Interface TownMine Info.h b/Strategic/Map Screen Interface TownMine Info.h index 73d210f62..7942be587 100644 --- a/Strategic/Map Screen Interface TownMine Info.h +++ b/Strategic/Map Screen Interface TownMine Info.h @@ -1,7 +1,7 @@ #ifndef __MS_I_TOWNMINE_INFO_H #define __MS_I_TOWNMINE_INFO_H -#include "Types.h" +#include "types.h" extern BOOLEAN fShowTownInfo; @@ -12,4 +12,4 @@ void DisplayTownInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ ); void CreateDestroyTownInfoBox( void ); -#endif +#endif diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 678c4fd7a..278dfecd4 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -8,8 +8,8 @@ #include "Overhead.h" #include "Squads.h" #include "Sound Control.h" - #include "Soundman.h" - #include "Message.h" + #include "soundman.h" + #include "message.h" #include "PopUpBox.h" #include "Game Clock.h" #include "Handle Items.h" @@ -19,20 +19,20 @@ #include "Game Event Hook.h" #include "Tactical Save.h" #include "Quests.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Soldier Profile.h" #include "Strategic Movement.h" #include "Dialogue Control.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Vehicles.h" - #include "LINE.H" + #include "line.h" #include "Text.h" #include "gameloop.h" #include "Map Screen Helicopter.h" #include "PreBattle Interface.h" #include "WordWrap.h" - #include "interface control.h" + #include "Interface Control.h" #include "GameSettings.h" #include "Campaign Types.h" #include "Map Screen Interface Map Inventory.h" @@ -40,7 +40,7 @@ #include "Keys.h" #include "Soldier macros.h" #include "Militia Control.h" - #include "Random.h" + #include "random.h" #include "Cursor Control.h" #include "renderworld.h" #include "Game Init.h" @@ -51,7 +51,7 @@ #include "Queen Command.h" #include "Render Fun.h" #include "Food.h" - #include "Personnel.h" + #include "personnel.h" #include "mapscreen.h" #include "connect.h" diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h index 5e7aafaf5..62569e193 100644 --- a/Strategic/Map Screen Interface.h +++ b/Strategic/Map Screen Interface.h @@ -2,7 +2,7 @@ #define MAP_SCREEN_INTERFACE_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "MessageBoxScreen.h" #include "Font Control.h" @@ -745,4 +745,4 @@ extern BOOLEAN CanCharacterMoveInStrategic( SOLDIERTYPE *pSoldier, INT8 *pbError extern BOOLEAN MapscreenCanPassItemToCharNum( INT32 iNewCharSlot ); -#endif +#endif diff --git a/Strategic/MapScreen Quotes.cpp b/Strategic/MapScreen Quotes.cpp index b90be26f2..72cb6375d 100644 --- a/Strategic/MapScreen Quotes.cpp +++ b/Strategic/MapScreen Quotes.cpp @@ -6,8 +6,8 @@ #include "Soldier Control.h" #include "Overhead.h" #include "Squads.h" - #include "Soundman.h" - #include "Message.h" + #include "soundman.h" + #include "message.h" #include "PopUpBox.h" #include "Handle Items.h" #include "Interface Items.h" @@ -16,14 +16,14 @@ #include "Game Event Hook.h" #include "Tactical Save.h" #include "Quests.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Soldier Profile.h" #include "Strategic Movement.h" #include "Dialogue Control.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Vehicles.h" - #include "LINE.H" + #include "line.h" #include "Text.h" #include "gameloop.h" #include "Map Screen Helicopter.h" @@ -36,7 +36,7 @@ #include "Keys.h" #include "Soldier macros.h" #include "Militia Control.h" - #include "Random.h" + #include "random.h" #include "Cursor Control.h" #include "renderworld.h" #include "Strategic Mines.h" diff --git a/Strategic/Meanwhile.cpp b/Strategic/Meanwhile.cpp index 52c578fdb..ed1893162 100644 --- a/Strategic/Meanwhile.cpp +++ b/Strategic/Meanwhile.cpp @@ -1,24 +1,24 @@ #include "sgp.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "PreBattle Interface.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "strategicmap.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "screenids.h" #include "jascreens.h" - #include "npc.h" - #include "game event hook.h" - #include "game clock.h" - #include "tactical save.h" - #include "soldier profile.h" - #include "overhead.h" - #include "dialogue control.h" + #include "NPC.h" + #include "Game Event Hook.h" + #include "Game Clock.h" + #include "Tactical Save.h" + #include "Soldier Profile.h" + #include "Overhead.h" + #include "Dialogue Control.h" #include "gameloop.h" - #include "npc.h" - #include "assignments.h" + #include "NPC.h" + #include "Assignments.h" #include "strategic.h" - #include "text.h" - #include "interface control.h" + #include "Text.h" + #include "Interface Control.h" #include "Interface Items.h" #include "Map Information.h" #include "Map Screen Interface Map.h" @@ -28,11 +28,11 @@ #include "Game Events.h" #include "GameSettings.h" #include "Strategic AI.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Quests.h" #include "Campaign Types.h" #include "Squads.h" - #include "Random.h" + #include "random.h" #include "GameInitOptionsScreen.h" diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index c5bbaf3d2..291b99aa8 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -1,15 +1,15 @@ #include "builddefines.h" - #include "Types.h" + #include "types.h" #include "Merc Contract.h" #include "Soldier Profile.h" - #include "History.h" + #include "history.h" #include "finances.h" #include "Game Clock.h" #include "Soldier Add.h" #include "Dialogue Control.h" #include "Soldier Create.h" - #include "Message.h" + #include "message.h" #include "Font Control.h" #include "personnel.h" #include "LaptopSave.h" @@ -23,7 +23,7 @@ #include "Interface Control.h" #include "gamescreen.h" #include "jascreens.h" - #include "Random.h" + #include "random.h" #include "Assignments.h" #include "Strategic Movement.h" #include "Squads.h" @@ -31,7 +31,7 @@ #include "Text.h" #include "Strategic Status.h" #include "mercs.h" - #include "insurance contract.h" + #include "insurance Contract.h" #include "Vehicles.h" #include "email.h" #include "Map Screen Helicopter.h" diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index dade1619c..fa117f444 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -6,7 +6,7 @@ #include "MilitiaIndividual.h" #include "random.h" -#include "text.h" +#include "Text.h" #include "Overhead Types.h" #include "Game Clock.h" #include "strategicmap.h" diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 303ea2836..5694509c9 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -7,13 +7,13 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "Game Clock.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "GameSettings.h" diff --git a/Strategic/MilitiaSquads.h b/Strategic/MilitiaSquads.h index 499bd38ce..f19c3876e 100644 --- a/Strategic/MilitiaSquads.h +++ b/Strategic/MilitiaSquads.h @@ -3,9 +3,9 @@ // header for town militia strategic control module -#include "Types.h" +#include "types.h" #include "Soldier Control.h" -#include "campaign types.h" +#include "Campaign Types.h" //#define MAXIMUM_MILITIA_SQUAD_SIZE 30 @@ -50,4 +50,4 @@ void DissolveAllMilitiaGroupsInSector( INT16 sMapX, INT16 sMapY ); BOOLEAN MilitiaGroupEntersCurrentSector( UINT8 usGroupId, INT16 sMapX, INT16 sMapY ); -#endif +#endif diff --git a/Strategic/MiniEvents.h b/Strategic/MiniEvents.h index 5ed48a4e6..2db093528 100644 --- a/Strategic/MiniEvents.h +++ b/Strategic/MiniEvents.h @@ -3,7 +3,7 @@ #define MINI_EVENT_Z_OFFSET 9 -#include "Types.h" +#include "types.h" void InitMiniEvents(); void CheckMiniEvents(UINT32 nextEventId); diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp index 51fd7d7dd..ba856cb39 100644 --- a/Strategic/Player Command.cpp +++ b/Strategic/Player Command.cpp @@ -1,18 +1,18 @@ #include "Player Command.h" #include "Queen Command.h" #include "Campaign Types.h" - #include "Strategic.h" + #include "strategic.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" - #include "text.h" - #include "laptopsave.h" - #include "quests.h" + #include "Text.h" + #include "LaptopSave.h" + #include "Quests.h" #include "Morale.h" #include "Overhead.h" #include "strategicmap.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "email.h" #include "GameSettings.h" #include "Strategic Status.h" @@ -21,14 +21,14 @@ #include "Map Screen Interface.h" #include "Tactical Save.h" #include "interface Dialogue.h" - #include "Random.h" + #include "random.h" // HEADROCK HAM 3.6: Added for facility string printing... #include "PopUpBox.h" #include "CampaignStats.h" // added by Flugente #include "Town Militia.h" // added by Flugente #include "LuaInitNPCs.h" // added by Flugente -#include "postalservice.h" +#include "PostalService.h" #include "GameInitOptionsScreen.h" diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 0f04d6158..abc745b8a 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -14,7 +14,7 @@ #include "Queen Command.h" #include "Strategic Movement.h" #include "Strategic Pathing.h" - #include "text.h" + #include "Text.h" #include "PopUpBox.h" #include "Player Command.h" #include "Cursors.h" @@ -22,19 +22,19 @@ #include "Sound Control.h" #include "english.h" #include "Map Screen Interface Bottom.h" - #include "overhead.h" + #include "Overhead.h" #include "Tactical Placement GUI.h" #include "Town Militia.h" - #include "campaign.h" + #include "Campaign.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Creature Spreading.h" #include "Multi Language Graphic Utils.h" #include "Map Screen Helicopter.h" #include "Quests.h" #include "Map Screen Interface Border.h" #include "Strategic Status.h" - #include "interface control.h" + #include "Interface Control.h" #include "Strategic Town Loyalty.h" #include "Squads.h" #include "Assignments.h" @@ -45,7 +45,7 @@ #include "Tactical Save.h" #include "message.h" #include "CampaignStats.h" // added by Flugente - #include "militiasquads.h" // added by Flugente + #include "MilitiaSquads.h" // added by Flugente #include "SkillCheck.h" // added by Flugente #include "Strategic Transport Groups.h" #include "Utilities.h" diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index b5ff2ce4b..2b14d1b72 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -5,8 +5,8 @@ #include "Overhead Types.h" #include "strategicmap.h" #include "Soldier Init List.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Strategic Movement.h" #include "Overhead.h" #include "Strategic Pathing.h" @@ -15,10 +15,10 @@ #include "Map Edgepoints.h" #include "PreBattle Interface.h" #include "strategic status.h" - #include "squads.h" - #include "assignments.h" - #include "items.h" - #include "tactical save.h" + #include "Squads.h" + #include "Assignments.h" + #include "Items.h" + #include "Tactical Save.h" #include "Soldier Ani.h" #include "Strategic AI.h" #include "GameSettings.h" @@ -36,7 +36,7 @@ #include "Town Militia.h" #include "Dialogue Control.h" #include "Campaign Init.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Soldier macros.h" #include "Morale.h" #include "CampaignStats.h" // added by Flugente diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 06d7457f9..82fd36b3a 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -1,10 +1,10 @@ #include "builddefines.h" - #include "Types.h" + #include "types.h" #include "Quest Debug System.h" #include "WCheck.h" #include "Font Control.h" - #include "Video.h" + #include "video.h" #include "Game Clock.h" #include "Render Dirty.h" #include "WordWrap.h" @@ -19,23 +19,23 @@ #include "Text Input.h" #include "Soldier Create.h" #include "strategicmap.h" - #include "soldier add.h" - #include "Opplist.h" + #include "Soldier Add.h" + #include "opplist.h" #include "Handle Items.h" #include "Game Clock.h" #include "environment.h" - #include "dialogue control.h" + #include "Dialogue Control.h" //#include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "MessageBoxScreen.h" - #include "Stdio.h" + #include "stdio.h" #include "english.h" #include "line.h" #include "Keys.h" - #include "Interface Dialogue.h" - #include "SysUtil.h" - #include "Message.h" - #include "Random.h" + #include "interface Dialogue.h" + #include "sysutil.h" + #include "message.h" + #include "random.h" //#ifdef JA2BETAVERSION diff --git a/Strategic/Quests.cpp b/Strategic/Quests.cpp index 55b7bb23a..24e83f562 100644 --- a/Strategic/Quests.cpp +++ b/Strategic/Quests.cpp @@ -1,17 +1,17 @@ #include "sgp.h" #include "message.h" - #include "quests.h" - #include "game clock.h" - #include "StrategicMap.h" - #include "soldier profile.h" + #include "Quests.h" + #include "Game Clock.h" + #include "strategicmap.h" + #include "Soldier Profile.h" #include "LaptopSave.h" #include "Handle Items.h" - #include "overhead.h" - #include "Interface Dialogue.h" + #include "Overhead.h" + #include "interface Dialogue.h" #include "Soldier Profile.h" #include "Isometric Utils.h" #include "Render Fun.h" - #include "History.h" + #include "history.h" #include "Map Screen Helicopter.h" #include "Overhead.h" #include "Strategic Mines.h" @@ -23,7 +23,7 @@ #include "GameSettings.h" #include "Arms Dealer Init.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Assignments.h" #include "strategic.h" #include "Strategic Event Handler.h" diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index 2f8a05c26..d52f07dba 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -75,7 +75,7 @@ Points of interest: #include "GameSettings.h" #include "GameVersion.h" #include "input.h" -#include "Line.h" +#include "line.h" #include "laptop.h" #include "message.h" #include "MessageBoxScreen.h" diff --git a/Strategic/Rebel Command.h b/Strategic/Rebel Command.h index 22b6fd3b6..452355a8c 100644 --- a/Strategic/Rebel Command.h +++ b/Strategic/Rebel Command.h @@ -4,7 +4,7 @@ #include "CampaignStats.h" #include "mapscreen.h" #include "Soldier Control.h" -#include "Types.h" +#include "types.h" #define REBEL_COMMAND_Z_OFFSET 9 #define REBEL_COMMAND_MAX_ACTIONS_PER_REGION 6 diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index 2adaa4f90..bdad2f073 100644 --- a/Strategic/Reinforcement.cpp +++ b/Strategic/Reinforcement.cpp @@ -7,12 +7,12 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "Queen Command.h" diff --git a/Strategic/Scheduling.cpp b/Strategic/Scheduling.cpp index 7408c37c7..06992561c 100644 --- a/Strategic/Scheduling.cpp +++ b/Strategic/Scheduling.cpp @@ -1,18 +1,18 @@ #include - #include "Fileman.h" + #include "FileMan.h" #include "types.h" #include "Scheduling.h" #include "message.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "Game Event Hook.h" #include "worlddef.h" #include "Soldier Init List.h" #include "Isometric Utils.h" #include "ai.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Animation Data.h" #include "Map Information.h" #include "Keys.h" diff --git a/Strategic/Scheduling.h b/Strategic/Scheduling.h index aa80f5fb0..5a076ac9e 100644 --- a/Strategic/Scheduling.h +++ b/Strategic/Scheduling.h @@ -1,7 +1,7 @@ #ifndef __SCHEDULING_H #define __SCHEDULING_H -#include "BuildDefines.h" +#include "builddefines.h" #include "Soldier Init List.h" //Merc scheduling actions diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index 8a3ca8a15..6572c879d 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -7,7 +7,7 @@ #include "Game Event Hook.h" #include "GameSettings.h" #include "Campaign Types.h" - #include "Random.h" + #include "random.h" #include "Strategic Pathing.h" #include "message.h" #include "strategicmap.h" @@ -30,7 +30,7 @@ #include "Soldier Profile.h" #include "Scheduling.h" #include "Map Information.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "ASD.h" // added by Flugente #include "Rebel Command.h" #include "Game Event Hook.h" diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp index 37147e6b5..6586e84c1 100644 --- a/Strategic/Strategic Event Handler.cpp +++ b/Strategic/Strategic Event Handler.cpp @@ -5,20 +5,20 @@ #include "Handle Items.h" #include "LaptopSave.h" #include "Tactical Save.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Quests.h" #include "Soldier Profile.h" #include "Game Event Hook.h" #include "Game Clock.h" - #include "Interface Dialogue.h" - #include "Random.h" + #include "interface Dialogue.h" + #include "random.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Soldier Init List.h" #include "SaveLoadMap.h" #include "Soldier Create.h" #include "Soldier Add.h" - #include "Renderworld.h" + #include "renderworld.h" #include "Soldier Profile.h" #include "email.h" #include "strategic.h" @@ -59,7 +59,7 @@ extern SECTOR_EXT_DATA SectorExternalData[256][4]; //void DropOffItemsInMeduna( UINT8 ubOrderNum ); /* -// WANNE: Dieser Code wird nicht mehr ausgefhrt. Es gibt jetzt das PostalService.cpp::DeliverShipment() +// WANNE: Dieser Code wird nicht mehr ausgef�hrt. Es gibt jetzt das PostalService.cpp::DeliverShipment() // In der Methode DeliverShipment() fehlt eine ganze Menge (PABLO Quests, ...) void BobbyRayPurchaseEventCallback( UINT8 ubOrderID ) { diff --git a/Strategic/Strategic Event Handler.h b/Strategic/Strategic Event Handler.h index 65e78aaa0..a4812254c 100644 --- a/Strategic/Strategic Event Handler.h +++ b/Strategic/Strategic Event Handler.h @@ -1,7 +1,7 @@ #ifndef _STRATEGIC_EVENT_HANDLER_H_ #define _STRATEGIC_EVENT_HANDLER_H_ -#include "Types.h" +#include "types.h" #define KINGPIN_MONEY_SECTOR_X gModSettings.ubKingpinMoneySectorX //5 #define KINGPIN_MONEY_SECTOR_Y gModSettings.ubKingpinMoneySectorY //MAP_ROW_D @@ -27,4 +27,4 @@ void MakeCivGroupHostileOnNextSectorEntrance( UINT8 ubCivGroup ); void RemoveAssassin( UINT8 ubProfile ); -#endif +#endif diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 501e2643b..4f5a8221a 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -1,8 +1,8 @@ - #include "Types.h" + #include "types.h" #include "Strategic Merc Handler.h" - #include "History.h" - #include "Game clock.h" + #include "history.h" + #include "Game Clock.h" #include "insurance Contract.h" #include "Soldier Profile.h" #include "Game Event Hook.h" @@ -11,15 +11,15 @@ #include "Merc Contract.h" #include "Merc Hiring.h" #include "Dialogue Control.h" - #include "Random.h" + #include "random.h" #include "Morale.h" - #include "Mercs.h" + #include "mercs.h" #include "Mapscreen.h" - #include "weapons.h" - #include "Personnel.h" + #include "Weapons.h" + #include "personnel.h" #include "Strategic Movement.h" #include "LaptopSave.h" - #include "Message.h" + #include "message.h" #include "Text.h" #include "Interface.h" #include "strategic.h" diff --git a/Strategic/Strategic Mines LUA.h b/Strategic/Strategic Mines LUA.h index ff1f129f8..d0314474f 100644 --- a/Strategic/Strategic Mines LUA.h +++ b/Strategic/Strategic Mines LUA.h @@ -1,7 +1,7 @@ #ifndef STRATEGIC_MINES_LUA_H #define STRATEGIC_MINES_LUA_H -#include "Types.h" +#include "types.h" extern "C" { #include "lua.h" diff --git a/Strategic/Strategic Mines.cpp b/Strategic/Strategic Mines.cpp index 9e99ae859..c998d1bf7 100644 --- a/Strategic/Strategic Mines.cpp +++ b/Strategic/Strategic Mines.cpp @@ -1,11 +1,11 @@ - #include + #include #include "Strategic Mines.h" - #include "Finances.h" + #include "finances.h" #include "Strategic Town Loyalty.h" #include "strategic.h" #include "Game Clock.h" #include "strategicmap.h" - #include "Random.h" + #include "random.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "Map Screen Interface.h" diff --git a/Strategic/Strategic Mines.h b/Strategic/Strategic Mines.h index 633516523..3e953ae5a 100644 --- a/Strategic/Strategic Mines.h +++ b/Strategic/Strategic Mines.h @@ -3,7 +3,7 @@ // the .h to the mine management system -#include "Types.h" +#include "types.h" #include "strategicmap.h" #include "mapscreen.h" @@ -218,4 +218,4 @@ BOOLEAN AreThereMinersInsideThisMine( UINT8 ubMineIndex ); // use this to determine whether or not the player has spoken to a head miner BOOLEAN SpokenToHeadMiner( UINT8 ubMineIndex ); -#endif +#endif diff --git a/Strategic/Strategic Movement Costs.cpp b/Strategic/Strategic Movement Costs.cpp index 4f45414e4..a641a7671 100644 --- a/Strategic/Strategic Movement Costs.cpp +++ b/Strategic/Strategic Movement Costs.cpp @@ -3,7 +3,7 @@ #include "Strategic Movement.h" #include "XML.h" #include "expat.h" - #include "Debug.h" + #include "DEBUG.H" #include "Debug Control.h" #include "Tactical Save.h" #include "Map Screen Interface Map.h" diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index b1e0b6be1..b79889e52 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -3,33 +3,33 @@ #include #include "Strategic Movement.h" #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "Campaign Types.h" #include "Game Event Hook.h" #include "Game Clock.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "strategicmap.h" #include "jascreens.h" #include "Strategic Pathing.h" #include "Map Screen Interface Map.h" #include "PreBattle Interface.h" - #include "Strategic.h" + #include "strategic.h" #include "Assignments.h" #include "Text.h" #include "Font Control.h" #include "message.h" #include "mapscreen.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Soldier Add.h" #include "Game Events.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "Map Screen Interface.h" #include "Squads.h" - #include "Random.h" - #include "soldier macros.h" + #include "random.h" + #include "Soldier macros.h" #include "Map Information.h" #include "Tactical Save.h" #include "Player Command.h" @@ -38,7 +38,7 @@ #include "Music Control.h" #include "Campaign.h" #include "Isometric Utils.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Inventory Choosing.h" #include "Map Screen Interface Border.h" #include "Auto Resolve.h" diff --git a/Strategic/Strategic Pathing.cpp b/Strategic/Strategic Pathing.cpp index 37c260bf4..2654fc54b 100644 --- a/Strategic/Strategic Pathing.cpp +++ b/Strategic/Strategic Pathing.cpp @@ -5,7 +5,7 @@ #include "sgp.h" #include "strategic.h" #include "mapscreen.h" - #include "overhead.h" + #include "Overhead.h" #include "strategicmap.h" #include "Strategic Pathing.h" #include "Map Screen Interface Border.h" @@ -2221,4 +2221,4 @@ PathStPtr GetLastNodeOfPath(PathStPtr pNode) } return pNode; -} +} diff --git a/Strategic/Strategic Status.cpp b/Strategic/Strategic Status.cpp index 0d0d571bd..b1c30b398 100644 --- a/Strategic/Strategic Status.cpp +++ b/Strategic/Strategic Status.cpp @@ -6,7 +6,7 @@ #include "Strategic Mines.h" #include "email.h" #include "Game Clock.h" - #include "Debug.h" + #include "DEBUG.H" #include "GameSettings.h" #include "history.h" #include "Strategic Town Loyalty.h" diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 9de36dc0a..2db0a664c 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -9,16 +9,16 @@ #include "Animation Data.h" #include "Quests.h" #include "Font.h" - #include "Message.h" + #include "message.h" #include "LOS.h" #include "World Items.h" #include "Tactical Save.h" #include "Soldier Profile.h" #include "Handle Items.h" #include "random.h" - #include "strategic movement.h" + #include "Strategic Movement.h" #include "Strategic Pathing.h" - #include "vehicles.h" + #include "Vehicles.h" #include "Game Clock.h" #include "Game Event Hook.h" #include "Morale.h" @@ -27,7 +27,7 @@ #include "MessageBoxScreen.h" #include "Town Militia.h" #include "history.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Strategic Status.h" // HEADROCK HAM B1: Added include for Dynamic Roaming Militia #include "MilitiaSquads.h" diff --git a/Strategic/Strategic Town Loyalty.h b/Strategic/Strategic Town Loyalty.h index 2d420c2f4..a29ba4ced 100644 --- a/Strategic/Strategic Town Loyalty.h +++ b/Strategic/Strategic Town Loyalty.h @@ -1,7 +1,7 @@ #ifndef __STRATEGIC_TOWN_LOYALTY_H #define __STRATEGIC_TOWN_LOYALTY_H -#include "Types.h" +#include "types.h" #include "mapscreen.h" #include "Soldier Control.h" @@ -224,4 +224,4 @@ void MaximizeLoyaltyForDeidrannaKilled( void ); // HEADROCK HAM 3.6: Loyalty hit for owing too much money on facility work void HandleFacilityDebtLoyaltyHit( void ); -#endif +#endif diff --git a/Strategic/Strategic Transport Groups.h b/Strategic/Strategic Transport Groups.h index 3fd873c54..b58bd1dcd 100644 --- a/Strategic/Strategic Transport Groups.h +++ b/Strategic/Strategic Transport Groups.h @@ -1,31 +1,31 @@ -#ifndef _STRATEGIC_TRANSPORT_GROUPS_H -#define _STRATEGIC_TRANSPORT_GROUPS_H - -#include "Campaign Types.h" -#include "Types.h" -#include - -enum TransportGroupSectorInfo -{ - TransportGroupSectorInfo_LocatedGroup = 0, - TransportGroupSectorInfo_LocatedDestination, -}; - -struct GROUP; - -BOOLEAN DeployTransportGroup(); -BOOLEAN ForceDeployTransportGroup(UINT8 sectorId); -BOOLEAN ReturnTransportGroup(INT32 groupId); -void FillMapColoursForTransportGroups(INT32(&colorMap)[MAXIMUM_VALID_Y_COORDINATE][MAXIMUM_VALID_X_COORDINATE]); -void ProcessTransportGroupReachedDestination(GROUP* pGroup); -void UpdateTransportGroupInventory(); - -const std::map GetTransportGroupSectorInfo(); - -void AddToTransportGroupMap(UINT8 groupId, int soldierClass, UINT8 amount); -void ClearTransportGroupMap(); - -void NotifyTransportGroupDefeated(); - -#endif - +#ifndef _STRATEGIC_TRANSPORT_GROUPS_H +#define _STRATEGIC_TRANSPORT_GROUPS_H + +#include "Campaign Types.h" +#include "types.h" +#include + +enum TransportGroupSectorInfo +{ + TransportGroupSectorInfo_LocatedGroup = 0, + TransportGroupSectorInfo_LocatedDestination, +}; + +struct GROUP; + +BOOLEAN DeployTransportGroup(); +BOOLEAN ForceDeployTransportGroup(UINT8 sectorId); +BOOLEAN ReturnTransportGroup(INT32 groupId); +void FillMapColoursForTransportGroups(INT32(&colorMap)[MAXIMUM_VALID_Y_COORDINATE][MAXIMUM_VALID_X_COORDINATE]); +void ProcessTransportGroupReachedDestination(GROUP* pGroup); +void UpdateTransportGroupInventory(); + +const std::map GetTransportGroupSectorInfo(); + +void AddToTransportGroupMap(UINT8 groupId, int soldierClass, UINT8 amount); +void ClearTransportGroupMap(); + +void NotifyTransportGroupDefeated(); + +#endif + diff --git a/Strategic/Strategic Turns.cpp b/Strategic/Strategic Turns.cpp index 8feb59e64..3dd8c1242 100644 --- a/Strategic/Strategic Turns.cpp +++ b/Strategic/Strategic Turns.cpp @@ -2,20 +2,20 @@ #include "Game Clock.h" #include "Font Control.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "worlddef.h" - #include "soldier create.h" - #include "soldier add.h" - #include "strategic turns.h" - #include "isometric utils.h" - #include "animation data.h" - #include "animation control.h" + #include "Soldier Create.h" + #include "Soldier Add.h" + #include "Strategic Turns.h" + #include "Isometric Utils.h" + #include "Animation Data.h" + #include "Animation Control.h" #include "Tactical Turns.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "rt time defines.h" - #include "assignments.h" + #include "Assignments.h" diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index feaf4aed1..ae370df0f 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -9,21 +9,21 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "finances.h" #include "Game Clock.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "GameSettings.h" #include "Queen Command.h" #include "PreBattle Interface.h" #include "Map Screen Interface Border.h" - #include "interface control.h" + #include "Interface Control.h" #include "Map Screen Interface Map.h" #include "laptop.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente @@ -2071,7 +2071,7 @@ UINT32 CalcMilitiaUpkeep( void ) militia_static[i] += MilitiaInSectorOfRank( sMapX, sMapY, i ); } - // Flugente: if indivdual militia is on, calculate costs there and use the above as a fallback option + // Flugente: if indiv�dual militia is on, calculate costs there and use the above as a fallback option if ( gGameExternalOptions.fIndividualMilitia ) { uiTotalPayment = GetDailyUpkeep_IndividualMilitia( militia_individual[GREEN_MILITIA], militia_individual[REGULAR_MILITIA], militia_individual[ELITE_MILITIA] ); diff --git a/Strategic/Town Militia.h b/Strategic/Town Militia.h index a9ef3536f..8b9f2a6b4 100644 --- a/Strategic/Town Militia.h +++ b/Strategic/Town Militia.h @@ -3,7 +3,7 @@ // header for town militia strategic control module -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // how many militia of all ranks can be in any one sector at once @@ -135,4 +135,4 @@ FLOAT GetIntel(); void AddRaidPersonnel( INT32 aBloodcats, INT32 aZombie, INT32 aBandits ); void GetRaidPersonnel( INT32& arBloodcats, INT32& arZombie, INT32& arBandits ); -#endif +#endif diff --git a/Strategic/UndergroundInit.h b/Strategic/UndergroundInit.h index e93ebbbf1..d3181334a 100644 --- a/Strategic/UndergroundInit.h +++ b/Strategic/UndergroundInit.h @@ -2,7 +2,7 @@ #define _UNDERGROUNDINIT_H #include "Campaign Types.h" -#include "Types.h" +#include "types.h" //#include "Strategic Mines LUA.h" #include "lua_state.h" diff --git a/Strategic/XML_ExtraItems.cpp b/Strategic/XML_ExtraItems.cpp index c5151d63a..db41b14af 100644 --- a/Strategic/XML_ExtraItems.cpp +++ b/Strategic/XML_ExtraItems.cpp @@ -2,7 +2,7 @@ #include #include "XML.h" #include "expat.h" -#include "DEBUG.h" +#include "DEBUG.H" #include "string.h" #include "Tactical Save.h" #include "FileMan.h" diff --git a/Strategic/XML_Facilities.cpp b/Strategic/XML_Facilities.cpp index 84fcb759d..198e61e14 100644 --- a/Strategic/XML_Facilities.cpp +++ b/Strategic/XML_Facilities.cpp @@ -11,7 +11,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp index 598cf88c4..60e964538 100644 --- a/Strategic/XML_FacilityTypes.cpp +++ b/Strategic/XML_FacilityTypes.cpp @@ -12,7 +12,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" diff --git a/Strategic/XML_SquadNames.cpp b/Strategic/XML_SquadNames.cpp index 8d82d6b7e..3a5216e14 100644 --- a/Strategic/XML_SquadNames.cpp +++ b/Strategic/XML_SquadNames.cpp @@ -1,6 +1,6 @@ #include "sgp.h" #include "Map Screen Interface.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" @@ -160,4 +160,4 @@ BOOLEAN ReadInSquadNamesStats(STR fileName) BOOLEAN WriteSquadNamesStats() { return( TRUE ); -} +} diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index ebff12805..2703c65a2 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -5,13 +5,13 @@ #include "gameloop.h" #include "sgp.h" #include "vobject.h" - #include "wcheck.h" + #include "WCheck.h" #include "worlddef.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "screens.h" - #include "overhead.h" + #include "Screens.h" + #include "Overhead.h" #include "sysutil.h" #include "Event Pump.h" #include "Font Control.h" @@ -19,18 +19,18 @@ #include "Interface.h" #include "Handle UI.h" #include "Interface Items.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "lighting.h" #include #include - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "Interface Panels.h" #include "Interface Control.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "Radar Screen.h" #include "Render Dirty.h" - #include "utilities.h" + #include "Utilities.h" #include "Game Init.h" #include "renderworld.h" #include "finances.h" @@ -41,26 +41,26 @@ #include "faces.h" #include "PopUpBox.h" #include "Game Clock.h" - #include "items.h" + #include "Items.h" #include "Cursor Control.h" - #include "text.h" + #include "Text.h" #include "strategic.h" #include "strategicmap.h" - #include "strategic pathing.h" + #include "Strategic Pathing.h" #include "Map Screen Interface Bottom.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Map.h" #include "Map Screen Interface.h" #include "Assignments.h" - #include "points.h" + #include "Points.h" #include "Squads.h" #include "Merc Contract.h" #include "Sound Control.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "Dialogue Control.h" #include "Map Screen Interface TownMine Info.h" #include "PreBattle Interface.h" - #include "Personnel.h" + #include "personnel.h" #include "Animated ProgressBar.h" #include "Queen Command.h" #include "LaptopSave.h" @@ -75,19 +75,19 @@ #include "SaveLoadScreen.h" #include "Options Screen.h" #include "Auto Resolve.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Campaign.h" - #include "Random.h" + #include "random.h" #include "Air Raid.h" - #include "quests.h" + #include "Quests.h" #include "Town Militia.h" - #include "weapons.h" + #include "Weapons.h" #include "Player Command.h" #include "Multi Language Graphic Utils.h" #include "HelpScreen.h" #include "Soldier macros.h" #include "Map Information.h" - #include "cheats.h" + #include "Cheats.h" #include "Strategic Town Loyalty.h" #include "GameSettings.h" #include "Militia Control.h" diff --git a/Strategic/mapscreen.h b/Strategic/mapscreen.h index 9bf934e00..b0749199a 100644 --- a/Strategic/mapscreen.h +++ b/Strategic/mapscreen.h @@ -2,7 +2,7 @@ #define __MAPSCREEN_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #define MAP_WORLD_X 18 @@ -228,4 +228,4 @@ void RetreatBandageCallback( UINT8 ubResult ); bool isWidescreenUI(void); -#endif +#endif diff --git a/Strategic/strategic town reputation.cpp b/Strategic/strategic town reputation.cpp index 06cc6a743..4ef2b90ef 100644 --- a/Strategic/strategic town reputation.cpp +++ b/Strategic/strategic town reputation.cpp @@ -1,12 +1,12 @@ #include "types.h" #include "strategic town reputation.h" #include "soldier profile type.h" - #include "game event hook.h" + #include "Game Event Hook.h" #include "Soldier Profile.h" #include "Overhead.h" #include "Game Clock.h" - #include "strategic town loyalty.h" - #include "Debug.h" + #include "Strategic Town Loyalty.h" + #include "DEBUG.H" #include "message.h" diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index 09513662f..9d05b97ad 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -1,5 +1,5 @@ - #include "Strategic.h" - #include "Types.h" + #include "strategic.h" + #include "types.h" #include "Squads.h" #include "jascreens.h" #include "Assignments.h" @@ -13,7 +13,7 @@ #include "Vehicles.h" #include "Game Clock.h" #include "CampaignStats.h" // added by Flugente - #include "militiasquads.h" // added by Flugente + #include "MilitiaSquads.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente #include "message.h" // added by Flugente #include "Text.h" // added by Flugente diff --git a/Strategic/strategic.h b/Strategic/strategic.h index c8d86357c..166ffe07b 100644 --- a/Strategic/strategic.h +++ b/Strategic/strategic.h @@ -1,9 +1,9 @@ #ifndef __STRATEGIC_H #define __STRATEGIC_H // header for strategic structure -#include "Types.h" +#include "types.h" #include "mapscreen.h" -#include "soldier control.h" +#include "Soldier Control.h" // Flugente: airspace flags #define AIRSPACE_ENEMY_ACTIVE 0x01 //1 // controlled by enemy and active @@ -65,4 +65,4 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier ); BOOLEAN HandleStrategicDeath( SOLDIERTYPE *pSoldier ); -#endif +#endif diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 010e944e6..ad66f7e6a 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -12,24 +12,24 @@ #include "jascreens.h" #include "worlddef.h" #include "Soldier Control.h" -#include "overhead.h" -#include "interface panels.h" -#include "isometric utils.h" +#include "Overhead.h" +#include "Interface Panels.h" +#include "Isometric Utils.h" #include "Ambient Control.h" #include "worlddef.h" -#include "worlddat.h" -#include "text.h" -#include "Soldier add.h" -#include "soldier macros.h" +#include "WorldDat.h" +#include "Text.h" +#include "Soldier Add.h" +#include "Soldier macros.h" #include "Strategic Pathing.h" -#include "soldier create.h" -#include "handle UI.h" +#include "Soldier Create.h" +#include "Handle UI.h" #include "faces.h" #include "renderworld.h" #include "gamescreen.h" -#include "game clock.h" +#include "Game Clock.h" #include "Soldier Init List.h" -#include "strategic turns.h" +#include "Strategic Turns.h" #include "merc entering.h" #include "Map Information.h" #include "Assignments.h" @@ -37,50 +37,50 @@ #include "Font Control.h" #include "environment.h" #include "Game Events.h" -#include "quests.h" +#include "Quests.h" #include "FileMan.h" -#include "animated progressbar.h" -#include "music control.h" -#include "fade screen.h" +#include "Animated ProgressBar.h" +#include "Music Control.h" +#include "Fade Screen.h" #include "Strategic Movement.h" #include "Campaign Types.h" -#include "sys globals.h" +#include "Sys Globals.h" #include "Exit Grids.h" #include "Tactical Save.h" -#include "pathai.h" -#include "animation control.h" -#include "squads.h" +#include "PATHAI.H" +#include "Animation Control.h" +#include "Squads.h" #include "worldman.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Queen Command.h" -#include "cursor control.h" +#include "Cursor Control.h" #include "PreBattle Interface.h" #include "Shade Table Util.h" #include "Scheduling.h" #include "gameloop.h" -#include "Random.h" +#include "random.h" #include "ai.h" #include "opplist.h" -#include "keys.h" +#include "Keys.h" #include "Tactical Placement GUI.h" #include "Map Screen Helicopter.h" -#include "map edgepoints.h" +#include "Map Edgepoints.h" #include "Player Command.h" #include "Event Pump.h" -#include "meanwhile.h" -#include "air raid.h" +#include "Meanwhile.h" +#include "Air Raid.h" #include "Strategic Mines.h" #include "Creature Spreading.h" #include "SaveLoadMap.h" #include "Militia Control.h" -#include "gamesettings.h" -#include "dialogue control.h" +#include "GameSettings.h" +#include "Dialogue Control.h" #include "Town Militia.h" #include "sysutil.h" #include "Sound Control.h" -#include "points.h" -#include "render dirty.h" +#include "Points.h" +#include "Render Dirty.h" #include "Debug Control.h" #include "expat.h" #include "Loading Screen.h" @@ -89,14 +89,14 @@ #include "NPC.h" #include "Strategic Event Handler.h" #include "MessageBoxScreen.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Map Screen Interface.h" #include "history.h" #include "Bullets.h" #include "physics.h" #include "Explosion Control.h" #include "Auto Resolve.h" -#include "cursors.h" +#include "Cursors.h" #include "GameVersion.h" #include "LuaInitNPCs.h" @@ -408,8 +408,8 @@ UINT32 uiBuildShadeTableTime; UINT32 uiNumTablesSaved; UINT32 uiNumTablesLoaded; UINT32 uiNumImagesReloaded; -#include "render dirty.h" -#include "tiledat.h" +#include "Render Dirty.h" +#include "TileDat.h" #endif // SAM externalization stuff diff --git a/Strategic/strategicmap.h b/Strategic/strategicmap.h index e43191c5b..786f1c132 100644 --- a/Strategic/strategicmap.h +++ b/Strategic/strategicmap.h @@ -2,7 +2,7 @@ #define __STRATMAP_H // this file is for manipulation of the strategic map structure #include "types.h" -#include "soldier control.h" +#include "Soldier Control.h" #include "FileMan.h" #include "mapscreen.h" diff --git a/Tactical/Air Raid.cpp b/Tactical/Air Raid.cpp index 120ad3d79..9e6c2fdaa 100644 --- a/Tactical/Air Raid.cpp +++ b/Tactical/Air Raid.cpp @@ -1,32 +1,32 @@ #include "sgp.h" - #include "air raid.h" - #include "game event hook.h" - #include "game clock.h" + #include "Air Raid.h" + #include "Game Event Hook.h" + #include "Game Clock.h" #include "strategicmap.h" #include "PreBattle Interface.h" #include "screenids.h" #include "jascreens.h" #include "random.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" - #include "timer control.h" - #include "dialogue control.h" - #include "overhead.h" + #include "Timer Control.h" + #include "Dialogue Control.h" + #include "Overhead.h" #include "message.h" - #include "isometric utils.h" - #include "soldier macros.h" - #include "los.h" + #include "Isometric Utils.h" + #include "Soldier macros.h" + #include "LOS.h" #include "math.h" - #include "explosion control.h" - #include "interface.h" - #include "music control.h" + #include "Explosion Control.h" + #include "Interface.h" + #include "Music Control.h" #include "Campaign Types.h" #include "GameSettings.h" - #include "text.h" + #include "Text.h" #include "Morale.h" - #include "Map screen helicopter.h" - #include "structure wrap.h" - #include "meanwhile.h" + #include "Map Screen Helicopter.h" + #include "Structure Wrap.h" + #include "Meanwhile.h" #include "GameInitOptionsScreen.h" diff --git a/Tactical/Air Raid.h b/Tactical/Air Raid.h index 14fc7cbd5..7b857861e 100644 --- a/Tactical/Air Raid.h +++ b/Tactical/Air Raid.h @@ -1,7 +1,7 @@ #ifndef AIR_RAID_H #define AIR_RAID_H -#include "soldier control.h" +#include "Soldier Control.h" #define AIR_RAID_BEGINNING_GAME 0x00000001 #define AIR_RAID_CAN_RANDOMIZE_TEASE_DIVES 0x00000002 @@ -62,4 +62,4 @@ BOOLEAN LoadAirRaidInfoFromSaveGameFile( HWFILE hFile ); void EndAirRaid( ); -#endif +#endif diff --git a/Tactical/Animation Cache.cpp b/Tactical/Animation Cache.cpp index ec30ff95c..ee3a3b7d7 100644 --- a/Tactical/Animation Cache.cpp +++ b/Tactical/Animation Cache.cpp @@ -2,9 +2,9 @@ #include #include "types.h" - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index fb2d9275b..bf1a83004 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -2,18 +2,18 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "Animation Control.h" #include "Animation Data.h" #include "FileMan.h" -#include "weapons.h" +#include "Weapons.h" #include "message.h" #include "structure.h" #include "worlddef.h" #include "worldman.h" -#include "rotting corpses.h" +#include "Rotting Corpses.h" #include "Debug Control.h" -#include "Random.h" +#include "random.h" #include "Soldier Control.h" #include "connect.h" diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index a75feb896..cf369488d 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Animation Data.h" #include "Animation Control.h" @@ -11,9 +11,9 @@ #include "tiledef.h" #include "Sys Globals.h" #include "Debug Control.h" - #include "utilities.h" + #include "Utilities.h" #include "worlddef.h" - #include "Fileman.h" + #include "FileMan.h" //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 187440691..40682b170 100644 --- a/Tactical/Arms Dealer Init.cpp +++ b/Tactical/Arms Dealer Init.cpp @@ -1,15 +1,15 @@ - #include "Types.h" + #include "types.h" #include "stdlib.h" #include "Arms Dealer Init.h" - #include "String.h" - #include "Debug.h" - #include "Random.h" + #include "string.h" + #include "DEBUG.H" + #include "random.h" #include "Weapons.h" #include "FileMan.h" #include "Game Clock.h" #include "ArmsDealerInvInit.h" - #include "Message.h" - #include "soldier profile.h" + #include "message.h" + #include "Soldier Profile.h" #include "Handle Items.h" #include "Quests.h" #include "Scheduling.h" diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp index c8376592b..d0c059868 100644 --- a/Tactical/ArmsDealerInvInit.cpp +++ b/Tactical/ArmsDealerInvInit.cpp @@ -1,16 +1,16 @@ - #include "Types.h" + #include "types.h" #include "ArmsDealerInvInit.h" //#include "Item Types.h" #include "Arms Dealer Init.h" - #include "DEbug.h" - #include "weapons.h" + #include "DEBUG.H" + #include "Weapons.h" #include "Campaign.h" #include "GameSettings.h" #include "AIInternals.h" #include "LaptopSave.h" - #include "bobbyr.h" - #include "Random.h" - #include "Shopkeeper Interface.h" + #include "BobbyR.h" + #include "random.h" + #include "ShopKeeper Interface.h" #include "connect.h" #include "Rebel Command.h" diff --git a/Tactical/Auto Bandage.cpp b/Tactical/Auto Bandage.cpp index a70f5f0ae..b426268b2 100644 --- a/Tactical/Auto Bandage.cpp +++ b/Tactical/Auto Bandage.cpp @@ -1,29 +1,29 @@ #include "sgp.h" - #include "overhead.h" - #include "messageboxscreen.h" + #include "Overhead.h" + #include "MessageBoxScreen.h" #include "screenids.h" #include "Handle UI.h" #include "message.h" - #include "game clock.h" - #include "items.h" + #include "Game Clock.h" + #include "Items.h" #include "Text.h" #include "MercTextBox.h" - #include "interface.h" - #include "auto bandage.h" + #include "Interface.h" + #include "Auto Bandage.h" #include "renderworld.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "Event Pump.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "ai.h" - #include "interface control.h" + #include "Interface Control.h" #include "strategicmap.h" - #include "animation control.h" + #include "Animation Control.h" #include "Map Screen Interface.h" #include "Soldier Profile.h" #include "Assignments.h" #include "WordWrap.h" - #include "cursors.h" - #include "English.h" + #include "Cursors.h" + #include "english.h" #include "SkillCheck.h" // added by Flugente #include "Music Control.h" diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp index 02db51b6d..0b1efae72 100644 --- a/Tactical/Boxing.cpp +++ b/Tactical/Boxing.cpp @@ -2,17 +2,17 @@ #include "Overhead.h" #include "Boxing.h" #include "Render Fun.h" - #include "Random.h" - #include "Worldman.h" + #include "random.h" + #include "worldman.h" #include "Soldier Profile.h" #include "NPC.h" - #include "Opplist.h" + #include "opplist.h" #include "ai.h" #include "Dialogue Control.h" #include "Handle UI.h" #include "Points.h" - #include "interface.h" - #include "interface dialogue.h" + #include "Interface.h" + #include "interface Dialogue.h" #include "TeamTurns.h" #include "Music Control.h" #include "history.h" diff --git a/Tactical/Bullets.h b/Tactical/Bullets.h index 4bff3c42c..f2ec631b0 100644 --- a/Tactical/Bullets.h +++ b/Tactical/Bullets.h @@ -3,8 +3,8 @@ #include "types.h" #include "Soldier Control.h" -#include "los.h" -#include "tile animation.h" +#include "LOS.h" +#include "Tile Animation.h" #define BULLET_FLAG_CREATURE_SPIT 0x0001 @@ -107,4 +107,4 @@ BOOLEAN SaveBulletStructureToSaveGameFile( HWFILE hFile ); BOOLEAN LoadBulletStructureFromSavedGameFile( HWFILE hFile ); -#endif +#endif diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 54d1c78c6..81afbea3e 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -3,15 +3,15 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "random.h" - #include "campaign.h" - #include "dialogue control.h" + #include "Campaign.h" + #include "Dialogue Control.h" #include "Map Screen Interface.h" - #include "Message.h" + #include "message.h" #include "Game Clock.h" #include "Strategic Mines.h" #include "Strategic Status.h" @@ -22,7 +22,7 @@ #include "Interface.h" #include "Game Event Hook.h" #include "Overhead.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Quests.h" #include "Squads.h" #include "Soldier macros.h" diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp index 4bcf45e3f..12965cf18 100644 --- a/Tactical/Civ Quotes.cpp +++ b/Tactical/Civ Quotes.cpp @@ -1,34 +1,34 @@ #include "builddefines.h" #include -#include "Types.h" -#include "civ quotes.h" +#include "types.h" +#include "Civ Quotes.h" #include "mousesystem.h" #include "strategicmap.h" #include "WCheck.h" #include "FileMan.h" -#include "encrypted file.h" +#include "Encrypted File.h" #include "MessageBoxScreen.h" #include "Queen Command.h" #include "Overhead.h" -#include "render dirty.h" -#include "merctextbox.h" +#include "Render Dirty.h" +#include "MercTextBox.h" #include "ai.h" #include "Text.h" #include "screenids.h" #include "Animation Data.h" -#include "Video.h" +#include "video.h" #include "Font Control.h" #include "message.h" #include "local.h" #include "renderworld.h" #include "Interface.h" -#include "cursors.h" +#include "Cursors.h" #include "Dialogue Control.h" #include "Quests.h" #include "Strategic Town Loyalty.h" #include "NPC.h" #include "Strategic Mines.h" -#include "Random.h" +#include "random.h" #include "connect.h" // for enemy taunts diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 10fa1d9cb..224fe5c4e 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -1,54 +1,54 @@ #include "sgp.h" - //#include "soldier control.h" + //#include "Soldier Control.h" #include "Encrypted File.h" #include "faces.h" - #include "wcheck.h" - #include "gap.h" - #include "overhead.h" + #include "WCheck.h" + #include "GAP.H" + #include "Overhead.h" #include "Sound Control.h" - #include "dialogue control.h" - #include "Message.h" - #include "render dirty.h" - #include "soldier profile.h" - #include "wordwrap.h" + #include "Dialogue Control.h" + #include "message.h" + #include "Render Dirty.h" + #include "Soldier Profile.h" + #include "WordWrap.h" #include "sysutil.h" #include "vobject_blitters.h" #include "AimMembers.h" #include "mercs.h" - #include "interface dialogue.h" - #include "merctextbox.h" + #include "interface Dialogue.h" + #include "MercTextBox.h" #include "renderworld.h" - #include "soldier macros.h" - #include "squads.h" + #include "Soldier macros.h" + #include "Squads.h" #include "screenids.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "strategicmap.h" #include "PreBattle Interface.h" #include "Game Clock.h" #include "Quests.h" - #include "cursors.h" + #include "Cursors.h" #include "gamescreen.h" - #include "Random.h" + #include "random.h" #include "Map Screen Helicopter.h" #include "GameSettings.h" #include "ShopKeeper Interface.h" #include "Map Screen Interface.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "Town Militia.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "SkillCheck.h" #include "Interface Control.h" #include "finances.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "Map Screen Interface Map.h" #include "opplist.h" #include "ai.h" #include "worldman.h" #include "Map Screen Interface Bottom.h" #include "Campaign.h" - #include "end game.h" - #include "los.h" + #include "End Game.h" + #include "LOS.h" #include "qarray.h" #include "Soldier Profile.h" #include diff --git a/Tactical/Disease.h b/Tactical/Disease.h index 3da6349cf..15949f8b2 100644 --- a/Tactical/Disease.h +++ b/Tactical/Disease.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" // number of different diseases. Altering this will alter the size of INT32 sDiseasePoints[NUM_DISEASES]; in SOLDIERTYPE #define NUM_DISEASES 20 diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp index b4324511a..d27d7949a 100644 --- a/Tactical/DisplayCover.cpp +++ b/Tactical/DisplayCover.cpp @@ -1,21 +1,21 @@ #include "builddefines.h" -#include "Types.h" +#include "types.h" #include "Isometric Utils.h" //#include "Soldier Control.h" #include "Overhead.h" -#include "displaycover.h" +#include "DisplayCover.h" #include "Font Control.h" #include "_Ja25EnglishText.h" #include "message.h" #include "GameSettings.h" #include "renderworld.h" #include "Interface.h" -#include "Debug.h" +#include "DEBUG.H" #include "PATHAI.H" #include "worldman.h" #include "opplist.h" -#include "los.h" -#include "weapons.h" +#include "LOS.h" +#include "Weapons.h" #include "Game Clock.h" #include "Animation Control.h" #include "lighting.h" diff --git a/Tactical/Drugs And Alcohol.cpp b/Tactical/Drugs And Alcohol.cpp index 0c7c281c6..e5119de42 100644 --- a/Tactical/Drugs And Alcohol.cpp +++ b/Tactical/Drugs And Alcohol.cpp @@ -1,17 +1,17 @@ #include "sgp.h" - #include "soldier control.h" - #include "soldier profile.h" - #include "drugs and alcohol.h" - #include "items.h" - #include "morale.h" - #include "points.h" + #include "Soldier Control.h" + #include "Soldier Profile.h" + #include "Drugs And Alcohol.h" + #include "Items.h" + #include "Morale.h" + #include "Points.h" #include "message.h" #include "GameSettings.h" // SANDRO - had to add this, dammit! - #include "Random.h" + #include "random.h" #include "Text.h" #include "Interface.h" #include "Food.h" // added by Flugente - #include "Animation data.h" // added by Flugente for SoldierBodyTypes + #include "Animation Data.h" // added by Flugente for SoldierBodyTypes #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h"// added by Flugente diff --git a/Tactical/DynamicDialogue.h b/Tactical/DynamicDialogue.h index 2eca4b6b6..57c57a9ae 100644 --- a/Tactical/DynamicDialogue.h +++ b/Tactical/DynamicDialogue.h @@ -7,7 +7,7 @@ * @brief This file contains declarations of classes and functions used for dynamic dialogue */ -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // Flugente: calculate A's opinion of B diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp index 95d86d980..ee6eda90c 100644 --- a/Tactical/End Game.cpp +++ b/Tactical/End Game.cpp @@ -1,14 +1,14 @@ #include "Overhead.h" #include "Render Fun.h" - #include "Random.h" - #include "Worldman.h" + #include "random.h" + #include "worldman.h" #include "Soldier Profile.h" #include "NPC.h" #include "ai.h" #include "Dialogue Control.h" #include "Handle UI.h" - #include "end game.h" + #include "End Game.h" #include "Intro.h" #include "Exit Grids.h" #include "strategicmap.h" @@ -20,7 +20,7 @@ #include "Music Control.h" #include "Soldier macros.h" #include "qarray.h" - #include "los.h" + #include "LOS.h" #include "Strategic AI.h" #include "Squads.h" #include "PreBattle Interface.h" diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp index 0d11d98a3..09c4c2fdb 100644 --- a/Tactical/Enemy Soldier Save.cpp +++ b/Tactical/Enemy Soldier Save.cpp @@ -6,19 +6,19 @@ #include "types.h" #include "strategicmap.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" - #include "soldier add.h" - #include "soldier create.h" + #include "Soldier Add.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "debug.h" - #include "Random.h" - #include "items.h" + #include "DEBUG.H" + #include "random.h" + #include "Items.h" #include "Map Information.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "EditorMercs.h" #include "Animation Data.h" #include "message.h" diff --git a/Tactical/EnemyItemDrops.cpp b/Tactical/EnemyItemDrops.cpp index 0d7202897..d985691da 100644 --- a/Tactical/EnemyItemDrops.cpp +++ b/Tactical/EnemyItemDrops.cpp @@ -1,9 +1,9 @@ - #include "Types.h" - #include "DEbug.h" + #include "types.h" + #include "DEBUG.H" #include "EnemyItemDrops.h" WEAPON_DROPS gEnemyWeaponDrops[MAX_DROP_ITEMS]; AMMO_DROPS gEnemyAmmoDrops[MAX_DROP_ITEMS]; EXPLOSIVE_DROPS gEnemyExplosiveDrops[MAX_DROP_ITEMS]; ARMOUR_DROPS gEnemyArmourDrops[MAX_DROP_ITEMS]; -MISC_DROPS gEnemyMiscDrops[MAX_DROP_ITEMS]; +MISC_DROPS gEnemyMiscDrops[MAX_DROP_ITEMS]; diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index 6eaa12e89..cd6e505a1 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -8,30 +8,30 @@ #include "vsurface.h" #include "Render Dirty.h" #include "sysutil.h" - #include "wcheck.h" + #include "WCheck.h" #include "video.h" #include "vobject_blitters.h" #include "faces.h" - #include "utilities.h" - #include "overhead.h" - #include "gap.h" + #include "Utilities.h" + #include "Overhead.h" + #include "GAP.H" #include "Soldier Profile.h" #include "Sound Control.h" - #include "teamturns.h" - #include "soldier macros.h" - #include "dialogue control.h" - #include "font control.h" + #include "TeamTurns.h" + #include "Soldier macros.h" + #include "Dialogue Control.h" + #include "Font Control.h" #include "Assignments.h" - #include "Random.h" + #include "random.h" #include "line.h" #include "GameSettings.h" - #include "squads.h" - #include "interface.h" + #include "Squads.h" + #include "Interface.h" #include "Quests.h" - #include "animation control.h" - #include "drugs and alcohol.h" + #include "Animation Control.h" + #include "Drugs And Alcohol.h" #include "Interface Items.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Map Screen Interface.h" // HEADROCK HAM 3.2: Added two includes so that a function can read values of the Gun Range/hospital location #include "Campaign Types.h" diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index 872a4958a..70bbb2985 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -1,13 +1,13 @@ #include #include "sgp.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "Food.h" - #include "items.h" - #include "morale.h" - #include "points.h" + #include "Items.h" + #include "Morale.h" + #include "Points.h" #include "message.h" #include "GameSettings.h" // SANDRO - had to add this, dammit! - #include "Random.h" + #include "random.h" #include "Text.h" #include "Interface.h" #include "Dialogue Control.h" diff --git a/Tactical/GAP.cpp b/Tactical/GAP.cpp index 5478734aa..efb7271eb 100644 --- a/Tactical/GAP.cpp +++ b/Tactical/GAP.cpp @@ -1,8 +1,8 @@ #include "builddefines.h" - #include "debug.h" + #include "DEBUG.H" #include "types.h" //#include "mssw.h" - #include "gap.h" + #include "GAP.H" #include "Sound Control.h" #include "soundman.h" #include diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp index ba62ff484..dd018bd59 100644 --- a/Tactical/Handle Doors.cpp +++ b/Tactical/Handle Doors.cpp @@ -7,17 +7,17 @@ #include "renderworld.h" #include "structure.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "opplist.h" - #include "overhead.h" - #include "tile animation.h" + #include "Overhead.h" + #include "Tile Animation.h" #include "Interactive Tiles.h" - #include "handle doors.h" + #include "Handle Doors.h" #include "Sound Control.h" - #include "interface.h" - #include "keys.h" + #include "Interface.h" + #include "Keys.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "random.h" #include "SkillCheck.h" #include "Dialogue Control.h" diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index b7d9414b1..90bfba9f6 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -1,66 +1,66 @@ #include "connect.h" - #include "items.h" + #include "Items.h" #include "Action Items.h" #include "handle Items.h" - #include "overhead.h" - #include "weapons.h" - #include "points.h" + #include "Overhead.h" + #include "Weapons.h" + #include "Points.h" #include "tiledef.h" #include "worlddef.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" #include "renderworld.h" #include "Animation Control.h" - #include "font control.h" - #include "render dirty.h" + #include "Font Control.h" + #include "Render Dirty.h" #include "World items.h" - #include "text.h" + #include "Text.h" #include "Timer Control.h" - #include "wcheck.h" - #include "interface items.h" + #include "WCheck.h" + #include "Interface Items.h" #include "physics.h" - #include "soldier profile.h" - #include "interface dialogue.h" - #include "quests.h" + #include "Soldier Profile.h" + #include "interface Dialogue.h" + #include "Quests.h" #include "message.h" - #include "isometric utils.h" - #include "los.h" - #include "dialogue control.h" + #include "Isometric Utils.h" + #include "LOS.h" + #include "Dialogue Control.h" #include "ai.h" - #include "soldier macros.h" - #include "interface panels.h" + #include "Soldier macros.h" + #include "Interface Panels.h" #include "Strategic Town Loyalty.h" - #include "soldier functions.h" + #include "Soldier Functions.h" #include "Map Screen Helicopter.h" - #include "pathai.h" + #include "PATHAI.H" #include "fov.h" #include "MessageBoxScreen.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "SkillCheck.h" #include "Campaign.h" - #include "Random.h" - #include "structure wrap.h" - #include "interactive tiles.h" + #include "random.h" + #include "Structure Wrap.h" + #include "Interactive Tiles.h" #include "SaveLoadMap.h" #include "ShopKeeper Interface.h" #include "Arms Dealer Init.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "Sound Control.h" - #include "squads.h" - #include "rotting corpses.h" - #include "soldier ani.h" - #include "Opplist.h" + #include "Squads.h" + #include "Rotting Corpses.h" + #include "Soldier Ani.h" + #include "opplist.h" #include "qarray.h" - #include "render fun.h" + #include "Render Fun.h" #include "Map Information.h" #include "GameSettings.h" - #include "end game.h" - #include "interface control.h" + #include "End Game.h" + #include "Interface Control.h" #include "Map Screen Interface Map Inventory.h" // added by SANDRO #include "Morale.h" // added by Flugente - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Food.h" // added by sevenfm - this is needed for _keydown(SHIFT) to work #include "english.h" diff --git a/Tactical/Handle UI Plan.cpp b/Tactical/Handle UI Plan.cpp index fbaac284a..6dc326089 100644 --- a/Tactical/Handle UI Plan.cpp +++ b/Tactical/Handle UI Plan.cpp @@ -1,15 +1,15 @@ #include "Handle UI Plan.h" - #include "overhead.h" + #include "Overhead.h" #include "Isometric Utils.h" - #include "pathai.h" + #include "PATHAI.H" #include "Handle UI.h" - #include "points.h" - #include "weapons.h" + #include "Points.h" + #include "Weapons.h" #include "renderworld.h" #include "Animation Control.h" #include "message.h" - #include "soldier create.h" - #include "interface.h" + #include "Soldier Create.h" + #include "Interface.h" UINT8 gubNumUIPlannedMoves = 0; SOLDIERTYPE *gpUIPlannedSoldier = NULL; diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 75733b2b2..2c24e53bd 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -3,77 +3,77 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" #include "Soldier Control.h" #include "Animation Control.h" #include "Animation Data.h" #include "Event Pump.h" #include "Timer Control.h" #include "mousesystem.h" -#include "cursors.h" +#include "Cursors.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" -#include "points.h" +#include "Interface.h" +#include "Cursor Control.h" +#include "Points.h" #include "Interactive Tiles.h" -#include "interface cursors.h" +#include "Interface Cursors.h" #include "opplist.h" #include "worldman.h" -#include "weapons.h" +#include "Weapons.h" #include "renderworld.h" #include "structure.h" -#include "interface panels.h" -#include "weapons.h" +#include "Interface Panels.h" +#include "Weapons.h" #include "Handle items.h" -#include "UI cursors.h" -#include "Handle UI plan.h" -#include "Message.h" -#include "Render fun.h" -#include "interface items.h" +#include "UI Cursors.h" +#include "Handle UI Plan.h" +#include "message.h" +#include "Render Fun.h" +#include "Interface Items.h" #include "physics.h" #include "Soldier Profile.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "interface dialogue.h" -#include "soldier macros.h" -#include "soldier functions.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "interface Dialogue.h" +#include "Soldier macros.h" +#include "Soldier Functions.h" #include "Assignments.h" -#include "squads.h" +#include "Squads.h" #include "Strategic Pathing.h" -#include "strategic movement.h" +#include "Strategic Movement.h" #include "strategic.h" -#include "exit grids.h" -#include "structure wrap.h" -#include "soldier add.h" -#include "Random.h" +#include "Exit Grids.h" +#include "Structure Wrap.h" +#include "Soldier Add.h" +#include "random.h" #include "english.h" -#include "Random.h" +#include "random.h" #include "english.h" -#include "vehicles.h" -#include "messageboxscreen.h" -#include "text.h" -#include "dialogue control.h" +#include "Vehicles.h" +#include "MessageBoxScreen.h" +#include "Text.h" +#include "Dialogue Control.h" #include "line.h" #include "GameSettings.h" -#include "los.h" +#include "LOS.h" #include "Campaign Types.h" #include "Queen Command.h" #include "Options Screen.h" #include "SaveLoadGame.h" -#include "Spread Burst.h" +#include "Spread burst.h" #include "ai.h" #include "Game Clock.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Militia Control.h" #include "qarray.h" #include "environment.h" @@ -82,7 +82,7 @@ #include "DisplayCover.h" #include "english.h" // sevenfm: this is needed for _keydown(SHIFT) to work -#include "teamturns.h" +#include "TeamTurns.h" #include "Options Screen.h" #include "SaveLoadScreen.h" #include "Map Screen Interface.h" // added by Flugente for SquadNames diff --git a/Tactical/Interface Control.cpp b/Tactical/Interface Control.cpp index 343be7a78..a34e89b6f 100644 --- a/Tactical/Interface Control.cpp +++ b/Tactical/Interface Control.cpp @@ -6,43 +6,43 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" #include "input.h" #include "Handle UI.h" #include "Animation Control.h" #include "Animation Data.h" #include "renderworld.h" - #include "cursors.h" - #include "radar screen.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "worldman.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" - #include "interface cursors.h" + #include "Render Dirty.h" + #include "Utilities.h" + #include "Interface Cursors.h" #include "lighting.h" #include "Interface Panels.h" - #include "pathai.h" + #include "PATHAI.H" #include "vobject_blitters.h" #include "faces.h" #include "Handle UI Plan.h" - #include "interface control.h" - #include "interface items.h" - #include "interface dialogue.h" - #include "interactive tiles.h" + #include "Interface Control.h" + #include "Interface Items.h" + #include "interface Dialogue.h" + #include "Interactive Tiles.h" #include "Game Clock.h" #include "Strategic Exit GUI.h" #include "PopUpBox.h" #include "Assignments.h" - #include "spread burst.h" - #include "squads.h" + #include "Spread burst.h" + #include "Squads.h" #include "line.h" #include "Militia Control.h" #include "Map Screen Interface.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "GameSettings.h" #include "Explosion Control.h" // added by Flugente diff --git a/Tactical/Interface Cursors.cpp b/Tactical/Interface Cursors.cpp index aaae395b6..4573e139b 100644 --- a/Tactical/Interface Cursors.cpp +++ b/Tactical/Interface Cursors.cpp @@ -5,16 +5,16 @@ #include "vsurface.h" #include "input.h" #include "Handle UI.h" - #include "cursors.h" + #include "Cursors.h" #include "worlddef.h" #include "worldman.h" #include "Interface Cursors.h" - #include "interface.h" - #include "Isometric utils.h" - #include "cursors.h" - #include "sys globals.h" - #include "overhead.h" - #include "interface items.h" + #include "Interface.h" + #include "Isometric Utils.h" + #include "Cursors.h" + #include "Sys Globals.h" + #include "Overhead.h" + #include "Interface Items.h" #include "GameSettings.h" #define DISPLAY_AP_INDEX MOCKFLOOR1 diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index d805af376..400cc51b8 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -3,57 +3,57 @@ #include "sgp.h" #include "Encrypted File.h" #include "faces.h" - #include "wcheck.h" - #include "soldier profile.h" - #include "wordwrap.h" + #include "WCheck.h" + #include "Soldier Profile.h" + #include "WordWrap.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "interface dialogue.h" - #include "font control.h" - #include "dialogue control.h" + #include "interface Dialogue.h" + #include "Font Control.h" + #include "Dialogue Control.h" #include "renderworld.h" - #include "npc.h" - #include "interface dialogue.h" - #include "merctextbox.h" + #include "NPC.h" + #include "interface Dialogue.h" + #include "MercTextBox.h" #include "message.h" - #include "items.h" - #include "text.h" - #include "overhead.h" - #include "assignments.h" + #include "Items.h" + #include "Text.h" + #include "Overhead.h" + #include "Assignments.h" #include "strategic.h" #include "strategicmap.h" #include "gamescreen.h" #include "ai.h" - #include "aiinternals.h" - #include "interactive tiles.h" - #include "soldier profile.h" - #include "interface panels.h" - #include "quests.h" - #include "squads.h" - #include "game event hook.h" - #include "game clock.h" + #include "AIInternals.h" + #include "Interactive Tiles.h" + #include "Soldier Profile.h" + #include "Interface Panels.h" + #include "Quests.h" + #include "Squads.h" + #include "Game Event Hook.h" + #include "Game Clock.h" #include "MessageBoxScreen.h" #include "Tactical Save.h" - #include "interface control.h" - #include "cursors.h" - #include "fade screen.h" + #include "Interface Control.h" + #include "Cursors.h" + #include "Fade Screen.h" #include "gameloop.h" #include "finances.h" - #include "saveloadmap.h" + #include "SaveLoadMap.h" #include "Arms Dealer Init.h" #include "ShopKeeper Interface.h" #include "Strategic Town Loyalty.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "GameSettings.h" #include "Strategic Mines.h" #include "Boxing.h" #include "Items.h" - #include "WorldMan.h" + #include "worldman.h" #include "Render Fun.h" // including this for Strategic AI.h #include "Strategic Movement.h" #include "Strategic AI.h" - #include "Soldier create.h" + #include "Soldier Create.h" #include "SkillCheck.h" #include "Sound Control.h" #include "opplist.h" @@ -66,7 +66,7 @@ #include "Queen Command.h" #include "Campaign.h" #include "BobbyRMailOrder.h" - #include "end game.h" + #include "End Game.h" #include "Map Screen Helicopter.h" #include "Cheats.h" #include "Overhead.h" diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index 85b1d188f..22cfe29ea 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -6,50 +6,50 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" #include "Font Control.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "weapons.h" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" #include "Font Control.h" #include "Cursor Control.h" - #include "interface utils.h" - #include "interface items.h" - #include "wordwrap.h" + #include "Interface Utils.h" + #include "Interface Items.h" + #include "WordWrap.h" #include "vobject_blitters.h" #include "world items.h" - #include "points.h" + #include "Points.h" #include "physics.h" - #include "handle ui.h" + #include "Handle UI.h" #include "ShopKeeper Interface.h" #include "english.h" - #include "keys.h" - #include "Strategicmap.h" - #include "soldier macros.h" - #include "squads.h" + #include "Keys.h" + #include "strategicmap.h" + #include "Soldier macros.h" + #include "Squads.h" #include "MessageBoxScreen.h" #include "GameSettings.h" #include "Map Screen Interface Map Inventory.h" #include "Quests.h" #include "Map Screen Interface.h" #include "Campaign Types.h" - #include "los.h" + #include "LOS.h" #include "Map Screen Interface Map.h" #include "Food.h" // added by Flugente diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 62dc9fa9b..ca4d58ea5 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -8,54 +8,54 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "sys globals.h" - #include "cursors.h" - #include "radar screen.h" + #include "Sys Globals.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" + #include "Render Dirty.h" + #include "Utilities.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "pathai.h" - #include "weapons.h" + #include "PATHAI.H" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" #include "Font Control.h" #include "Cursor Control.h" - #include "interface cursors.h" - #include "interface utils.h" - #include "interface items.h" - #include "wordwrap.h" - #include "interface control.h" + #include "Interface Cursors.h" + #include "Interface Utils.h" + #include "Interface Items.h" + #include "WordWrap.h" + #include "Interface Control.h" #include "vobject_blitters.h" #include "world items.h" - #include "points.h" + #include "Points.h" #include "physics.h" #include "finances.h" - #include "ui cursors.h" - #include "handle ui.h" + #include "UI Cursors.h" + #include "Handle UI.h" #include "ShopKeeper Interface.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "english.h" - #include "keys.h" - #include "Strategicmap.h" - #include "soldier macros.h" - #include "game clock.h" - #include "squads.h" + #include "Keys.h" + #include "strategicmap.h" + #include "Soldier macros.h" + #include "Game Clock.h" + #include "Squads.h" #include "MessageBoxScreen.h" #include "GameSettings.h" #include "Map Screen Interface Map Inventory.h" @@ -63,7 +63,7 @@ #include "Map Screen Interface.h" #include "Campaign Types.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "Map Screen Interface Map.h" #include "Interface Enhanced.h" #include "InterfaceItemImages.h" @@ -12415,7 +12415,7 @@ void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier if ( gGameExternalOptions.fAdvRepairSystem && sThreshold < 100 ) { if( g_lang == i18n::Lang::zh ) { - swprintf( pStr, L"%s [%d%(%d%)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%£¥(%d%£¥)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s", ItemNames[ usItem ], sValue, sThreshold, @@ -12457,7 +12457,7 @@ void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier else { if( g_lang == i18n::Lang::zh ) { - swprintf( pStr, L"%s [%d%]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s", + swprintf( pStr, L"%s [%d%£¥]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s", ItemNames[ usItem ], sValue, gWeaponStatsDesc[ 9 ], //Accuracy String diff --git a/Tactical/Interface Items.h b/Tactical/Interface Items.h index 607890ff0..489539695 100644 --- a/Tactical/Interface Items.h +++ b/Tactical/Interface Items.h @@ -1,7 +1,7 @@ #ifndef __INTERFACE_ITEMS_H #define __INTERFACE_ITEMS_H -#include "items.h" +#include "Items.h" #include "Handle Items.h" #include "popup_class.h" diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 5eb078686..d81c04591 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -6,42 +6,42 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "cursors.h" - #include "radar screen.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" + #include "Render Dirty.h" + #include "Utilities.h" #include "Sound Control.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "pathai.h" - #include "weapons.h" + #include "PATHAI.H" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" - #include "interface control.h" - #include "interface utils.h" + #include "Interface Control.h" + #include "Interface Utils.h" #include "Game Clock.h" #include "mapscreen.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "strategicmap.h" - #include "soldier functions.h" + #include "Soldier Functions.h" #include "gamescreen.h" #include "Assignments.h" - #include "points.h" + #include "Points.h" #include "Squads.h" #include "strategic.h" #include "Map Screen Interface Map.h" @@ -50,21 +50,21 @@ #include "Options Screen.h" #include "ShopKeeper Interface.h" #include "english.h" - #include "keys.h" + #include "Keys.h" #include "Soldier Add.h" - #include "vehicles.h" - #include "gamesettings.h" - #include "dialogue control.h" + #include "Vehicles.h" + #include "GameSettings.h" + #include "Dialogue Control.h" #include "Items.h" - #include "drugs and alcohol.h" - #include "los.h" + #include "Drugs And Alcohol.h" + #include "LOS.h" #include "opplist.h" #include "vobject_blitters.h" - #include "Finances.h" + #include "finances.h" #include "LaptopSave.h" #include "Cursor Control.h" #include "MessageBoxScreen.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Boxing.h" #include "personnel.h" // HEADROCK HAM 3.6: This is required for Stat Progress Bars @@ -7902,7 +7902,7 @@ BOOLEAN HandleKlerykPistolet( SOLDIERTYPE *pSoldier, UINT32 uiHandPos, UINT16 us else { //legion // Do we have nothing or the leather vest or kevlar leather vest? - if ( usReplaceItem == 4520 ) //zoty pistolet items.xml + if ( usReplaceItem == 4520 ) //z�oty pistolet items.xml { // This is good.... fRefuse = FALSE; diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp index 73519abc9..a37f45223 100644 --- a/Tactical/Interface Utils.cpp +++ b/Tactical/Interface Utils.cpp @@ -3,13 +3,13 @@ #include "sgp.h" #include "himage.h" #include "vobject.h" - #include "interface utils.h" - #include "render dirty.h" - #include "interface.h" + #include "Interface Utils.h" + #include "Render Dirty.h" + #include "Interface.h" #include "sysutil.h" #include "faces.h" - #include "render dirty.h" - #include "weapons.h" + #include "Render Dirty.h" + #include "Weapons.h" #include "Overhead.h" #include "Soldier macros.h" #include "line.h" diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 9d0c27db0..64881ccc0 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -7,56 +7,56 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "Animation Control.h" #include "Animation Data.h" #include "renderworld.h" - #include "sys globals.h" - #include "cursors.h" - #include "radar screen.h" + #include "Sys Globals.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "worldman.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" - #include "interface cursors.h" + #include "Render Dirty.h" + #include "Utilities.h" + #include "Interface Cursors.h" #include "Sound Control.h" #include "lighting.h" #include "Interface Panels.h" - #include "pathai.h" + #include "PATHAI.H" #include "vobject_blitters.h" #include "faces.h" #include "Handle UI Plan.h" - #include "interface control.h" - #include "interface items.h" - #include "soldier profile.h" + #include "Interface Control.h" + #include "Interface Items.h" + #include "Soldier Profile.h" #include "MercTextBox.h" - #include "soldier functions.h" - #include "cursor control.h" - #include "handle doors.h" - #include "keys.h" - #include "text.h" - #include "points.h" - #include "soldier macros.h" - #include "game clock.h" + #include "Soldier Functions.h" + #include "Cursor Control.h" + #include "Handle Doors.h" + #include "Keys.h" + #include "Text.h" + #include "Points.h" + #include "Soldier macros.h" + #include "Game Clock.h" #include "physics.h" #include "Map Screen Interface Map.h" #include "line.h" #include "Vehicles.h" - #include "messageboxscreen.h" - #include "gamesettings.h" + #include "MessageBoxScreen.h" + #include "GameSettings.h" #include "Squads.h" #include "message.h" #include "strategicmap.h" #include "Queen Command.h" // HEADROCK HAM 4: Included for new CTH indicator - #include "weapons.h" + #include "Weapons.h" #include "Map Screen Interface.h" // added by Flugente for SquadNames #include "environment.h" #include "SkillCheck.h" // added by Flugente diff --git a/Tactical/Interface.h b/Tactical/Interface.h index 18f4bd33c..a4ab8becc 100644 --- a/Tactical/Interface.h +++ b/Tactical/Interface.h @@ -1,7 +1,7 @@ #ifndef _INTERFACE_H #define _INTERFACE_H -#include "handle UI.h" +#include "Handle UI.h" #include "mousesystem.h" #include "structure.h" #include "Assignments.h" // added by Flugente for the stat-enums @@ -581,4 +581,4 @@ void NCTHShowMounted( SOLDIERTYPE* pSoldier, UINT16* ptrBuf, UINT32 uiPitch, INT BOOLEAN HasBackgroundFlag( UINT8 usProfile, UINT64 aFlag ); INT16 GetBackgroundValue( UINT8 usProfile, UINT16 aNr ); -#endif +#endif diff --git a/Tactical/InterfaceItemImages.cpp b/Tactical/InterfaceItemImages.cpp index 2bed22b90..679eed220 100644 --- a/Tactical/InterfaceItemImages.cpp +++ b/Tactical/InterfaceItemImages.cpp @@ -2,7 +2,7 @@ #include "DEBUG.H" #include "vobject.h" -#include "utilities.h" +#include "Utilities.h" #include "GameSettings.h" #include diff --git a/Tactical/InterfaceItemImages.h b/Tactical/InterfaceItemImages.h index 635a31054..2c6eb3959 100644 --- a/Tactical/InterfaceItemImages.h +++ b/Tactical/InterfaceItemImages.h @@ -1,7 +1,7 @@ #ifndef _ITERFACEITEMIMAGES_H_ #define _ITERFACEITEMIMAGES_H_ -#include "Types.h" +#include "types.h" #include #include #include diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 72bfa7969..060f9d229 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -1,8 +1,8 @@ #include #include "Inventory Choosing.h" - #include "animation data.h" + #include "Animation Data.h" #include "Items.h" - #include "Random.h" + #include "random.h" #include "Weapons.h" #include "Strategic Status.h" #include "Campaign.h" diff --git a/Tactical/Item Types.cpp b/Tactical/Item Types.cpp index b80888d0e..515fbb6cb 100644 --- a/Tactical/Item Types.cpp +++ b/Tactical/Item Types.cpp @@ -1,13 +1,13 @@ #include "Item Types.h" -#include "Debug.h" +#include "DEBUG.H" #include "Items.h" #include "GameSettings.h" #include "screenids.h" #include "Action Items.h" // added by Flugente for the ACTION_ITEM_BLOW_UP value -#include "Random.h" // added by Flugente -#include "Message.h" // added by BOB for missing LBE info messages -#include "overhead.h" // added by BOB for missing LBE info messages +#include "random.h" // added by Flugente +#include "message.h" // added by BOB for missing LBE info messages +#include "Overhead.h" // added by BOB for missing LBE info messages #include "Map Screen Interface.h" // added by BOB for missing LBE info messages @@ -1278,7 +1278,7 @@ OLD_OBJECTTYPE_101& OLD_OBJECTTYPE_101::operator=(OBJECTTYPE& src) // Flugente fix: there is a severe problem with Action items. The problem is that in the above switch statement, we use the default stuff for action items. // If the action item is a bomb etc. (bActionValue = 3), we want to set the bomb item. But due to EXTREME RETARDNESS, the ugYucky-struct differs on variable positions. - // To be precise (see in ItemTypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its + // To be precise (see in Itemtypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its // // ... // INT8 bGunStatus; // status % of gun @@ -1419,7 +1419,7 @@ OBJECTTYPE& OBJECTTYPE::operator=(const OBJECTTYPE& src) // Flugente fix: there is a severe problem with Action items. The problem is that in the above switch statement, we use the default stuff for action items. // If the action item is a bomb etc. (bActionValue = 3), we want to set the bomb item. But due to EXTREME RETARDNESS, the ugYucky-struct differs on variable positions. - // To be precise (see in ItemTypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its + // To be precise (see in Itemtypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its // // ... // INT8 bGunStatus; // status % of gun @@ -1626,7 +1626,7 @@ OBJECTTYPE& OBJECTTYPE::operator=(const OLD_OBJECTTYPE_101& src) // Flugente fix: there is a severe problem with Action items. The problem is that in the above switch statement, we use the default stuff for action items. // If the action item is a bomb etc. (bActionValue = 3), we want to set the bomb item. But due to EXTREME RETARDNESS, the ugYucky-struct differs on variable positions. - // To be precise (see in ItemTypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its + // To be precise (see in Itemtypes.h: union OLD_OBJECTTYPE_101_UNION for reference), its // // ... // INT8 bGunStatus; // status % of gun diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index c1fe83a02..e1272bb63 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1,28 +1,28 @@ - #include "items.h" + #include "Items.h" #include "Action Items.h" - #include "weapons.h" + #include "Weapons.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Sound Control.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "interface.h" - #include "interface panels.h" - #include "explosion control.h" + #include "Interface.h" + #include "Interface Panels.h" + #include "Explosion Control.h" #include "Keys.h" #include "faces.h" - #include "wcheck.h" - #include "soldier profile.h" + #include "WCheck.h" + #include "Soldier Profile.h" #include "SkillCheck.h" - #include "los.h" + #include "LOS.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "fov.h" #include "MessageBoxScreen.h" @@ -41,16 +41,16 @@ #include "Soldier macros.h" #include "Smell.h" #include "lighting.h" - #include "utilities.h" + #include "Utilities.h" #include "english.h" - #include "debug control.h" + #include "Debug Control.h" #include "math.h" // THE_BOB : added for pocket popup definitions #include #include "popup_definition.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Food.h" #include "opplist.h" #include "Sys Globals.h"//dnl ch74 201013 diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp index 28ee41e21..e77b35f2a 100644 --- a/Tactical/Ja25_Tactical.cpp +++ b/Tactical/Ja25_Tactical.cpp @@ -1,21 +1,21 @@ - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "interface.h" + #include "Interface.h" #include "Keys.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "SkillCheck.h" - #include "los.h" + #include "LOS.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "MessageBoxScreen.h" @@ -30,9 +30,9 @@ #include "Soldier macros.h" #include "Smell.h" #include "lighting.h" - #include "utilities.h" + #include "Utilities.h" #include "english.h" - #include "debug control.h" + #include "Debug Control.h" #ifdef JA2UB #include "worldman.h" diff --git a/Tactical/Keys.cpp b/Tactical/Keys.cpp index b8dc66e4f..0c489d7a2 100644 --- a/Tactical/Keys.cpp +++ b/Tactical/Keys.cpp @@ -5,35 +5,35 @@ #include "types.h" #include "Keys.h" - #include "debug.h" + #include "DEBUG.H" #include "Smoothing Utils.h" #include "SkillCheck.h" #include "opplist.h" - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "ai.h" #include "message.h" - #include "text.h" - #include "explosion control.h" - #include "isometric utils.h" - #include "StrategicMap.h" + #include "Text.h" + #include "Explosion Control.h" + #include "Isometric Utils.h" + #include "strategicmap.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "los.h" + #include "LOS.h" #include "opplist.h" - #include "tiledat.h" - #include "overhead.h" + #include "TileDat.h" + #include "Overhead.h" #include "structure.h" #include "renderworld.h" #include "worldman.h" - #include "wcheck.h" + #include "WCheck.h" #include "random.h" #include "worlddef.h" - #include "campaign.h" + #include "Campaign.h" #include "Sound Control.h" #include "Interface.h" #include "Game Clock.h" - #include "handle doors.h" + #include "Handle Doors.h" #include "Map Screen Interface.h" #include "GameSettings.h" // added by SANDRO #include "Dialogue Control.h" // added by Flugente diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 6d674b550..2821976f6 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -4,41 +4,41 @@ #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Isometric Utils.h" -#include "debug.h" -#include "los.h" -#include "animation control.h" -#include "Random.h" -//#include "soldier control.h" +#include "DEBUG.H" +#include "LOS.h" +#include "Animation Control.h" +#include "random.h" +//#include "Soldier Control.h" #include "Event Pump.h" -#include "overhead.h" -#include "weapons.h" +#include "Overhead.h" +#include "Weapons.h" #include "opplist.h" -#include "bullets.h" +#include "Bullets.h" #include "lighting.h" #include "phys math.h" -#include "items.h" +#include "Items.h" #include "Soldier Profile.h" #include "worldman.h" -#include "rotting corpses.h" +#include "Rotting Corpses.h" #include "GameSettings.h" -#include "keys.h" +#include "Keys.h" #include "message.h" #include "Structure Wrap.h" -#include "campaign.h" +#include "Campaign.h" #include "environment.h" -#include "Pathai.h" +#include "PATHAI.H" #include "Soldier macros.h" #include "strategicmap.h" #include "Interface.h" -#include "points.h" +#include "Points.h" #include "Smell.h" #include "Text.h" #include "Quests.h" -#include "items.h" +#include "Items.h" #include "Item Types.h" #include "Vehicles.h" #include "fresh_header.h" diff --git a/Tactical/LogicalBodyTypes/AbstractXMLLoader.h b/Tactical/LogicalBodyTypes/AbstractXMLLoader.h index 20749ba0e..e96f666df 100644 --- a/Tactical/LogicalBodyTypes/AbstractXMLLoader.h +++ b/Tactical/LogicalBodyTypes/AbstractXMLLoader.h @@ -6,7 +6,7 @@ #include #include #include "expat.h" -#include "Types.h" +#include "types.h" #include "XML.h" #include "TopicIDs.h" #include "TopicOps.h" diff --git a/Tactical/LogicalBodyTypes/PaletteTable.h b/Tactical/LogicalBodyTypes/PaletteTable.h index 0c2141e80..e8eef7807 100644 --- a/Tactical/LogicalBodyTypes/PaletteTable.h +++ b/Tactical/LogicalBodyTypes/PaletteTable.h @@ -3,7 +3,7 @@ #ifndef _LBT_PALETTETABLE__H_ #define _LBT_PALETTETABLE__H_ -#include "soldier control.h" +#include "Soldier Control.h" #include "Utilities.h" #include "lighting.h" diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp index 0ff75813e..c1457d701 100644 --- a/Tactical/Map Information.cpp +++ b/Tactical/Map Information.cpp @@ -1,9 +1,9 @@ #include - #include "fileMan.h" + #include "FileMan.h" #include "types.h" #include "Map Information.h" #include "Soldier Init List.h" - #include "Random.h" + #include "random.h" #include "worlddef.h" #include "renderworld.h" #include "EditorMercs.h" @@ -12,7 +12,7 @@ #include "Animation Data.h" #include "Road Smoothing.h" #include "message.h" - #include "weapons.h" + #include "Weapons.h" #include "environment.h" #include "lighting.h" #include "Animated ProgressBar.h" diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp index eacb0f7ca..003052e2b 100644 --- a/Tactical/Merc Entering.cpp +++ b/Tactical/Merc Entering.cpp @@ -2,35 +2,35 @@ #include #include #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" + #include "DEBUG.H" + //#include "Soldier Control.h" // HEADROCK HAM 3.5: Strange that this wasn't included. #include "GameSettings.h" - #include "weapons.h" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" - #include "rotting corpses.h" - #include "tile cache.h" - #include "isometric utils.h" - #include "animation control.h" - #include "utilities.h" - #include "game clock.h" - #include "soldier create.h" + #include "Rotting Corpses.h" + #include "Tile Cache.h" + #include "Isometric Utils.h" + #include "Animation Control.h" + #include "Utilities.h" + #include "Game Clock.h" + #include "Soldier Create.h" #include "renderworld.h" - #include "tile animation.h" + #include "Tile Animation.h" #include "merc entering.h" #include "Sound Control.h" #include "strategic.h" #include "strategicmap.h" #include "Handle UI.h" - #include "squads.h" + #include "Squads.h" #include "english.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "Merc Hiring.h" #include "Font Control.h" #include "message.h" #include "Text.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "ai.h" #include "Dialogue Control.h" #include "Music Control.h" diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index faa732873..5c413bf44 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -2,7 +2,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" @@ -13,25 +13,25 @@ #include "Isometric Utils.h" #include "Event Pump.h" #include "Render Fun.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Merc Hiring.h" #include "Game Event Hook.h" #include "message.h" #include "strategicmap.h" #include "strategic.h" - #include "items.h" + #include "Items.h" #include "Soldier Add.h" - #include "History.h" + #include "history.h" #include "Squads.h" #include "Strategic Merc Handler.h" #include "Dialogue Control.h" @@ -39,7 +39,7 @@ #include "Map Screen Interface Map.h" #include "screenids.h" #include "jascreens.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "LaptopSave.h" #include "personnel.h" @@ -1079,8 +1079,8 @@ void UpdateJerryMiloInInitialSector() pSoldier->fWaitingToGetupFromJA25Start = TRUE; pSoldier->fIgnoreGetupFromCollapseCheck = TRUE; - //pSoldier->ubStrategicInsertionCode = INSERTION_CODE_GRIDNO; //to byo wyczone - //pSoldier->usStrategicInsertionData = GetInitialHeliGridNo( ); //to byo wyczone + //pSoldier->ubStrategicInsertionCode = INSERTION_CODE_GRIDNO; //to by�o wy��czone + //pSoldier->usStrategicInsertionData = GetInitialHeliGridNo( ); //to by�o wy��czone RESETTIMECOUNTER( pSoldier->GetupFromJA25StartCounter, gsInitialHeliRandomTimes[6] + 800 + Random( 400 ) ); diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index 935d78524..52a2ea576 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -9,20 +9,20 @@ #include "Map Screen Interface.h" #include "Queen Command.h" #include "strategic.h" - #include "popupbox.h" - #include "interface control.h" + #include "PopUpBox.h" + #include "Interface Control.h" #include "Map Screen Interface Map.h" #include "renderworld.h" #include "Text.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface.h" #include "GameSettings.h" - #include "Input.h" + #include "input.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "Items.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Campaign.h" #include "ai.h" #include "Isometric Utils.h" diff --git a/Tactical/Militia Control.h b/Tactical/Militia Control.h index b309e2887..0e7c09bc9 100644 --- a/Tactical/Militia Control.h +++ b/Tactical/Militia Control.h @@ -1,7 +1,7 @@ #ifndef __MILITIA_CONTROL_H #define __MILITIA_CONTROL_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "mousesystem.h" #include "Strategic Movement.h" @@ -28,4 +28,4 @@ BOOLEAN CreateDestroyMilitiaControlPopUpBoxes( void ); BOOLEAN CheckIfRadioIsEquipped( void ); -#endif +#endif diff --git a/Tactical/Minigame.cpp b/Tactical/Minigame.cpp index b87b3b1a6..fc2282ee6 100644 --- a/Tactical/Minigame.cpp +++ b/Tactical/Minigame.cpp @@ -13,7 +13,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,20 +32,20 @@ #include "himage.h" #include "vobject.h" #include "vobject_blitters.h" -#include "wcheck.h" +#include "WCheck.h" #include "input.h" -#include "font.h" +#include "Font.h" #include "timer.h" #include "mousesystem.h" #include #include #include "Timer Control.h" #include "Sys Globals.h" -#include "interface.h" -#include "utilities.h" -#include "render dirty.h" -#include "cursor control.h" -#include "utilities.h" +#include "Interface.h" +#include "Utilities.h" +#include "Render Dirty.h" +#include "Cursor Control.h" +#include "Utilities.h" #include "english.h" #include "WordWrap.h" #include "gamescreen.h" diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp index 0783a3f40..bd8c6fe9b 100644 --- a/Tactical/Morale.cpp +++ b/Tactical/Morale.cpp @@ -2,16 +2,16 @@ #include "Morale.h" #include "Overhead.h" #include "Soldier Profile.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Map Screen Interface.h" #include "message.h" - #include "assignments.h" + #include "Assignments.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "SkillCheck.h" - #include "drugs and alcohol.h" - #include "StrategicMap.h" - #include "Debug.h" + #include "Drugs And Alcohol.h" + #include "strategicmap.h" + #include "DEBUG.H" #include "Squads.h" #include "ai.h" #include "Campaign.h" @@ -33,7 +33,7 @@ #include "connect.h" #include "fresh_header.h" -#include "Random.h" +#include "random.h" #include "Merc Contract.h" diff --git a/Tactical/Morale.h b/Tactical/Morale.h index c423faa3b..f79a018f0 100644 --- a/Tactical/Morale.h +++ b/Tactical/Morale.h @@ -1,7 +1,7 @@ #ifndef _MORALE_H #define _MORALE_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" //#define DEFAULT_MORALE 50 @@ -160,4 +160,4 @@ void DailyMoraleUpdate( SOLDIERTYPE *pSoldier ); void DecayTacticalMoraleModifiers( void ); -#endif +#endif diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index 9a349c5fe..abe6f5e47 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -2,7 +2,7 @@ #define __OVERHEAD_TYPES_H // GLOBAL HEADER FOR DATA, TYPES FOR TACTICAL ENGINE -#include "Types.h" +#include "types.h" #define REFINE_AIM_1 0 #define REFINE_AIM_MID1 1 diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 14cdf1ac8..dde421564 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -2,9 +2,9 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -19,30 +19,30 @@ #include "Render Fun.h" #include "Render Dirty.h" #include "mousesystem.h" -#include "interface.h" +#include "Interface.h" #include "sysutil.h" #include "FileMan.h" -#include "points.h" -#include "Random.h" +#include "Points.h" +#include "random.h" #include "ai.h" #include "Interactive Tiles.h" -#include "soldier ani.h" +#include "Soldier Ani.h" #include "english.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" #include "Sound Control.h" #include "Font Control.h" #include "lighting.h" -#include "pathai.h" +#include "PATHAI.H" #include "screenids.h" -#include "weapons.h" -#include "rotting corpses.h" +#include "Weapons.h" +#include "Rotting Corpses.h" #include "lighting.h" #include "Handle UI Plan.h" #include "structure.h" -#include "interface panels.h" +#include "Interface Panels.h" #include "message.h" -#include "items.h" +#include "Items.h" #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" @@ -51,60 +51,60 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "structure wrap.h" -#include "tile animation.h" +#include "Structure Wrap.h" +#include "Tile Animation.h" #include "Strategic Merc Handler.h" -#include "strategic turns.h" +#include "Strategic Turns.h" #include "Squads.h" #include "Morale.h" #include "Campaign.h" -#include "music control.h" +#include "Music Control.h" #include "faces.h" -#include "dialogue control.h" +#include "Dialogue Control.h" #include "Queen Command.h" #include "Quests.h" #include "NPC.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier functions.h" -#include "auto bandage.h" +#include "Soldier Profile.h" +#include "Soldier Functions.h" +#include "Auto Bandage.h" #include "Game Event Hook.h" #include "Explosion Control.h" #include "SkillCheck.h" #include "World Items.h" -#include "smell.h" +#include "Smell.h" #include "Player Command.h" #include "GameSettings.h" -#include "messageboxscreen.h" +#include "MessageBoxScreen.h" #include "Game Clock.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" -#include "interface items.h" -#include "text.h" -#include "keys.h" +#include "Interface Items.h" +#include "Text.h" +#include "Keys.h" #include "Boxing.h" #include "Town Militia.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "Map Screen Helicopter.h" -#include "interface control.h" -#include "exit grids.h" +#include "Interface Control.h" +#include "Exit Grids.h" #include "jascreens.h" #include "strategic.h" #include "arms dealer init.h" -#include "interface utils.h" +#include "Interface Utils.h" #include "Air Raid.h" -#include "civ quotes.h" -#include "drugs and alcohol.h" +#include "Civ Quotes.h" +#include "Drugs And Alcohol.h" #include "history.h" -#include "los.h" -#include "interface dialogue.h" +#include "LOS.h" +#include "interface Dialogue.h" #include "Strategic AI.h" -#include "end game.h" +#include "End Game.h" #include "Strategic Status.h" #include "PreBattle Interface.h" #include "Militia Control.h" #include "Lua Interpreter.h" -#include "bullets.h" +#include "Bullets.h" #include "Inventory Choosing.h" // added by Flugente for TakeMilitiaEquipmentfromSector() #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinions() diff --git a/Tactical/Overhead.h b/Tactical/Overhead.h index 16c42a6fe..9c0fa0957 100644 --- a/Tactical/Overhead.h +++ b/Tactical/Overhead.h @@ -5,7 +5,7 @@ #include #include "Soldier Control.h" #include -#include "soldier find.h" +#include "Soldier Find.h" #include "Campaign Types.h" // added by Flugente for SECTORINFO and UNDERGROUND_SECTORINFO #define ADD_SOLDIER_NO_PROFILE_ID 200 diff --git a/Tactical/PATHAI.H b/Tactical/PATHAI.H index cf80a125e..53c00255d 100644 --- a/Tactical/PATHAI.H +++ b/Tactical/PATHAI.H @@ -8,7 +8,7 @@ #ifndef _PATHAI_H #define _PATHAI_H -#include "isometric utils.h" +#include "Isometric Utils.h" namespace ASTAR { #include "BinaryHeap.hpp" diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp index 02a8067d3..54c83a16b 100644 --- a/Tactical/PATHAI.cpp +++ b/Tactical/PATHAI.cpp @@ -11,14 +11,14 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" - #include "interface.h" + #include "Interface.h" #include #include "input.h" @@ -26,18 +26,18 @@ #include "worlddef.h" #include "worldman.h" // #include "renderworld.h" - #include "pathai.h" + #include "PATHAI.H" #include "Points.h" #include "ai.h" - #include "Random.h" + #include "random.h" #include "message.h" - #include "structure wrap.h" - #include "keys.h" - #include "gamesettings.h" + #include "Structure Wrap.h" + #include "Keys.h" + #include "GameSettings.h" #include "Buildings.h" - #include "soldier profile.h" // added by SANDRO + #include "Soldier Profile.h" // added by SANDRO #include "Soldier macros.h" - #include "AIinternals.h" + #include "AIInternals.h" #include "Rotting Corpses.h" #include "Meanwhile.h" #include "connect.h" @@ -50,7 +50,7 @@ class SOLDIERTYPE; #include "BinaryHeap.hpp" #include "opplist.h" -#include "weapons.h" +#include "Weapons.h" extern BOOLEAN gubWorldTileInLight[MAX_ALLOWED_WORLD_MAX]; extern BOOLEAN gubIsCorpseThere[MAX_ALLOWED_WORLD_MAX]; extern INT32 gubMerkCanSeeThisTile[MAX_ALLOWED_WORLD_MAX]; diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index ee07e3f06..4feac0480 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -1,30 +1,30 @@ #include "sgp.h" #include "worlddef.h" - #include "points.h" - #include "overhead.h" - #include "Font control.h" - #include "interface.h" - #include "Isometric utils.h" - #include "pathai.h" - #include "interface.h" + #include "Points.h" + #include "Overhead.h" + #include "Font Control.h" + #include "Interface.h" + #include "Isometric Utils.h" + #include "PATHAI.H" + #include "Interface.h" #include "message.h" #include "Animation Control.h" #include "Weapons.h" - #include "structure wrap.h" - #include "dialogue control.h" - #include "items.h" + #include "Structure Wrap.h" + #include "Dialogue Control.h" + #include "Items.h" #include "rt time defines.h" #include "ai.h" - #include "handle ui.h" - #include "text.h" + #include "Handle UI.h" + #include "Text.h" #include "SkillCheck.h" - #include "wcheck.h" + #include "WCheck.h" #include "Soldier Profile.h" #include "Soldier macros.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "GameSettings.h" #include "worldman.h" #include "math.h" @@ -3589,7 +3589,7 @@ INT16 GetAPsToRefuelVehicle( SOLDIERTYPE *pSoldier ) #define TOSSES_PER_10TURNS 18 // max # of grenades tossable in 10 turns //COMMENTED OUT, AS THEY WERE -//1. ALREADY DEFINED IN POINTS.H TO BEGIN WITH +//1. ALREADY DEFINED IN Points.h TO BEGIN WITH //2. EXTERNALIZED BY GOTTHARD 7/2/08 //#define APBPConstants[AP_MIN_AIM_ATTACK] 0 // minimum permitted extra aiming //#define APBPConstants[AP_MAX_AIM_ATTACK] 4 // maximum permitted extra aiming diff --git a/Tactical/Rain.cpp b/Tactical/Rain.cpp index fbb80d34d..ad18bc121 100644 --- a/Tactical/Rain.cpp +++ b/Tactical/Rain.cpp @@ -1,43 +1,43 @@ #include "types.h" - //#include "soldier control.h" - #include "overhead.h" - #include "animation control.h" + //#include "Soldier Control.h" + #include "Overhead.h" + #include "Animation Control.h" #include "timer.h" - #include "event pump.h" + #include "Event Pump.h" // #include "Sound Control.h" - #include "interface.h" - #include "Font Control.H" + #include "Interface.h" + #include "Font Control.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "TeamTurns.h" #include "Smell.h" #include "Soldier Functions.h" - #include "cursors.h" + #include "Cursors.h" #include "Queen Command.h" #include "lighting.h" #include "environment.h" - #include "dialogue control.h" - #include "Soldier Profile Type.h" - #include "air raid.h" + #include "Dialogue Control.h" + #include "soldier profile type.h" + #include "Air Raid.h" #include "SkillCheck.h" #include "AIInternals.h" #include "AIList.h" #ifdef DEBUG_INTERRUPTS - #include "debug.h" + #include "DEBUG.H" #endif - #include "render dirty.h" + #include "Render Dirty.h" #include "GameSettings.h" #include "screenids.h" #include "vsurface.h" #include "math.h" - #include "merctextbox.h" - #include "Video.h" + #include "MercTextBox.h" + #include "video.h" #include "local.h" #include "line.h" #include "overhead map.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Rain.h" diff --git a/Tactical/RandomMerc.cpp b/Tactical/RandomMerc.cpp index 0e0a24133..4c1448c2b 100644 --- a/Tactical/RandomMerc.cpp +++ b/Tactical/RandomMerc.cpp @@ -1,12 +1,12 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" #include "XML.h" diff --git a/Tactical/Real Time Input.cpp b/Tactical/Real Time Input.cpp index f62e77de5..1560b7381 100644 --- a/Tactical/Real Time Input.cpp +++ b/Tactical/Real Time Input.cpp @@ -1,10 +1,10 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" //#include "Soldier Control.h" #include "Animation Control.h" #include "Animation Data.h" @@ -13,28 +13,28 @@ #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" +#include "Interface.h" +#include "Cursor Control.h" #include "Interactive Tiles.h" -#include "spread burst.h" +#include "Spread burst.h" #include "world items.h" -#include "interface items.h" +#include "Interface Items.h" #include "physics.h" -#include "ui cursors.h" +#include "UI Cursors.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "dialogue control.h" -#include "interface dialogue.h" -#include "interactive tiles.h" -#include "messageboxscreen.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "Dialogue Control.h" +#include "interface Dialogue.h" +#include "Interactive Tiles.h" +#include "MessageBoxScreen.h" #include "gameloop.h" -#include "spread burst.h" -#include "explosion control.h" +#include "Spread burst.h" +#include "Explosion Control.h" #include "message.h" #include "Strategic Exit GUI.h" #include "Assignments.h" @@ -42,18 +42,18 @@ #include "renderworld.h" #include "GameSettings.h" #include "english.h" -#include "text.h" -#include "soldier macros.h" -#include "render dirty.h" +#include "Text.h" +#include "Soldier macros.h" +#include "Render Dirty.h" #include "Militia Control.h" -#include "render dirty.h" +#include "Render Dirty.h" #include "Militia Control.h" ///***dddd #include "Squads.h" #include "Interface Panels.h" -#include "Soldier functions.h" +#include "Soldier Functions.h" #include "SaveLoadMap.h" -#include "worlddat.h" //for gtileset +#include "WorldDat.h" //for gtileset #include "Debug Control.h" //for livelog #include "SkillMenu.h" // sevenfm: need this for TraitsMenu diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 64707e3fe..fb77052df 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -1,36 +1,36 @@ #include "builddefines.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" - #include "weapons.h" + #include "DEBUG.H" + //#include "Soldier Control.h" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" #include "worldman.h" - #include "rotting corpses.h" - #include "tile cache.h" - #include "isometric utils.h" - #include "animation control.h" - #include "utilities.h" - #include "game clock.h" - #include "soldier create.h" + #include "Rotting Corpses.h" + #include "Tile Cache.h" + #include "Isometric Utils.h" + #include "Animation Control.h" + #include "Utilities.h" + #include "Game Clock.h" + #include "Soldier Create.h" #include "renderworld.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "strategicmap.h" - #include "los.h" + #include "LOS.h" #include "opplist.h" #include "structure.h" #include "message.h" #include "Sound Control.h" - #include "pathai.h" - #include "Random.h" - #include "dialogue control.h" - #include "items.h" - #include "smell.h" + #include "PATHAI.H" + #include "random.h" + #include "Dialogue Control.h" + #include "Items.h" + #include "Smell.h" #include "World Items.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "GameSettings.h" #include "Interface Items.h" #include "Soldier Profile.h" @@ -42,7 +42,7 @@ #include "Interface.h" #include "Music Control.h" #include "Campaign Types.h" - #include "text.h" // added by Flugente + #include "Text.h" // added by Flugente #include "Vehicles.h" // added by silversurfer #include "ai.h" // added by Flugente #include "PreBattle Interface.h" // added by Flugente diff --git a/Tactical/Rotting Corpses.h b/Tactical/Rotting Corpses.h index af65bcbcb..dc0c0c272 100644 --- a/Tactical/Rotting Corpses.h +++ b/Tactical/Rotting Corpses.h @@ -1,7 +1,7 @@ #ifndef _ROTTING_CORPSES_H #define _ROTTING_CORPSES_H -#include "tile animation.h" +#include "Tile Animation.h" #define NUM_CORPSE_SHADES 17 #define CORPSE_WARNING_MAX 5 diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index b58d61bbb..d940af9b6 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "ShopKeeper Interface.h" #include "Utilities.h" #include "Game Clock.h" @@ -10,43 +10,43 @@ #include "Interface Control.h" #include "Overhead.h" #include "Cursors.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Interface Panels.h" #include "Radar Screen.h" #include "Interface Items.h" #include "Interface Utils.h" - #include "VObject_Blitters.h" - #include "Finances.h" + #include "vobject_blitters.h" + #include "finances.h" #include "Text.h" #include "Cursor Control.h" - #include "Input.h" + #include "input.h" #include "Arms Dealer Init.h" #include "english.h" #include "Soldier Add.h" - #include "Faces.h" + #include "faces.h" #include "Dialogue Control.h" #include "ShopKeeper Quotes.h" #include "GameSettings.h" #include "MercTextBox.h" - #include "Random.h" + #include "random.h" #include "Squads.h" #include "Soldier Profile.h" - #include "Message.h" - #include "Personnel.h" + #include "message.h" + #include "personnel.h" #include "LaptopSave.h" #include "Quests.h" #include "Weapons.h" #include "MessageBoxScreen.h" - #include "LINE.H" - #include "Drugs and Alcohol.h" + #include "line.h" + #include "Drugs And Alcohol.h" #include "Map Screen Interface.h" #include "Soldier macros.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "NPC.h" #include "Soldier Create.h" - #include "PATHAI.h" + #include "PATHAI.H" #include "Points.h" #include "InterfaceItemImages.h" #include "Encyclopedia_new.h" @@ -64,7 +64,7 @@ #include "ub_config.h" #endif -#include "BuildDefines.h" +#include "builddefines.h" #include //////////////////////////////////////////// diff --git a/Tactical/SkillCheck.cpp b/Tactical/SkillCheck.cpp index cff7ad4e3..28b35b6a9 100644 --- a/Tactical/SkillCheck.cpp +++ b/Tactical/SkillCheck.cpp @@ -1,13 +1,13 @@ #include "SkillCheck.h" #include "Soldier Profile.h" - #include "Random.h" + #include "random.h" #include "Items.h" #include "Dialogue Control.h" #include "Overhead.h" #include "Soldier macros.h" #include "Isometric Utils.h" #include "Morale.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "strategicmap.h" // added by SANDRO #include "GameSettings.h" diff --git a/Tactical/SkillMenu.cpp b/Tactical/SkillMenu.cpp index bb11f167d..93bfb5038 100644 --- a/Tactical/SkillMenu.cpp +++ b/Tactical/SkillMenu.cpp @@ -4,7 +4,7 @@ */ #include "SkillMenu.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Overhead.h" #include "Text.h" #include "Isometric Utils.h" diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp index 67b0e79d3..71689197b 100644 --- a/Tactical/Soldier Add.cpp +++ b/Tactical/Soldier Add.cpp @@ -1,22 +1,22 @@ #include "sgp.h" - #include "overhead.h" - #include "overhead types.h" - #include "isometric utils.h" - #include "interface panels.h" - #include "soldier macros.h" + #include "Overhead.h" + #include "Overhead Types.h" + #include "Isometric Utils.h" + #include "Interface Panels.h" + #include "Soldier macros.h" #include "strategicmap.h" #include "strategic.h" - #include "animation control.h" - #include "soldier create.h" + #include "Animation Control.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "Map Information.h" #include "fov.h" - #include "pathai.h" - #include "Random.h" + #include "PATHAI.H" + #include "random.h" #include "Render Fun.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Exit Grids.h" #include "Interface.h" // added by Flugente for zBackground #include "renderworld.h" // added by Flugente @@ -31,8 +31,8 @@ #endif #include "GameSettings.h" // ary-05/05/2009 : add forced turn mode -#include "text.h" // : add forced turn mode -#include "font control.h" // : add forced turn mode +#include "Text.h" // : add forced turn mode +#include "Font Control.h" // : add forced turn mode #include "message.h" // : add forced turn mode #include "connect.h" //forward declarations of common classes to eliminate includes diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index 662bc460b..f294f9da9 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -1,61 +1,61 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Soldier Control.h" // I need this here - SANDRO #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" -#include "weapons.h" -#include "soldier ani.h" -#include "Random.h" +#include "Weapons.h" +#include "Soldier Ani.h" +#include "random.h" #include "video.h" #include "vobject_blitters.h" #include "Sound Control.h" -#include "isometric utils.h" +#include "Isometric Utils.h" #include "Handle UI.h" #include "Event Pump.h" #include "opplist.h" #include "lighting.h" #include "ai.h" #include "renderworld.h" -#include "interactive tiles.h" -#include "points.h" +#include "Interactive Tiles.h" +#include "Points.h" #include "message.h" #include "world items.h" #include "physics.h" -#include "soldier create.h" -#include "dialogue control.h" -#include "soldier functions.h" -#include "rotting corpses.h" +#include "Soldier Create.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" +#include "Rotting Corpses.h" #include "merc entering.h" -#include "soldier add.h" -#include "soldier profile.h" -#include "soldier functions.h" -#include "interface.h" +#include "Soldier Add.h" +#include "Soldier Profile.h" +#include "Soldier Functions.h" +#include "Interface.h" #include "qarray.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "Strategic Town Loyalty.h" #include "Squads.h" #include "worldman.h" -#include "structure wrap.h" -#include "pathai.h" +#include "Structure Wrap.h" +#include "PATHAI.H" #include "pits.h" -#include "text.h" -#include "npc.h" -#include "meanwhile.h" +#include "Text.h" +#include "NPC.h" +#include "Meanwhile.h" #include "Explosion Control.h" #include "fov.h" -#include "campaign.h" -#include "los.h" +#include "Campaign.h" +#include "LOS.h" #include "GameSettings.h" #include "Boxing.h" -#include "drugs and alcohol.h" +#include "Drugs And Alcohol.h" #include "Smell.h" #include "GameSettings.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Strategic Status.h" #include "Food.h" #include "CampaignStats.h" // added by Flugente diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index f9bdabce6..5fda23d67 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -2,10 +2,10 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Render Fun.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" //#include "Soldier Control.h" @@ -14,28 +14,28 @@ #include "Animation Control.h" #define _USE_MATH_DEFINES // for C #include -#include "pathai.h" -#include "Random.h" +#include "PATHAI.H" +#include "random.h" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" -#include "points.h" +#include "Points.h" #include "Sound Control.h" -#include "weapons.h" +#include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" -#include "soldier ani.h" -#include "Event pump.h" +#include "Soldier Ani.h" +#include "Event Pump.h" #include "opplist.h" #include "ai.h" -#include "interface.h" +#include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" -#include "gap.h" -#include "campaign.h" -#include "soldier macros.h" +#include "GAP.H" +#include "Campaign.h" +#include "Soldier macros.h" #include "english.h" #include "Squads.h" @@ -43,37 +43,37 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "structure wrap.h" -#include "items.h" -#include "Soundman.h" -#include "utilities.h" -#include "Strategic.h" +#include "Structure Wrap.h" +#include "Items.h" +#include "soundman.h" +#include "Utilities.h" +#include "strategic.h" #include "soldier tile.h" #include "Smell.h" #include "Keys.h" -#include "dialogue control.h" -#include "soldier functions.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" #include "rt time defines.h" #include "Exit Grids.h" #include "Quests.h" #include "message.h" #include "NPC.h" #include "SkillCheck.h" -#include "handle doors.h" -#include "interface dialogue.h" -#include "smokeeffects.h" +#include "Handle Doors.h" +#include "interface Dialogue.h" +#include "SmokeEffects.h" #include "GameSettings.h" -#include "tile animation.h" +#include "Tile Animation.h" #include "ShopKeeper Interface.h" -#include "vehicles.h" -#include "rotting corpses.h" +#include "Vehicles.h" +#include "Rotting Corpses.h" #include "Interface Control.h" #include "strategicmap.h" -#include "morale.h" -#include "meanwhile.h" -#include "drugs and alcohol.h" +#include "Morale.h" +#include "Meanwhile.h" +#include "Drugs And Alcohol.h" #include "SkillCheck.h" -#include "boxing.h" +#include "Boxing.h" #include "overhead map.h" #include "Map Information.h" #include "environment.h" @@ -84,7 +84,7 @@ #include "Strategic Merc Handler.h" #include "Campaign Types.h" #include "Strategic Status.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Strategic Pathing.h" #include "Debug Control.h" #include "LOS.h" // added by SANDRO @@ -120,7 +120,7 @@ #include "Tactical Save.h" // added by Flugente for AddItemsToUnLoadedSector() #include "LightEffects.h" // added by Flugente for CreatePersonalLight() #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinions() -#include "strategic town loyalty.h" // added by Flugente for gTownLoyalty +#include "Strategic Town Loyalty.h" // added by Flugente for gTownLoyalty #include "Rebel Command.h" //forward declarations of common classes to eliminate includes @@ -5975,7 +5975,7 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1 } } // marke added one 'or' for explosive ammo. variation of: AmmoTypes[this->inv[this->ubAttackingHand ][0]->data.gun.ubGunAmmoType].explosionSize > 1 - // extracting attackers ammo type + // extracting attacker�s ammo type else if ( Item[usWeaponIndex].usItemClass & IC_EXPLOSV || AmmoTypes[MercPtrs[ubAttackerID]->inv[MercPtrs[ubAttackerID]->ubAttackingHand][0]->data.gun.ubGunAmmoType].explosionSize > 1 ) { INT8 bDeafValue; diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index 202d1dc62..706f55902 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -1,16 +1,16 @@ #include "sgp.h" #include "Soldier Create.h" - #include "overhead.h" - #include "wcheck.h" - #include "soldier profile.h" - #include "animation control.h" - #include "animation data.h" + #include "Overhead.h" + #include "WCheck.h" + #include "Soldier Profile.h" + #include "Animation Control.h" + #include "Animation Data.h" #include "Sound Control.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "faces.h" - #include "isometric utils.h" - #include "items.h" - #include "weapons.h" + #include "Isometric Utils.h" + #include "Items.h" + #include "Weapons.h" #include "opplist.h" #include "random.h" #include "Assignments.h" @@ -18,7 +18,7 @@ #include "Smell.h" #include "Squads.h" #include "Interface Panels.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Inventory Choosing.h" #include "Queen Command.h" #include "Soldier Add.h" @@ -27,9 +27,9 @@ #include "Sys Globals.h" #include "Scheduling.h" #include "Rotting Corpses.h" - #include "vehicles.h" - #include "handle ui.h" - #include "text.h" + #include "Vehicles.h" + #include "Handle UI.h" + #include "Text.h" #include "Campaign.h" #include "GameSettings.h" #include "PreBattle Interface.h" diff --git a/Tactical/Soldier Create.h b/Tactical/Soldier Create.h index 06398454a..3afc4c05f 100644 --- a/Tactical/Soldier Create.h +++ b/Tactical/Soldier Create.h @@ -6,7 +6,7 @@ #include "vobject.h" #include "Overhead Types.h" //#include "Item Types.h" -#include "soldier control.h" +#include "Soldier Control.h" #include #include @@ -600,4 +600,4 @@ INT32 ChooseHairColor( UINT8 usBodyType, INT32 skin ); // Flugente: set palettes for vest/shirt void SetClothes( SOLDIERTYPE* pSoldier, INT8 aVest, INT8 aPants, INT8 aHair = -1, INT8 aSkin = -1 ); -#endif +#endif diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp index c45b35c00..34736ccc9 100644 --- a/Tactical/Soldier Find.cpp +++ b/Tactical/Soldier Find.cpp @@ -1,7 +1,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -14,32 +14,32 @@ #include "Event Pump.h" #include "Render Fun.h" #include "mousesystem.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" //#include "Sound Control.h" #include "lighting.h" - #include "pathai.h" + #include "PATHAI.H" #include "screenids.h" - #include "weapons.h" + #include "Weapons.h" #include "lighting.h" #include "Handle UI Plan.h" #include "structure.h" #include "message.h" - #include "items.h" + #include "Items.h" #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" #include "soldier tile.h" - #include "soldier find.h" + #include "Soldier Find.h" #include "Vehicles.h" #include "GameSettings.h" - #include "ui cursors.h" + #include "UI Cursors.h" BOOLEAN IsGridNoInScreenRect( INT32 sGridNo, SGPRect *pRect ); diff --git a/Tactical/Soldier Functions.h b/Tactical/Soldier Functions.h index a48fb12a7..997306af0 100644 --- a/Tactical/Soldier Functions.h +++ b/Tactical/Soldier Functions.h @@ -1,7 +1,7 @@ #ifndef _SOLDIER_FUNCTIONS_H #define _SOLDIER_FUNCTIONS_H -#include "soldier control.h" +#include "Soldier Control.h" void ContinueMercMovement( SOLDIERTYPE *pSoldier ); @@ -25,4 +25,4 @@ void HandleCrowShadowVisibility( SOLDIERTYPE *pSoldier ); BOOLEAN DoesSoldierWearGasMask(SOLDIERTYPE *pSoldier);//dnl ch40 200909 -#endif +#endif diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 85b2e5cff..0b2f429de 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -5,20 +5,20 @@ #include "types.h" #include "strategicmap.h" -#include "overhead.h" -#include "isometric utils.h" +#include "Overhead.h" +#include "Isometric Utils.h" -#include "soldier add.h" -#include "soldier create.h" +#include "Soldier Add.h" +#include "Soldier Create.h" #include "Soldier Init List.h" -#include "debug.h" -#include "Random.h" -#include "items.h" +#include "DEBUG.H" +#include "random.h" +#include "Items.h" #include "GameSettings.h" #include "Map Information.h" -#include "soldier profile.h" +#include "Soldier Profile.h" #include "Sys Globals.h" #include "EditorMercs.h" #include "Animation Data.h" @@ -27,7 +27,7 @@ #include "Sound Control.h" #include "Quests.h" #include "Render Fun.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "Map Screen Interface Map.h" #include "mapscreen.h" #include "Debug Control.h" @@ -3325,4 +3325,4 @@ void SectorAddDownedPilot( INT16 sMapX, INT16 sMapY, INT16 sMapZ ) // remove the flag. We can only find the pilot the first time we visit this sector after the heli was shut down pSector->usSectorInfoFlag &= ~SECTORINFO_ENEMYHELI_SHOTDOWN; } -} +} diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index ee38c12c6..6dc342a45 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -1,7 +1,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" @@ -12,32 +12,32 @@ #include "Isometric Utils.h" #include "Event Pump.h" #include "Render Fun.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" + #include "Soldier Ani.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "assignments.h" + #include "Assignments.h" #include "Dialogue Control.h" - #include "soldier create.h" - #include "soldier add.h" + #include "Soldier Create.h" + #include "Soldier Add.h" #include "opplist.h" - #include "weapons.h" + #include "Weapons.h" #include "Strategic Town Loyalty.h" - #include "squads.h" + #include "Squads.h" #include "Tactical Save.h" #include "Quests.h" #include "aim.h" - #include "Interface Dialogue.h" + #include "interface Dialogue.h" #include "GameSettings.h" #include "strategic town reputation.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "Game Event Hook.h" #include "Map Information.h" #include "history.h" @@ -46,7 +46,7 @@ #include "Player Command.h" #include "strategic.h" #include "strategicmap.h" // added by SANDRO - #include "drugs and alcohol.h" // added by Flugente + #include "Drugs And Alcohol.h" // added by Flugente #include "Campaign.h" #include "LuaInitNPCs.h" // added by Flugente diff --git a/Tactical/Soldier Profile.h b/Tactical/Soldier Profile.h index 39e0860e0..2382003e3 100644 --- a/Tactical/Soldier Profile.h +++ b/Tactical/Soldier Profile.h @@ -2,7 +2,7 @@ #define __SOLDER_PROFILE_H #include "Soldier Control.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Merc Hiring.h" typedef struct diff --git a/Tactical/Soldier Tile.cpp b/Tactical/Soldier Tile.cpp index 6b994eacb..f4de60f08 100644 --- a/Tactical/Soldier Tile.cpp +++ b/Tactical/Soldier Tile.cpp @@ -3,29 +3,29 @@ #include #include "Render Fun.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" - #include "pathai.h" - #include "Random.h" + #include "PATHAI.H" + #include "random.h" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" - #include "points.h" + #include "Points.h" // #include "Sound Control.h" #include "lighting.h" - #include "weapons.h" + #include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" - #include "Event pump.h" + #include "Event Pump.h" #include "opplist.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" @@ -35,10 +35,10 @@ #include "NetworkEvent.h" #endif - #include "items.h" - #include "Soundman.h" + #include "Items.h" + #include "soundman.h" #include "soldier tile.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "fov.h" #include "Font Control.h" #include "message.h" diff --git a/Tactical/Soldier macros.h b/Tactical/Soldier macros.h index a436a3cd2..4997be129 100644 --- a/Tactical/Soldier macros.h +++ b/Tactical/Soldier macros.h @@ -2,9 +2,9 @@ #define SOLDIER_MACROS_H // MACROS FOR EASIER SOLDIER CONTROL -#include "teamturns.h" -#include "soldier profile.h" -#include "assignments.h" +#include "TeamTurns.h" +#include "Soldier Profile.h" +#include "Assignments.h" #include "Animation Data.h" // MACROS @@ -41,4 +41,4 @@ //#define OK_ENTERABLE_VEHICLE( p ) ( ( p->flags.uiStatusFlags & SOLDIER_VEHICLE ) && !TANK( p ) && p->stats.bLife >= OKLIFE ) #define OK_ENTERABLE_VEHICLE( p ) ( ( p->flags.uiStatusFlags & SOLDIER_VEHICLE ) && (!ARMED_VEHICLE( p ) || !(p->flags.uiStatusFlags & SOLDIER_ENEMY) ) && p->stats.bLife >= OKLIFE ) -#endif +#endif diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 731bb6360..f441dc745 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -1,7 +1,7 @@ -#include "Types.h" -#include "Windows.h" +#include "types.h" +#include "windows.h" //#include "Soldier Control.h" -#include "Input.h" +#include "input.h" #include "english.h" #include "Isometric Utils.h" #include "GameSettings.h" @@ -10,14 +10,14 @@ #include "Text.h" #include "lighting.h" #include "Interface.h" -#include "weapons.h" +#include "Weapons.h" #include "renderworld.h" #include "Font Control.h" -#include "font.h" +#include "Font.h" #include "local.h" #include "vsurface.h" #include "line.h" -#include "los.h" +#include "LOS.h" // added by SANDRO #include "SkillCheck.h" #include "soldier profile type.h" @@ -28,8 +28,8 @@ #include "AIInternals.h" #include "opplist.h" #include "Map Screen Interface.h" -#include "cheats.h" -#include "Drugs and Alcohol.h" +#include "Cheats.h" +#include "Drugs And Alcohol.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Spread Burst.cpp b/Tactical/Spread Burst.cpp index 1f8ae8577..4362859c7 100644 --- a/Tactical/Spread Burst.cpp +++ b/Tactical/Spread Burst.cpp @@ -1,17 +1,17 @@ #include #include #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" - #include "weapons.h" - #include "cursor control.h" - #include "soldier find.h" - #include "isometric utils.h" + #include "DEBUG.H" + //#include "Soldier Control.h" + #include "Weapons.h" + #include "Cursor Control.h" + #include "Soldier Find.h" + #include "Isometric Utils.h" #include "renderworld.h" - #include "render dirty.h" - #include "interface.h" - #include "spread burst.h" - #include "points.h" + #include "Render Dirty.h" + #include "Interface.h" + #include "Spread burst.h" + #include "Points.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp index a7dda1b15..8b1de4e11 100644 --- a/Tactical/Squads.cpp +++ b/Tactical/Squads.cpp @@ -1,16 +1,16 @@ - #include "Types.h" + #include "types.h" #include "Squads.h" #include "Strategic Pathing.h" - #include "Strategicmap.h" - #include "Faces.h" + #include "strategicmap.h" + #include "faces.h" #include "Strategic Movement.h" #include "Assignments.h" - #include "OverHead.h" + #include "Overhead.h" #include "Interface.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "Soldier Profile.h" - #include "Debug.h" + #include "DEBUG.H" #include "jascreens.h" #include "screenids.h" #include "Soldier macros.h" diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index 18dcb08fe..b09acb0f6 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -8,17 +8,17 @@ #include "Game Clock.h" #include "sysutil.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "PopUpBox.h" #include "Cursors.h" #include "Strategic Exit GUI.h" #include "MercTextBox.h" #include "renderworld.h" - #include "overhead.h" - #include "cursor control.h" + #include "Overhead.h" + #include "Cursor Control.h" #include "input.h" #include "english.h" - #include "text.h" + #include "Text.h" #include "Strategic Movement.h" #include "Squads.h" #include "Assignments.h" diff --git a/Tactical/Structure Wrap.cpp b/Tactical/Structure Wrap.cpp index 3a388897e..2973b6407 100644 --- a/Tactical/Structure Wrap.cpp +++ b/Tactical/Structure Wrap.cpp @@ -1,14 +1,14 @@ #include - #include "debug.h" + #include "DEBUG.H" #include "worlddef.h" #include "worldman.h" - #include "structure wrap.h" - #include "isometric utils.h" + #include "Structure Wrap.h" + #include "Isometric Utils.h" #include "worldman.h" - #include "overhead.h" + #include "Overhead.h" #include "renderworld.h" #include "strategicmap.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "WorldDat.h" // added by Flugente extern BOOLEAN DoesSAMExistHere( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ, INT32 sGridNo ); diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp index 7352422f9..1cfacd97f 100644 --- a/Tactical/Tactical Save.cpp +++ b/Tactical/Tactical Save.cpp @@ -1,33 +1,33 @@ - #include "Types.h" + #include "types.h" #include "MemMan.h" #include "message.h" #include "Items.h" #include "Handle Items.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Tactical Save.h" #include #include "Campaign Types.h" #include "SaveLoadGame.h" - #include "WorldDef.h" - #include "rotting corpses.h" - #include "OverHead.h" + #include "worlddef.h" + #include "Rotting Corpses.h" + #include "Overhead.h" #include "Keys.h" #include "Soldier Create.h" #include "Soldier Profile.h" #include "Isometric Utils.h" #include "Soldier Add.h" - #include "Npc.h" - #include "Ai.h" + #include "NPC.h" + #include "ai.h" #include "Game Clock.h" #include "Animation Control.h" #include "Map Information.h" #include "SaveLoadMap.h" - #include "debug.h" - #include "Random.h" - #include "quests.h" + #include "DEBUG.H" + #include "random.h" + #include "Quests.h" #include "Animated ProgressBar.h" #include "Text.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Enemy Soldier Save.h" #include "SmokeEffects.h" #include "LightEffects.h" diff --git a/Tactical/Tactical Save.h b/Tactical/Tactical Save.h index 6f60237a6..0dfafcfd1 100644 --- a/Tactical/Tactical Save.h +++ b/Tactical/Tactical Save.h @@ -3,10 +3,10 @@ #include "World Items.h" -#include "WorldDef.h" -#include "rotting corpses.h" +#include "worlddef.h" +#include "Rotting Corpses.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #define MAPS_DIR "Temp\\" diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp index 9816d8a77..5cb5c9d59 100644 --- a/Tactical/Tactical Turns.cpp +++ b/Tactical/Tactical Turns.cpp @@ -2,27 +2,27 @@ #include "Game Clock.h" #include "Font Control.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "worlddef.h" - #include "rotting corpses.h" - #include "soldier create.h" - #include "soldier add.h" - #include "isometric utils.h" - #include "animation data.h" - #include "animation control.h" + #include "Rotting Corpses.h" + #include "Soldier Create.h" + #include "Soldier Add.h" + #include "Isometric Utils.h" + #include "Animation Data.h" + #include "Animation Control.h" #include "Tactical Turns.h" - #include "smell.h" + #include "Smell.h" #include "opplist.h" #include "Queen Command.h" - #include "dialogue control.h" - #include "smokeeffects.h" - #include "lighteffects.h" - #include "campaign.h" + #include "Dialogue Control.h" + #include "SmokeEffects.h" + #include "LightEffects.h" + #include "Campaign.h" #include "Soldier macros.h" #include "strategicmap.h" - #include "Random.h" + #include "random.h" #include "Explosion Control.h" #include "Dialogue Control.h" // added by Flugente diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp index ddf9e4430..28a372f3c 100644 --- a/Tactical/TeamTurns.cpp +++ b/Tactical/TeamTurns.cpp @@ -1,47 +1,47 @@ #include "types.h" - #include "overhead.h" - #include "animation control.h" - #include "points.h" + #include "Overhead.h" + #include "Animation Control.h" + #include "Points.h" #include "opplist.h" #include "timer.h" - #include "event pump.h" + #include "Event Pump.h" #include "Sound Control.h" - #include "interface.h" + #include "Interface.h" #include "Isometric Utils.h" - #include "Font Control.H" + #include "Font Control.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "TeamTurns.h" #include "Smell.h" - #include "game clock.h" + #include "Game Clock.h" #include "Soldier Functions.h" - #include "cursors.h" + #include "Cursors.h" #include "Queen Command.h" - #include "Pathai.h" + #include "PATHAI.H" #include "lighting.h" #include "environment.h" #include "Explosion Control.h" - #include "dialogue control.h" - #include "Soldier Profile Type.h" + #include "Dialogue Control.h" + #include "soldier profile type.h" #include "SmokeEffects.h" - #include "lighteffects.h" - #include "air raid.h" - #include "meanwhile.h" + #include "LightEffects.h" + #include "Air Raid.h" + #include "Meanwhile.h" #include "SkillCheck.h" #include "AIInternals.h" #include "AIList.h" #ifdef DEBUG_INTERRUPTS - #include "debug.h" + #include "DEBUG.H" #endif #include "renderworld.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "Squads.h" #include "Soldier macros.h" #include "Soldier Profile.h" #include "NPC.h" - #include "drugs and alcohol.h" // added by Flugente + #include "Drugs And Alcohol.h" // added by Flugente #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 13f5666f2..0bd3c26df 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -2,10 +2,10 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" #include "Animation Control.h" #include "Animation Data.h" #include "Event Pump.h" @@ -13,22 +13,22 @@ #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" -#include "points.h" +#include "Interface.h" +#include "Cursor Control.h" +#include "Points.h" #include "Interactive Tiles.h" -#include "interface cursors.h" -#include "weapons.h" +#include "Interface Cursors.h" +#include "Weapons.h" #include "lighting.h" -#include "sound control.h" +#include "Sound Control.h" #include "environment.h" #include "Music Control.h" #include "ai.h" #include "renderworld.h" -#include "font control.h" +#include "Font Control.h" #include "worldman.h" #include "Handle UI Plan.h" #include "message.h" @@ -39,39 +39,39 @@ #include "overhead map.h" #include "world items.h" #include "Game Clock.h" -#include "interface items.h" +#include "Interface Items.h" #include "physics.h" -#include "ui cursors.h" +#include "UI Cursors.h" #include "worldman.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "dialogue control.h" -#include "interface dialogue.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "Dialogue Control.h" +#include "interface Dialogue.h" #include "opplist.h" -#include "interactive tiles.h" -#include "messageboxscreen.h" +#include "Interactive Tiles.h" +#include "MessageBoxScreen.h" #include "gameloop.h" -#include "spread burst.h" -#include "explosion control.h" +#include "Spread burst.h" +#include "Explosion Control.h" #include "QuestDebug.h" -#include "assignments.h" -#include "EditScreen.h" +#include "Assignments.h" +#include "editscreen.h" #include "SaveLoadGame.h" -#include "los.h" +#include "LOS.h" #include "Exit Grids.h" #include "Strategic Exit GUI.h" -#include "auto bandage.h" +#include "Auto Bandage.h" #include "Options Screen.h" -#include "squads.h" -#include "interface panels.h" +#include "Squads.h" +#include "Interface Panels.h" #include "soldier tile.h" -#include "Soldier functions.h" +#include "Soldier Functions.h" #include "Game Events.h" #include "english.h" -#include "Random.h" +#include "random.h" #include "Assignments.h" #include "Map Screen Interface.h" #include "renderworld.h" @@ -80,16 +80,16 @@ #include "Arms Dealer Init.h" #include "ShopKeeper Interface.h" #include "GameSettings.h" -#include "vehicles.h" +#include "Vehicles.h" #include "SaveLoadScreen.h" -#include "Air raid.h" -#include "meanwhile.h" -#include "text.h" +#include "Air Raid.h" +#include "Meanwhile.h" +#include "Text.h" #include "Inventory Choosing.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "HelpScreen.h" -#include "cheats.h" -#include "displaycover.h" +#include "Cheats.h" +#include "DisplayCover.h" #include "Tactical Save.h" #include "history.h" #include "Queen Command.h" diff --git a/Tactical/UI Cursors.cpp b/Tactical/UI Cursors.cpp index 142aff022..91a1f3604 100644 --- a/Tactical/UI Cursors.cpp +++ b/Tactical/UI Cursors.cpp @@ -1,33 +1,33 @@ - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "Interface Cursors.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Sound Control.h" - #include "Sys globals.h" + #include "Sys Globals.h" #include "Isometric Utils.h" #include "Animation Data.h" #include "worldman.h" - #include "ui cursors.h" - #include "los.h" + #include "UI Cursors.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" - #include "ui cursors.h" - #include "cursors.h" - #include "cursor control.h" - #include "structure wrap.h" + #include "Interface.h" + #include "UI Cursors.h" + #include "Cursors.h" + #include "Cursor Control.h" + #include "Structure Wrap.h" #include "physics.h" - #include "soldier macros.h" - #include "text.h" - #include "spread burst.h" + #include "Soldier macros.h" + #include "Text.h" + #include "Spread burst.h" #include "GameSettings.h" #include "Interactive Tiles.h" #include "PATHAI.H" #include "SkillCheck.h" // added by SANDRO - #include "message.H" //ddd + #include "message.h" //ddd #include "english.h" // added by Flugente //forward declarations of common classes to eliminate includes diff --git a/Tactical/VehicleMenu.cpp b/Tactical/VehicleMenu.cpp index ca4d704a0..6908590c3 100644 --- a/Tactical/VehicleMenu.cpp +++ b/Tactical/VehicleMenu.cpp @@ -1,16 +1,16 @@ // anv: totally not a copy of SkillMenu.cpp #include "VehicleMenu.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Overhead.h" #include "Text.h" #include "Isometric Utils.h" #include "DisplayCover.h" #include "worldman.h" #include "Vehicles.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "Soldier Add.h" -#include "PATHAI.h" +#include "PATHAI.H" #include "Points.h" #include "Handle UI.h" #include "Squads.h" @@ -219,4 +219,4 @@ void VehicleMenu( INT32 usMapPos, SOLDIERTYPE *pSoldier, SOLDIERTYPE *pVehicle ) pCurrentSoldier = pSoldier; pCurrentVehicle = pVehicle; gVehicleSelection.Setup(0); -} +} diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index d954d75aa..467aa2176 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -1,28 +1,28 @@ #include "Vehicles.h" - #include "String.h" + #include "string.h" #include "Strategic Pathing.h" #include "Assignments.h" #include "Strategic Movement.h" #include "Squads.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" - #include "overhead.h" - #include "soldier profile.h" + #include "Overhead.h" + #include "Soldier Profile.h" #include "Sound Control.h" #include "soundman.h" - #include "soldier add.h" - #include "interface panels.h" + #include "Soldier Add.h" + #include "Interface Panels.h" #include "strategic.h" #include "worlddef.h" #include "Isometric Utils.h" #include "Mapscreen.h" #include "message.h" - #include "interface.h" - #include "Random.h" - #include "text.h" - #include "explosion control.h" - #include "soldier create.h" - #include "animation control.h" + #include "Interface.h" + #include "random.h" + #include "Text.h" + #include "Explosion Control.h" + #include "Soldier Create.h" + #include "Animation Control.h" #include "strategicmap.h" #include "Interface Control.h" #include "Campaign Types.h" @@ -33,7 +33,7 @@ #include "Tactical Save.h" #include "Soldier macros.h" #include "opplist.h" - #include "Soldier ani.h" + #include "Soldier Ani.h" #include "GameSettings.h" #include "Queen Command.h" diff --git a/Tactical/Vehicles.h b/Tactical/Vehicles.h index 571fa98e6..456e54dfe 100644 --- a/Tactical/Vehicles.h +++ b/Tactical/Vehicles.h @@ -1,7 +1,7 @@ #ifndef _VEHICLES_H #define _VEHICLES_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "Strategic Movement.h" diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 9649faa01..e105bdb7f 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -1,40 +1,40 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" #include "Cheats.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "worldman.h" #include "math.h" - #include "points.h" + #include "Points.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" #include "opplist.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" - #include "tile animation.h" + #include "Tile Animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Render Fun.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" - #include "meanwhile.h" + #include "Bullets.h" + #include "Morale.h" + #include "Meanwhile.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" @@ -50,7 +50,7 @@ #include "CampaignStats.h" // added by Flugente #include "environment.h" // added by silversurfer // sevenfm - #include "buildings.h" // SameBuilding + #include "Buildings.h" // SameBuilding //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index d6eb1c8f1..ade73087e 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -1,17 +1,17 @@ - #include "items.h" + #include "Items.h" #include "handle Items.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "tiledef.h" #include "worlddef.h" - #include "interface.h" + #include "Interface.h" #include "renderworld.h" #include "Animation Control.h" - #include "font control.h" + #include "Font Control.h" #include "World items.h" - #include "debug.h" - #include "Isometric utils.h" - #include "sys globals.h" + #include "DEBUG.H" + #include "Isometric Utils.h" + #include "Sys Globals.h" #include "Tactical Save.h" #include "strategicmap.h" #include "Campaign Types.h" @@ -22,7 +22,7 @@ #include "Quests.h" #include "Soldier Profile.h" #include "message.h" - #include "map screen interface map inventory.h" // added by Flugente + #include "Map Screen Interface Map Inventory.h" // added by Flugente #include "connect.h" #ifdef JA2EDITOR//dnl ch84 290114 #include "Item Statistics.h" diff --git a/Tactical/World Items.h b/Tactical/World Items.h index 524b67b85..fa57ec591 100644 --- a/Tactical/World Items.h +++ b/Tactical/World Items.h @@ -1,7 +1,7 @@ #ifndef __WORLD_ITEMS #define __WORLD_ITEMS -#include "items.h" +#include "Items.h" #include "FileMan.h" diff --git a/Tactical/XML.h b/Tactical/XML.h index d1ab96b97..277a8bd03 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -2,7 +2,7 @@ #define __XML_H #include "expat.h" -#include "armsdealerinvinit.h" +#include "ArmsDealerInvInit.h" #include "EnemyItemDrops.h" #include "Loading Screen.h" #include "faces.h" diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp index 65ea633b9..16069ccdf 100644 --- a/Tactical/XML_AmmoStrings.cpp +++ b/Tactical/XML_AmmoStrings.cpp @@ -1,7 +1,7 @@ #include "sgp.h" - #include "overhead types.h" - #include "overhead.h" - #include "text.h" + #include "Overhead Types.h" + #include "Overhead.h" + #include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_AmmoTypes.cpp b/Tactical/XML_AmmoTypes.cpp index 04dfa7540..22442b70d 100644 --- a/Tactical/XML_AmmoTypes.cpp +++ b/Tactical/XML_AmmoTypes.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "weapons.h" - #include "overhead.h" + #include "Weapons.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Armour.cpp b/Tactical/XML_Armour.cpp index 316b517a7..ae4abab8d 100644 --- a/Tactical/XML_Armour.cpp +++ b/Tactical/XML_Armour.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "weapons.h" - #include "overhead.h" + #include "Weapons.h" + #include "Overhead.h" #include "GameSettings.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_AttachmentInfo.cpp b/Tactical/XML_AttachmentInfo.cpp index 7bd8a0bf3..35f1bd3db 100644 --- a/Tactical/XML_AttachmentInfo.cpp +++ b/Tactical/XML_AttachmentInfo.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_AttachmentSlots.cpp b/Tactical/XML_AttachmentSlots.cpp index 80e76a494..d68ac1bc6 100644 --- a/Tactical/XML_AttachmentSlots.cpp +++ b/Tactical/XML_AttachmentSlots.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp index fdb28fc99..e38f2c74a 100644 --- a/Tactical/XML_Attachments.cpp +++ b/Tactical/XML_Attachments.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" struct diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp index 8e140deb3..d1d91f686 100644 --- a/Tactical/XML_BurstSounds.cpp +++ b/Tactical/XML_BurstSounds.cpp @@ -1,34 +1,34 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Clothes.cpp b/Tactical/XML_Clothes.cpp index 319aa9a30..0541a8992 100644 --- a/Tactical/XML_Clothes.cpp +++ b/Tactical/XML_Clothes.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_ComboMergeInfo.cpp b/Tactical/XML_ComboMergeInfo.cpp index 52e4d7b22..8184398b2 100644 --- a/Tactical/XML_ComboMergeInfo.cpp +++ b/Tactical/XML_ComboMergeInfo.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_CompatibleFaceItems.cpp b/Tactical/XML_CompatibleFaceItems.cpp index 195749fc6..be38b1f95 100644 --- a/Tactical/XML_CompatibleFaceItems.cpp +++ b/Tactical/XML_CompatibleFaceItems.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Disease.cpp b/Tactical/XML_Disease.cpp index a64f75a11..e446f1f1e 100644 --- a/Tactical/XML_Disease.cpp +++ b/Tactical/XML_Disease.cpp @@ -1,5 +1,5 @@ #include "sgp.h" -#include "overhead.h" +#include "Overhead.h" #include "Disease.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Drugs.cpp b/Tactical/XML_Drugs.cpp index 2f59756aa..dbc6f76f9 100644 --- a/Tactical/XML_Drugs.cpp +++ b/Tactical/XML_Drugs.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Drugs And Alcohol.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_EnemyAmmoDrops.cpp b/Tactical/XML_EnemyAmmoDrops.cpp index 7642dd9be..31eaa617d 100644 --- a/Tactical/XML_EnemyAmmoDrops.cpp +++ b/Tactical/XML_EnemyAmmoDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyArmourDrops.cpp b/Tactical/XML_EnemyArmourDrops.cpp index 0e5fc4901..b34c25d1b 100644 --- a/Tactical/XML_EnemyArmourDrops.cpp +++ b/Tactical/XML_EnemyArmourDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyExplosiveDrops.cpp b/Tactical/XML_EnemyExplosiveDrops.cpp index 206ffd8ca..609e80005 100644 --- a/Tactical/XML_EnemyExplosiveDrops.cpp +++ b/Tactical/XML_EnemyExplosiveDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyItemChoice.cpp b/Tactical/XML_EnemyItemChoice.cpp index df4ed87da..2fa46fd89 100644 --- a/Tactical/XML_EnemyItemChoice.cpp +++ b/Tactical/XML_EnemyItemChoice.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyMiscDrops.cpp b/Tactical/XML_EnemyMiscDrops.cpp index b9fff0d89..5ed4b4947 100644 --- a/Tactical/XML_EnemyMiscDrops.cpp +++ b/Tactical/XML_EnemyMiscDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyWeaponChoice.cpp b/Tactical/XML_EnemyWeaponChoice.cpp index 241b4d0ad..636d85b96 100644 --- a/Tactical/XML_EnemyWeaponChoice.cpp +++ b/Tactical/XML_EnemyWeaponChoice.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp index 1ac0d6ad8..0c5915822 100644 --- a/Tactical/XML_EnemyWeaponDrops.cpp +++ b/Tactical/XML_EnemyWeaponDrops.cpp @@ -1,31 +1,31 @@ #include "sgp.h" - #include "overhead types.h" - #include "overhead.h" + #include "Overhead Types.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp index eed422259..b64ccc03b 100644 --- a/Tactical/XML_Explosive.cpp +++ b/Tactical/XML_Explosive.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Food.cpp b/Tactical/XML_Food.cpp index fac80524d..4840810ee 100644 --- a/Tactical/XML_Food.cpp +++ b/Tactical/XML_Food.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_FoodOpinions.cpp b/Tactical/XML_FoodOpinions.cpp index 8846743bd..7c602e47f 100644 --- a/Tactical/XML_FoodOpinions.cpp +++ b/Tactical/XML_FoodOpinions.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_IMPItemChoices.cpp b/Tactical/XML_IMPItemChoices.cpp index fe639f179..f5f79c9e9 100644 --- a/Tactical/XML_IMPItemChoices.cpp +++ b/Tactical/XML_IMPItemChoices.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_IncompatibleAttachments.cpp b/Tactical/XML_IncompatibleAttachments.cpp index 65103d78c..b73fe4085 100644 --- a/Tactical/XML_IncompatibleAttachments.cpp +++ b/Tactical/XML_IncompatibleAttachments.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_InteractiveTiles.cpp b/Tactical/XML_InteractiveTiles.cpp index e7145446c..665d43ec5 100644 --- a/Tactical/XML_InteractiveTiles.cpp +++ b/Tactical/XML_InteractiveTiles.cpp @@ -6,7 +6,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Handle Items.h" diff --git a/Tactical/XML_ItemAdjustments.cpp b/Tactical/XML_ItemAdjustments.cpp index 82ba287a9..d528a3045 100644 --- a/Tactical/XML_ItemAdjustments.cpp +++ b/Tactical/XML_ItemAdjustments.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Item Types.h" diff --git a/Tactical/XML_LBEPocket.cpp b/Tactical/XML_LBEPocket.cpp index e4a6cadc1..7810eedb3 100644 --- a/Tactical/XML_LBEPocket.cpp +++ b/Tactical/XML_LBEPocket.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Launchable.cpp b/Tactical/XML_Launchable.cpp index 26994d2d4..40e7c6b93 100644 --- a/Tactical/XML_Launchable.cpp +++ b/Tactical/XML_Launchable.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_LoadBearingEquipment.cpp b/Tactical/XML_LoadBearingEquipment.cpp index f89cb67ba..e9135dd29 100644 --- a/Tactical/XML_LoadBearingEquipment.cpp +++ b/Tactical/XML_LoadBearingEquipment.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Magazine.cpp b/Tactical/XML_Magazine.cpp index 5c9899204..f2215eb26 100644 --- a/Tactical/XML_Magazine.cpp +++ b/Tactical/XML_Magazine.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_MercStartingGear.cpp b/Tactical/XML_MercStartingGear.cpp index 1713ea751..3e40e8a63 100644 --- a/Tactical/XML_MercStartingGear.cpp +++ b/Tactical/XML_MercStartingGear.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" @@ -757,4 +757,4 @@ BOOLEAN WriteMercStartingGearStats() FileClose( hFile ); return( TRUE ); -} +} diff --git a/Tactical/XML_Merchants.cpp b/Tactical/XML_Merchants.cpp index b43c32b41..f1c72ce0a 100644 --- a/Tactical/XML_Merchants.cpp +++ b/Tactical/XML_Merchants.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Arms Dealer Init.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp index eee7b4047..f06064c81 100644 --- a/Tactical/XML_Merge.cpp +++ b/Tactical/XML_Merge.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" struct diff --git a/Tactical/XML_NewFaceGear.cpp b/Tactical/XML_NewFaceGear.cpp index b941e746b..4bde7a05f 100644 --- a/Tactical/XML_NewFaceGear.cpp +++ b/Tactical/XML_NewFaceGear.cpp @@ -3,7 +3,7 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Faces.h" + #include "faces.h" struct { diff --git a/Tactical/XML_Opinions.cpp b/Tactical/XML_Opinions.cpp index a82c5fdac..9571b7f37 100644 --- a/Tactical/XML_Opinions.cpp +++ b/Tactical/XML_Opinions.cpp @@ -13,7 +13,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Soldier Profile.h" diff --git a/Tactical/XML_Profiles.cpp b/Tactical/XML_Profiles.cpp index 380fffb1a..adce87e43 100644 --- a/Tactical/XML_Profiles.cpp +++ b/Tactical/XML_Profiles.cpp @@ -13,7 +13,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Soldier Profile.h" #include "Soldier Profile.h" diff --git a/Tactical/XML_RandomItem.cpp b/Tactical/XML_RandomItem.cpp index 335d1096e..554d74c6c 100644 --- a/Tactical/XML_RandomItem.cpp +++ b/Tactical/XML_RandomItem.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_RandomStats.cpp b/Tactical/XML_RandomStats.cpp index c9489e974..273f0515e 100644 --- a/Tactical/XML_RandomStats.cpp +++ b/Tactical/XML_RandomStats.cpp @@ -6,7 +6,7 @@ #include "soldier profile type.h" #include "Soldier Profile.h" -#include "Random.h" +#include "random.h" struct { @@ -298,4 +298,4 @@ BOOLEAN WriteRandomStats( STR fileName) FileClose( hFile ); return( TRUE ); -} +} diff --git a/Tactical/XML_SectorLoadscreens.cpp b/Tactical/XML_SectorLoadscreens.cpp index 99a11c1b1..ed2c1818a 100644 --- a/Tactical/XML_SectorLoadscreens.cpp +++ b/Tactical/XML_SectorLoadscreens.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp index 5d5732aaf..7a7f91a21 100644 --- a/Tactical/XML_SpreadPatterns.cpp +++ b/Tactical/XML_SpreadPatterns.cpp @@ -1,34 +1,34 @@ //zilpin: pellet spread patterns externalized in XML #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "weapons.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Weapons.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_StructureConstruct.cpp b/Tactical/XML_StructureConstruct.cpp index 4a8b31880..99584be6b 100644 --- a/Tactical/XML_StructureConstruct.cpp +++ b/Tactical/XML_StructureConstruct.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_StructureDeconstruct.cpp b/Tactical/XML_StructureDeconstruct.cpp index d1128481a..7c974d004 100644 --- a/Tactical/XML_StructureDeconstruct.cpp +++ b/Tactical/XML_StructureDeconstruct.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Structure_Move.cpp b/Tactical/XML_Structure_Move.cpp index 9d06e5583..0a7d6bcde 100644 --- a/Tactical/XML_Structure_Move.cpp +++ b/Tactical/XML_Structure_Move.cpp @@ -1,5 +1,5 @@ #include "sgp.h" -#include "overhead.h" +#include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_TonyInventory.cpp b/Tactical/XML_TonyInventory.cpp index 60336809d..565a4a5cd 100644 --- a/Tactical/XML_TonyInventory.cpp +++ b/Tactical/XML_TonyInventory.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Vehicles.cpp b/Tactical/XML_Vehicles.cpp index 73236aeca..e40c6d81c 100644 --- a/Tactical/XML_Vehicles.cpp +++ b/Tactical/XML_Vehicles.cpp @@ -1,9 +1,9 @@ - #include "sgp.h" - #include "Debug Control.h" - #include "expat.h" - #include "XML.h" - #include "Interface.h" - #include "Vehicles.h" +#include "sgp.h" +#include "Debug Control.h" +#include "expat.h" +#include "XML.h" +#include "Interface.h" +#include "Vehicles.h" struct { diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp index 3d1e62a3d..9ee2d9297 100644 --- a/Tactical/bullets.cpp +++ b/Tactical/bullets.cpp @@ -7,15 +7,15 @@ #include "renderworld.h" #include "vsurface.h" #include "sysutil.h" - #include "wcheck.h" + #include "WCheck.h" #include "video.h" #include "vobject_blitters.h" #include "faces.h" - #include "utilities.h" - #include "overhead.h" + #include "Utilities.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Bullets.h" - #include "los.h" + #include "LOS.h" #include "worldman.h" #include "random.h" #include "GameSettings.h" diff --git a/Tactical/faces.h b/Tactical/faces.h index 3e374974f..aa496ff56 100644 --- a/Tactical/faces.h +++ b/Tactical/faces.h @@ -5,7 +5,7 @@ #define ANGRY 2 #define SURPRISED 3 -#include "soldier control.h" +#include "Soldier Control.h" #include "soldier profile type.h" // Defines diff --git a/Tactical/fov.cpp b/Tactical/fov.cpp index 7aa7bdba1..3291992f5 100644 --- a/Tactical/fov.cpp +++ b/Tactical/fov.cpp @@ -1,26 +1,26 @@ #include "sgp.h" #include "Isometric Utils.h" #include "worlddef.h" - #include "render fun.h" + #include "Render Fun.h" #include "renderworld.h" - #include "dialogue control.h" - #include "structure wrap.h" - #include "font control.h" - #include "pathai.h" - #include "overhead.h" - #include "smell.h" + #include "Dialogue Control.h" + #include "Structure Wrap.h" + #include "Font Control.h" + #include "PATHAI.H" + #include "Overhead.h" + #include "Smell.h" #include "fov.h" - #include "rotting corpses.h" - #include "keys.h" + #include "Rotting Corpses.h" + #include "Keys.h" #include "english.h" - #include "Random.h" + #include "random.h" #include "input.h" - #include "exit grids.h" + #include "Exit Grids.h" #include "environment.h" #include "worldman.h" #include "Fog Of War.h" - #include "Strategicmap.h" - #include "boxing.h" + #include "strategicmap.h" + #include "Boxing.h" #include "opplist.h" #include "lighting.h" #include "Soldier macros.h" diff --git a/Tactical/fov.h b/Tactical/fov.h index 82b57efff..69c8c1292 100644 --- a/Tactical/fov.h +++ b/Tactical/fov.h @@ -1,7 +1,7 @@ #ifndef __FOV_H #define __FOV_H -#include "overhead.h" +#include "Overhead.h" void RevealRoofsAndItems(SOLDIERTYPE *pSoldier, UINT32 itemsToo, BOOLEAN fShowLocators, UINT8 ubLevel, BOOLEAN fForce ); @@ -20,4 +20,4 @@ void ExamineSlantRoofFOVSlots( ); -#endif +#endif diff --git a/Tactical/interface Dialogue.h b/Tactical/interface Dialogue.h index 9ca784082..ea1e00598 100644 --- a/Tactical/interface Dialogue.h +++ b/Tactical/interface Dialogue.h @@ -3,7 +3,7 @@ #include "mousesystem.h" -#include "npc.h" +#include "NPC.h" extern UINT8 gubSrcSoldierProfile; diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 2b8c8cc01..d0e85f9cd 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -1,48 +1,48 @@ #include "sgp.h" //#include "ai.h" #include "Isometric Utils.h" - #include "overhead.h" + #include "Overhead.h" #include "math.h" #include "Event Pump.h" #include "random.h" #include "Overhead Types.h" #include "opplist.h" #include "ai.h" - #include "font control.h" - #include "Animation COntrol.h" - #include "los.h" + #include "Font Control.h" + #include "Animation Control.h" + #include "LOS.h" #include "fov.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "lighting.h" #include "environment.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "message.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "TeamTurns.h" - #include "interactive tiles.h" - #include "render fun.h" + #include "Interactive Tiles.h" + #include "Render Fun.h" #include "Text.h" - #include "timer control.h" - #include "soldier macros.h" - #include "soldier functions.h" - #include "handle ui.h" + #include "Timer Control.h" + #include "Soldier macros.h" + #include "Soldier Functions.h" + #include "Handle UI.h" #include "Queen Command.h" - #include "keys.h" + #include "Keys.h" #include "Campaign.h" #include "Soldier Init List.h" - #include "music control.h" + #include "Music Control.h" #include "Soldier Profile.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Quests.h" - #include "meanwhile.h" - #include "WorldMan.h" + #include "Meanwhile.h" + #include "worldman.h" #include "SkillCheck.h" #include "GameSettings.h" #include "Smell.h" #include "Game Clock.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "Sound Control.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Interface.h" #include "Explosion Control.h"//dnl ch40 200909 #include "Vehicles.h" diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index 222d54010..3d0251453 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -1,7 +1,7 @@ #ifndef __SOLDER_PROFILE_TYPE_H #define __SOLDER_PROFILE_TYPE_H -#include "overhead types.h" +#include "Overhead Types.h" #include "Soldier Control.h" #include "mapscreen.h" diff --git a/Tactical/soldier tile.h b/Tactical/soldier tile.h index e20e32329..6bda3498e 100644 --- a/Tactical/soldier tile.h +++ b/Tactical/soldier tile.h @@ -1,7 +1,7 @@ #ifndef __SOLDIER_TILE_H #define __SOLDIER_TILE_H -#include "soldier control.h" +#include "Soldier Control.h" #define MOVE_TILE_CLEAR 1 #define MOVE_TILE_TEMP_BLOCKED -1 @@ -27,4 +27,4 @@ void SetDelayedTileWaiting( SOLDIERTYPE *pSoldier, INT32 sCauseGridNo, INT8 bVal BOOLEAN CanExchangePlaces( SOLDIERTYPE *pSoldier1, SOLDIERTYPE *pSoldier2, BOOLEAN fShow ); -#endif +#endif diff --git a/TacticalAI/AIList.cpp b/TacticalAI/AIList.cpp index fef94af55..e237b9922 100644 --- a/TacticalAI/AIList.cpp +++ b/TacticalAI/AIList.cpp @@ -12,7 +12,7 @@ #include "AIList.h" #include "Overhead.h" - #include "debug.h" + #include "DEBUG.H" #include "AIInternals.h" #include "ai.h" #include "opplist.h" diff --git a/TacticalAI/AIList.h b/TacticalAI/AIList.h index d67bfc6dc..9d3471cc5 100644 --- a/TacticalAI/AIList.h +++ b/TacticalAI/AIList.h @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" typedef struct AILIST { diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index ce032d072..5bdc06241 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -1,25 +1,25 @@ #include "sgp.h" #include "ai.h" #include "Isometric Utils.h" -#include "overhead.h" +#include "Overhead.h" #include "math.h" #include "Event Pump.h" #include "Soldier Control.h" #include "Overhead Types.h" #include "opplist.h" -#include "animation control.h" -#include "font control.h" -#include "interface.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 "PATHAI.H" +#include "Points.h" +#include "Weapons.h" +#include "Items.h" #include "Handle Items.h" #include "AIInternals.h" -#include "animation data.h" -#include "los.h" +#include "Animation Data.h" +#include "LOS.h" #include "message.h" #include "TeamTurns.h" #include "NPC.h" @@ -30,7 +30,7 @@ #include "Soldier Create.h" #include "Explosion Control.h" #include "Interactive Tiles.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Vehicles.h" #include "renderworld.h" #include "AIList.h" @@ -39,13 +39,13 @@ #include "physics.h" #include "GameSettings.h" #include "Debug Control.h" -#include "interface panels.h" +#include "Interface Panels.h" #include "Sound Control.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Quests.h" #include "Campaign Types.h" #include "Queen Command.h" -#include "points.h" +#include "Points.h" #include "Soldier Functions.h" // added by SANDRO #include "Text.h" // sevenfm #include "english.h" // sevenfm: for ESC key diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index e0f53ecc4..a7a3821a1 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -2,13 +2,13 @@ #include "Weapons.h" #include "opplist.h" #include "Points.h" - #include "PathAI.h" - #include "WorldMan.h" + #include "PATHAI.H" + #include "worldman.h" #include "AIInternals.h" #include "Items.h" #include "message.h" - #include "los.h" - #include "assignments.h" + #include "LOS.h" + #include "Assignments.h" #include "Soldier Functions.h" #include "Points.h" #include "GameSettings.h" @@ -23,7 +23,7 @@ #include "Vehicles.h" // added by silversurfer #include "Game Clock.h" // sevenfm #include "Rotting Corpses.h" // sevenfm - #include "wcheck.h" // sevenfm + #include "WCheck.h" // sevenfm #include "SmokeEffects.h" // sevenfm #include "GameInitOptionsScreen.h" diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp index cfea4a61e..7e2e6fd9c 100644 --- a/TacticalAI/Attacks.cpp +++ b/TacticalAI/Attacks.cpp @@ -3,11 +3,11 @@ #include "opplist.h" #include "AIInternals.h" #include "LOS.h" -#include "Physics.h" +#include "physics.h" #include "Items.h" #include "Weapons.h" -#include "Spread Burst.h" -#include "overhead.h" +#include "Spread burst.h" +#include "Overhead.h" #include "SkillCheck.h" #include "Soldier Profile.h" #include "Isometric Utils.h" diff --git a/TacticalAI/CreatureDecideAction.cpp b/TacticalAI/CreatureDecideAction.cpp index 94fa1e186..ca0f3688c 100644 --- a/TacticalAI/CreatureDecideAction.cpp +++ b/TacticalAI/CreatureDecideAction.cpp @@ -1,11 +1,11 @@ #include "types.h" - //#include "soldier control.h" + //#include "Soldier Control.h" #include "ai.h" #include "AIInternals.h" #include "opplist.h" #include "Items.h" #include "Rotting Corpses.h" - #include "soldier add.h" + #include "Soldier Add.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp index 624ccb40c..5f6216ead 100644 --- a/TacticalAI/DecideAction.cpp +++ b/TacticalAI/DecideAction.cpp @@ -1,32 +1,32 @@ #include "ai.h" #include "AIInternals.h" -#include "Isometric utils.h" +#include "Isometric Utils.h" #include "Points.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" -#include "items.h" +#include "Items.h" #include "Weapons.h" #include "NPC.h" #include "Soldier Functions.h" #include "worldman.h" #include "Scheduling.h" -#include "Message.h" +#include "message.h" #include "Structure Wrap.h" #include "Keys.h" -#include "pathai.h" +#include "PATHAI.H" #include "Render Fun.h" #include "Boxing.h" // #include "Air Raid.h" #include "Soldier Profile.h" #include "soldier profile type.h" #include "Soldier macros.h" -#include "los.h" +#include "LOS.h" #include "Buildings.h" #include "strategicmap.h" #include "Quests.h" #include "Map Screen Interface Map.h" -#include "soldier ani.h" -#include "rotting corpses.h" +#include "Soldier Ani.h" +#include "Rotting Corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" #include "connect.h" diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp index 3c9ab556f..ac2634fc2 100644 --- a/TacticalAI/FindLocations.cpp +++ b/TacticalAI/FindLocations.cpp @@ -2,11 +2,11 @@ #include "Isometric Utils.h" #include "ai.h" #include "AIInternals.h" - #include "los.h" + #include "LOS.h" #include "Weapons.h" - #include "Opplist.h" - #include "pathai.h" - #include "items.h" + #include "opplist.h" + #include "PATHAI.H" + #include "Items.h" #include "World Items.h" #include "Points.h" #include "message.h" @@ -26,7 +26,7 @@ #include "Buildings.h" #include "GameSettings.h" #include "Soldier Profile.h" - #include "rotting corpses.h" // sevenfm + #include "Rotting Corpses.h" // sevenfm //////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/TacticalAI/Knowledge.cpp b/TacticalAI/Knowledge.cpp index c6e93a1fb..12077332d 100644 --- a/TacticalAI/Knowledge.cpp +++ b/TacticalAI/Knowledge.cpp @@ -2,7 +2,7 @@ #include "AIInternals.h" #include "opplist.h" #include "Soldier Profile.h" - #include "los.h" + #include "LOS.h" #include "NPC.h" #include "Quests.h" #include "Render Fun.h" diff --git a/TacticalAI/Medical.cpp b/TacticalAI/Medical.cpp index 41b896729..d54bc0c77 100644 --- a/TacticalAI/Medical.cpp +++ b/TacticalAI/Medical.cpp @@ -4,10 +4,10 @@ #include "ai.h" #include "AIInternals.h" #include "Animation Control.h" - #include "pathai.h" - #include "overhead.h" - #include "items.h" - #include "Message.h" + #include "PATHAI.H" + #include "Overhead.h" + #include "Items.h" + #include "message.h" #include "Buildings.h" #include "worldman.h" #include "Assignments.h" diff --git a/TacticalAI/Movement.cpp b/TacticalAI/Movement.cpp index 5bc4b0a9e..a1137120b 100644 --- a/TacticalAI/Movement.cpp +++ b/TacticalAI/Movement.cpp @@ -1,10 +1,10 @@ #include "ai.h" #include "AIInternals.h" #include "Isometric Utils.h" - #include "overhead.h" + #include "Overhead.h" #include "worldman.h" - #include "pathai.h" - //#include "points.h" + #include "PATHAI.H" + //#include "Points.h" #include "message.h" #include "Smell.h" #include "mapscreen.h" diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp index 84702a013..eab9cb7af 100644 --- a/TacticalAI/NPC.cpp +++ b/TacticalAI/NPC.cpp @@ -1,28 +1,28 @@ #include "types.h" - #include "wcheck.h" - #include "overhead.h" + #include "WCheck.h" + #include "Overhead.h" #include "ai.h" #include "Soldier Profile.h" #include "NPC.h" #include "Isometric Utils.h" #include "Quests.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Game Clock.h" #include "FileMan.h" - #include "Random.h" - #include "items.h" - #include "interface.h" + #include "random.h" + #include "Items.h" + #include "Interface.h" #include "Assignments.h" - #include "soldier macros.h" - #include "dialogue control.h" + #include "Soldier macros.h" + #include "Dialogue Control.h" #include "Strategic Town Loyalty.h" #include "message.h" #include "Timer Control.h" #include "Soldier Add.h" - #include "Soldier Tile.h" + #include "soldier tile.h" #include "Weapons.h" - #include "meanwhile.h" + #include "Meanwhile.h" #ifdef JA2TESTVERSION #include "Quest Debug System.h" diff --git a/TacticalAI/PanicButtons.cpp b/TacticalAI/PanicButtons.cpp index 03c54f3f0..5aa40f8a5 100644 --- a/TacticalAI/PanicButtons.cpp +++ b/TacticalAI/PanicButtons.cpp @@ -1,7 +1,7 @@ #include "AIInternals.h" #include "ai.h" - #include "pathai.h" - #include "items.h" + #include "PATHAI.H" + #include "Items.h" #include "World Items.h" #include "strategicmap.h" #include "Map Screen Interface Map.h" diff --git a/TacticalAI/QuestDebug.cpp b/TacticalAI/QuestDebug.cpp index 046991f34..799e68d2c 100644 --- a/TacticalAI/QuestDebug.cpp +++ b/TacticalAI/QuestDebug.cpp @@ -2,8 +2,8 @@ #include "QuestDebug.h" #include "stdarg.h" #include "stdio.h" - #include "Debug.h" - #include "Message.h" + #include "DEBUG.H" + #include "message.h" #define QUEST_DEBUG_FILE "QuestDebug.txt" diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp index 0ec6254fe..3f18bdc2b 100644 --- a/TacticalAI/Realtime.cpp +++ b/TacticalAI/Realtime.cpp @@ -1,12 +1,12 @@ #include "ai.h" #include "AIInternals.h" - #include "Isometric utils.h" - #include "overhead.h" - #include "soldier add.h" - #include "Soldier Profile Type.h" + #include "Isometric Utils.h" + #include "Overhead.h" + #include "Soldier Add.h" + #include "soldier profile type.h" #include "Items.h" #include "Weapons.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "Soldier Profile.h" #include "NPC.h" #include "Render Fun.h" diff --git a/TacticalAI/ZombieDecideAction.cpp b/TacticalAI/ZombieDecideAction.cpp index 16c7f321f..a2dd32751 100644 --- a/TacticalAI/ZombieDecideAction.cpp +++ b/TacticalAI/ZombieDecideAction.cpp @@ -1,32 +1,32 @@ #include "ai.h" #include "AIInternals.h" -#include "Isometric utils.h" +#include "Isometric Utils.h" #include "Points.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" -#include "items.h" +#include "Items.h" #include "Weapons.h" #include "NPC.h" #include "Soldier Functions.h" #include "worldman.h" #include "Scheduling.h" -#include "Message.h" +#include "message.h" #include "Structure Wrap.h" #include "Keys.h" -#include "pathai.h" +#include "PATHAI.H" #include "Render Fun.h" #include "Boxing.h" // #include "Air Raid.h" #include "Soldier Profile.h" #include "soldier profile type.h" #include "Soldier macros.h" -#include "los.h" +#include "LOS.h" #include "Buildings.h" #include "strategicmap.h" #include "Quests.h" #include "Map Screen Interface Map.h" -#include "soldier ani.h" -#include "rotting corpses.h" +#include "Soldier Ani.h" +#include "Rotting Corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" #include "connect.h" diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index cf42114ad..8f2accd93 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -4,13 +4,13 @@ #include "Sound Control.h" #include "Game Events.h" #include "lighting.h" - #include "Random.h" + #include "random.h" // sevenfm #include "SmokeEffects.h" #include "Overhead.h" #include "Strategic Movement.h" #include "Game Clock.h" - #include "strategic mines.h" + #include "Strategic Mines.h" AMBIENTDATA_STRUCT gAmbData[ MAX_AMBIENT_SOUNDS ]; INT16 gsNumAmbData = 0; @@ -721,4 +721,4 @@ void SetSSA(void) //guiCurrentSteadyStateSoundHandle = SoundPlay( zFileName, &spParms ); guiCurrentSteadyStateSoundHandle = SoundPlayStreamedFile(zFileName, &spParms); -} +} diff --git a/TileEngine/Ambient Control.h b/TileEngine/Ambient Control.h index 01035d220..cdd910432 100644 --- a/TileEngine/Ambient Control.h +++ b/TileEngine/Ambient Control.h @@ -3,7 +3,7 @@ #include "sgp.h" -#include "Ambient types.h" +#include "Ambient Types.h" BOOLEAN LoadAmbientControlFile( UINT8 ubAmbientID ); @@ -51,4 +51,4 @@ typedef struct -#endif +#endif diff --git a/TileEngine/Buildings.cpp b/TileEngine/Buildings.cpp index dfcaa7c8e..feb3264a0 100644 --- a/TileEngine/Buildings.cpp +++ b/TileEngine/Buildings.cpp @@ -1,6 +1,6 @@ - #include "Types.h" + #include "types.h" #include "Buildings.h" - #include "Pathai.h" + #include "PATHAI.H" #include "Structure Wrap.h" #include "Render Fun.h" #include "worldman.h" diff --git a/TileEngine/Exit Grids.cpp b/TileEngine/Exit Grids.cpp index 036b48d54..78feb2926 100644 --- a/TileEngine/Exit Grids.cpp +++ b/TileEngine/Exit Grids.cpp @@ -1,12 +1,12 @@ - #include "debug.h" + #include "DEBUG.H" #include "worlddef.h" #include "worldman.h" #include "Exit Grids.h" #include "Editor Undo.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Strategic Movement.h" #include "message.h" - #include "pathai.h" + #include "PATHAI.H" #include "Animation Control.h" #include "Sys Globals.h" #include "SaveLoadMap.h" diff --git a/TileEngine/Exit Grids.h b/TileEngine/Exit Grids.h index 0b8a4362b..4e13524a4 100644 --- a/TileEngine/Exit Grids.h +++ b/TileEngine/Exit Grids.h @@ -1,7 +1,7 @@ #ifndef __EXIT_GRIDS_H #define __EXIT_GRIDS_H -#include "Worlddef.h" +#include "worlddef.h" //dnl ch42 250909 typedef struct diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index d1281de3a..abd00f0ea 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1,43 +1,43 @@ #include "builddefines.h" -#include "debug.h" -#include "weapons.h" +#include "DEBUG.H" +#include "Weapons.h" #include "worldman.h" -#include "game clock.h" +#include "Game Clock.h" #include "renderworld.h" -#include "explosion control.h" -#include "sound control.h" -#include "structure wrap.h" -#include "interactive tiles.h" +#include "Explosion Control.h" +#include "Sound Control.h" +#include "Structure Wrap.h" +#include "Interactive Tiles.h" #include "SaveLoadMap.h" -#include "Message.h" -#include "Random.h" -#include "smokeeffects.h" -#include "pathai.h" +#include "message.h" +#include "random.h" +#include "SmokeEffects.h" +#include "PATHAI.H" #include "strategic.h" #include "Action Items.h" -#include "Interface Dialogue.h" +#include "interface Dialogue.h" #include "LightEffects.h" -#include "AI.h" -#include "Soldier tile.h" +#include "ai.h" +#include "soldier tile.h" #include "Render Fun.h" -#include "Opplist.h" -#include "smell.h" -#include "end game.h" +#include "opplist.h" +#include "Smell.h" +#include "End Game.h" #include "Buildings.h" #include "fov.h" #include "Map Information.h" #include "Soldier Functions.h"//dnl ch40 200909 #include "Text.h" // added by SANDRO -#include "campaign.h" // yet another one added +#include "Campaign.h" // yet another one added #include "CampaignStats.h" // added by Flugente #include "Points.h" // added by Flugente #include "Interface Control.h" // added by Flugente for DrawExplosionWarning(...) #include "SkillMenu.h" -#include "Soldier Macros.h" +#include "Soldier macros.h" #include "connect.h" -#include "debug control.h" +#include "Debug Control.h" #include "LuaInitNPCs.h" #include "Luaglobal.h" diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index 550df2ae4..02741379a 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -4,13 +4,13 @@ #include "renderworld.h" #include "Sound Control.h" #include "Interactive Tiles.h" - #include "interface cursors.h" + #include "Interface Cursors.h" #include "worldman.h" - #include "points.h" - #include "structure wrap.h" - #include "tile animation.h" - #include "tile cache.h" - #include "handle doors.h" + #include "Points.h" + #include "Structure Wrap.h" + #include "Tile Animation.h" + #include "Tile Cache.h" + #include "Handle Doors.h" #include "Dialogue Control.h" #include "english.h" #include "NPC.h" diff --git a/TileEngine/Isometric Utils.cpp b/TileEngine/Isometric Utils.cpp index 51d8a986f..bde2e3692 100644 --- a/TileEngine/Isometric Utils.cpp +++ b/TileEngine/Isometric Utils.cpp @@ -1,14 +1,14 @@ - #include "debug.h" + #include "DEBUG.H" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "worldman.h" #include "Structure Wrap.h" - #include "sys globals.h" - #include "overhead.h" - #include "Random.h" - #include "Pathai.h" + #include "Sys Globals.h" + #include "Overhead.h" + #include "random.h" + #include "PATHAI.H" #include "Map Information.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "strategicmap.h" UINT32 guiForceRefreshMousePositionCalculation = 0; diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index dcbb15748..339d44d28 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" - #include "debug.h" - #include "animation control.h" - #include "lighteffects.h" - #include "isometric utils.h" + #include "DEBUG.H" + #include "Animation Control.h" + #include "LightEffects.h" + #include "Isometric Utils.h" #include "lighting.h" #include "Game Clock.h" #include "opplist.h" diff --git a/TileEngine/Map Edgepoints.cpp b/TileEngine/Map Edgepoints.cpp index 42106638a..ef3655841 100644 --- a/TileEngine/Map Edgepoints.cpp +++ b/TileEngine/Map Edgepoints.cpp @@ -1,11 +1,11 @@ //#include // added by Flugente #include "Map Edgepoints.h" - #include "pathai.h" + #include "PATHAI.H" #include "ai.h" #include "Map Information.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Animation Control.h" #include "Render Fun.h" #include "strategicmap.h" diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index 128773242..b59f6c67d 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -6,8 +6,8 @@ #include "line.h" #include "renderworld.h" #include "lighting.h" - #include "wcheck.h" - #include "render dirty.h" + #include "WCheck.h" + #include "Render Dirty.h" #include "overhead map.h" #include "Squads.h" #include "Text.h" diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 8fb82dad4..0b7be536a 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -6,7 +6,7 @@ #include "vobject_blitters.h" #ifdef JA2BETAVERSION -#include "Message.h" +#include "message.h" #endif // Forward Declarations diff --git a/TileEngine/Render Fun.cpp b/TileEngine/Render Fun.cpp index e2ecd20cf..b265f8ed1 100644 --- a/TileEngine/Render Fun.cpp +++ b/TileEngine/Render Fun.cpp @@ -1,13 +1,13 @@ #include "Render Fun.h" #include "sysutil.h" - #include "debug.h" + #include "DEBUG.H" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "fov.h" #include "Fog Of War.h" - #include "dialogue control.h" - #include "Random.h" + #include "Dialogue Control.h" + #include "random.h" // Room Information //UINT8 gubWorldRoomInfo[ WORLD_MAX ]; diff --git a/TileEngine/SaveLoadMap.cpp b/TileEngine/SaveLoadMap.cpp index 3ca80d74c..0a26d77be 100644 --- a/TileEngine/SaveLoadMap.cpp +++ b/TileEngine/SaveLoadMap.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "SaveLoadMap.h" - #include "OverHead.h" + #include "Overhead.h" #include "FileMan.h" #include "Tactical Save.h" - #include "Debug.h" - #include "WorldMan.h" - #include "StrategicMap.h" + #include "DEBUG.H" + #include "worldman.h" + #include "strategicmap.h" #include "Campaign Types.h" - #include "RenderWorld.h" + #include "renderworld.h" #include "Render Fun.h" #include "fov.h" - #include "WorldDef.h" + #include "worlddef.h" #include "Exit Grids.h" - #include "Message.h" + #include "message.h" #include "GameSettings.h" #include "Smell.h" diff --git a/TileEngine/SaveLoadMap.h b/TileEngine/SaveLoadMap.h index ff48d1582..9e019c271 100644 --- a/TileEngine/SaveLoadMap.h +++ b/TileEngine/SaveLoadMap.h @@ -1,7 +1,7 @@ #ifndef _SAVELOADMAP__H_ #define _SAVELOADMAP__H_ -#include "WorldDef.h" +#include "worlddef.h" #include "Exit Grids.h" //Used for the ubType in the MODIFY_MAP struct diff --git a/TileEngine/Shade Table Util.cpp b/TileEngine/Shade Table Util.cpp index b2345f4f6..6827c3c7d 100644 --- a/TileEngine/Shade Table Util.cpp +++ b/TileEngine/Shade Table Util.cpp @@ -6,7 +6,7 @@ #include "Shade Table Util.h" #include "video.h" #include "WorldDat.h" - #include "Fileman.h" + #include "FileMan.h" #include diff --git a/TileEngine/Smell.cpp b/TileEngine/Smell.cpp index 45f75140c..2d7d76215 100644 --- a/TileEngine/Smell.cpp +++ b/TileEngine/Smell.cpp @@ -1,16 +1,16 @@ #include "worlddef.h" - #include "Random.h" + #include "random.h" #include "Smell.h" #include "worldman.h" #include "renderworld.h" #include "SaveLoadMap.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "message.h" - #include "Isometric utils.h" + #include "Isometric Utils.h" #include "Map Information.h" #include "Game Clock.h" #include "Overhead.h" - #include "debug control.h" + #include "Debug Control.h" /* * Smell & Blood system diff --git a/TileEngine/Smell.h b/TileEngine/Smell.h index c4bbfb34c..1e16571e2 100644 --- a/TileEngine/Smell.h +++ b/TileEngine/Smell.h @@ -1,4 +1,4 @@ -#include "soldier control.h" +#include "Soldier Control.h" #define HUMAN 0 #define CREATURE_ON_FLOOR 0x01 diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index 4e202318a..2f3de8976 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -3,20 +3,20 @@ #include #include #include "stdlib.h" - #include "debug.h" - #include "weapons.h" + #include "DEBUG.H" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" #include "worldman.h" - #include "animation control.h" - #include "tile animation.h" + #include "Animation Control.h" + #include "Tile Animation.h" #include "handle items.h" - #include "smokeeffects.h" + #include "SmokeEffects.h" #include "message.h" - #include "isometric utils.h" + #include "Isometric Utils.h" #include "renderworld.h" - #include "explosion control.h" - #include "Random.h" + #include "Explosion Control.h" + #include "random.h" #include "Game Clock.h" #include "opplist.h" #include "Campaign Types.h" @@ -27,7 +27,7 @@ #include "Render Fun.h" #include "SaveLoadGame.h" -#include "debug control.h" +#include "Debug Control.h" #include "connect.h" diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 7b6c1daa0..d4c852364 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -4,17 +4,17 @@ //sgp #include "english.h" - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "vobject_blitters.h" #include "line.h" //ja2 #include "Tactical Placement GUI.h" - #include "Overhead Map.h" + #include "overhead map.h" #include "strategicmap.h" #include "Interface.h" - #include "overhead.h" + #include "Overhead.h" #include "Render Dirty.h" #include "sysutil.h" #include "PreBattle Interface.h" @@ -24,10 +24,10 @@ #include "message.h" #include "Map Information.h" #include "Soldier Add.h" - #include "cursors.h" + #include "Cursors.h" #include "Cursor Control.h" #include "MessageBoxScreen.h" - #include "text.h" + #include "Text.h" #include "WordWrap.h" #include "Game Clock.h" #include "Isometric Utils.h" diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 266bd856b..339c7770f 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -1,16 +1,16 @@ #include "worlddef.h" -#include "tile animation.h" -#include "debug.h" +#include "Tile Animation.h" +#include "DEBUG.H" #include "worldman.h" #include "lighting.h" #include "renderworld.h" -#include "overhead.h" +#include "Overhead.h" #include "ai.h" #include "Sound Control.h" -#include "tile cache.h" -#include "explosion control.h" +#include "Tile Cache.h" +#include "Explosion Control.h" #include "Keys.h" -#include "bullets.h" +#include "Bullets.h" #include "LightEffects.h" #include "SmokeEffects.h" diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index ae94e395b..ee8f4dd59 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -1,11 +1,11 @@ #include "builddefines.h" - #include "debug.h" + #include "DEBUG.H" #include "Debug Control.h" - #include "tile surface.h" - #include "tile cache.h" + #include "Tile Surface.h" + #include "Tile Cache.h" #ifdef JA2TESTVERSION - #include "sys globals.h" + #include "Sys Globals.h" #endif UINT32 guiNumTileCacheStructs = 0; diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 9f14fcec7..4cbb20621 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" - #include "debug.h" - #include "sys globals.h" + #include "DEBUG.H" + #include "Sys Globals.h" #include "XML.h" diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index 92b1b2041..e1290a2d8 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" - #include "worlddat.h" - #include "sys globals.h" - #include "tile surface.h" - #include "Debug.h" + #include "WorldDat.h" + #include "Sys Globals.h" + #include "Tile Surface.h" + #include "DEBUG.H" #include #include diff --git a/TileEngine/WorldDat.h b/TileEngine/WorldDat.h index 5d020aa2f..f756b49e2 100644 --- a/TileEngine/WorldDat.h +++ b/TileEngine/WorldDat.h @@ -2,7 +2,7 @@ #define WORLD_DAT_H #include "types.h" -#include "tiledat.h" +#include "TileDat.h" #include "World Tileset Enums.h" typedef void (*TILESET_CALLBACK)( void ); @@ -34,4 +34,4 @@ void SetTilesetTwoTerrainValues( ); -#endif +#endif diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index 5d3218dfd..d02032150 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -3,8 +3,8 @@ #include #include - #include "explosion control.h" - #include "Debug.h" + #include "Explosion Control.h" + #include "DEBUG.H" #include "FileMan.h" #include "Debug Control.h" diff --git a/TileEngine/environment.cpp b/TileEngine/environment.cpp index ad04fdc9e..a4cb9540a 100644 --- a/TileEngine/environment.cpp +++ b/TileEngine/environment.cpp @@ -2,13 +2,13 @@ #include "environment.h" #include "renderworld.h" #include "Sound Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "Ambient Control.h" #include "Game Events.h" #include "message.h" #include "opplist.h" - #include "Random.h" + #include "random.h" #include "Points.h" // added by Flugente #include "Campaign.h" // added by Flugente #include "Isometric Utils.h" // added by Flugente diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index f76525986..edb1b6c5a 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -19,14 +19,14 @@ #include "worlddef.h" #include "renderworld.h" #include "sysutil.h" - #include "debug.h" - #include "wcheck.h" + #include "DEBUG.H" + #include "WCheck.h" #include "Animation Control.h" #include "Sys Globals.h" #include "lighting.h" - #include "structure wrap.h" + #include "Structure Wrap.h" #include "Shade Table Util.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "PATHAI.H" #define LVL1_L1_PER (50) diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index b2f7e8e73..507be62ec 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -1,21 +1,21 @@ #include "builddefines.h" #include "sysutil.h" - #include "utilities.h" + #include "Utilities.h" #include "renderworld.h" #include "vobject_blitters.h" #include "overhead map.h" - #include "interface control.h" - #include "overhead.h" - #include "radar screen.h" - #include "cursors.h" + #include "Interface Control.h" + #include "Overhead.h" + #include "Radar Screen.h" + #include "Cursors.h" #include "Sys Globals.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Game Clock.h" - #include "interface panels.h" + #include "Interface Panels.h" #include "english.h" #include "line.h" - #include "map information.h" + #include "Map Information.h" #include "Tactical Placement GUI.h" #include "Interactive Tiles.h" #include "gameloop.h" @@ -1014,7 +1014,7 @@ void RenderOverheadMap( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStart //ColorFillVideoSurfaceArea( FRAME_BUFFER, 0, 0, (INT16)(640), (INT16)(gsVIEWPORT_WINDOW_END_Y), Get16BPPColor( FROMRGB( 0, 0, 0 ) ) ); pDestBuf = LockVideoSurface(uiBigMap, &uiDestPitchBYTES);//dnl ch77 211113 - // Nur Karte und position der gebude + // Nur Karte und position der geb�ude do { fEndRenderRow = FALSE; @@ -2103,7 +2103,7 @@ BOOLEAN GetOverheadScreenXYFromGridNo(INT32 sGridNo, INT16* psScreenX, INT16* ps GetWorldXYAbsoluteScreenXY((sX/CELL_X_SIZE), (sY/CELL_Y_SIZE), &sWorldScreenX, &sWorldScreenY); //DBrot: big maps if(gfUseBiggerOverview){ - //there must be proper values to check for a 360 map, but I have no idea what they are + //there must be proper values to check for a 360� map, but I have no idea what they are //for now, we just pray that it works and only catch negatives if(sWorldScreenX < 0 || /*sWorldScreenX > NORMAL_MAP_SCREEN_WIDTH ||*/ sWorldScreenY < 0 /*|| sWorldScreenY > NORMAL_MAP_SCREEN_HEIGHT*/) return(FALSE); diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index 138e4b097..3d0c699af 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -1,20 +1,20 @@ #include "builddefines.h" #include "physics.h" - #include "wcheck.h" - #include "isometric utils.h" + #include "WCheck.h" + #include "Isometric Utils.h" #include "worldman.h" #include "Sound Control.h" - #include "interface.h" - #include "interface items.h" - #include "explosion control.h" + #include "Interface.h" + #include "Interface Items.h" + #include "Explosion Control.h" #include "Debug Control.h" #include "message.h" - #include "structure wrap.h" - #include "animation control.h" - #include "text.h" - #include "Random.h" - #include "lighteffects.h" + #include "Structure Wrap.h" + #include "Animation Control.h" + #include "Text.h" + #include "random.h" + #include "LightEffects.h" #include "opplist.h" #include "Buildings.h" #include "Dialogue Control.h" // added by Flugente diff --git a/TileEngine/pits.cpp b/TileEngine/pits.cpp index 59478dc6e..9ce433117 100644 --- a/TileEngine/pits.cpp +++ b/TileEngine/pits.cpp @@ -8,7 +8,7 @@ #include "strategicmap.h" #include "Isometric Utils.h" #include "Sound Control.h" - #include "animation control.h" + #include "Animation Control.h" #include "strategic.h" #include "Action Items.h" diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index ce88dc766..3655e4093 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -7,17 +7,17 @@ #include "renderworld.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "debug.h" - #include "wcheck.h" + #include "DEBUG.H" + #include "WCheck.h" #include "worldman.h" #include "Radar Screen.h" #include "Render Dirty.h" #include "ai.h" - #include "render fun.h" - #include "interactive tiles.h" - #include "tile cache.h" - #include "English.h" - #include "interface control.h" + #include "Render Fun.h" + #include "Interactive Tiles.h" + #include "Tile Cache.h" + #include "english.h" + #include "Interface Control.h" #include "Sound Control.h" #include "LogicalBodyTypes/Layers.h" #include "LogicalBodyTypes/BodyTypeDB.h" diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp index 296d08595..445e5ec36 100644 --- a/TileEngine/structure.cpp +++ b/TileEngine/structure.cpp @@ -1,7 +1,7 @@ #include #include "types.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "FileMan.h" #include "MemMan.h" #include "structure.h" @@ -9,12 +9,12 @@ #include "worlddef.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" - #include "isometric utils.h" - #include "font.h" - #include "font control.h" - #include "los.h" + #include "Isometric Utils.h" + #include "Font.h" + #include "Font Control.h" + #include "LOS.h" #include "lighting.h" #include "Smell.h" @@ -29,12 +29,12 @@ #include "Editor Undo.h" //for access to AddToUndoList( iMapIndex ) #endif - #include "explosion control.h" + #include "Explosion Control.h" #include "Sound Control.h" #include "Buildings.h" - #include "Random.h" + #include "random.h" #include "Tile Animation.h" #include "Explosion Control.h" // added by Flugente diff --git a/TileEngine/structure.h b/TileEngine/structure.h index a5bf6bd51..d6c1f644e 100644 --- a/TileEngine/structure.h +++ b/TileEngine/structure.h @@ -3,7 +3,7 @@ #include "Structure Internals.h" #include "tiledef.h" -#include "overhead types.h" +#include "Overhead Types.h" #define NOTHING_BLOCKING 0 #define BLOCKING_REDUCE_RANGE 1 @@ -136,4 +136,4 @@ UINT8 StructureFlagToType( UINT32 uiFlag ); UINT32 GetStructureOpenSound( STRUCTURE *pStructure, BOOLEAN fClose ); -#endif +#endif diff --git a/TileEngine/sysutil.cpp b/TileEngine/sysutil.cpp index e3090125d..d49c8916e 100644 --- a/TileEngine/sysutil.cpp +++ b/TileEngine/sysutil.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "wcheck.h" + #include "WCheck.h" #include "sysutil.h" UINT32 guiBOTTOMPANEL = 0; diff --git a/TileEngine/sysutil.h b/TileEngine/sysutil.h index 5b460d637..e19fed0d7 100644 --- a/TileEngine/sysutil.h +++ b/TileEngine/sysutil.h @@ -1,9 +1,9 @@ #ifndef __SYSTEM_UTILS #define __SYSTEM_UTILS -#include "font.h" +#include "Font.h" #include "Isometric Utils.h" -#include "interface.h" +#include "Interface.h" // Global variables for video objects extern UINT32 guiBOTTOMPANEL; @@ -18,4 +18,4 @@ BOOLEAN InitializeSystemVideoObjects( ); BOOLEAN InitializeGameVideoObjects( ); -#endif +#endif diff --git a/TileEngine/tiledef.cpp b/TileEngine/tiledef.cpp index 26ca0d4c9..1820cb03b 100644 --- a/TileEngine/tiledef.cpp +++ b/TileEngine/tiledef.cpp @@ -1,11 +1,11 @@ #include "tiledef.h" #include "worlddef.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "worldman.h" #include "edit_sys.h" - #include "pathai.h" - #include "tile surface.h" + #include "PATHAI.H" + #include "Tile Surface.h" #include "Tactical Save.h" //#include "editscreen.h" diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 628a35e3d..863abc209 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -1,26 +1,26 @@ #include "builddefines.h" #include "worlddef.h" - #include "worlddat.h" - #include "wcheck.h" - #include "debug.h" + #include "WorldDat.h" + #include "WCheck.h" + #include "DEBUG.H" #include "worldman.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "Render Fun.h" #include "lighting.h" #include "Interactive Tiles.h" - #include "utilities.h" - #include "overhead.h" + #include "Utilities.h" + #include "Overhead.h" #include "opplist.h" #include "renderworld.h" #include "Radar Screen.h" #include "Exit Grids.h" - #include "tile surface.h" - #include "rotting corpses.h" + #include "Tile Surface.h" + #include "Rotting Corpses.h" #include "Keys.h" #include "Map Information.h" #include "Animated ProgressBar.h" - #include "pathai.h" + #include "PATHAI.H" #include "EditorBuildings.h" #include "Map Edgepoints.h" #include "Shade Table Util.h" @@ -34,13 +34,13 @@ #include "overhead map.h" #include "SmokeEffects.h" #include "LightEffects.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "LoadScreen.h"//dnl ch30 150909 #include "Interface Cursors.h" #include "Simple Render Utils.h"//dnl ch54 111009 #include "Interface.h" ///ddd - #include "gamesettings.h" + #include "GameSettings.h" #include "editscreen.h" #include "Editor Taskbar Utils.h" diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index 6f869e308..ca2c44b48 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -1,13 +1,13 @@ #include "worlddef.h" #include "worldman.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "lighting.h" #include "renderworld.h" #include "ai.h" - #include "animation control.h" + #include "Animation Control.h" #include "message.h" - #include "tile cache.h" + #include "Tile Cache.h" #include "SaveLoadMap.h" #include "random.h" // sevenfm diff --git a/Utils/Animated ProgressBar.cpp b/Utils/Animated ProgressBar.cpp index 5cdfa0ab6..97de4a38a 100644 --- a/Utils/Animated ProgressBar.cpp +++ b/Utils/Animated ProgressBar.cpp @@ -1,18 +1,18 @@ #include "types.h" #include "Animated ProgressBar.h" #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "Font Control.h" #include "vsurface.h" #include "video.h" #include "Render Dirty.h" - #include "music control.h" + #include "Music Control.h" #include "Timer Control.h" #include "sysutil.h" #include "random.h" #include "math.h" #include "WordWrap.h" - #include "Message.h" + #include "message.h" #include "Text.h" #include "Loading Screen.h" diff --git a/Utils/Cinematics Bink.cpp b/Utils/Cinematics Bink.cpp index 4393c13be..a6eecf200 100644 --- a/Utils/Cinematics Bink.cpp +++ b/Utils/Cinematics Bink.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #include #include #include @@ -8,15 +8,15 @@ #include #include -#include "Debug.h" +#include "DEBUG.H" #include "FileMan.h" -#include "smack.h" -#include "DDraw.h" -#include "mss.h" +#include "SMACK.H" +#include "ddraw.h" +#include "Mss.h" #include "DirectX Common.h" #include "DirectDraw Calls.h" -#include "SoundMan.h" -#include "Video.h" +#include "soundman.h" +#include "video.h" #include "Cinematics Bink.h" diff --git a/Utils/Cinematics.cpp b/Utils/Cinematics.cpp index 5e810cbd2..579152bf7 100644 --- a/Utils/Cinematics.cpp +++ b/Utils/Cinematics.cpp @@ -11,7 +11,7 @@ //---------------------------------------------------------------------------------- //#include "LocalCodeAll.h" -#include "Types.h" +#include "types.h" #include #include #include @@ -23,7 +23,7 @@ #include "DEBUG.H" #include "FileMan.h" -#include "smack.h" +#include "SMACK.H" #include "ddraw.h" #include "DirectX Common.h" #include "DirectDraw Calls.h" diff --git a/Utils/Cinematics.h b/Utils/Cinematics.h index 52be5601d..5aebbfbdc 100644 --- a/Utils/Cinematics.h +++ b/Utils/Cinematics.h @@ -1,7 +1,7 @@ #ifndef _CINEMATICS_H_ #define _CINEMATICS_H_ -#include "smack.h" +#include "SMACK.H" struct SMKFLIC { diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index 2338d366e..e6639e96c 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1,15 +1,15 @@ #include "builddefines.h" #include #include "sgp.h" - #include "cursors.h" + #include "Cursors.h" #include "Timer Control.h" #include "jascreens.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "Sys Globals.h" #include "Handle UI.h" - #include "interface.h" - #include "overhead.h" + #include "Interface.h" + #include "Overhead.h" #include "Cursor Control.h" #include "Sound Control.h" // HEADROCK HAM B2.6: included this here to allow toggling the CTH bars. diff --git a/Utils/Encrypted File.cpp b/Utils/Encrypted File.cpp index 20fba5448..46a478ade 100644 --- a/Utils/Encrypted File.cpp +++ b/Utils/Encrypted File.cpp @@ -1,9 +1,9 @@ #include "Encrypted File.h" #include "FileMan.h" - #include "Debug.h" + #include "DEBUG.H" // anv: for selecting random line -#include "Random.h" +#include "random.h" // anv: loading random line from the file BOOLEAN LoadEncryptedDataFromFileRandomLine(STR pFileName, STR16 pDestString, UINT32 uiSeekAmount) @@ -99,19 +99,19 @@ void DecodeString(STR16 pDestString, UINT32 uiSeekAmount) //#ifdef GERMAN // //switch( pDestString[ i ] ) // //{ - // // // + // // // ü // // case 252: pDestString[i] = 252; break; - // // // + // // // Ü // // case 220: pDestString[i] = 220; break; - // // // + // // // ä // // case 228: pDestString[i] = 228; break; - // // // + // // // Ä // // case 196: pDestString[i] = 196; break; - // // // + // // // ö // // case 246: pDestString[i] = 246; break; - // // // + // // // Ö // // case 214: pDestString[i] = 214; break; - // // // + // // // ß // // case 223: pDestString[i] = 223; break; // //} //#endif @@ -158,12 +158,12 @@ void DecodeString(STR16 pDestString, UINT32 uiSeekAmount) // case 184: pDestString[ i ] = 1105; break; //U+0451 d1 91 CYRILLIC SMALL LETTER IO //case 185: pDestString[ i ] = 8470; break; // ? //case 178: pDestString[ i ] = 1030; break; // ? - //case 161: pDestString[ i ] = 1038; break; // + //case 161: pDestString[ i ] = 1038; break; // í //case 179: pDestString[ i ] = 1110; break; // ? - //case 162: pDestString[ i ] = 1118; break; // - //case 165: pDestString[ i ] = 1168; break; // - //case 170: pDestString[ i ] = 1028; break; // - //case 175: pDestString[ i ] = 1031; break; // + //case 162: pDestString[ i ] = 1118; break; // ó + //case 165: pDestString[ i ] = 1168; break; // Ñ + //case 170: pDestString[ i ] = 1028; break; // ¬ + //case 175: pDestString[ i ] = 1031; break; // » //case 180: pDestString[ i ] = 1169; break; // ? //case 186: pDestString[ i ] = 1108; break; // ? //case 191: pDestString[ i ] = 1111; break; // ? @@ -229,4 +229,4 @@ void DecodeString(STR16 pDestString, UINT32 uiSeekAmount) // } //#endif } -} +} diff --git a/Utils/Event Pump.cpp b/Utils/Event Pump.cpp index 74576ef5e..f955a9d69 100644 --- a/Utils/Event Pump.cpp +++ b/Utils/Event Pump.cpp @@ -1,12 +1,12 @@ #include #include #include "sgp.h" -#include "wcheck.h" +#include "WCheck.h" #include "Event Pump.h" #include "Timer.h" #include "Sound Control.h" #include "Overhead.h" -#include "weapons.h" +#include "Weapons.h" #include "Animation Control.h" #include "opplist.h" #include "Tactical Save.h" diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp index efb10ba58..5c652b23a 100644 --- a/Utils/Font Control.cpp +++ b/Utils/Font Control.cpp @@ -3,7 +3,7 @@ #include "sgp.h" #include "himage.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "Font Control.h" #include diff --git a/Utils/Font Control.h b/Utils/Font Control.h index db5856cdd..45ff67f4c 100644 --- a/Utils/Font Control.h +++ b/Utils/Font Control.h @@ -2,7 +2,7 @@ #define __FONT_CONTROL_H #include "builddefines.h" -#include "font.h" +#include "Font.h" extern BOOLEAN gfUseWinFonts; extern INT32 giCurWinFont; diff --git a/Utils/INIReader.cpp b/Utils/INIReader.cpp index d238ddb07..284ec7aa2 100644 --- a/Utils/INIReader.cpp +++ b/Utils/INIReader.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" -#include "IniReader.h" +#include "INIReader.h" #include "FileMan.h" -#include "debug.h" +#include "DEBUG.H" #include "Font Control.h" #include "message.h" #include diff --git a/Utils/INIReader.h b/Utils/INIReader.h index 11595a1e9..1454d8b95 100644 --- a/Utils/INIReader.h +++ b/Utils/INIReader.h @@ -2,8 +2,8 @@ #define INIREADER_H #define NOMINMAX #include -#include -#include +#include +#include #include #include diff --git a/Utils/KeyMap.cpp b/Utils/KeyMap.cpp index 5f0402767..a116c9e3a 100644 --- a/Utils/KeyMap.cpp +++ b/Utils/KeyMap.cpp @@ -1,6 +1,6 @@ #include "KeyMap.h" #include -#include "text.h" +#include "Text.h" static Str8EnumLookupType gKeyTable[] = { diff --git a/Utils/KeyMap.h b/Utils/KeyMap.h index 9b9a6d7ed..6aac83d22 100644 --- a/Utils/KeyMap.h +++ b/Utils/KeyMap.h @@ -1,4 +1,4 @@ -#include +#include extern int ParseKeyString(const STR value); extern BOOLEAN IsKeyPressed(int value); diff --git a/Utils/MapUtility.cpp b/Utils/MapUtility.cpp index baf030a8c..1001a28a9 100644 --- a/Utils/MapUtility.cpp +++ b/Utils/MapUtility.cpp @@ -2,19 +2,19 @@ #ifdef JA2EDITOR #include "Screens.h" -#include "Maputility.h" +#include "maputility.h" #include "worlddef.h" -#include "overhead.h" -#include "fileman.h" +#include "Overhead.h" +#include "FileMan.h" #include "loadscreen.h" #include "overhead map.h" -#include "radar screen.h" +#include "Radar Screen.h" #include "vobject_blitters.h" #include "sticonvert.h" -#include "font control.h" -#include "worlddat.h" +#include "Font Control.h" +#include "WorldDat.h" #include "english.h" -#include "map information.h" +#include "Map Information.h" #include "line.h" #include "quantize wrap.h" //dnl ch77 131113 diff --git a/Utils/MercTextBox.cpp b/Utils/MercTextBox.cpp index 395376154..e8dda94e2 100644 --- a/Utils/MercTextBox.cpp +++ b/Utils/MercTextBox.cpp @@ -5,7 +5,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "vobject_blitters.h" - #include "Message.h" + #include "message.h" #define TEXT_POPUP_WINDOW_TEXT_OFFSET_X 8 diff --git a/Utils/MercTextBox.h b/Utils/MercTextBox.h index 72bf1808a..8ed908598 100644 --- a/Utils/MercTextBox.h +++ b/Utils/MercTextBox.h @@ -1,7 +1,7 @@ #ifndef __MERCTEXTBOX_H_ #define __MERCTEXTBOX_H_ -#include "Types.h" +#include "types.h" #define MERC_POPUP_PREPARE_FLAGS_TRANS_BACK 0x00000001 diff --git a/Utils/Multilingual Text Code Generator.cpp b/Utils/Multilingual Text Code Generator.cpp index 2bdfcb2a2..c3eb26d34 100644 --- a/Utils/Multilingual Text Code Generator.cpp +++ b/Utils/Multilingual Text Code Generator.cpp @@ -32,8 +32,8 @@ CREATED: Feb 16, 1999 #include "builddefines.h" #include #include "types.h" -#include "debug.h" -#include "Fileman.h" +#include "DEBUG.H" +#include "FileMan.h" //Currently in JA2's _EnglishText, these tokens make up all of the //format specifiers that are actually used. Feel free to add more, diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp index 1030cd3d7..335300fc3 100644 --- a/Utils/Music Control.cpp +++ b/Utils/Music Control.cpp @@ -1,10 +1,10 @@ #include "types.h" #include "Music Control.h" #include "soundman.h" - #include "Random.h" + #include "random.h" #include "jascreens.h" - #include "overhead.h" - #include "timer control.h" + #include "Overhead.h" + #include "Timer Control.h" #include "strategicmap.h" #include "Overhead Types.h" diff --git a/Utils/STIConvert.cpp b/Utils/STIConvert.cpp index 09018200f..caf3b0c9e 100644 --- a/Utils/STIConvert.cpp +++ b/Utils/STIConvert.cpp @@ -3,14 +3,14 @@ #include #include #include "types.h" - #include "compression.h" - #include "debug.h" - #include "fileman.h" + #include "Compression.h" + #include "DEBUG.H" + #include "FileMan.h" #include "imgfmt.h" #include "himage.h" #include "pcx.h" #include "impTGA.h" - #include "wcheck.h" + #include "WCheck.h" //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 5b7383b88..be3f07029 100644 --- a/Utils/Slider.cpp +++ b/Utils/Slider.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "WordWrap.h" #include "Render Dirty.h" #include "Utilities.h" #include "WCheck.h" #include "Slider.h" - #include "SysUtil.h" - #include "Line.h" + #include "sysutil.h" + #include "line.h" diff --git a/Utils/Sound Control.cpp b/Utils/Sound Control.cpp index 3c8472f8c..83ac23e11 100644 --- a/Utils/Sound Control.cpp +++ b/Utils/Sound Control.cpp @@ -3,8 +3,8 @@ #include "sgp.h" #include "Sound Control.h" #include "soundman.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" #include "renderworld.h" #include "GameSettings.h" #include "math.h" diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index 7f4033880..75aff20e8 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -4,12 +4,12 @@ #include #include #include "input.h" - #include "font.h" + #include "Font.h" #include "english.h" #include "vsurface.h" #include "video.h" - #include "debug.h" - #include "cursors.h" + #include "DEBUG.H" + #include "Cursors.h" #include "Text Input.h" #include "Timer Control.h" #include "vobject_blitters.h" diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index 757a20c73..5ae5ac513 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -1,5 +1,5 @@ - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "GameSettings.h" // sevenfm #include diff --git a/Utils/Timer Control.cpp b/Utils/Timer Control.cpp index ae6ee36cb..c38ad6564 100644 --- a/Utils/Timer Control.cpp +++ b/Utils/Timer Control.cpp @@ -2,14 +2,14 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "handle items.h" #include "worlddef.h" #include "renderworld.h" - #include "interface control.h" - #include "keymap.h" + #include "Interface Control.h" + #include "KeyMap.h" #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/Utils/Utilities.cpp b/Utils/Utilities.cpp index f8ed44764..859c33e31 100644 --- a/Utils/Utilities.cpp +++ b/Utils/Utilities.cpp @@ -1,16 +1,16 @@ #include "types.h" #include - #include + #include #include "sgp.h" #include "time.h" #include "vobject.h" #include "FileMan.h" #include "Utilities.h" #include "Font Control.h" - #include "overhead.h" - #include "overhead types.h" - #include "wcheck.h" - #include "sys globals.h" + #include "Overhead.h" + #include "Overhead Types.h" + #include "WCheck.h" + #include "Sys Globals.h" extern BOOLEAN GetCDromDriveLetter( STR8 pString ); @@ -72,20 +72,20 @@ BOOLEAN PerformTimeLimitedCheck(); // WANNE: Replaces german specific characters //STR8 ReplaceGermanSpecialCharacters(STR8 text) //{ -// // -// text = Replace(text, "ä", ""); -// // -// text = Replace(text, "Ä", ""); -// // -// text = Replace(text, "ö", ""); -// // -// text = Replace(text, "Ö", ""); -// // -// text = Replace(text, "ü", ""); -// // -// text = Replace(text, "Ü", ""); -// // -// text = Replace(text, "ß", ""); +// // ä +// text = Replace(text, "ä", "ä"); +// // Ä +// text = Replace(text, "Ä", "Ä"); +// // ö +// text = Replace(text, "ö", "ö"); +// // Ö +// text = Replace(text, "Ö", "Ö"); +// // ü +// text = Replace(text, "ü", "ü"); +// // Ü +// text = Replace(text, "Ãœ", "Ü"); +// // ß +// text = Replace(text, "ß", "ß"); // // return text; //} diff --git a/Utils/Utilities.h b/Utils/Utilities.h index d0d5dda04..933e84b2e 100644 --- a/Utils/Utilities.h +++ b/Utils/Utilities.h @@ -1,7 +1,7 @@ #ifndef _UTILITIES_H_ #define _UTILITIES_H_ -#include "Overhead types.h" +#include "Overhead Types.h" #include "sgp.h" diff --git a/Utils/Utils All.h b/Utils/Utils All.h index 3b6750c66..db8f63d95 100644 --- a/Utils/Utils All.h +++ b/Utils/Utils All.h @@ -6,22 +6,22 @@ #include "types.h" #include "Animated ProgressBar.h" #include "MemMan.h" -#include "debug.h" +#include "DEBUG.H" #include "Font Control.h" #include "vsurface.h" #include "video.h" #include "Render Dirty.h" -#include "music control.h" +#include "Music Control.h" #include #include "sgp.h" -#include "cursors.h" +#include "Cursors.h" #include "Timer Control.h" #include "jascreens.h" -#include "font.h" +#include "Font.h" #include "Sys Globals.h" #include "Handle UI.h" -#include "interface.h" -#include "overhead.h" +#include "Interface.h" +#include "Overhead.h" #include "Cursor Control.h" #include "Debug Control.h" #include "stdio.h" @@ -30,64 +30,64 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Event Manager.h" #include "Event Pump.h" #include "Timer.h" #include "Soldier Control.h" #include "Sound Control.h" -#include "weapons.h" +#include "Weapons.h" #include "Animation Control.h" #include "opplist.h" #include "himage.h" #include "vsurface_private.h" -#include "text.h" +#include "Text.h" #include "Screens.h" -#include "Maputility.h" +#include "maputility.h" #include "worlddef.h" #include "loadscreen.h" #include "overhead map.h" -#include "radar screen.h" +#include "Radar Screen.h" #include "vobject_blitters.h" #include "sticonvert.h" -#include "worlddat.h" +#include "WorldDat.h" #include "english.h" -#include "map information.h" +#include "Map Information.h" #include "line.h" #include "MercTextBox.h" #include "renderworld.h" #include "Utilities.h" #include "WordWrap.h" -#include "Message.h" +#include "message.h" #include #include "mbstring.h" #include "local.h" #include "Map Screen Interface Bottom.h" -#include "Soundman.h" -#include "BuildDefines.h" +#include "soundman.h" +#include "builddefines.h" #include "Dialogue Control.h" #include "Multi Language Graphic Utils.h" -#include "Random.h" +#include "random.h" #include "gamescreen.h" #include "Creature Spreading.h" #include "strategicmap.h" -#include "fade screen.h" +#include "Fade Screen.h" #include "PopUpBox.h" #include "sysutil.h" #include "phys math.h" -#include "Types.h" +#include "types.h" #include "WordWrap.h" #include "Render Dirty.h" #include "Utilities.h" #include "Cursors.h" #include "WCheck.h" #include "Slider.h" -#include "SysUtil.h" -#include "Line.h" -#include "isometric utils.h" +#include "sysutil.h" +#include "line.h" +#include "Isometric Utils.h" #include #include -#include "compression.h" +#include "Compression.h" #include "imgfmt.h" #include "pcx.h" #include "impTGA.h" @@ -98,8 +98,8 @@ #include "handle items.h" #include "time.h" #include "vobject.h" -#include "overhead types.h" -#include "tactical save.h" +#include "Overhead Types.h" +#include "Tactical Save.h" #include "KeyMap.h" //#include diff --git a/Utils/Win Util.cpp b/Utils/Win Util.cpp index 78f6df824..189c72821 100644 --- a/Utils/Win Util.cpp +++ b/Utils/Win Util.cpp @@ -4,7 +4,7 @@ #include #include #include "dsutil.h" -#include "debug.h" +#include "DEBUG.H" #include "sgp.h" diff --git a/Utils/WordWrap.cpp b/Utils/WordWrap.cpp index b0e8e4321..bd750d0d6 100644 --- a/Utils/WordWrap.cpp +++ b/Utils/WordWrap.cpp @@ -2,7 +2,7 @@ #include "sgp.h" #include "Render Dirty.h" #include "Font Control.h" - #include "Stdio.h" + #include "stdio.h" #include "WinFont.h" #include diff --git a/Utils/XMLAccess.cpp b/Utils/XMLAccess.cpp index 44d444841..6d9ce6901 100644 --- a/Utils/XMLAccess.cpp +++ b/Utils/XMLAccess.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #define WEAPONSFILENAME "TABLEDATA\\Weapons.dat" #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Utils/XMLProperties.cpp b/Utils/XMLProperties.cpp index b75f3b921..8001b4e01 100644 --- a/Utils/XMLProperties.cpp +++ b/Utils/XMLProperties.cpp @@ -8,7 +8,7 @@ #include "XML_Parser.h" #include "XMLWriter.h" -#include "Debug.h" +#include "DEBUG.H" vfs::PropertyContainer::TagMap::TagMap() { diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 52f14ece5..d8eae129d 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -1,37 +1,37 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" - #include "utilities.h" + #include "Utilities.h" #include "store inventory.h" // 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 diff --git a/Utils/XML_Language.h b/Utils/XML_Language.h index a039faa61..e78c2607e 100644 --- a/Utils/XML_Language.h +++ b/Utils/XML_Language.h @@ -1,7 +1,7 @@ #ifndef __XML_LANGUAGE_H #define __XML_LANGUAGE_H -#include "Types.h" +#include "types.h" #define MAX_MESSAGE_NAMES_CHARS 400 @@ -14,4 +14,4 @@ typedef struct extern LANGUAGE_LOCATION zlanguageText[1000]; -#endif +#endif diff --git a/Utils/XML_SenderNameList.h b/Utils/XML_SenderNameList.h index 3cca54e10..fae15a81d 100644 --- a/Utils/XML_SenderNameList.h +++ b/Utils/XML_SenderNameList.h @@ -1,7 +1,7 @@ #ifndef _XML_SENDERNAMELIST_H #define _XML_SENDERNAMELIST_H -#include "Types.h" +#include "types.h" #define MAX_SENDER_NAMES_CHARS 128 diff --git a/Utils/message.cpp b/Utils/message.cpp index 4b09a0b9c..0b73c4614 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -1,21 +1,21 @@ #include "sgp.h" - #include "font.h" + #include "Font.h" #include "types.h" #include "Font Control.h" #include "message.h" #include "memory.h" #include "mbstring.h" #include "Timer Control.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "renderworld.h" #include "local.h" - #include "interface.h" + #include "Interface.h" #include "mapscreen.h" #include "Map Screen Interface Bottom.h" #include "WordWrap.h" #include "Sound Control.h" - #include "Soundman.h" - #include "BuildDefines.h" + #include "soundman.h" + #include "builddefines.h" #include "Dialogue Control.h" #include #include "Game Clock.h" diff --git a/Utils/message.h b/Utils/message.h index 360a764de..e2f73cea2 100644 --- a/Utils/message.h +++ b/Utils/message.h @@ -2,10 +2,10 @@ #define __MESSAGE_H //#include "sgp.h" -#include "font.h" +#include "Font.h" #include "Font Control.h" #include "types.h" -#include "Fileman.h" +#include "FileMan.h" struct stringstruct{ @@ -118,4 +118,4 @@ void DisplayLastMessage( void ); */ -#endif +#endif diff --git a/Utils/popup_class.cpp b/Utils/popup_class.cpp index fec319e93..faf735a91 100644 --- a/Utils/popup_class.cpp +++ b/Utils/popup_class.cpp @@ -1,12 +1,12 @@ #include "Map Screen Interface.h" - #include "popupbox.h" - #include "interface control.h" + #include "PopUpBox.h" + #include "Interface Control.h" #include "renderworld.h" #include "Text.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface.h" #include "GameSettings.h" - #include "Input.h" + #include "input.h" #include "Console.h" #include "lwstring.h" @@ -1861,4 +1861,4 @@ void popupMouseClickCallback(MOUSE_REGION *pRegion, INT32 iReason) if (p) { p->MenuBtnCallBack(pRegion, iReason); } -} +} diff --git a/ext/VFS/ext/7z/CMakeLists.txt b/ext/VFS/ext/7z/CMakeLists.txt index caa436e35..483d435da 100644 --- a/ext/VFS/ext/7z/CMakeLists.txt +++ b/ext/VFS/ext/7z/CMakeLists.txt @@ -26,7 +26,7 @@ set(INCLUDE_7z src/LzmaLib.h src/Ppmd.h src/Sha256.h - src/Types.h + src/types.h # src/Xz.h # src/XzEnc.h src/7zAlloc.h diff --git a/ext/VFS/ext/7z/doc/lzma.txt b/ext/VFS/ext/7z/doc/lzma.txt index 9d3cef003..327b07016 100644 --- a/ext/VFS/ext/7z/doc/lzma.txt +++ b/ext/VFS/ext/7z/doc/lzma.txt @@ -76,7 +76,7 @@ C/ - C files LzmaDec.* - LZMA decoding LzmaEnc.* - LZMA encoding LzmaLib.* - LZMA Library for DLL calling - Types.h - Basic types for another .c files + types.h - Basic types for another .c files Threads.* - The code for multithreading. LzmaLib - LZMA Library (.DLL for Windows) @@ -321,7 +321,7 @@ If you want to use old interfaces you can download previous version of LZMA SDK from sourceforge.net site. To use ANSI-C LZMA Decoder you need the following files: -1) LzmaDec.h + LzmaDec.c + Types.h +1) LzmaDec.h + LzmaDec.c + types.h LzmaUtil/LzmaUtil.c is example application that uses these files. @@ -356,7 +356,7 @@ You can use p = p; operator to disable compiler warnings. Single-call Decompressing ------------------------- When to use: RAM->RAM decompressing -Compile files: LzmaDec.h + LzmaDec.c + Types.h +Compile files: LzmaDec.h + LzmaDec.c + types.h Compile defines: no defines Memory Requirements: - Input buffer: compressed size @@ -410,7 +410,7 @@ Multi-call State Decompressing (zlib-like interface) ---------------------------------------------------- When to use: file->file decompressing -Compile files: LzmaDec.h + LzmaDec.c + Types.h +Compile files: LzmaDec.h + LzmaDec.c + types.h Memory Requirements: - Buffer for input stream: any size (for example, 16 KB) @@ -451,7 +451,7 @@ For full code example, look at C/LzmaUtil/LzmaUtil.c code. How To compress data -------------------- -Compile files: LzmaEnc.h + LzmaEnc.c + Types.h + +Compile files: LzmaEnc.h + LzmaEnc.c + types.h + LzFind.c + LzFind.h + LzFindMt.c + LzFindMt.h + LzHash.h Memory Requirements: diff --git a/ext/VFS/ext/7z/src/7zBuf.h b/ext/VFS/ext/7z/src/7zBuf.h index 88ff0c2f2..a1124eb91 100644 --- a/ext/VFS/ext/7z/src/7zBuf.h +++ b/ext/VFS/ext/7z/src/7zBuf.h @@ -4,7 +4,7 @@ #ifndef __7Z_BUF_H #define __7Z_BUF_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/7zCrc.h b/ext/VFS/ext/7z/src/7zCrc.h index 4a1ec38c9..ddf22795a 100644 --- a/ext/VFS/ext/7z/src/7zCrc.h +++ b/ext/VFS/ext/7z/src/7zCrc.h @@ -4,7 +4,7 @@ #ifndef __7Z_CRC_H #define __7Z_CRC_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/7zFile.h b/ext/VFS/ext/7z/src/7zFile.h index 5d857879e..496a37154 100644 --- a/ext/VFS/ext/7z/src/7zFile.h +++ b/ext/VFS/ext/7z/src/7zFile.h @@ -14,7 +14,7 @@ #include #endif -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/7zStream.c b/ext/VFS/ext/7z/src/7zStream.c index f0959fb07..5c84216f2 100644 --- a/ext/VFS/ext/7z/src/7zStream.c +++ b/ext/VFS/ext/7z/src/7zStream.c @@ -3,7 +3,7 @@ #include -#include "Types.h" +#include "types.h" SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType) { diff --git a/ext/VFS/ext/7z/src/Bcj2.h b/ext/VFS/ext/7z/src/Bcj2.h index d9d857bc3..6a87a2798 100644 --- a/ext/VFS/ext/7z/src/Bcj2.h +++ b/ext/VFS/ext/7z/src/Bcj2.h @@ -4,7 +4,7 @@ #ifndef __BCJ2_H #define __BCJ2_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Bra.h b/ext/VFS/ext/7z/src/Bra.h index 9c91e332d..f6fbde636 100644 --- a/ext/VFS/ext/7z/src/Bra.h +++ b/ext/VFS/ext/7z/src/Bra.h @@ -4,7 +4,7 @@ #ifndef __BRA_H #define __BRA_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/CpuArch.h b/ext/VFS/ext/7z/src/CpuArch.h index 1cd7c29c5..10d4dfc98 100644 --- a/ext/VFS/ext/7z/src/CpuArch.h +++ b/ext/VFS/ext/7z/src/CpuArch.h @@ -4,7 +4,7 @@ #ifndef __CPU_ARCH_H #define __CPU_ARCH_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Delta.h b/ext/VFS/ext/7z/src/Delta.h index 776cd4551..cf72817bd 100644 --- a/ext/VFS/ext/7z/src/Delta.h +++ b/ext/VFS/ext/7z/src/Delta.h @@ -4,7 +4,7 @@ #ifndef __DELTA_H #define __DELTA_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/LzFind.h b/ext/VFS/ext/7z/src/LzFind.h index 7ebdfa446..d1b5f34aa 100644 --- a/ext/VFS/ext/7z/src/LzFind.h +++ b/ext/VFS/ext/7z/src/LzFind.h @@ -4,7 +4,7 @@ #ifndef __LZ_FIND_H #define __LZ_FIND_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Lzma86.h b/ext/VFS/ext/7z/src/Lzma86.h index 6425bb8f5..7bc0b74a9 100644 --- a/ext/VFS/ext/7z/src/Lzma86.h +++ b/ext/VFS/ext/7z/src/Lzma86.h @@ -4,7 +4,7 @@ #ifndef __LZMA86_H #define __LZMA86_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/LzmaDec.h b/ext/VFS/ext/7z/src/LzmaDec.h index 6741a644b..dcb146f56 100644 --- a/ext/VFS/ext/7z/src/LzmaDec.h +++ b/ext/VFS/ext/7z/src/LzmaDec.h @@ -4,7 +4,7 @@ #ifndef __LZMA_DEC_H #define __LZMA_DEC_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/LzmaEnc.h b/ext/VFS/ext/7z/src/LzmaEnc.h index 7573ba01b..b50a953d0 100644 --- a/ext/VFS/ext/7z/src/LzmaEnc.h +++ b/ext/VFS/ext/7z/src/LzmaEnc.h @@ -4,7 +4,7 @@ #ifndef __LZMA_ENC_H #define __LZMA_ENC_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/LzmaLib.h b/ext/VFS/ext/7z/src/LzmaLib.h index 55e1e1148..0dff2b607 100644 --- a/ext/VFS/ext/7z/src/LzmaLib.h +++ b/ext/VFS/ext/7z/src/LzmaLib.h @@ -4,7 +4,7 @@ #ifndef __LZMA_LIB_H #define __LZMA_LIB_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Ppmd.h b/ext/VFS/ext/7z/src/Ppmd.h index d62df4d36..42d17284b 100644 --- a/ext/VFS/ext/7z/src/Ppmd.h +++ b/ext/VFS/ext/7z/src/Ppmd.h @@ -5,7 +5,7 @@ This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */ #ifndef __PPMD_H #define __PPMD_H -#include "Types.h" +#include "types.h" #include "CpuArch.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Sha256.h b/ext/VFS/ext/7z/src/Sha256.h index 26d1e3af8..8b7121e81 100644 --- a/ext/VFS/ext/7z/src/Sha256.h +++ b/ext/VFS/ext/7z/src/Sha256.h @@ -4,7 +4,7 @@ #ifndef __CRYPTO_SHA256_H #define __CRYPTO_SHA256_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Threads.h b/ext/VFS/ext/7z/src/Threads.h index 6a7afa829..9ff25dad7 100644 --- a/ext/VFS/ext/7z/src/Threads.h +++ b/ext/VFS/ext/7z/src/Threads.h @@ -4,7 +4,7 @@ #ifndef __7Z_THREADS_H #define __7Z_THREADS_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/XzCrc64.h b/ext/VFS/ext/7z/src/XzCrc64.h index 05d0d09ca..0444f5ead 100644 --- a/ext/VFS/ext/7z/src/XzCrc64.h +++ b/ext/VFS/ext/7z/src/XzCrc64.h @@ -6,7 +6,7 @@ #include -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Types.h b/ext/VFS/ext/7z/src/types.h similarity index 95% rename from ext/VFS/ext/7z/src/Types.h rename to ext/VFS/ext/7z/src/types.h index f193ce2f5..53c6a9486 100644 --- a/ext/VFS/ext/7z/src/Types.h +++ b/ext/VFS/ext/7z/src/types.h @@ -1,4 +1,4 @@ -/* Types.h -- Basic types +/* types.h -- Basic types 2010-10-09 : Igor Pavlov : Public domain */ #ifndef __7Z_TYPES_H diff --git a/ext/VFS/include/vfs/Tools/vfs_hp_timer.h b/ext/VFS/include/vfs/Tools/vfs_hp_timer.h index dd198cf51..6272ebbd6 100644 --- a/ext/VFS/include/vfs/Tools/vfs_hp_timer.h +++ b/ext/VFS/include/vfs/Tools/vfs_hp_timer.h @@ -27,7 +27,7 @@ #include #ifdef WIN32 - #include + #include #elif __linux__ #include #endif diff --git a/ext/export/src/export/jsd/structure.cpp b/ext/export/src/export/jsd/structure.cpp index 7f234e4fd..e93bf0476 100644 --- a/ext/export/src/export/jsd/structure.cpp +++ b/ext/export/src/export/jsd/structure.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/ext/export/src/export/sti/Image.h b/ext/export/src/export/sti/Image.h index 9a2072958..8de3ddd0d 100644 --- a/ext/export/src/export/sti/Image.h +++ b/ext/export/src/export/sti/Image.h @@ -1,7 +1,7 @@ #ifndef _IMAGE_H_ #define _IMAGE_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include diff --git a/ext/export/src/export/sti/STCI_lib.cpp b/ext/export/src/export/sti/STCI_lib.cpp index 0b82d716c..16a79489b 100644 --- a/ext/export/src/export/sti/STCI_lib.cpp +++ b/ext/export/src/export/sti/STCI_lib.cpp @@ -4,7 +4,7 @@ #include "imgfmt.h" #include "himage.h" -#include "Types.h" +#include "types.h" #include #include #include diff --git a/ext/export/src/export/sti/STCI_lib.h b/ext/export/src/export/sti/STCI_lib.h index df6ac1adf..c4afc856a 100644 --- a/ext/export/src/export/sti/STCI_lib.h +++ b/ext/export/src/export/sti/STCI_lib.h @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #include "himage.h" #include diff --git a/ext/export/src/export/sti/stci_image_utils.h b/ext/export/src/export/sti/stci_image_utils.h index 258baec7d..090921535 100644 --- a/ext/export/src/export/sti/stci_image_utils.h +++ b/ext/export/src/export/sti/stci_image_utils.h @@ -1,7 +1,7 @@ #ifndef _STCI_IMAGE_UTILS_H_ #define _STCI_IMAGE_UTILS_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include #include diff --git a/ext/export/src/ja2/imgfmt.h b/ext/export/src/ja2/imgfmt.h index e88f7eaf6..82ed3429f 100644 --- a/ext/export/src/ja2/imgfmt.h +++ b/ext/export/src/ja2/imgfmt.h @@ -8,7 +8,7 @@ // * SubRectInfo's (usNumberOfRects > 0, size = usNumberOfSubRects * sizeof(SubRectInfo) ), uncompressed // * Bytes of image data, possibly compressed -#include "Types.h" +#include "types.h" #define STCI_ID_STRING "STCI" #define STCI_ID_LEN 4 diff --git a/ext/export/src/ja2/Types.h b/ext/export/src/ja2/types.h similarity index 100% rename from ext/export/src/ja2/Types.h rename to ext/export/src/ja2/types.h diff --git a/i18n/ExportStrings.cpp b/i18n/ExportStrings.cpp index b79841b9f..c390cb179 100644 --- a/i18n/ExportStrings.cpp +++ b/i18n/ExportStrings.cpp @@ -3,12 +3,12 @@ #include "Map Screen Interface.h" #include "personnel.h" #include "soldier profile type.h" -#include "interface.h" +#include "Interface.h" #include "Keys.h" #include "Merc Contract.h" #include "Campaign Types.h" -#include "Finances.h" -#include "Laptop.h" +#include "finances.h" +#include "laptop.h" #include #include @@ -68,7 +68,7 @@ namespace Loc } #include "Assignments.h" -#include "History.h" +#include "history.h" template void ExportSection(vfs::PropertyContainer& props, const vfs::String::char_t* section_name, T* strings, int min, int max) diff --git a/i18n/Multi Language Graphic Utils.cpp b/i18n/Multi Language Graphic Utils.cpp index af383bd72..2530e5055 100644 --- a/i18n/Multi Language Graphic Utils.cpp +++ b/i18n/Multi Language Graphic Utils.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" #include "stdio.h" -#include "Windows.h" -#include "Types.h" +#include "windows.h" +#include "types.h" #include "Multi Language Graphic Utils.h" //SB diff --git a/i18n/_ChineseText.cpp b/i18n/_ChineseText.cpp index 56deb0558..63b089f1c 100644 --- a/i18n/_ChineseText.cpp +++ b/i18n/_ChineseText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("CHINESE") #if defined( CHINESE ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_DutchText.cpp b/i18n/_DutchText.cpp index 580bb33c9..859c86bd1 100644 --- a/i18n/_DutchText.cpp +++ b/i18n/_DutchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("DUTCH") #if defined( DUTCH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_EnglishText.cpp b/i18n/_EnglishText.cpp index 377ad7558..ef53f3b05 100644 --- a/i18n/_EnglishText.cpp +++ b/i18n/_EnglishText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ENGLISH") #if defined( ENGLISH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_FrenchText.cpp b/i18n/_FrenchText.cpp index fbd776a85..c5e56fd60 100644 --- a/i18n/_FrenchText.cpp +++ b/i18n/_FrenchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("FRENCH") #ifdef FRENCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_GermanText.cpp b/i18n/_GermanText.cpp index 4b66db3f0..5f9776af0 100644 --- a/i18n/_GermanText.cpp +++ b/i18n/_GermanText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("GERMAN") #ifdef GERMAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_ItalianText.cpp b/i18n/_ItalianText.cpp index 0601468b7..beb570d0f 100644 --- a/i18n/_ItalianText.cpp +++ b/i18n/_ItalianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ITALIAN") #if defined( ITALIAN ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_Ja25ChineseText.cpp b/i18n/_Ja25ChineseText.cpp index 1bfcf23e3..94e28304c 100644 --- a/i18n/_Ja25ChineseText.cpp +++ b/i18n/_Ja25ChineseText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("CHINESE") #ifdef CHINESE - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25DutchText.cpp b/i18n/_Ja25DutchText.cpp index 396f8ac54..33b814281 100644 --- a/i18n/_Ja25DutchText.cpp +++ b/i18n/_Ja25DutchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("DUTCH") #ifdef DUTCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25EnglishText.cpp b/i18n/_Ja25EnglishText.cpp index 70a0c7e2e..aaae4773e 100644 --- a/i18n/_Ja25EnglishText.cpp +++ b/i18n/_Ja25EnglishText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ENGLISH") #ifdef ENGLISH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25FrenchText.cpp b/i18n/_Ja25FrenchText.cpp index 17f9fa2a5..630fc5fef 100644 --- a/i18n/_Ja25FrenchText.cpp +++ b/i18n/_Ja25FrenchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("FRENCH") #ifdef FRENCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25GermanText.cpp b/i18n/_Ja25GermanText.cpp index 663aba593..c8c97c161 100644 --- a/i18n/_Ja25GermanText.cpp +++ b/i18n/_Ja25GermanText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("GERMAN") #ifdef GERMAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25ItalianText.cpp b/i18n/_Ja25ItalianText.cpp index 06d7f2981..1ffa7c5cd 100644 --- a/i18n/_Ja25ItalianText.cpp +++ b/i18n/_Ja25ItalianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ITALIAN") #ifdef ITALIAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25PolishText.cpp b/i18n/_Ja25PolishText.cpp index f78354026..1034b4589 100644 --- a/i18n/_Ja25PolishText.cpp +++ b/i18n/_Ja25PolishText.cpp @@ -3,8 +3,8 @@ //#pragma setlocale("POLISH") #ifdef POLISH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25RussianText.cpp b/i18n/_Ja25RussianText.cpp index 77e48edd7..fc037607e 100644 --- a/i18n/_Ja25RussianText.cpp +++ b/i18n/_Ja25RussianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("RUSSIAN") #ifdef RUSSIAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_PolishText.cpp b/i18n/_PolishText.cpp index f49fe6376..2e9849172 100644 --- a/i18n/_PolishText.cpp +++ b/i18n/_PolishText.cpp @@ -3,8 +3,8 @@ //#pragma setlocale("POLISH") #if defined( POLISH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_RussianText.cpp b/i18n/_RussianText.cpp index 5b1a777e4..14620dc0d 100644 --- a/i18n/_RussianText.cpp +++ b/i18n/_RussianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("RUSSIAN") #if defined( RUSSIAN ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/include/Text.h b/i18n/include/Text.h index 12584904e..d9bb16b09 100644 --- a/i18n/include/Text.h +++ b/i18n/include/Text.h @@ -1,7 +1,7 @@ #ifndef __TEXT_H #define __TEXT_H -#include "items.h" +#include "Items.h" #include "types.h" #include "mapscreen.h" #include "XML_Language.h" diff --git a/i18n/include/language.hpp b/i18n/include/language.hpp index bd895bccd..d9ebd5bbe 100644 --- a/i18n/include/language.hpp +++ b/i18n/include/language.hpp @@ -1,23 +1,23 @@ -#pragma once - -#include - -namespace i18n { -enum class Lang -{ - en, - de, - ru, - nl, - pl, - fr, - it, - zh -}; -} - -extern const i18n::Lang g_lang; - -extern const int MAX_MESSAGES_ON_MAP_BOTTOM; - -auto GetLanguagePrefix() -> const STR; +#pragma once + +#include + +namespace i18n { +enum class Lang +{ + en, + de, + ru, + nl, + pl, + fr, + it, + zh +}; +} + +extern const i18n::Lang g_lang; + +extern const int MAX_MESSAGES_ON_MAP_BOTTOM; + +auto GetLanguagePrefix() -> const STR; diff --git a/lua/Lua Interpreter.h b/lua/Lua Interpreter.h index 8be61dfe9..bef02328a 100644 --- a/lua/Lua Interpreter.h +++ b/lua/Lua Interpreter.h @@ -7,7 +7,7 @@ extern "C" { #include "lualib.h" } -#include "Types.h" +#include "types.h" typedef struct { STR8 name; diff --git a/lua/lua.cpp b/lua/lua.cpp index 4bd4b1819..b3d1cb32b 100644 --- a/lua/lua.cpp +++ b/lua/lua.cpp @@ -2,7 +2,7 @@ #include #include #include "Lua Interpreter.h" -#include +#include #include "MemMan.h" lua_State *L; diff --git a/lua/lua_class_interface.cpp b/lua/lua_class_interface.cpp index b9f950b99..4979561c2 100644 --- a/lua/lua_class_interface.cpp +++ b/lua/lua_class_interface.cpp @@ -1,6 +1,6 @@ #include "lua_class_interface.h" -#include +#include #define ARRAY_INDEX " idx" // The space is intentional to make this an out-of-band field diff --git a/lua/lua_state.cpp b/lua/lua_state.cpp index 2b11e1b78..f2c7b34d7 100644 --- a/lua/lua_state.cpp +++ b/lua/lua_state.cpp @@ -1,5 +1,5 @@ #include "lua_state.h" -#include +#include #include "sgp_logger.h" #include diff --git a/lua/lwstring.cpp b/lua/lwstring.cpp index 83cb1a241..2e25f384d 100644 --- a/lua/lwstring.cpp +++ b/lua/lwstring.cpp @@ -1,5 +1,5 @@ #include "builddefines.h" -#include +#include #include "MemMan.h" diff --git a/lua/lwstring.h b/lua/lwstring.h index 306e3fdaf..be3ba5b94 100644 --- a/lua/lwstring.h +++ b/lua/lwstring.h @@ -15,7 +15,7 @@ extern "C" { #include } -#include "Types.h" +#include "types.h" typedef struct { int len; diff --git a/sgp/Button System.cpp b/sgp/Button System.cpp index 9ccc6bc37..81308e216 100644 --- a/sgp/Button System.cpp +++ b/sgp/Button System.cpp @@ -8,9 +8,9 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "english.h" #include "vobject.h" #include "vobject_blitters.h" @@ -24,7 +24,7 @@ #ifdef _JA2_RENDER_DIRTY #include "Font Control.h" #include "Render Dirty.h" - #include "utilities.h" + #include "Utilities.h" #endif #include diff --git a/sgp/Compression.cpp b/sgp/Compression.cpp index b9922aae4..7de1d5624 100644 --- a/sgp/Compression.cpp +++ b/sgp/Compression.cpp @@ -1,5 +1,5 @@ #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "zlib.h" diff --git a/sgp/Cursor Control.h b/sgp/Cursor Control.h index bd3404ca5..43553d709 100644 --- a/sgp/Cursor Control.h +++ b/sgp/Cursor Control.h @@ -1,12 +1,12 @@ #ifndef __CURSOR_DATABASE_ #define __CURSOR_DATABASE_ -#include "Types.h" +#include "types.h" #include "FileMan.h" -#include "VObject.h" -#include "VSurface.h" +#include "vobject.h" +#include "vsurface.h" -#include "Video.h" +#include "video.h" #ifdef __cplusplus extern "C" { diff --git a/sgp/DEBUG.H b/sgp/DEBUG.H index 1d0d0c3ed..4339ff490 100644 --- a/sgp/DEBUG.H +++ b/sgp/DEBUG.H @@ -1,6 +1,6 @@ //************************************************************************** // -// Filename : debug.h +// Filename : DEBUG.H // // Purpose : prototypes for the debug manager // diff --git a/sgp/DEBUG.cpp b/sgp/DEBUG.cpp index 2aad673b1..c73062454 100644 --- a/sgp/DEBUG.cpp +++ b/sgp/DEBUG.cpp @@ -28,7 +28,7 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" //Kris addition #include "screenids.h" @@ -39,7 +39,7 @@ // CJC added #ifndef _NO_DEBUG_TXT - #include "fileman.h" + #include "FileMan.h" #endif #include "GameSettings.h" #include "SaveLoadGame.h" diff --git a/sgp/DirectDraw Calls.cpp b/sgp/DirectDraw Calls.cpp index 99fa328f6..4b5451abe 100644 --- a/sgp/DirectDraw Calls.cpp +++ b/sgp/DirectDraw Calls.cpp @@ -2,7 +2,7 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "vobject_blitters.h" // DirectDrawSurface2 Calls diff --git a/sgp/DirectX Common.cpp b/sgp/DirectX Common.cpp index 9c6daefb8..403fbb307 100644 --- a/sgp/DirectX Common.cpp +++ b/sgp/DirectX Common.cpp @@ -6,7 +6,7 @@ #include #include "DirectX Common.h" #include - #include "debug.h" + #include "DEBUG.H" void DirectXZeroMem ( void* pMemory, int nSize ) { diff --git a/sgp/FileMan.cpp b/sgp/FileMan.cpp index 6ad5bcf5d..c141ddf11 100644 --- a/sgp/FileMan.cpp +++ b/sgp/FileMan.cpp @@ -24,7 +24,7 @@ // Includes // //************************************************************************** - #include "Types.h" + #include "types.h" #include #include #include @@ -34,7 +34,7 @@ #include "windows.h" #include "FileMan.h" #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include "LibraryDataBase.h" #include "io.h" #include "sgp_logger.h" diff --git a/sgp/FileMan.h b/sgp/FileMan.h index bc860fc8b..251749b44 100644 --- a/sgp/FileMan.h +++ b/sgp/FileMan.h @@ -20,7 +20,7 @@ //************************************************************************** #include "types.h" -#include "Windows.h" +#include "windows.h" diff --git a/sgp/Font.cpp b/sgp/Font.cpp index d853c542e..a219e3854 100644 --- a/sgp/Font.cpp +++ b/sgp/Font.cpp @@ -8,10 +8,10 @@ #include #include "sgp.h" #include "pcx.h" - #include "memman.h" - #include "fileman.h" + #include "MemMan.h" + #include "FileMan.h" #include "Font.h" - #include "Debug.h" + #include "DEBUG.H" #include "video.h" @@ -931,7 +931,7 @@ CHAR16 GetUnicodeChar(CHAR16 siChar) //case 244: siChar = 244; break; //? //case 249: siChar = 249; break; //? //case 251: siChar = 251; break; //? - //case 255: siChar = 255; break; // + //case 255: siChar = 255; break; //ÿ //inshy: italian letters //case 204: siChar = 204; break; //I' //case 236: siChar = 236; break; //i' @@ -1886,7 +1886,7 @@ FontTranslationTable *CreateEnglishTransTable( ) temp++; *temp = 1102; // ? temp++; - *temp = 1103; // + *temp = 1103; // ÿ temp++; // BELORUSSIAN and UKRAINIAN letters in UNICODE @@ -1936,23 +1936,23 @@ FontTranslationTable *CreateEnglishTransTable( ) temp++; *temp = 377; // ?(zet) temp++; - *temp = 261; // ?() + *temp = 261; // ?(îí) temp++; - *temp = 263; // ?() + *temp = 263; // ?(öå) temp++; - *temp = 281; // ?() + *temp = 281; // ?(ýí) temp++; - *temp = 322; // ?(? + *temp = 322; // ?(ýë? temp++; - *temp = 324; // ?(? + *temp = 324; // ?(ýí? temp++; - *temp = 243; // ?(?? + *temp = 243; // ?(?êðàòêî? temp++; - *temp = 347; // ?(? + *temp = 347; // ?(ýñ? temp++; - *temp = 380; // ?(? + *temp = 380; // ?(æå? temp++; - *temp = 378; // ?(? + *temp = 378; // ?(çå? temp++; // FRENCH and ITALIAN letters in UNICODE @@ -2007,7 +2007,7 @@ FontTranslationTable *CreateEnglishTransTable( ) temp++; *temp = 251; //? temp++; - *temp = 255; // + *temp = 255; //ÿ temp++; //Italian letters *temp = 204; //I' diff --git a/sgp/Font.h b/sgp/Font.h index 16802d614..a48ff41ba 100644 --- a/sgp/Font.h +++ b/sgp/Font.h @@ -1,7 +1,7 @@ #ifndef __FONT_H_ #define __FONT_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include "vobject.h" //#ifdef WINFONTS diff --git a/sgp/LibraryDataBase.cpp b/sgp/LibraryDataBase.cpp index dd5bd67e0..acf75294e 100644 --- a/sgp/LibraryDataBase.cpp +++ b/sgp/LibraryDataBase.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "windows.h" #include "FileMan.h" #include "LibraryDataBase.h" #include "MemMan.h" #include "stdio.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "video.h" diff --git a/sgp/LibraryDataBase.h b/sgp/LibraryDataBase.h index 86922d8ae..06ba02fd6 100644 --- a/sgp/LibraryDataBase.h +++ b/sgp/LibraryDataBase.h @@ -1,7 +1,7 @@ #ifndef _LIBRARY_DATABASE_H #define _LIBRARY_DATABASE_H -#include "Types.h" +#include "types.h" #include "windows.h" #include "FileMan.h" diff --git a/sgp/MemMan.cpp b/sgp/MemMan.cpp index caa545e8c..06580b1c2 100644 --- a/sgp/MemMan.cpp +++ b/sgp/MemMan.cpp @@ -24,7 +24,7 @@ #include #include #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include #include "sgp_logger.h" #ifdef _DEBUG diff --git a/sgp/PCX.cpp b/sgp/PCX.cpp index 25eb2cb2b..4954e97a9 100644 --- a/sgp/PCX.cpp +++ b/sgp/PCX.cpp @@ -1,7 +1,7 @@ #include #include "pcx.h" - #include "memman.h" - #include "fileman.h" + #include "MemMan.h" + #include "FileMan.h" // Local typedefs diff --git a/sgp/Random.cpp b/sgp/Random.cpp index d78445dd3..a413eae5b 100644 --- a/sgp/Random.cpp +++ b/sgp/Random.cpp @@ -1,5 +1,5 @@ -#include "Random.h" -#include "debug control.h" +#include "random.h" +#include "Debug Control.h" extern bool is_client; extern bool is_server; diff --git a/sgp/SMACK.H b/sgp/SMACK.H index 2bb08aeb0..ff9f74881 100644 --- a/sgp/SMACK.H +++ b/sgp/SMACK.H @@ -5,7 +5,7 @@ #ifndef __RADRES__ -#include "rad.h" +#include "RAD.H" RADDEFSTART diff --git a/sgp/STCI.cpp b/sgp/STCI.cpp index 7a117e574..9187cee3b 100644 --- a/sgp/STCI.cpp +++ b/sgp/STCI.cpp @@ -3,8 +3,8 @@ #include "FileMan.h" #include "imgfmt.h" #include "himage.h" - #include "Types.h" - #include "Debug.h" + #include "types.h" + #include "DEBUG.H" #include "WCheck.h" BOOLEAN STCILoadRGB( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader ); diff --git a/sgp/WinFont.cpp b/sgp/WinFont.cpp index 0760c9284..8836519a3 100644 --- a/sgp/WinFont.cpp +++ b/sgp/WinFont.cpp @@ -10,16 +10,16 @@ #include #include #include "sgp.h" -#include "memman.h" -#include "fileman.h" +#include "MemMan.h" +#include "FileMan.h" #include "Font.h" -#include "Debug.h" +#include "DEBUG.H" #include "vsurface.h" #include "vsurface_private.h" #include "DirectX Common.h" #include #include "winfont.h" -#include "font.h" +#include "Font.h" #include "Font Control.h" #include "GameSettings.h" #include diff --git a/sgp/himage.cpp b/sgp/himage.cpp index f2c84bdd7..71582fca8 100644 --- a/sgp/himage.cpp +++ b/sgp/himage.cpp @@ -3,14 +3,14 @@ #include #include "types.h" #include "string.h" - #include "debug.h" - #include "fileman.h" + #include "DEBUG.H" + #include "FileMan.h" #include "himage.h" #include "impTGA.h" #include "pcx.h" #include "STCI.h" #include "PngLoader.h" - #include "wcheck.h" + #include "WCheck.h" #include "Compression.h" #include "vobject.h" #include "vobject_blitters.h" diff --git a/sgp/imgfmt.h b/sgp/imgfmt.h index 6bdb69190..82ed3429f 100644 --- a/sgp/imgfmt.h +++ b/sgp/imgfmt.h @@ -8,7 +8,7 @@ // * SubRectInfo's (usNumberOfRects > 0, size = usNumberOfSubRects * sizeof(SubRectInfo) ), uncompressed // * Bytes of image data, possibly compressed -#include "Types.h" +#include "types.h" #define STCI_ID_STRING "STCI" #define STCI_ID_LEN 4 @@ -89,4 +89,4 @@ typedef struct #define STCI_PALETTE_ELEMENT_SIZE 3 #define STCI_8BIT_PALETTE_SIZE 768 -#endif +#endif diff --git a/sgp/impTGA.cpp b/sgp/impTGA.cpp index 8c4564c06..04b52dc69 100644 --- a/sgp/impTGA.cpp +++ b/sgp/impTGA.cpp @@ -17,12 +17,12 @@ //************************************************************************** #include "types.h" - #include "Fileman.h" - #include "memman.h" + #include "FileMan.h" + #include "MemMan.h" #include "WCheck.h" #include "himage.h" #include "string.h" - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "impTGA.h" diff --git a/sgp/input.cpp b/sgp/input.cpp index d3f514741..7b760e6d2 100644 --- a/sgp/input.cpp +++ b/sgp/input.cpp @@ -11,9 +11,9 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "english.h" #include "video.h" #include "local.h" diff --git a/sgp/mousesystem.cpp b/sgp/mousesystem.cpp index a9fb22c2d..f57129bfb 100644 --- a/sgp/mousesystem.cpp +++ b/sgp/mousesystem.cpp @@ -15,14 +15,14 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "line.h" #include "video.h" #define BASE_REGION_FLAGS (MSYS_REGION_ENABLED | MSYS_SET_CURSOR) #ifdef _JA2_RENDER_DIRTY - #include "render dirty.h" + #include "Render Dirty.h" #include "Font Control.h" #endif #include "english.h" diff --git a/sgp/random.h b/sgp/random.h index 008c3c684..446fc8d38 100644 --- a/sgp/random.h +++ b/sgp/random.h @@ -3,8 +3,8 @@ #define BMP_RANDOM -#include "Types.h" -#include "Debug.h" +#include "types.h" +#include "DEBUG.H" #include "GameSettings.h" //IMPORTANT: Changing this define will invalidate the JA2 save. If this is necessary, please ifdef your own value. diff --git a/sgp/sgp.cpp b/sgp/sgp.cpp index 07518b0b0..b501a0a1a 100644 --- a/sgp/sgp.cpp +++ b/sgp/sgp.cpp @@ -7,17 +7,17 @@ #include #include "sgp.h" #include "vobject.h" - #include "font.h" + #include "Font.h" #include "local.h" - #include "Fileman.h" + #include "FileMan.h" #include "input.h" - #include "Random.h" + #include "random.h" #include "gameloop.h" #include "soundman.h" #include "JA2 Splash.h" #include "Timer Control.h" #include "LibraryDataBase.h" - #include "utilities.h" + #include "Utilities.h" #include "GameSettings.h" #include "input.h" @@ -51,7 +51,7 @@ #include "english.h" #include "wine.h" - #include "BuildDefines.h" + #include "builddefines.h" #include "Intro.h" #ifndef WIN32_LEAN_AND_MEAN diff --git a/sgp/sgp.h b/sgp/sgp.h index 138628dad..2c01a0b51 100644 --- a/sgp/sgp.h +++ b/sgp/sgp.h @@ -4,7 +4,7 @@ #include "local.h" #include "types.h" #include "timer.h" -#include "debug.h" +#include "DEBUG.H" #include "video.h" diff --git a/sgp/sgp_logger.cpp b/sgp/sgp_logger.cpp index dc82bbdec..6499adc92 100644 --- a/sgp/sgp_logger.cpp +++ b/sgp/sgp_logger.cpp @@ -1,8 +1,8 @@ #include "sgp_logger.h" -#include "Debug.h" +#include "DEBUG.H" #include "Font Control.h" -#include "Message.h" +#include "message.h" #include static inline void flush_screen(std::wstringstream& stream) diff --git a/sgp/shading.cpp b/sgp/shading.cpp index 321551393..19a46ff2e 100644 --- a/sgp/shading.cpp +++ b/sgp/shading.cpp @@ -1,6 +1,6 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "himage.h" #include "vobject.h" diff --git a/sgp/soundman.cpp b/sgp/soundman.cpp index 02d33d3e7..663f5b870 100644 --- a/sgp/soundman.cpp +++ b/sgp/soundman.cpp @@ -11,7 +11,7 @@ #include #include "soundman.h" #include "FileMan.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "random.h" #include "fmod.h" diff --git a/sgp/Types.h b/sgp/types.h similarity index 100% rename from sgp/Types.h rename to sgp/types.h diff --git a/sgp/video.cpp b/sgp/video.cpp index f6ca2cafc..bbd93c4b5 100644 --- a/sgp/video.cpp +++ b/sgp/video.cpp @@ -1,16 +1,16 @@ #include "types.h" -#include "Video.h" +#include "video.h" #include "vobject_blitters.h" #include "sgp.h" #include #include #include "renderworld.h" #include "Render Dirty.h" -#include "fade screen.h" +#include "Fade Screen.h" #include "impTGA.h" -#include "timer control.h" -#include "Fileman.h" -#include "Input.h" +#include "Timer Control.h" +#include "FileMan.h" +#include "input.h" #include "GameSettings.h" #include "sgp_logger.h" @@ -18,8 +18,8 @@ #include #include -#include "Local.h" -#include "text.h" +#include "local.h" +#include "Text.h" #ifndef _MT diff --git a/sgp/video.h b/sgp/video.h index 02527b3ac..16bd664fc 100644 --- a/sgp/video.h +++ b/sgp/video.h @@ -5,11 +5,11 @@ #include #include -#include "Local.h" -#include "Debug.h" -#include "Types.h" +#include "local.h" +#include "DEBUG.H" +#include "types.h" #include "DirectDraw Calls.h" -#include "VSurface.h" +#include "vsurface.h" #define BUFFER_READY 0x00 #define BUFFER_BUSY 0x01 diff --git a/sgp/vobject.cpp b/sgp/vobject.cpp index 154c2c5d5..1276bb0ca 100644 --- a/sgp/vobject.cpp +++ b/sgp/vobject.cpp @@ -1,10 +1,10 @@ #include "DirectDraw Calls.h" #include -#include "debug.h" +#include "DEBUG.H" #include "video.h" #include "himage.h" #include "vobject.h" -#include "wcheck.h" +#include "WCheck.h" #include "vobject_blitters.h" #include "sgp.h" diff --git a/sgp/vobject_blitters.cpp b/sgp/vobject_blitters.cpp index 21225e64a..6637db9ef 100644 --- a/sgp/vobject_blitters.cpp +++ b/sgp/vobject_blitters.cpp @@ -1,10 +1,10 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "video.h" // JA2 #include "himage.h" #include "vobject.h" - #include "wcheck.h" + #include "WCheck.h" #include "vobject.h" #include "vobject_blitters.h" #include "shading.h" diff --git a/sgp/vsurface.cpp b/sgp/vsurface.cpp index 905cf8937..075381265 100644 --- a/sgp/vsurface.cpp +++ b/sgp/vsurface.cpp @@ -1,12 +1,12 @@ #include "DirectDraw Calls.h" #include #include -#include "debug.h" +#include "DEBUG.H" #include "video.h" #include "himage.h" #include "vsurface.h" #include "vsurface_private.h" -#include "wcheck.h" +#include "WCheck.h" #include "vobject_blitters.h" extern void SetClippingRect(SGPRect *clip); diff --git a/sgp/ZCONF.H b/sgp/zconf.h similarity index 95% rename from sgp/ZCONF.H rename to sgp/zconf.h index 38df56c42..428f39058 100644 --- a/sgp/ZCONF.H +++ b/sgp/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id: ZCONF.H,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */ +/* $Id: zconf.h,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/sgp/ZLIB.H b/sgp/zlib.h similarity index 100% rename from sgp/ZLIB.H rename to sgp/zlib.h