Move game-specific sources into their respective mod-dirs. This was planned

for a while and was inevitable. Latest fteqcc required that fixes a limit
with paths. Also added src/server/mapcycle.qc

.gitignore

@@ -24,6 +24,7 @@ entities.def
 *.pak
 *.pk3
 *.pk4
+*.kdev4
 csqccore.txt
 *.log
 ssqccore.txt

base/src/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	cd client && $(MAKE)
+	cd server && $(MAKE)

base/src/client/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	mkdir -p ../../data.pk3dir
+	$(CC) progs.src

base/src/client/progs.src

@@ -0,0 +1,36 @@
+#pragma target fte
+#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+
+#define CSQC
+#define CLIENT
+#define CLASSIC_VGUI
+#define GS_RENDERFX
+
+#includelist
+../../../src/shared/fteextensions.qc
+../../../src/shared/defs.h
+defs.h
+../../../src/client/defs.h
+
+../../../src/vgui/include.src
+
+../../../src/gs-entbase/client.src
+../../../src/gs-entbase/shared.src
+../shared/include.src
+
+predict.qc
+init.qc
+player.qc
+entities.qc
+cmds.qc
+game_event.qc
+view.qc
+hud.qc
+hud_weaponselect.qc
+scoreboard.qc
+input.qc
+modelevent.qc
+
+../../../src/client/include.src
+../../../src/shared/include.src
+#endlist

base/src/progs.src

@@ -0,0 +1,2 @@
+#pragma sourcefile client/progs.src
+#pragma sourcefile server/progs.src

base/src/server/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	mkdir -p ../../data.pk3dir
+	$(CC) progs.src

base/src/server/progs.src

@@ -0,0 +1,41 @@
+#pragma target fte
+#pragma progs_dat  "../../data.pk3dir/progs.dat"
+
+#define QWSSQC
+#define SERVER
+#define GS_RENDERFX
+
+#includelist
+../../../src/shared/fteextensions.qc
+../../../src/gs-entbase/server/defs.h
+../../../src/shared/defs.h
+../../../src/server/defs.h
+
+../../../src/gs-entbase/server.src
+../../../src/gs-entbase/shared.src
+../shared/include.src
+
+defs.h
+
+player.qc
+spectator.qc
+
+../../../src/botlib/include.src
+
+gamerules.qc
+gamerules_singleplayer.qc
+gamerules_multiplayer.qc
+client.qc
+server.qc
+damage.qc
+items.qc
+rules.qc
+flashlight.qc
+modelevent.qc
+
+input.qc
+spawn.qc
+
+../../../src/server/include.src
+../../../src/shared/include.src
+#endlist

base/src/shared/include.src

@@ -0,0 +1,21 @@
+ #includelist
+flags.h
+player.qc
+weapon_common.h
+animations.h
+animations.qc
+pmove.qc
+pmove_water.qc
+
+fx_blood.qc
+fx_breakmodel.qc
+fx_explosion.qc
+fx_gibhuman.qc
+fx_spark.qc
+fx_impact.qc
+
+items.h
+weapons.h
+weapons.qc
+weapon_common.qc
+#endlist

cstrike/src/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	cd client && $(MAKE)
+	cd server && $(MAKE)

cstrike/src/client/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	mkdir -p ../../data.pk3dir
+	$(CC) progs.src

cstrike/src/client/defs.h

@@ -16,7 +16,7 @@
 
 #include "hud.h"
 #include "radio.h"
-#include "../valve/obituary.h"
+#include "../../../valve/src/client/obituary.h"
 
 var int autocvar_cl_autoweaponswitch = TRUE;
 

cstrike/src/client/progs.src

@@ -0,0 +1,42 @@
+#pragma target fte
+#pragma progs_dat  "../../data.pk3dir/csprogs.dat"
+#pragma includedir "../../../valve/src"
+
+#define CSQC
+#define CLIENT
+#define VALVE
+#define CSTRIKE
+#define CLASSIC_VGUI
+#define GS_RENDERFX
+
+#includelist
+../../../src/shared/fteextensions.qc
+../../../src/shared/defs.h
+../shared/defs.h
+defs.h
+../../../src/client/defs.h
+../../../src/vgui/include.src
+../../../src/gs-entbase/client.src
+../../../src/gs-entbase/shared.src
+../shared/include.src
+
+predict.qc
+textmenu.qc
+init.qc
+player.qc
+entities.qc
+cmds.qc
+game_event.qc
+../../../valve/src/client/view.qc
+crosshair.qc
+../../../valve/src/client/obituary.qc
+hud.qc
+hud_weaponselect.qc
+../../../valve/src/client/scoreboard.qc
+../../../valve/src/client/input.qc
+radio.qc
+../../../base/src/client/modelevent.qc
+
+../../../src/client/include.src
+../../../src/shared/include.src
+#endlist

cstrike/src/progs.src

@@ -0,0 +1,2 @@
+#pragma sourcefile client/progs.src
+#pragma sourcefile server/progs.src

cstrike/src/server/Makefile

@@ -0,0 +1,5 @@
+CC=fteqcc
+
+all:
+	mkdir -p ../../data.pk3dir
+	$(CC) progs.src

cstrike/src/server/defs.h

@@ -17,7 +17,7 @@
 #include "gamerules.h"
 #include "money.h"
 #include "radio.h"
-#include "../valve/items.h"
+#include "../../../valve/src/server/items.h"
 
 var int g_cstrike_buying = 0;
 var float g_cstrike_bombradius = 500;

cstrike/src/server/gamerules.h

@@ -14,8 +14,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "../gamerules.h"
-
 class CSGameRules:CGameRules
 {
 	virtual void(base_player) PlayerConnect;

cstrike/src/server/progs.src

@@ -0,0 +1,61 @@
+#pragma target fte
+#pragma progs_dat  "../../data.pk3dir/progs.dat"
+
+#define QWSSQC
+#define SERVER
+#define VALVE
+#define CSTRIKE
+#define BULLETPENETRATION
+#define BULLETPATTERNS
+#define GS_RENDERFX
+
+#includelist
+../../../src/shared/fteextensions.qc
+../../../src/gs-entbase/server/defs.h
+../../../src/shared/defs.h
+../../../src/server/defs.h
+../../../src/gs-entbase/server.src
+../../../src/gs-entbase/shared.src
+
+defs.h
+../shared/include.src
+
+player.qc
+../../../valve/src/server/spectator.qc
+
+hostage_entity.qc
+armoury_entity.qc
+func_bomb_target.qc
+func_buyzone.qc
+info_buyzone.qc
+func_escapezone.qc
+func_hostage_rescue.qc
+info_hostage_rescue.qc
+func_vip_safetyzone.qc
+info_map_parameters.qc
+item_suit.qc
+../../../valve/src/server/items.qc
+
+../../../src/botlib/include.src
+
+game_money.qc
+gamerules.qc
+gamerules_singleplayer.qc
+gamerules_multiplayer.qc
+
+radio.qc
+client.qc
+ammo.qc
+buy.qc
+server.qc
+../../../valve/src/server/damage.qc
+../../../valve/src/server/rules.qc
+../../../valve/src/server/flashlight.qc
+../../../base/src/server/modelevent.qc
+
+input.qc
+spawn.qc
+
+../../../src/server/include.src
+../../../src/shared/include.src
+#endlist