From dd7198099d8a20bb5c3fc9fe8366d537f5ca1d15 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 23 Dec 2015 18:45:24 +1000 Subject: [PATCH] Move some stuff around, kill a server file included from client --- qcsrc/client/movelib.qc | 1 - qcsrc/client/movelib.qh | 1 - qcsrc/client/progs.inc | 1 - qcsrc/common/_all.inc | 3 +-- qcsrc/common/physics/all.inc | 3 +++ qcsrc/{server => common/physics}/movelib.qc | 0 qcsrc/{server => common/physics}/movelib.qh | 0 qcsrc/common/{ => physics}/movetypes/follow.qc | 0 qcsrc/common/{ => physics}/movetypes/include.qc | 0 qcsrc/common/{ => physics}/movetypes/include.qh | 0 qcsrc/common/{ => physics}/movetypes/movetypes.qc | 0 qcsrc/common/{ => physics}/movetypes/movetypes.qh | 0 qcsrc/common/{ => physics}/movetypes/push.qc | 0 qcsrc/common/{ => physics}/movetypes/push.qh | 0 qcsrc/common/{ => physics}/movetypes/step.qc | 0 qcsrc/common/{ => physics}/movetypes/toss.qc | 0 qcsrc/common/{ => physics}/movetypes/toss.qh | 0 qcsrc/common/{ => physics}/movetypes/walk.qc | 0 qcsrc/common/{ => physics}/movetypes/walk.qh | 0 qcsrc/common/{physics.qc => physics/player.qc} | 0 qcsrc/common/{physics.qh => physics/player.qh} | 0 qcsrc/server/progs.inc | 1 - 22 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 qcsrc/client/movelib.qc delete mode 100644 qcsrc/client/movelib.qh create mode 100644 qcsrc/common/physics/all.inc rename qcsrc/{server => common/physics}/movelib.qc (100%) rename qcsrc/{server => common/physics}/movelib.qh (100%) rename qcsrc/common/{ => physics}/movetypes/follow.qc (100%) rename qcsrc/common/{ => physics}/movetypes/include.qc (100%) rename qcsrc/common/{ => physics}/movetypes/include.qh (100%) rename qcsrc/common/{ => physics}/movetypes/movetypes.qc (100%) rename qcsrc/common/{ => physics}/movetypes/movetypes.qh (100%) rename qcsrc/common/{ => physics}/movetypes/push.qc (100%) rename qcsrc/common/{ => physics}/movetypes/push.qh (100%) rename qcsrc/common/{ => physics}/movetypes/step.qc (100%) rename qcsrc/common/{ => physics}/movetypes/toss.qc (100%) rename qcsrc/common/{ => physics}/movetypes/toss.qh (100%) rename qcsrc/common/{ => physics}/movetypes/walk.qc (100%) rename qcsrc/common/{ => physics}/movetypes/walk.qh (100%) rename qcsrc/common/{physics.qc => physics/player.qc} (100%) rename qcsrc/common/{physics.qh => physics/player.qh} (100%) diff --git a/qcsrc/client/movelib.qc b/qcsrc/client/movelib.qc deleted file mode 100644 index 074f146dc..000000000 --- a/qcsrc/client/movelib.qc +++ /dev/null @@ -1 +0,0 @@ -#include "../server/movelib.qc" diff --git a/qcsrc/client/movelib.qh b/qcsrc/client/movelib.qh deleted file mode 100644 index a0634f6de..000000000 --- a/qcsrc/client/movelib.qh +++ /dev/null @@ -1 +0,0 @@ -#include "../server/movelib.qh" diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 75ca9ac13..70bf45e5c 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -11,7 +11,6 @@ #include "main.qc" #include "mapvoting.qc" #include "miscfunctions.qc" -#include "movelib.qc" #include "player_skeleton.qc" #include "scoreboard.qc" #include "shownames.qc" diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index f955949ae..a27202962 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -15,8 +15,7 @@ #endif #ifndef MENUQC -#include "physics.qc" -#include "movetypes/include.qc" +#include "physics/all.inc" #include "triggers/include.qc" #include "viewloc.qc" #endif diff --git a/qcsrc/common/physics/all.inc b/qcsrc/common/physics/all.inc new file mode 100644 index 000000000..cea8df71e --- /dev/null +++ b/qcsrc/common/physics/all.inc @@ -0,0 +1,3 @@ +#include "player.qc" +#include "movelib.qc" +#include "movetypes/include.qc" diff --git a/qcsrc/server/movelib.qc b/qcsrc/common/physics/movelib.qc similarity index 100% rename from qcsrc/server/movelib.qc rename to qcsrc/common/physics/movelib.qc diff --git a/qcsrc/server/movelib.qh b/qcsrc/common/physics/movelib.qh similarity index 100% rename from qcsrc/server/movelib.qh rename to qcsrc/common/physics/movelib.qh diff --git a/qcsrc/common/movetypes/follow.qc b/qcsrc/common/physics/movetypes/follow.qc similarity index 100% rename from qcsrc/common/movetypes/follow.qc rename to qcsrc/common/physics/movetypes/follow.qc diff --git a/qcsrc/common/movetypes/include.qc b/qcsrc/common/physics/movetypes/include.qc similarity index 100% rename from qcsrc/common/movetypes/include.qc rename to qcsrc/common/physics/movetypes/include.qc diff --git a/qcsrc/common/movetypes/include.qh b/qcsrc/common/physics/movetypes/include.qh similarity index 100% rename from qcsrc/common/movetypes/include.qh rename to qcsrc/common/physics/movetypes/include.qh diff --git a/qcsrc/common/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc similarity index 100% rename from qcsrc/common/movetypes/movetypes.qc rename to qcsrc/common/physics/movetypes/movetypes.qc diff --git a/qcsrc/common/movetypes/movetypes.qh b/qcsrc/common/physics/movetypes/movetypes.qh similarity index 100% rename from qcsrc/common/movetypes/movetypes.qh rename to qcsrc/common/physics/movetypes/movetypes.qh diff --git a/qcsrc/common/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc similarity index 100% rename from qcsrc/common/movetypes/push.qc rename to qcsrc/common/physics/movetypes/push.qc diff --git a/qcsrc/common/movetypes/push.qh b/qcsrc/common/physics/movetypes/push.qh similarity index 100% rename from qcsrc/common/movetypes/push.qh rename to qcsrc/common/physics/movetypes/push.qh diff --git a/qcsrc/common/movetypes/step.qc b/qcsrc/common/physics/movetypes/step.qc similarity index 100% rename from qcsrc/common/movetypes/step.qc rename to qcsrc/common/physics/movetypes/step.qc diff --git a/qcsrc/common/movetypes/toss.qc b/qcsrc/common/physics/movetypes/toss.qc similarity index 100% rename from qcsrc/common/movetypes/toss.qc rename to qcsrc/common/physics/movetypes/toss.qc diff --git a/qcsrc/common/movetypes/toss.qh b/qcsrc/common/physics/movetypes/toss.qh similarity index 100% rename from qcsrc/common/movetypes/toss.qh rename to qcsrc/common/physics/movetypes/toss.qh diff --git a/qcsrc/common/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc similarity index 100% rename from qcsrc/common/movetypes/walk.qc rename to qcsrc/common/physics/movetypes/walk.qc diff --git a/qcsrc/common/movetypes/walk.qh b/qcsrc/common/physics/movetypes/walk.qh similarity index 100% rename from qcsrc/common/movetypes/walk.qh rename to qcsrc/common/physics/movetypes/walk.qh diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics/player.qc similarity index 100% rename from qcsrc/common/physics.qc rename to qcsrc/common/physics/player.qc diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics/player.qh similarity index 100% rename from qcsrc/common/physics.qh rename to qcsrc/common/physics/player.qh diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index cde4b68f9..f0c13be64 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -20,7 +20,6 @@ #include "item_key.qc" #include "mapvoting.qc" #include "miscfunctions.qc" -#include "movelib.qc" #include "playerdemo.qc" #include "portals.qc" #include "race.qc" -- 2.39.2