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
+11 -11
View File
@@ -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