Merge branch 'master' into ExtraMercs

This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
601 changed files with 4005 additions and 10278 deletions
+21 -21
View File
@@ -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 <vector>