1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +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
Multiplayer/client.cpp
+26 -26
View File
@@ -1,10 +1,10 @@
#include "builddefines.h"
#include "bullets.h"
#include "Bullets.h"
#include <stdio.h>
#include <string.h>
#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 <cstdio>
#include <cstring>
#include <stdlib.h>
#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 <vfs/Core/File/vfs_file.h>
#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];
Multiplayer/connect.h
+2 -1
View File
@@ -3,9 +3,10 @@
#include "Soldier Init List.h"
#include "Merc Hiring.h"
#include "event pump.h"
#include "Event Pump.h"
#include "Bullets.h"
#include "builddefines.h"
#include "Strategic Movement.h"
extern bool isOwnTeamWipedOut;
Multiplayer/raknet/Gen_RPC8.h
+1 -1
View File
@@ -12,7 +12,7 @@
#endif
#include <stddef.h>
//#define ASSEMBLY_BLOCK asm
//#include "Types.h"
//#include "types.h"
#include "BitStream.h"
// #define AUTO_RPC_NO_ASM
Multiplayer/server.cpp
+5 -5
View File
@@ -21,18 +21,18 @@
#include <list>
#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 <vfs/Core/vfs.h>
#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"
Multiplayer/transfer_rules.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "transfer_rules.h"
#include "Debug.h"
#include "DEBUG.H"
#include <vfs/Core/vfs.h>
#include <vfs/Core/vfs_file_raii.h>
#include <vfs/Core/File/vfs_file.h>