1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ExtraMercs

Browse Source
This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
parent f3194718e4 4ec012ce7b
commit 82aca548f5
601 changed files with 4005 additions and 10278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ja2/Credits.cpp
+11 -11
View File
@@ -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;
Ja2/Fade Screen.cpp
+4 -4
View File
@@ -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"
Ja2/FeaturesScreen.cpp
+10 -10
View File
@@ -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"
Ja2/GameInitOptionsScreen.cpp
+7 -7
View File
@@ -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"
Ja2/GameInitOptionsScreen.h
+1 -1
View File
@@ -85,7 +85,7 @@ typedef struct
UINT8 usLevelModifierLowLimit;
UINT8 usLevelModifierHighLimit;
BOOLEAN bAllowUnrestrictedXPLevels;
BOOLEAN bQueenLosingControlOfSector;
UINT8 bQueenLosingControlOfSector;
BOOLEAN bBloodcatAmbush;
BOOLEAN bAirRaidLookForDive;
UINT32 iGetNumberOfTurnsPowerGenFanWillBeStoppedFor; //UB
Ja2/GameSettings.cpp
+9 -6
View File
@@ -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"
@@ -1679,6 +1679,9 @@ void LoadGameExternalOptions()
//JMich.BackpackClimb
gGameExternalOptions.sBackpackWeightToClimb = iniReader.ReadInteger("Tactical Gameplay Settings", "MAX_BACKPACK_WEIGHT_TO_CLIMB", -1);
gGameExternalOptions.fUseGlobalBackpackSettings = iniReader.ReadBoolean("Tactical Gameplay Settings", "USE_GLOBAL_BACKPACK_SETTINGS", TRUE);
// Buscher
gGameExternalOptions.ubBackPackWeightFactorForAPPenalty = iniReader.ReadInteger("Tactical Gameplay Settings", "BACKPACK_WEIGHT_FACTOR", 50, 1, 250);
// sevenfm
gGameExternalOptions.fShowEnemyWeapon = iniReader.ReadBoolean("Tactical Gameplay Settings","SHOW_ENEMY_WEAPON", FALSE);
@@ -2602,7 +2605,7 @@ void LoadSkillTraitsExternalSettings()
gSkillTraitValues.ubNumberOfMajorTraitsAllowed = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED", 3, 2, gSkillTraitValues.ubMaxNumberOfTraits - 1);
gSkillTraitValues.ubMaxNumberOfTraitsForIMP = iniReader.ReadInteger("Generic Traits Settings","MAX_NUMBER_OF_TRAITS_FOR_IMP", 3, 2, 30);
gSkillTraitValues.ubNumberOfMajorTraitsAllowedForIMP = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP", 2, 2, min( gSkillTraitValues.ubNumberOfMajorTraitsAllowed, gSkillTraitValues.ubMaxNumberOfTraitsForIMP - 1 ) );
gSkillTraitValues.ubNumberOfMajorTraitsAllowedForIMP = iniReader.ReadInteger( "Generic Traits Settings", "NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP", 2, 2, min( gSkillTraitValues.ubNumberOfMajorTraitsAllowed, gSkillTraitValues.ubMaxNumberOfTraitsForIMP ) );
// Allow an exception in number of traits for Special Merc?
//gSkillTraitValues.fAllowSpecialMercTraitsException = iniReader.ReadBoolean("Generic Traits Settings","ALLOW_EXCEPTION_FOR_SPECIAL_MERC", TRUE);
Ja2/GameSettings.h
+4 -1
View File
@@ -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"
@@ -1361,6 +1361,9 @@ typedef struct
INT16 sBackpackWeightToClimb;
BOOLEAN fUseGlobalBackpackSettings;
// Buscher
UINT8 ubBackPackWeightFactorForAPPenalty;
// sevenfm: show enemy weapon above soldier in tactical
BOOLEAN fShowEnemyWeapon;
BOOLEAN fShowEnemyExtendedInfo;
Ja2/GameVersion.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "Types.h"
#include "types.h"
#include "GameVersion.h"
//
Ja2/HelpScreen.cpp
+7 -7
View File
@@ -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"
Ja2/Init.cpp
+8 -8
View File
@@ -1,7 +1,7 @@
#include "builddefines.h"
#include <stdio.h>
#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"
Ja2/Intro.cpp
+5 -5
View File
@@ -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"
Ja2/JA2 Splash.cpp
+2 -2
View File
@@ -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 <stdio.h>
Ja2/Ja25Update.cpp
+18 -18
View File
@@ -4,7 +4,7 @@
#include <string.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"
@@ -12,21 +12,21 @@
#include "Animation Data.h"
#include "Animation Control.h"
#include <math.h>
#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
Ja2/Ja25Update.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JA25UPDATE__C_
#define JA25UPDATE__C_
#include "Types.h"
#include "types.h"
#ifdef JA2UB
Ja2/Loading Screen.cpp
+4 -4
View File
@@ -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 <string>
Ja2/MPChatScreen.cpp
+6 -6
View File
@@ -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
Ja2/MPConnectScreen.cpp
+8 -8
View File
@@ -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"
////////////////////////////////////////////
Ja2/MPHostScreen.cpp
+9 -9
View File
@@ -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 <vfs/Tools/vfs_property_container.h>
#include <vfs/Core/vfs_os_functions.h>
#include "MPJoinScreen.h"
#include "MainMenuScreen.h"
#include "mainmenuscreen.h"
#include "Init.h"
#include "xml.h"
#include "XML.h"
////////////////////////////////////////////
//
Ja2/MPJoinScreen.cpp
+9 -9
View File
@@ -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 <vfs/Core/vfs.h>
#include <vfs/Core/vfs_init.h>
#include <vfs/Tools/vfs_property_container.h>
#include <vfs/Core/vfs_os_functions.h>
#include "Random.h"
#include "random.h"
////////////////////////////////////////////
//
Ja2/MPScoreScreen.cpp
+6 -6
View File
@@ -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"
Ja2/MainMenuScreen.cpp
+14 -14
View File
@@ -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 <vfs/Core/vfs.h>
#include <vfs/Core/vfs_profile.h>
Ja2/MessageBoxScreen.cpp
+6 -6
View File
@@ -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
Ja2/Options Screen.cpp
+10 -10
View File
@@ -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"
Ja2/SaveLoadGame.cpp
+33 -33
View File
@@ -1,32 +1,32 @@
#include "Types.h"
#include "types.h"
#include "Soldier Profile.h"
#include "FileMan.h"
#include <string.h>
#include <stdio.h>
#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"
Ja2/SaveLoadScreen.cpp
+12 -12
View File
@@ -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"
Ja2/Screens.h
+2 -2
View File
@@ -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
Ja2/TimeLogging.h
+1 -1
View File
@@ -1,5 +1,5 @@
#pragma once
#include "Types.h"
#include "types.h"
void TimingLogInitialize(const CHAR8* filename);
void TimingLog(const CHAR8* logEvent, int n);
Ja2/XML_DifficultySettings.cpp
+1 -1
View File
@@ -555,7 +555,7 @@ difficultySettingsEndElementHandle(void *userData, const XML_Char *name)
else if(strcmp(name, "QueenAttackLosingControlOfSector") == 0)
{
pData->curElement = ELEMENT;
pData->curDifficultySettings.bQueenLosingControlOfSector = (BOOLEAN) atol(pData->szCharData);
pData->curDifficultySettings.bQueenLosingControlOfSector = atoi(pData->szCharData);
}
else if(strcmp(name, "BloodcatAmbushSectors") == 0)
{
Ja2/aniviewscreen.cpp
+4 -4
View File
@@ -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 <wchar.h>
#include <tchar.h>
#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;
Ja2/builddefines.h
+1 -1
View File
@@ -79,6 +79,6 @@
#define _CRT_NON_CONFORMING_SWPRINTFS
#define _SCL_SECURE_NO_WARNINGS
#include "Profiler.h"
#include "profiler.h"
#endif
Ja2/gameloop.cpp
+7 -7
View File
@@ -1,17 +1,17 @@
#include <stdio.h>
#include <time.h>
#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
Ja2/gameloop.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __GAMELOOP_
#define __GAMELOOP_
#include "Types.h"
#include "types.h"
// main game loop systems
#define INIT_SYSTEM 0
Ja2/gamescreen.cpp
+24 -24
View File
@@ -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 <wchar.h>
#include <tchar.h>
#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 <string.h>
#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"
Ja2/jascreens.cpp
+15 -15
View File
@@ -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 <tchar.h>
#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 <language.hpp>
Ja2/jascreens.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define __JASCREENS_H_
#include "sgp.h"
#include "ScreenIds.h"
#include "screenids.h"
#include "mousesystem.h"
#include "Button System.h"
#include <list>
Ja2/legion cfg.cpp
+12 -12
View File
@@ -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
Ja2/ub_config.cpp
+12 -12
View File
@@ -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