From fbd313c7ceb26a09310d8062926f4ac2468623a8 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 10 Jun 2018 01:52:03 +1000 Subject: [PATCH] Rename triggers to mapobjects --- qcsrc/client/main.qc | 2 +- qcsrc/client/view.qc | 4 +-- qcsrc/common/_all.inc | 2 +- qcsrc/common/mapobjects/_mod.inc | 11 ++++++++ qcsrc/common/mapobjects/_mod.qh | 11 ++++++++ qcsrc/common/{triggers => mapobjects}/defs.qh | 0 qcsrc/common/mapobjects/func/_mod.inc | 19 ++++++++++++++ qcsrc/common/mapobjects/func/_mod.qh | 19 ++++++++++++++ .../{triggers => mapobjects}/func/bobbing.qc | 0 .../{triggers => mapobjects}/func/bobbing.qh | 0 .../func/breakable.qc | 0 .../func/breakable.qh | 0 .../{triggers => mapobjects}/func/button.qc | 0 .../{triggers => mapobjects}/func/button.qh | 0 .../{triggers => mapobjects}/func/conveyor.qc | 0 .../{triggers => mapobjects}/func/conveyor.qh | 0 .../{triggers => mapobjects}/func/door.qc | 0 .../{triggers => mapobjects}/func/door.qh | 0 .../func/door_rotating.qc | 0 .../func/door_rotating.qh | 0 .../func/door_secret.qc | 0 .../func/door_secret.qh | 0 .../{triggers => mapobjects}/func/fourier.qc | 0 .../{triggers => mapobjects}/func/fourier.qh | 0 .../{triggers => mapobjects}/func/include.qc | 0 .../{triggers => mapobjects}/func/include.qh | 0 .../{triggers => mapobjects}/func/ladder.qc | 0 .../{triggers => mapobjects}/func/ladder.qh | 0 .../{triggers => mapobjects}/func/pendulum.qc | 0 .../{triggers => mapobjects}/func/pendulum.qh | 0 .../{triggers => mapobjects}/func/plat.qc | 0 .../{triggers => mapobjects}/func/plat.qh | 0 .../func/pointparticles.qc | 0 .../func/pointparticles.qh | 0 .../{triggers => mapobjects}/func/rainsnow.qc | 0 .../{triggers => mapobjects}/func/rainsnow.qh | 0 .../{triggers => mapobjects}/func/rotating.qc | 0 .../{triggers => mapobjects}/func/rotating.qh | 0 .../{triggers => mapobjects}/func/stardust.qc | 0 .../{triggers => mapobjects}/func/stardust.qh | 0 .../{triggers => mapobjects}/func/train.qc | 0 .../{triggers => mapobjects}/func/train.qh | 0 .../func/vectormamamam.qc | 0 .../func/vectormamamam.qh | 0 .../{triggers => mapobjects}/include.qc | 0 .../{triggers => mapobjects}/include.qh | 0 qcsrc/common/mapobjects/misc/_mod.inc | 6 +++++ qcsrc/common/mapobjects/misc/_mod.qh | 6 +++++ .../{triggers => mapobjects}/misc/corner.qc | 0 .../{triggers => mapobjects}/misc/corner.qh | 0 .../{triggers => mapobjects}/misc/follow.qc | 0 .../{triggers => mapobjects}/misc/follow.qh | 0 .../{triggers => mapobjects}/misc/include.qc | 0 .../{triggers => mapobjects}/misc/include.qh | 0 .../{triggers => mapobjects}/misc/laser.qc | 0 .../{triggers => mapobjects}/misc/laser.qh | 0 .../misc/teleport_dest.qc | 0 .../misc/teleport_dest.qh | 0 .../{triggers => mapobjects}/platforms.qc | 0 .../{triggers => mapobjects}/platforms.qh | 0 qcsrc/common/{triggers => mapobjects}/subs.qc | 0 qcsrc/common/{triggers => mapobjects}/subs.qh | 0 qcsrc/common/mapobjects/target/_mod.inc | 11 ++++++++ qcsrc/common/mapobjects/target/_mod.qh | 11 ++++++++ .../target/changelevel.qc | 0 .../target/changelevel.qh | 0 .../target/include.qc | 0 .../target/include.qh | 0 .../{triggers => mapobjects}/target/kill.qc | 0 .../{triggers => mapobjects}/target/kill.qh | 0 .../target/levelwarp.qc | 0 .../target/levelwarp.qh | 0 .../target/location.qc | 0 .../target/location.qh | 0 .../{triggers => mapobjects}/target/music.qc | 0 .../{triggers => mapobjects}/target/music.qh | 0 .../{triggers => mapobjects}/target/spawn.qc | 0 .../{triggers => mapobjects}/target/spawn.qh | 0 .../target/spawnpoint.qc | 0 .../target/spawnpoint.qh | 0 .../target/speaker.qc | 0 .../target/speaker.qh | 0 .../target/voicescript.qc | 0 .../target/voicescript.qh | 0 .../{triggers => mapobjects}/teleporters.qc | 2 +- .../{triggers => mapobjects}/teleporters.qh | 0 qcsrc/common/mapobjects/trigger/_mod.inc | 25 +++++++++++++++++++ qcsrc/common/mapobjects/trigger/_mod.qh | 25 +++++++++++++++++++ .../trigger/counter.qc | 0 .../trigger/counter.qh | 0 .../{triggers => mapobjects}/trigger/delay.qc | 0 .../{triggers => mapobjects}/trigger/delay.qh | 0 .../trigger/disablerelay.qc | 0 .../trigger/disablerelay.qh | 0 .../trigger/flipflop.qc | 0 .../trigger/flipflop.qh | 0 .../trigger/gamestart.qc | 0 .../trigger/gamestart.qh | 0 .../trigger/gravity.qc | 0 .../trigger/gravity.qh | 0 .../{triggers => mapobjects}/trigger/heal.qc | 0 .../{triggers => mapobjects}/trigger/heal.qh | 0 .../{triggers => mapobjects}/trigger/hurt.qc | 0 .../{triggers => mapobjects}/trigger/hurt.qh | 0 .../trigger/impulse.qc | 0 .../trigger/impulse.qh | 0 .../trigger/include.qc | 0 .../trigger/include.qh | 0 .../trigger/jumppads.qc | 0 .../trigger/jumppads.qh | 0 .../trigger/keylock.qc | 0 .../trigger/keylock.qh | 0 .../trigger/magicear.qc | 0 .../trigger/magicear.qh | 0 .../trigger/monoflop.qc | 0 .../trigger/monoflop.qh | 0 .../{triggers => mapobjects}/trigger/multi.qc | 0 .../{triggers => mapobjects}/trigger/multi.qh | 0 .../trigger/multivibrator.qc | 0 .../trigger/multivibrator.qh | 0 .../{triggers => mapobjects}/trigger/relay.qc | 0 .../{triggers => mapobjects}/trigger/relay.qh | 0 .../trigger/relay_activators.qc | 0 .../trigger/relay_activators.qh | 0 .../trigger/relay_if.qc | 0 .../trigger/relay_if.qh | 0 .../trigger/relay_teamcheck.qc | 0 .../trigger/relay_teamcheck.qh | 0 .../trigger/secret.qc | 0 .../trigger/secret.qh | 0 .../{triggers => mapobjects}/trigger/swamp.qc | 0 .../{triggers => mapobjects}/trigger/swamp.qh | 0 .../trigger/teleport.qc | 0 .../trigger/teleport.qh | 0 .../trigger/viewloc.qc | 0 .../trigger/viewloc.qh | 0 .../{triggers => mapobjects}/triggers.qc | 0 .../{triggers => mapobjects}/triggers.qh | 0 qcsrc/common/monsters/sv_monsters.qc | 2 +- .../common/mutators/mutator/buffs/sv_buffs.qc | 2 +- qcsrc/common/physics/player.qc | 4 +-- qcsrc/common/t_items.qc | 2 +- qcsrc/common/triggers/_mod.inc | 11 -------- qcsrc/common/triggers/_mod.qh | 11 -------- qcsrc/common/triggers/func/_mod.inc | 19 -------------- qcsrc/common/triggers/func/_mod.qh | 19 -------------- qcsrc/common/triggers/misc/_mod.inc | 6 ----- qcsrc/common/triggers/misc/_mod.qh | 6 ----- qcsrc/common/triggers/target/_mod.inc | 11 -------- qcsrc/common/triggers/target/_mod.qh | 11 -------- qcsrc/common/triggers/trigger/_mod.inc | 25 ------------------- qcsrc/common/triggers/trigger/_mod.qh | 25 ------------------- qcsrc/common/vehicles/vehicle/racer.qc | 2 +- qcsrc/common/weapons/weapon/porto.qc | 2 +- qcsrc/lib/warpzone/server.qc | 2 +- qcsrc/server/bot/default/havocbot/havocbot.qc | 4 +-- qcsrc/server/bot/default/navigation.qc | 2 +- qcsrc/server/cheats.qc | 6 ++--- qcsrc/server/client.qc | 12 ++++----- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/g_models.qc | 4 +-- qcsrc/server/g_subs.qc | 2 +- qcsrc/server/g_world.qc | 4 +-- qcsrc/server/item_key.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/gamemode.qh | 4 +-- qcsrc/server/mutators/mutator.qh | 4 +-- qcsrc/server/player.qc | 4 +-- qcsrc/server/portals.qc | 4 +-- qcsrc/server/race.qc | 2 +- qcsrc/server/spawnpoints.qc | 4 +-- qcsrc/server/weapons/throwing.qc | 2 +- 172 files changed, 189 insertions(+), 189 deletions(-) create mode 100644 qcsrc/common/mapobjects/_mod.inc create mode 100644 qcsrc/common/mapobjects/_mod.qh rename qcsrc/common/{triggers => mapobjects}/defs.qh (100%) create mode 100644 qcsrc/common/mapobjects/func/_mod.inc create mode 100644 qcsrc/common/mapobjects/func/_mod.qh rename qcsrc/common/{triggers => mapobjects}/func/bobbing.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/bobbing.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/breakable.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/breakable.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/button.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/button.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/conveyor.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/conveyor.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/door.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/door.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/door_rotating.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/door_rotating.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/door_secret.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/door_secret.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/fourier.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/fourier.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/include.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/include.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/ladder.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/ladder.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/pendulum.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/pendulum.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/plat.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/plat.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/pointparticles.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/pointparticles.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/rainsnow.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/rainsnow.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/rotating.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/rotating.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/stardust.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/stardust.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/train.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/train.qh (100%) rename qcsrc/common/{triggers => mapobjects}/func/vectormamamam.qc (100%) rename qcsrc/common/{triggers => mapobjects}/func/vectormamamam.qh (100%) rename qcsrc/common/{triggers => mapobjects}/include.qc (100%) rename qcsrc/common/{triggers => mapobjects}/include.qh (100%) create mode 100644 qcsrc/common/mapobjects/misc/_mod.inc create mode 100644 qcsrc/common/mapobjects/misc/_mod.qh rename qcsrc/common/{triggers => mapobjects}/misc/corner.qc (100%) rename qcsrc/common/{triggers => mapobjects}/misc/corner.qh (100%) rename qcsrc/common/{triggers => mapobjects}/misc/follow.qc (100%) rename qcsrc/common/{triggers => mapobjects}/misc/follow.qh (100%) rename qcsrc/common/{triggers => mapobjects}/misc/include.qc (100%) rename qcsrc/common/{triggers => mapobjects}/misc/include.qh (100%) rename qcsrc/common/{triggers => mapobjects}/misc/laser.qc (100%) rename qcsrc/common/{triggers => mapobjects}/misc/laser.qh (100%) rename qcsrc/common/{triggers => mapobjects}/misc/teleport_dest.qc (100%) rename qcsrc/common/{triggers => mapobjects}/misc/teleport_dest.qh (100%) rename qcsrc/common/{triggers => mapobjects}/platforms.qc (100%) rename qcsrc/common/{triggers => mapobjects}/platforms.qh (100%) rename qcsrc/common/{triggers => mapobjects}/subs.qc (100%) rename qcsrc/common/{triggers => mapobjects}/subs.qh (100%) create mode 100644 qcsrc/common/mapobjects/target/_mod.inc create mode 100644 qcsrc/common/mapobjects/target/_mod.qh rename qcsrc/common/{triggers => mapobjects}/target/changelevel.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/changelevel.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/include.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/include.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/kill.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/kill.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/levelwarp.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/levelwarp.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/location.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/location.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/music.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/music.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/spawn.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/spawn.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/spawnpoint.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/spawnpoint.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/speaker.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/speaker.qh (100%) rename qcsrc/common/{triggers => mapobjects}/target/voicescript.qc (100%) rename qcsrc/common/{triggers => mapobjects}/target/voicescript.qh (100%) rename qcsrc/common/{triggers => mapobjects}/teleporters.qc (99%) rename qcsrc/common/{triggers => mapobjects}/teleporters.qh (100%) create mode 100644 qcsrc/common/mapobjects/trigger/_mod.inc create mode 100644 qcsrc/common/mapobjects/trigger/_mod.qh rename qcsrc/common/{triggers => mapobjects}/trigger/counter.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/counter.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/delay.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/delay.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/disablerelay.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/disablerelay.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/flipflop.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/flipflop.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/gamestart.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/gamestart.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/gravity.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/gravity.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/heal.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/heal.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/hurt.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/hurt.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/impulse.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/impulse.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/include.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/include.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/jumppads.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/jumppads.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/keylock.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/keylock.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/magicear.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/magicear.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/monoflop.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/monoflop.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/multi.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/multi.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/multivibrator.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/multivibrator.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_activators.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_activators.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_if.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_if.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_teamcheck.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/relay_teamcheck.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/secret.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/secret.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/swamp.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/swamp.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/teleport.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/teleport.qh (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/viewloc.qc (100%) rename qcsrc/common/{triggers => mapobjects}/trigger/viewloc.qh (100%) rename qcsrc/common/{triggers => mapobjects}/triggers.qc (100%) rename qcsrc/common/{triggers => mapobjects}/triggers.qh (100%) delete mode 100644 qcsrc/common/triggers/_mod.inc delete mode 100644 qcsrc/common/triggers/_mod.qh delete mode 100644 qcsrc/common/triggers/func/_mod.inc delete mode 100644 qcsrc/common/triggers/func/_mod.qh delete mode 100644 qcsrc/common/triggers/misc/_mod.inc delete mode 100644 qcsrc/common/triggers/misc/_mod.qh delete mode 100644 qcsrc/common/triggers/target/_mod.inc delete mode 100644 qcsrc/common/triggers/target/_mod.qh delete mode 100644 qcsrc/common/triggers/trigger/_mod.inc delete mode 100644 qcsrc/common/triggers/trigger/_mod.qh diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 9222d976b..8e0c76d42 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index f2196cd1c..fa5a79207 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index 32dbf5208..708b4e951 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -22,7 +22,7 @@ noref float autocvar_net_connecttimeout = 30; #ifdef GAMEQC #include "physics/all.inc" -#include "triggers/include.qc" +#include "mapobjects/include.qc" #include "viewloc.qc" #endif diff --git a/qcsrc/common/mapobjects/_mod.inc b/qcsrc/common/mapobjects/_mod.inc new file mode 100644 index 000000000..efc838487 --- /dev/null +++ b/qcsrc/common/mapobjects/_mod.inc @@ -0,0 +1,11 @@ +// generated file; do not modify +#include +#include +#include +#include +#include + +#include +#include +#include +#include diff --git a/qcsrc/common/mapobjects/_mod.qh b/qcsrc/common/mapobjects/_mod.qh new file mode 100644 index 000000000..11854c091 --- /dev/null +++ b/qcsrc/common/mapobjects/_mod.qh @@ -0,0 +1,11 @@ +// generated file; do not modify +#include +#include +#include +#include +#include + +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/defs.qh b/qcsrc/common/mapobjects/defs.qh similarity index 100% rename from qcsrc/common/triggers/defs.qh rename to qcsrc/common/mapobjects/defs.qh diff --git a/qcsrc/common/mapobjects/func/_mod.inc b/qcsrc/common/mapobjects/func/_mod.inc new file mode 100644 index 000000000..e3425e34a --- /dev/null +++ b/qcsrc/common/mapobjects/func/_mod.inc @@ -0,0 +1,19 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mapobjects/func/_mod.qh b/qcsrc/common/mapobjects/func/_mod.qh new file mode 100644 index 000000000..c0381a3f2 --- /dev/null +++ b/qcsrc/common/mapobjects/func/_mod.qh @@ -0,0 +1,19 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/func/bobbing.qc b/qcsrc/common/mapobjects/func/bobbing.qc similarity index 100% rename from qcsrc/common/triggers/func/bobbing.qc rename to qcsrc/common/mapobjects/func/bobbing.qc diff --git a/qcsrc/common/triggers/func/bobbing.qh b/qcsrc/common/mapobjects/func/bobbing.qh similarity index 100% rename from qcsrc/common/triggers/func/bobbing.qh rename to qcsrc/common/mapobjects/func/bobbing.qh diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/mapobjects/func/breakable.qc similarity index 100% rename from qcsrc/common/triggers/func/breakable.qc rename to qcsrc/common/mapobjects/func/breakable.qc diff --git a/qcsrc/common/triggers/func/breakable.qh b/qcsrc/common/mapobjects/func/breakable.qh similarity index 100% rename from qcsrc/common/triggers/func/breakable.qh rename to qcsrc/common/mapobjects/func/breakable.qh diff --git a/qcsrc/common/triggers/func/button.qc b/qcsrc/common/mapobjects/func/button.qc similarity index 100% rename from qcsrc/common/triggers/func/button.qc rename to qcsrc/common/mapobjects/func/button.qc diff --git a/qcsrc/common/triggers/func/button.qh b/qcsrc/common/mapobjects/func/button.qh similarity index 100% rename from qcsrc/common/triggers/func/button.qh rename to qcsrc/common/mapobjects/func/button.qh diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/mapobjects/func/conveyor.qc similarity index 100% rename from qcsrc/common/triggers/func/conveyor.qc rename to qcsrc/common/mapobjects/func/conveyor.qc diff --git a/qcsrc/common/triggers/func/conveyor.qh b/qcsrc/common/mapobjects/func/conveyor.qh similarity index 100% rename from qcsrc/common/triggers/func/conveyor.qh rename to qcsrc/common/mapobjects/func/conveyor.qh diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/mapobjects/func/door.qc similarity index 100% rename from qcsrc/common/triggers/func/door.qc rename to qcsrc/common/mapobjects/func/door.qc diff --git a/qcsrc/common/triggers/func/door.qh b/qcsrc/common/mapobjects/func/door.qh similarity index 100% rename from qcsrc/common/triggers/func/door.qh rename to qcsrc/common/mapobjects/func/door.qh diff --git a/qcsrc/common/triggers/func/door_rotating.qc b/qcsrc/common/mapobjects/func/door_rotating.qc similarity index 100% rename from qcsrc/common/triggers/func/door_rotating.qc rename to qcsrc/common/mapobjects/func/door_rotating.qc diff --git a/qcsrc/common/triggers/func/door_rotating.qh b/qcsrc/common/mapobjects/func/door_rotating.qh similarity index 100% rename from qcsrc/common/triggers/func/door_rotating.qh rename to qcsrc/common/mapobjects/func/door_rotating.qh diff --git a/qcsrc/common/triggers/func/door_secret.qc b/qcsrc/common/mapobjects/func/door_secret.qc similarity index 100% rename from qcsrc/common/triggers/func/door_secret.qc rename to qcsrc/common/mapobjects/func/door_secret.qc diff --git a/qcsrc/common/triggers/func/door_secret.qh b/qcsrc/common/mapobjects/func/door_secret.qh similarity index 100% rename from qcsrc/common/triggers/func/door_secret.qh rename to qcsrc/common/mapobjects/func/door_secret.qh diff --git a/qcsrc/common/triggers/func/fourier.qc b/qcsrc/common/mapobjects/func/fourier.qc similarity index 100% rename from qcsrc/common/triggers/func/fourier.qc rename to qcsrc/common/mapobjects/func/fourier.qc diff --git a/qcsrc/common/triggers/func/fourier.qh b/qcsrc/common/mapobjects/func/fourier.qh similarity index 100% rename from qcsrc/common/triggers/func/fourier.qh rename to qcsrc/common/mapobjects/func/fourier.qh diff --git a/qcsrc/common/triggers/func/include.qc b/qcsrc/common/mapobjects/func/include.qc similarity index 100% rename from qcsrc/common/triggers/func/include.qc rename to qcsrc/common/mapobjects/func/include.qc diff --git a/qcsrc/common/triggers/func/include.qh b/qcsrc/common/mapobjects/func/include.qh similarity index 100% rename from qcsrc/common/triggers/func/include.qh rename to qcsrc/common/mapobjects/func/include.qh diff --git a/qcsrc/common/triggers/func/ladder.qc b/qcsrc/common/mapobjects/func/ladder.qc similarity index 100% rename from qcsrc/common/triggers/func/ladder.qc rename to qcsrc/common/mapobjects/func/ladder.qc diff --git a/qcsrc/common/triggers/func/ladder.qh b/qcsrc/common/mapobjects/func/ladder.qh similarity index 100% rename from qcsrc/common/triggers/func/ladder.qh rename to qcsrc/common/mapobjects/func/ladder.qh diff --git a/qcsrc/common/triggers/func/pendulum.qc b/qcsrc/common/mapobjects/func/pendulum.qc similarity index 100% rename from qcsrc/common/triggers/func/pendulum.qc rename to qcsrc/common/mapobjects/func/pendulum.qc diff --git a/qcsrc/common/triggers/func/pendulum.qh b/qcsrc/common/mapobjects/func/pendulum.qh similarity index 100% rename from qcsrc/common/triggers/func/pendulum.qh rename to qcsrc/common/mapobjects/func/pendulum.qh diff --git a/qcsrc/common/triggers/func/plat.qc b/qcsrc/common/mapobjects/func/plat.qc similarity index 100% rename from qcsrc/common/triggers/func/plat.qc rename to qcsrc/common/mapobjects/func/plat.qc diff --git a/qcsrc/common/triggers/func/plat.qh b/qcsrc/common/mapobjects/func/plat.qh similarity index 100% rename from qcsrc/common/triggers/func/plat.qh rename to qcsrc/common/mapobjects/func/plat.qh diff --git a/qcsrc/common/triggers/func/pointparticles.qc b/qcsrc/common/mapobjects/func/pointparticles.qc similarity index 100% rename from qcsrc/common/triggers/func/pointparticles.qc rename to qcsrc/common/mapobjects/func/pointparticles.qc diff --git a/qcsrc/common/triggers/func/pointparticles.qh b/qcsrc/common/mapobjects/func/pointparticles.qh similarity index 100% rename from qcsrc/common/triggers/func/pointparticles.qh rename to qcsrc/common/mapobjects/func/pointparticles.qh diff --git a/qcsrc/common/triggers/func/rainsnow.qc b/qcsrc/common/mapobjects/func/rainsnow.qc similarity index 100% rename from qcsrc/common/triggers/func/rainsnow.qc rename to qcsrc/common/mapobjects/func/rainsnow.qc diff --git a/qcsrc/common/triggers/func/rainsnow.qh b/qcsrc/common/mapobjects/func/rainsnow.qh similarity index 100% rename from qcsrc/common/triggers/func/rainsnow.qh rename to qcsrc/common/mapobjects/func/rainsnow.qh diff --git a/qcsrc/common/triggers/func/rotating.qc b/qcsrc/common/mapobjects/func/rotating.qc similarity index 100% rename from qcsrc/common/triggers/func/rotating.qc rename to qcsrc/common/mapobjects/func/rotating.qc diff --git a/qcsrc/common/triggers/func/rotating.qh b/qcsrc/common/mapobjects/func/rotating.qh similarity index 100% rename from qcsrc/common/triggers/func/rotating.qh rename to qcsrc/common/mapobjects/func/rotating.qh diff --git a/qcsrc/common/triggers/func/stardust.qc b/qcsrc/common/mapobjects/func/stardust.qc similarity index 100% rename from qcsrc/common/triggers/func/stardust.qc rename to qcsrc/common/mapobjects/func/stardust.qc diff --git a/qcsrc/common/triggers/func/stardust.qh b/qcsrc/common/mapobjects/func/stardust.qh similarity index 100% rename from qcsrc/common/triggers/func/stardust.qh rename to qcsrc/common/mapobjects/func/stardust.qh diff --git a/qcsrc/common/triggers/func/train.qc b/qcsrc/common/mapobjects/func/train.qc similarity index 100% rename from qcsrc/common/triggers/func/train.qc rename to qcsrc/common/mapobjects/func/train.qc diff --git a/qcsrc/common/triggers/func/train.qh b/qcsrc/common/mapobjects/func/train.qh similarity index 100% rename from qcsrc/common/triggers/func/train.qh rename to qcsrc/common/mapobjects/func/train.qh diff --git a/qcsrc/common/triggers/func/vectormamamam.qc b/qcsrc/common/mapobjects/func/vectormamamam.qc similarity index 100% rename from qcsrc/common/triggers/func/vectormamamam.qc rename to qcsrc/common/mapobjects/func/vectormamamam.qc diff --git a/qcsrc/common/triggers/func/vectormamamam.qh b/qcsrc/common/mapobjects/func/vectormamamam.qh similarity index 100% rename from qcsrc/common/triggers/func/vectormamamam.qh rename to qcsrc/common/mapobjects/func/vectormamamam.qh diff --git a/qcsrc/common/triggers/include.qc b/qcsrc/common/mapobjects/include.qc similarity index 100% rename from qcsrc/common/triggers/include.qc rename to qcsrc/common/mapobjects/include.qc diff --git a/qcsrc/common/triggers/include.qh b/qcsrc/common/mapobjects/include.qh similarity index 100% rename from qcsrc/common/triggers/include.qh rename to qcsrc/common/mapobjects/include.qh diff --git a/qcsrc/common/mapobjects/misc/_mod.inc b/qcsrc/common/mapobjects/misc/_mod.inc new file mode 100644 index 000000000..d8d5ea6a6 --- /dev/null +++ b/qcsrc/common/mapobjects/misc/_mod.inc @@ -0,0 +1,6 @@ +// generated file; do not modify +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mapobjects/misc/_mod.qh b/qcsrc/common/mapobjects/misc/_mod.qh new file mode 100644 index 000000000..5fefbe41b --- /dev/null +++ b/qcsrc/common/mapobjects/misc/_mod.qh @@ -0,0 +1,6 @@ +// generated file; do not modify +#include +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/misc/corner.qc b/qcsrc/common/mapobjects/misc/corner.qc similarity index 100% rename from qcsrc/common/triggers/misc/corner.qc rename to qcsrc/common/mapobjects/misc/corner.qc diff --git a/qcsrc/common/triggers/misc/corner.qh b/qcsrc/common/mapobjects/misc/corner.qh similarity index 100% rename from qcsrc/common/triggers/misc/corner.qh rename to qcsrc/common/mapobjects/misc/corner.qh diff --git a/qcsrc/common/triggers/misc/follow.qc b/qcsrc/common/mapobjects/misc/follow.qc similarity index 100% rename from qcsrc/common/triggers/misc/follow.qc rename to qcsrc/common/mapobjects/misc/follow.qc diff --git a/qcsrc/common/triggers/misc/follow.qh b/qcsrc/common/mapobjects/misc/follow.qh similarity index 100% rename from qcsrc/common/triggers/misc/follow.qh rename to qcsrc/common/mapobjects/misc/follow.qh diff --git a/qcsrc/common/triggers/misc/include.qc b/qcsrc/common/mapobjects/misc/include.qc similarity index 100% rename from qcsrc/common/triggers/misc/include.qc rename to qcsrc/common/mapobjects/misc/include.qc diff --git a/qcsrc/common/triggers/misc/include.qh b/qcsrc/common/mapobjects/misc/include.qh similarity index 100% rename from qcsrc/common/triggers/misc/include.qh rename to qcsrc/common/mapobjects/misc/include.qh diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/mapobjects/misc/laser.qc similarity index 100% rename from qcsrc/common/triggers/misc/laser.qc rename to qcsrc/common/mapobjects/misc/laser.qc diff --git a/qcsrc/common/triggers/misc/laser.qh b/qcsrc/common/mapobjects/misc/laser.qh similarity index 100% rename from qcsrc/common/triggers/misc/laser.qh rename to qcsrc/common/mapobjects/misc/laser.qh diff --git a/qcsrc/common/triggers/misc/teleport_dest.qc b/qcsrc/common/mapobjects/misc/teleport_dest.qc similarity index 100% rename from qcsrc/common/triggers/misc/teleport_dest.qc rename to qcsrc/common/mapobjects/misc/teleport_dest.qc diff --git a/qcsrc/common/triggers/misc/teleport_dest.qh b/qcsrc/common/mapobjects/misc/teleport_dest.qh similarity index 100% rename from qcsrc/common/triggers/misc/teleport_dest.qh rename to qcsrc/common/mapobjects/misc/teleport_dest.qh diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/mapobjects/platforms.qc similarity index 100% rename from qcsrc/common/triggers/platforms.qc rename to qcsrc/common/mapobjects/platforms.qc diff --git a/qcsrc/common/triggers/platforms.qh b/qcsrc/common/mapobjects/platforms.qh similarity index 100% rename from qcsrc/common/triggers/platforms.qh rename to qcsrc/common/mapobjects/platforms.qh diff --git a/qcsrc/common/triggers/subs.qc b/qcsrc/common/mapobjects/subs.qc similarity index 100% rename from qcsrc/common/triggers/subs.qc rename to qcsrc/common/mapobjects/subs.qc diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/mapobjects/subs.qh similarity index 100% rename from qcsrc/common/triggers/subs.qh rename to qcsrc/common/mapobjects/subs.qh diff --git a/qcsrc/common/mapobjects/target/_mod.inc b/qcsrc/common/mapobjects/target/_mod.inc new file mode 100644 index 000000000..5ac26d9cf --- /dev/null +++ b/qcsrc/common/mapobjects/target/_mod.inc @@ -0,0 +1,11 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mapobjects/target/_mod.qh b/qcsrc/common/mapobjects/target/_mod.qh new file mode 100644 index 000000000..80a1a7f0c --- /dev/null +++ b/qcsrc/common/mapobjects/target/_mod.qh @@ -0,0 +1,11 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/target/changelevel.qc b/qcsrc/common/mapobjects/target/changelevel.qc similarity index 100% rename from qcsrc/common/triggers/target/changelevel.qc rename to qcsrc/common/mapobjects/target/changelevel.qc diff --git a/qcsrc/common/triggers/target/changelevel.qh b/qcsrc/common/mapobjects/target/changelevel.qh similarity index 100% rename from qcsrc/common/triggers/target/changelevel.qh rename to qcsrc/common/mapobjects/target/changelevel.qh diff --git a/qcsrc/common/triggers/target/include.qc b/qcsrc/common/mapobjects/target/include.qc similarity index 100% rename from qcsrc/common/triggers/target/include.qc rename to qcsrc/common/mapobjects/target/include.qc diff --git a/qcsrc/common/triggers/target/include.qh b/qcsrc/common/mapobjects/target/include.qh similarity index 100% rename from qcsrc/common/triggers/target/include.qh rename to qcsrc/common/mapobjects/target/include.qh diff --git a/qcsrc/common/triggers/target/kill.qc b/qcsrc/common/mapobjects/target/kill.qc similarity index 100% rename from qcsrc/common/triggers/target/kill.qc rename to qcsrc/common/mapobjects/target/kill.qc diff --git a/qcsrc/common/triggers/target/kill.qh b/qcsrc/common/mapobjects/target/kill.qh similarity index 100% rename from qcsrc/common/triggers/target/kill.qh rename to qcsrc/common/mapobjects/target/kill.qh diff --git a/qcsrc/common/triggers/target/levelwarp.qc b/qcsrc/common/mapobjects/target/levelwarp.qc similarity index 100% rename from qcsrc/common/triggers/target/levelwarp.qc rename to qcsrc/common/mapobjects/target/levelwarp.qc diff --git a/qcsrc/common/triggers/target/levelwarp.qh b/qcsrc/common/mapobjects/target/levelwarp.qh similarity index 100% rename from qcsrc/common/triggers/target/levelwarp.qh rename to qcsrc/common/mapobjects/target/levelwarp.qh diff --git a/qcsrc/common/triggers/target/location.qc b/qcsrc/common/mapobjects/target/location.qc similarity index 100% rename from qcsrc/common/triggers/target/location.qc rename to qcsrc/common/mapobjects/target/location.qc diff --git a/qcsrc/common/triggers/target/location.qh b/qcsrc/common/mapobjects/target/location.qh similarity index 100% rename from qcsrc/common/triggers/target/location.qh rename to qcsrc/common/mapobjects/target/location.qh diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/mapobjects/target/music.qc similarity index 100% rename from qcsrc/common/triggers/target/music.qc rename to qcsrc/common/mapobjects/target/music.qc diff --git a/qcsrc/common/triggers/target/music.qh b/qcsrc/common/mapobjects/target/music.qh similarity index 100% rename from qcsrc/common/triggers/target/music.qh rename to qcsrc/common/mapobjects/target/music.qh diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/mapobjects/target/spawn.qc similarity index 100% rename from qcsrc/common/triggers/target/spawn.qc rename to qcsrc/common/mapobjects/target/spawn.qc diff --git a/qcsrc/common/triggers/target/spawn.qh b/qcsrc/common/mapobjects/target/spawn.qh similarity index 100% rename from qcsrc/common/triggers/target/spawn.qh rename to qcsrc/common/mapobjects/target/spawn.qh diff --git a/qcsrc/common/triggers/target/spawnpoint.qc b/qcsrc/common/mapobjects/target/spawnpoint.qc similarity index 100% rename from qcsrc/common/triggers/target/spawnpoint.qc rename to qcsrc/common/mapobjects/target/spawnpoint.qc diff --git a/qcsrc/common/triggers/target/spawnpoint.qh b/qcsrc/common/mapobjects/target/spawnpoint.qh similarity index 100% rename from qcsrc/common/triggers/target/spawnpoint.qh rename to qcsrc/common/mapobjects/target/spawnpoint.qh diff --git a/qcsrc/common/triggers/target/speaker.qc b/qcsrc/common/mapobjects/target/speaker.qc similarity index 100% rename from qcsrc/common/triggers/target/speaker.qc rename to qcsrc/common/mapobjects/target/speaker.qc diff --git a/qcsrc/common/triggers/target/speaker.qh b/qcsrc/common/mapobjects/target/speaker.qh similarity index 100% rename from qcsrc/common/triggers/target/speaker.qh rename to qcsrc/common/mapobjects/target/speaker.qh diff --git a/qcsrc/common/triggers/target/voicescript.qc b/qcsrc/common/mapobjects/target/voicescript.qc similarity index 100% rename from qcsrc/common/triggers/target/voicescript.qc rename to qcsrc/common/mapobjects/target/voicescript.qc diff --git a/qcsrc/common/triggers/target/voicescript.qh b/qcsrc/common/mapobjects/target/voicescript.qh similarity index 100% rename from qcsrc/common/triggers/target/voicescript.qh rename to qcsrc/common/mapobjects/target/voicescript.qh diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc similarity index 99% rename from qcsrc/common/triggers/teleporters.qc rename to qcsrc/common/mapobjects/teleporters.qc index 25626e01b..ec6a26d18 100644 --- a/qcsrc/common/triggers/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -7,7 +7,7 @@ #include #include #include "../constants.qh" - #include "../triggers/subs.qh" + #include "../mapobjects/subs.qh" #include "../util.qh" #include #include diff --git a/qcsrc/common/triggers/teleporters.qh b/qcsrc/common/mapobjects/teleporters.qh similarity index 100% rename from qcsrc/common/triggers/teleporters.qh rename to qcsrc/common/mapobjects/teleporters.qh diff --git a/qcsrc/common/mapobjects/trigger/_mod.inc b/qcsrc/common/mapobjects/trigger/_mod.inc new file mode 100644 index 000000000..82eb9f4a9 --- /dev/null +++ b/qcsrc/common/mapobjects/trigger/_mod.inc @@ -0,0 +1,25 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/mapobjects/trigger/_mod.qh b/qcsrc/common/mapobjects/trigger/_mod.qh new file mode 100644 index 000000000..6250a76a7 --- /dev/null +++ b/qcsrc/common/mapobjects/trigger/_mod.qh @@ -0,0 +1,25 @@ +// generated file; do not modify +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/qcsrc/common/triggers/trigger/counter.qc b/qcsrc/common/mapobjects/trigger/counter.qc similarity index 100% rename from qcsrc/common/triggers/trigger/counter.qc rename to qcsrc/common/mapobjects/trigger/counter.qc diff --git a/qcsrc/common/triggers/trigger/counter.qh b/qcsrc/common/mapobjects/trigger/counter.qh similarity index 100% rename from qcsrc/common/triggers/trigger/counter.qh rename to qcsrc/common/mapobjects/trigger/counter.qh diff --git a/qcsrc/common/triggers/trigger/delay.qc b/qcsrc/common/mapobjects/trigger/delay.qc similarity index 100% rename from qcsrc/common/triggers/trigger/delay.qc rename to qcsrc/common/mapobjects/trigger/delay.qc diff --git a/qcsrc/common/triggers/trigger/delay.qh b/qcsrc/common/mapobjects/trigger/delay.qh similarity index 100% rename from qcsrc/common/triggers/trigger/delay.qh rename to qcsrc/common/mapobjects/trigger/delay.qh diff --git a/qcsrc/common/triggers/trigger/disablerelay.qc b/qcsrc/common/mapobjects/trigger/disablerelay.qc similarity index 100% rename from qcsrc/common/triggers/trigger/disablerelay.qc rename to qcsrc/common/mapobjects/trigger/disablerelay.qc diff --git a/qcsrc/common/triggers/trigger/disablerelay.qh b/qcsrc/common/mapobjects/trigger/disablerelay.qh similarity index 100% rename from qcsrc/common/triggers/trigger/disablerelay.qh rename to qcsrc/common/mapobjects/trigger/disablerelay.qh diff --git a/qcsrc/common/triggers/trigger/flipflop.qc b/qcsrc/common/mapobjects/trigger/flipflop.qc similarity index 100% rename from qcsrc/common/triggers/trigger/flipflop.qc rename to qcsrc/common/mapobjects/trigger/flipflop.qc diff --git a/qcsrc/common/triggers/trigger/flipflop.qh b/qcsrc/common/mapobjects/trigger/flipflop.qh similarity index 100% rename from qcsrc/common/triggers/trigger/flipflop.qh rename to qcsrc/common/mapobjects/trigger/flipflop.qh diff --git a/qcsrc/common/triggers/trigger/gamestart.qc b/qcsrc/common/mapobjects/trigger/gamestart.qc similarity index 100% rename from qcsrc/common/triggers/trigger/gamestart.qc rename to qcsrc/common/mapobjects/trigger/gamestart.qc diff --git a/qcsrc/common/triggers/trigger/gamestart.qh b/qcsrc/common/mapobjects/trigger/gamestart.qh similarity index 100% rename from qcsrc/common/triggers/trigger/gamestart.qh rename to qcsrc/common/mapobjects/trigger/gamestart.qh diff --git a/qcsrc/common/triggers/trigger/gravity.qc b/qcsrc/common/mapobjects/trigger/gravity.qc similarity index 100% rename from qcsrc/common/triggers/trigger/gravity.qc rename to qcsrc/common/mapobjects/trigger/gravity.qc diff --git a/qcsrc/common/triggers/trigger/gravity.qh b/qcsrc/common/mapobjects/trigger/gravity.qh similarity index 100% rename from qcsrc/common/triggers/trigger/gravity.qh rename to qcsrc/common/mapobjects/trigger/gravity.qh diff --git a/qcsrc/common/triggers/trigger/heal.qc b/qcsrc/common/mapobjects/trigger/heal.qc similarity index 100% rename from qcsrc/common/triggers/trigger/heal.qc rename to qcsrc/common/mapobjects/trigger/heal.qc diff --git a/qcsrc/common/triggers/trigger/heal.qh b/qcsrc/common/mapobjects/trigger/heal.qh similarity index 100% rename from qcsrc/common/triggers/trigger/heal.qh rename to qcsrc/common/mapobjects/trigger/heal.qh diff --git a/qcsrc/common/triggers/trigger/hurt.qc b/qcsrc/common/mapobjects/trigger/hurt.qc similarity index 100% rename from qcsrc/common/triggers/trigger/hurt.qc rename to qcsrc/common/mapobjects/trigger/hurt.qc diff --git a/qcsrc/common/triggers/trigger/hurt.qh b/qcsrc/common/mapobjects/trigger/hurt.qh similarity index 100% rename from qcsrc/common/triggers/trigger/hurt.qh rename to qcsrc/common/mapobjects/trigger/hurt.qh diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/mapobjects/trigger/impulse.qc similarity index 100% rename from qcsrc/common/triggers/trigger/impulse.qc rename to qcsrc/common/mapobjects/trigger/impulse.qc diff --git a/qcsrc/common/triggers/trigger/impulse.qh b/qcsrc/common/mapobjects/trigger/impulse.qh similarity index 100% rename from qcsrc/common/triggers/trigger/impulse.qh rename to qcsrc/common/mapobjects/trigger/impulse.qh diff --git a/qcsrc/common/triggers/trigger/include.qc b/qcsrc/common/mapobjects/trigger/include.qc similarity index 100% rename from qcsrc/common/triggers/trigger/include.qc rename to qcsrc/common/mapobjects/trigger/include.qc diff --git a/qcsrc/common/triggers/trigger/include.qh b/qcsrc/common/mapobjects/trigger/include.qh similarity index 100% rename from qcsrc/common/triggers/trigger/include.qh rename to qcsrc/common/mapobjects/trigger/include.qh diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc similarity index 100% rename from qcsrc/common/triggers/trigger/jumppads.qc rename to qcsrc/common/mapobjects/trigger/jumppads.qc diff --git a/qcsrc/common/triggers/trigger/jumppads.qh b/qcsrc/common/mapobjects/trigger/jumppads.qh similarity index 100% rename from qcsrc/common/triggers/trigger/jumppads.qh rename to qcsrc/common/mapobjects/trigger/jumppads.qh diff --git a/qcsrc/common/triggers/trigger/keylock.qc b/qcsrc/common/mapobjects/trigger/keylock.qc similarity index 100% rename from qcsrc/common/triggers/trigger/keylock.qc rename to qcsrc/common/mapobjects/trigger/keylock.qc diff --git a/qcsrc/common/triggers/trigger/keylock.qh b/qcsrc/common/mapobjects/trigger/keylock.qh similarity index 100% rename from qcsrc/common/triggers/trigger/keylock.qh rename to qcsrc/common/mapobjects/trigger/keylock.qh diff --git a/qcsrc/common/triggers/trigger/magicear.qc b/qcsrc/common/mapobjects/trigger/magicear.qc similarity index 100% rename from qcsrc/common/triggers/trigger/magicear.qc rename to qcsrc/common/mapobjects/trigger/magicear.qc diff --git a/qcsrc/common/triggers/trigger/magicear.qh b/qcsrc/common/mapobjects/trigger/magicear.qh similarity index 100% rename from qcsrc/common/triggers/trigger/magicear.qh rename to qcsrc/common/mapobjects/trigger/magicear.qh diff --git a/qcsrc/common/triggers/trigger/monoflop.qc b/qcsrc/common/mapobjects/trigger/monoflop.qc similarity index 100% rename from qcsrc/common/triggers/trigger/monoflop.qc rename to qcsrc/common/mapobjects/trigger/monoflop.qc diff --git a/qcsrc/common/triggers/trigger/monoflop.qh b/qcsrc/common/mapobjects/trigger/monoflop.qh similarity index 100% rename from qcsrc/common/triggers/trigger/monoflop.qh rename to qcsrc/common/mapobjects/trigger/monoflop.qh diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/mapobjects/trigger/multi.qc similarity index 100% rename from qcsrc/common/triggers/trigger/multi.qc rename to qcsrc/common/mapobjects/trigger/multi.qc diff --git a/qcsrc/common/triggers/trigger/multi.qh b/qcsrc/common/mapobjects/trigger/multi.qh similarity index 100% rename from qcsrc/common/triggers/trigger/multi.qh rename to qcsrc/common/mapobjects/trigger/multi.qh diff --git a/qcsrc/common/triggers/trigger/multivibrator.qc b/qcsrc/common/mapobjects/trigger/multivibrator.qc similarity index 100% rename from qcsrc/common/triggers/trigger/multivibrator.qc rename to qcsrc/common/mapobjects/trigger/multivibrator.qc diff --git a/qcsrc/common/triggers/trigger/multivibrator.qh b/qcsrc/common/mapobjects/trigger/multivibrator.qh similarity index 100% rename from qcsrc/common/triggers/trigger/multivibrator.qh rename to qcsrc/common/mapobjects/trigger/multivibrator.qh diff --git a/qcsrc/common/triggers/trigger/relay.qc b/qcsrc/common/mapobjects/trigger/relay.qc similarity index 100% rename from qcsrc/common/triggers/trigger/relay.qc rename to qcsrc/common/mapobjects/trigger/relay.qc diff --git a/qcsrc/common/triggers/trigger/relay.qh b/qcsrc/common/mapobjects/trigger/relay.qh similarity index 100% rename from qcsrc/common/triggers/trigger/relay.qh rename to qcsrc/common/mapobjects/trigger/relay.qh diff --git a/qcsrc/common/triggers/trigger/relay_activators.qc b/qcsrc/common/mapobjects/trigger/relay_activators.qc similarity index 100% rename from qcsrc/common/triggers/trigger/relay_activators.qc rename to qcsrc/common/mapobjects/trigger/relay_activators.qc diff --git a/qcsrc/common/triggers/trigger/relay_activators.qh b/qcsrc/common/mapobjects/trigger/relay_activators.qh similarity index 100% rename from qcsrc/common/triggers/trigger/relay_activators.qh rename to qcsrc/common/mapobjects/trigger/relay_activators.qh diff --git a/qcsrc/common/triggers/trigger/relay_if.qc b/qcsrc/common/mapobjects/trigger/relay_if.qc similarity index 100% rename from qcsrc/common/triggers/trigger/relay_if.qc rename to qcsrc/common/mapobjects/trigger/relay_if.qc diff --git a/qcsrc/common/triggers/trigger/relay_if.qh b/qcsrc/common/mapobjects/trigger/relay_if.qh similarity index 100% rename from qcsrc/common/triggers/trigger/relay_if.qh rename to qcsrc/common/mapobjects/trigger/relay_if.qh diff --git a/qcsrc/common/triggers/trigger/relay_teamcheck.qc b/qcsrc/common/mapobjects/trigger/relay_teamcheck.qc similarity index 100% rename from qcsrc/common/triggers/trigger/relay_teamcheck.qc rename to qcsrc/common/mapobjects/trigger/relay_teamcheck.qc diff --git a/qcsrc/common/triggers/trigger/relay_teamcheck.qh b/qcsrc/common/mapobjects/trigger/relay_teamcheck.qh similarity index 100% rename from qcsrc/common/triggers/trigger/relay_teamcheck.qh rename to qcsrc/common/mapobjects/trigger/relay_teamcheck.qh diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/mapobjects/trigger/secret.qc similarity index 100% rename from qcsrc/common/triggers/trigger/secret.qc rename to qcsrc/common/mapobjects/trigger/secret.qc diff --git a/qcsrc/common/triggers/trigger/secret.qh b/qcsrc/common/mapobjects/trigger/secret.qh similarity index 100% rename from qcsrc/common/triggers/trigger/secret.qh rename to qcsrc/common/mapobjects/trigger/secret.qh diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/mapobjects/trigger/swamp.qc similarity index 100% rename from qcsrc/common/triggers/trigger/swamp.qc rename to qcsrc/common/mapobjects/trigger/swamp.qc diff --git a/qcsrc/common/triggers/trigger/swamp.qh b/qcsrc/common/mapobjects/trigger/swamp.qh similarity index 100% rename from qcsrc/common/triggers/trigger/swamp.qh rename to qcsrc/common/mapobjects/trigger/swamp.qh diff --git a/qcsrc/common/triggers/trigger/teleport.qc b/qcsrc/common/mapobjects/trigger/teleport.qc similarity index 100% rename from qcsrc/common/triggers/trigger/teleport.qc rename to qcsrc/common/mapobjects/trigger/teleport.qc diff --git a/qcsrc/common/triggers/trigger/teleport.qh b/qcsrc/common/mapobjects/trigger/teleport.qh similarity index 100% rename from qcsrc/common/triggers/trigger/teleport.qh rename to qcsrc/common/mapobjects/trigger/teleport.qh diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/mapobjects/trigger/viewloc.qc similarity index 100% rename from qcsrc/common/triggers/trigger/viewloc.qc rename to qcsrc/common/mapobjects/trigger/viewloc.qc diff --git a/qcsrc/common/triggers/trigger/viewloc.qh b/qcsrc/common/mapobjects/trigger/viewloc.qh similarity index 100% rename from qcsrc/common/triggers/trigger/viewloc.qh rename to qcsrc/common/mapobjects/trigger/viewloc.qh diff --git a/qcsrc/common/triggers/triggers.qc b/qcsrc/common/mapobjects/triggers.qc similarity index 100% rename from qcsrc/common/triggers/triggers.qc rename to qcsrc/common/mapobjects/triggers.qc diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/mapobjects/triggers.qh similarity index 100% rename from qcsrc/common/triggers/triggers.qh rename to qcsrc/common/mapobjects/triggers.qh diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index ccd10ee45..718838cde 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -18,7 +18,7 @@ #include "../vehicles/all.qh" #include #include -#include "../triggers/triggers.qh" +#include "../mapobjects/triggers.qh" #include #include #include diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 5afb96507..4be441dc1 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -1,6 +1,6 @@ #include "sv_buffs.qh" -#include +#include #include void buffs_DelayedInit(entity this); diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 53765f419..04dc20770 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -1,11 +1,11 @@ #include "player.qh" -#include "../triggers/include.qh" +#include "../mapobjects/include.qh" #include "../viewloc.qh" #ifdef SVQC #include -#include "../triggers/trigger/viewloc.qh" +#include "../mapobjects/trigger/viewloc.qh" // client side physics bool Physics_Valid(string thecvar) diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 8be48b530..5a849ee14 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -15,7 +15,7 @@ #include "constants.qh" #include #include - #include "triggers/subs.qh" + #include "mapobjects/subs.qh" #include "util.qh" #include diff --git a/qcsrc/common/triggers/_mod.inc b/qcsrc/common/triggers/_mod.inc deleted file mode 100644 index 9b327de55..000000000 --- a/qcsrc/common/triggers/_mod.inc +++ /dev/null @@ -1,11 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include - -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/_mod.qh b/qcsrc/common/triggers/_mod.qh deleted file mode 100644 index d3bb2dc3a..000000000 --- a/qcsrc/common/triggers/_mod.qh +++ /dev/null @@ -1,11 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include - -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/func/_mod.inc b/qcsrc/common/triggers/func/_mod.inc deleted file mode 100644 index 675e3689b..000000000 --- a/qcsrc/common/triggers/func/_mod.inc +++ /dev/null @@ -1,19 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/func/_mod.qh b/qcsrc/common/triggers/func/_mod.qh deleted file mode 100644 index fb179a42c..000000000 --- a/qcsrc/common/triggers/func/_mod.qh +++ /dev/null @@ -1,19 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/misc/_mod.inc b/qcsrc/common/triggers/misc/_mod.inc deleted file mode 100644 index 4a8ec06ef..000000000 --- a/qcsrc/common/triggers/misc/_mod.inc +++ /dev/null @@ -1,6 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/misc/_mod.qh b/qcsrc/common/triggers/misc/_mod.qh deleted file mode 100644 index 98615ccb0..000000000 --- a/qcsrc/common/triggers/misc/_mod.qh +++ /dev/null @@ -1,6 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/target/_mod.inc b/qcsrc/common/triggers/target/_mod.inc deleted file mode 100644 index afd1050b9..000000000 --- a/qcsrc/common/triggers/target/_mod.inc +++ /dev/null @@ -1,11 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/target/_mod.qh b/qcsrc/common/triggers/target/_mod.qh deleted file mode 100644 index 7c9fbeec5..000000000 --- a/qcsrc/common/triggers/target/_mod.qh +++ /dev/null @@ -1,11 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/trigger/_mod.inc b/qcsrc/common/triggers/trigger/_mod.inc deleted file mode 100644 index 05a496eb3..000000000 --- a/qcsrc/common/triggers/trigger/_mod.inc +++ /dev/null @@ -1,25 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/triggers/trigger/_mod.qh b/qcsrc/common/triggers/trigger/_mod.qh deleted file mode 100644 index 2c7477b1d..000000000 --- a/qcsrc/common/triggers/trigger/_mod.qh +++ /dev/null @@ -1,25 +0,0 @@ -// generated file; do not modify -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index 4f61de816..93ed6d31d 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -1,7 +1,7 @@ #include "racer.qh" #ifdef SVQC -#include +#include bool autocvar_g_vehicle_racer = true; diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index ca460f089..9f79bf440 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -1,7 +1,7 @@ #include "porto.qh" #ifdef SVQC -#include +#include REGISTER_MUTATOR(porto_ticker, true); MUTATOR_HOOKFUNCTION(porto_ticker, SV_StartFrame) { diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index ce4535452..2805c0050 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -6,7 +6,7 @@ #elif defined(SVQC) #include #include - #include + #include #include #include #include diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index f52974020..91b5c463d 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 36f25d79f..9334f011a 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -13,7 +13,7 @@ #include #include -#include +#include .float speed; diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 22e77b4ea..aa3890452 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -6,7 +6,7 @@ #include "g_damage.qh" #include "race.qh" -#include "../common/triggers/teleporters.qh" +#include "../common/mapobjects/teleporters.qh" #include "mutators/_mod.qh" @@ -22,9 +22,9 @@ #include -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" -#include "../common/triggers/func/breakable.qh" +#include "../common/mapobjects/func/breakable.qh" #include "../lib/csqcmodel/sv_model.qh" diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index bd71d982d..b8cd3cdab 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -33,9 +33,9 @@ #include -#include "../common/triggers/func/conveyor.qh" -#include "../common/triggers/teleporters.qh" -#include "../common/triggers/target/spawnpoint.qh" +#include "../common/mapobjects/func/conveyor.qh" +#include "../common/mapobjects/teleporters.qh" +#include "../common/mapobjects/target/spawnpoint.qh" #include "../common/vehicles/all.qh" @@ -51,9 +51,9 @@ #include "../common/mutators/mutator/waypoints/all.qh" #include "../common/mutators/mutator/instagib/sv_instagib.qh" -#include "../common/triggers/subs.qh" -#include "../common/triggers/triggers.qh" -#include "../common/triggers/trigger/secret.qh" +#include "../common/mapobjects/subs.qh" +#include "../common/mapobjects/triggers.qh" +#include "../common/mapobjects/trigger/secret.qh" #include "../common/minigames/sv_minigames.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index e0c72dbc2..291d8b178 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index c8f85247c..b7779368d 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -4,8 +4,8 @@ #include #include "g_subs.qh" #include -#include "../common/triggers/subs.qh" -#include "../common/triggers/triggers.qh" +#include "../common/mapobjects/subs.qh" +#include "../common/mapobjects/triggers.qh" entityclass(BGMScript); classfield(BGMScript) .string bgmscript; diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index d9372e0aa..21c43ea10 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -6,7 +6,7 @@ #include "command/common.qh" #include "../common/state.qh" #include "../lib/warpzone/common.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" spawnfunc(info_null) { diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index a613edc14..ba0b5e96b 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -30,8 +30,8 @@ #include "../common/playerstats.qh" #include "../common/stats.qh" #include "../common/teams.qh" -#include "../common/triggers/trigger/secret.qh" -#include "../common/triggers/target/music.qh" +#include "../common/mapobjects/trigger/secret.qh" +#include "../common/mapobjects/target/music.qh" #include "../common/util.qh" #include "../common/items/_mod.qh" #include diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index c645c7fac..066fef345 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -1,6 +1,6 @@ #include "item_key.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../common/monsters/_mod.qh" #include "../common/notifications/all.qh" #include "../common/util.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index bdd226b5c..4ba5efb09 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -20,7 +20,7 @@ #include "../common/notifications/all.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../common/util.qh" #include "../common/turrets/sv_turrets.qh" #include diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index b0f42f59e..270667a5d 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -95,8 +95,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index e051cd697..bea16f7a3 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 2fcd30163..fa2cd48da 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -16,7 +16,7 @@ #include "../common/animdecide.qh" #include "../common/csqcmodel_settings.qh" #include "../common/deathtypes/all.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../common/playerstats.qh" #include "../lib/csqcmodel/sv_model.qh" @@ -25,7 +25,7 @@ #include "../common/physics/player.qh" #include "../common/effects/qc/_mod.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" -#include "../common/triggers/include.qh" +#include "../common/mapobjects/include.qh" #include "../common/wepent.qh" #include "weapons/weaponstats.qh" diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index ca0dc20fd..758c69bcc 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -6,8 +6,8 @@ #include "../common/constants.qh" #include "../common/deathtypes/all.qh" #include "../common/notifications/all.qh" -#include "../common/triggers/teleporters.qh" -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/teleporters.qh" +#include "../common/mapobjects/subs.qh" #include "../common/util.qh" #include #include "../lib/csqcmodel/sv_model.qh" diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index da86f76f0..c1b272cea 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -14,7 +14,7 @@ #include #include #include -#include "../common/triggers/subs.qh" +#include "../common/mapobjects/subs.qh" #include "../lib/warpzone/util_server.qh" #include "../lib/warpzone/common.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index e48840883..3a6d36d31 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -6,8 +6,8 @@ #include "../common/constants.qh" #include #include "../common/teams.qh" -#include "../common/triggers/subs.qh" -#include "../common/triggers/target/spawnpoint.qh" +#include "../common/mapobjects/subs.qh" +#include "../common/mapobjects/target/spawnpoint.qh" #include "../common/util.qh" #include "../lib/warpzone/common.qh" #include "../lib/warpzone/util_server.qh" diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 821a02327..8eb8beeca 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include -- 2.39.2