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
+15 -15
View File
@@ -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 <algorithm>
////////////////////////////////////////////