From 289dc834837712c152d42d7755992e8e5ed09deb Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 11 Oct 2015 12:08:03 +1100 Subject: [PATCH] lib: move csqcmodellib and warpzonelib --- qcsrc/Makefile | 6 ++--- qcsrc/client/csqcmodel_hooks.qc | 6 ++--- qcsrc/client/hook.qc | 4 +-- qcsrc/client/hud.qc | 2 +- qcsrc/client/laser.qc | 2 +- qcsrc/client/main.qc | 6 ++--- qcsrc/client/miscfunctions.qc | 2 +- qcsrc/client/particles.qc | 2 +- qcsrc/client/player_skeleton.qc | 4 +-- qcsrc/client/progs.inc | 14 +++++----- qcsrc/client/shownames.qc | 2 +- qcsrc/client/t_items.qc | 4 +-- qcsrc/client/teamradar.qc | 2 +- qcsrc/client/view.qc | 6 ++--- qcsrc/client/wall.qc | 2 +- qcsrc/client/weapons/projectile.qc | 4 +-- qcsrc/common/monsters/monster.qh | 2 +- qcsrc/common/monsters/sv_monsters.qc | 4 +-- qcsrc/common/movetypes/movetypes.qc | 2 +- qcsrc/common/nades/all.qc | 2 +- qcsrc/common/triggers/func/breakable.qc | 2 +- qcsrc/common/triggers/misc/laser.qc | 4 +-- qcsrc/common/triggers/teleporters.qc | 6 ++--- qcsrc/common/triggers/trigger/swamp.qc | 2 +- qcsrc/common/triggers/trigger/viewloc.qc | 2 +- qcsrc/common/weapons/all.qc | 20 +++++++------- qcsrc/lib/_all.inc | 2 +- .../csqcmodel}/cl_model.qc | 21 +++++++-------- .../csqcmodel}/cl_model.qh | 4 +-- .../csqcmodel}/cl_player.qc | 27 +++++++++---------- .../csqcmodel}/cl_player.qh | 4 +-- .../{csqcmodellib => lib/csqcmodel}/common.qh | 6 ++--- .../csqcmodel}/interpolate.qc | 11 ++++---- .../csqcmodel}/interpolate.qh | 4 +-- .../csqcmodel}/settings.qh | 4 +-- .../csqcmodel}/sv_model.qc | 18 +++++-------- .../csqcmodel}/sv_model.qh | 6 ++--- qcsrc/{warpzonelib => lib/warpzone}/COPYING | 0 qcsrc/{warpzonelib => lib/warpzone}/TODO | 0 .../warpzone}/anglestransform.qc | 5 ---- .../warpzone}/anglestransform.qh | 4 +-- qcsrc/{warpzonelib => lib/warpzone}/client.qc | 4 +-- qcsrc/{warpzonelib => lib/warpzone}/client.qh | 4 +-- qcsrc/{warpzonelib => lib/warpzone}/common.qc | 4 +-- qcsrc/{warpzonelib => lib/warpzone}/common.qh | 4 +-- .../{warpzonelib => lib/warpzone}/mathlib.qc | 0 .../{warpzonelib => lib/warpzone}/mathlib.qh | 4 +-- qcsrc/{warpzonelib => lib/warpzone}/server.qc | 12 ++++----- qcsrc/{warpzonelib => lib/warpzone}/server.qh | 4 +-- .../warpzone}/util_server.qc | 2 +- .../warpzone}/util_server.qh | 4 +-- qcsrc/server/bot/bot.qc | 6 ++--- qcsrc/server/bot/havocbot/havocbot.qc | 2 +- qcsrc/server/bot/waypoints.qc | 4 +-- qcsrc/server/cheats.qc | 6 ++--- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/cl_player.qc | 2 +- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/command/common.qc | 2 +- qcsrc/server/command/radarmap.qc | 2 +- qcsrc/server/g_damage.qc | 4 +-- qcsrc/server/g_damage.qh | 4 +-- qcsrc/server/g_hook.qc | 4 +-- qcsrc/server/g_models.qc | 2 +- qcsrc/server/g_subs.qc | 2 +- qcsrc/server/item_key.qc | 2 +- qcsrc/server/miscfunctions.qc | 6 ++--- qcsrc/server/mutators/gamemode.qh | 4 +-- qcsrc/server/mutators/gamemode_ctf.qc | 2 +- qcsrc/server/mutators/mutator.qh | 6 ++--- qcsrc/server/mutators/mutators_include.qc | 12 ++++----- qcsrc/server/portals.qc | 8 +++--- qcsrc/server/progs.inc | 10 +++---- qcsrc/server/race.qc | 4 +-- qcsrc/server/spawnpoints.qc | 4 +-- qcsrc/server/sv_main.qc | 6 ++--- qcsrc/server/t_items.qc | 2 +- qcsrc/server/weapons/tracing.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 2 +- 79 files changed, 186 insertions(+), 200 deletions(-) rename qcsrc/{csqcmodellib => lib/csqcmodel}/cl_model.qc (96%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/cl_model.qh (97%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/cl_player.qc (95%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/cl_player.qh (95%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/common.qh (97%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/interpolate.qc (96%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/interpolate.qh (96%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/settings.qh (93%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/sv_model.qc (93%) rename qcsrc/{csqcmodellib => lib/csqcmodel}/sv_model.qh (94%) rename qcsrc/{warpzonelib => lib/warpzone}/COPYING (100%) rename qcsrc/{warpzonelib => lib/warpzone}/TODO (100%) rename qcsrc/{warpzonelib => lib/warpzone}/anglestransform.qc (98%) rename qcsrc/{warpzonelib => lib/warpzone}/anglestransform.qh (95%) rename qcsrc/{warpzonelib => lib/warpzone}/client.qc (98%) rename qcsrc/{warpzonelib => lib/warpzone}/client.qh (84%) rename qcsrc/{warpzonelib => lib/warpzone}/common.qc (99%) rename qcsrc/{warpzonelib => lib/warpzone}/common.qh (98%) rename qcsrc/{warpzonelib => lib/warpzone}/mathlib.qc (100%) rename qcsrc/{warpzonelib => lib/warpzone}/mathlib.qh (98%) rename qcsrc/{warpzonelib => lib/warpzone}/server.qc (99%) rename qcsrc/{warpzonelib => lib/warpzone}/server.qh (89%) rename qcsrc/{warpzonelib => lib/warpzone}/util_server.qc (95%) rename qcsrc/{warpzonelib => lib/warpzone}/util_server.qh (68%) diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 51440d4a3..452dfc9a6 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -42,17 +42,17 @@ $(QCCVERSIONFILE): $(RM) qccversion.* echo This file intentionally left blank. > $@ -FILES_CSPROGS = $(shell find client lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) +FILES_CSPROGS = $(shell find lib common client -type f) ../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/client\' cd client && $(QCC) $(QCCFLAGS) -DCSQC -FILES_PROGS = $(shell find server lib common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm) +FILES_PROGS = $(shell find lib common server -type f) ../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/server\' cd server && $(QCC) $(QCCFLAGS) -DSVQC -FILES_MENU = $(shell find menu lib common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm) +FILES_MENU = $(shell find lib common menu -type f) ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE) @echo make[1]: Entering directory \`$(PWD)/menu\' cd menu && $(QCC) $(QCCFLAGS) -DMENUQC diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 708e305fa..6e7e5a8de 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -4,9 +4,9 @@ #include "../common/animdecide.qh" #include "../common/movetypes/movetypes.qh" #include "../common/viewloc.qh" -#include "../csqcmodellib/cl_model.qh" -#include "../csqcmodellib/cl_player.qh" -#include "../csqcmodellib/interpolate.qh" +#include "../lib/csqcmodel/cl_model.qh" +#include "../lib/csqcmodel/cl_player.qh" +#include "../lib/csqcmodel/interpolate.qh" .float death_time; .int modelflags; diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc index 6143874e6..3f623b276 100644 --- a/qcsrc/client/hook.qc +++ b/qcsrc/client/hook.qc @@ -1,7 +1,7 @@ #include "hook.qh" -#include "../csqcmodellib/interpolate.qh" -#include "../warpzonelib/common.qh" +#include "../lib/csqcmodel/interpolate.qh" +#include "../lib/warpzone/common.qh" entityclass(Hook); class(Hook) .float HookType; // ENT_CLIENT_* diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 4e83ac31e..0e5246043 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -12,7 +12,7 @@ #include "../common/mutators/mutator/waypoints/all.qh" #include "../common/nades/all.qh" #include "../common/stats.qh" -#include "../csqcmodellib/cl_player.qh" +#include "../lib/csqcmodel/cl_player.qh" #include "../server/mutators/gamemode_ctf.qh" diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc index 4d52c8eee..1c63a0dc2 100644 --- a/qcsrc/client/laser.qc +++ b/qcsrc/client/laser.qc @@ -1,6 +1,6 @@ #include "laser.qh" -#include "../csqcmodellib/interpolate.qh" +#include "../lib/csqcmodel/interpolate.qh" // a laser goes from origin in direction angles // it has color 'colormod' diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 8571d43a3..05704e5cb 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -29,9 +29,9 @@ #include "../common/triggers/include.qh" #include "../common/turrets/cl_turrets.qh" #include "../common/vehicles/all.qh" -#include "../csqcmodellib/cl_model.qh" -#include "../csqcmodellib/interpolate.qh" -#include "../warpzonelib/client.qh" +#include "../lib/csqcmodel/cl_model.qh" +#include "../lib/csqcmodel/interpolate.qh" +#include "../lib/warpzone/client.qh" // -------------------------------------------------------------------------- // BEGIN REQUIRED CSQC FUNCTIONS diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 8a5b70704..7983e740f 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -6,7 +6,7 @@ #include "../common/teams.qh" -#include "../csqcmodellib/cl_model.qh" +#include "../lib/csqcmodel/cl_model.qh" void AuditLists() diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc index 75f293feb..0c7f7a39f 100644 --- a/qcsrc/client/particles.qc +++ b/qcsrc/client/particles.qc @@ -2,7 +2,7 @@ #include "../common/stats.qh" -#include "../warpzonelib/common.qh" +#include "../lib/warpzone/common.qh" void Net_ReadVortexBeamParticle() { diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc index cdb1fdf74..d6b2b0d44 100644 --- a/qcsrc/client/player_skeleton.qc +++ b/qcsrc/client/player_skeleton.qc @@ -1,8 +1,8 @@ #include "player_skeleton.qh" #include "mutators/events.qh" -#include "../csqcmodellib/cl_player.qh" -#include "../warpzonelib/anglestransform.qh" +#include "../lib/csqcmodel/cl_player.qh" +#include "../lib/warpzone/anglestransform.qh" .vector v_angle; diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 367e5ffd5..04eb78822 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -61,16 +61,16 @@ #include "../common/triggers/include.qc" -#include "../csqcmodellib/cl_model.qc" -#include "../csqcmodellib/cl_player.qc" -#include "../csqcmodellib/interpolate.qc" +#include "../lib/csqcmodel/cl_model.qc" +#include "../lib/csqcmodel/cl_player.qc" +#include "../lib/csqcmodel/interpolate.qc" #include "../server/mutators/mutator_multijump.qc" -#include "../warpzonelib/anglestransform.qc" -#include "../warpzonelib/client.qc" -#include "../warpzonelib/common.qc" -#include "../warpzonelib/util_server.qc" +#include "../lib/warpzone/anglestransform.qc" +#include "../lib/warpzone/client.qc" +#include "../lib/warpzone/common.qc" +#include "../lib/warpzone/util_server.qc" #if BUILD_MOD #include "../../mod/client/progs.inc" diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 994a1ae30..80a15ad38 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -6,7 +6,7 @@ #include "../common/mapinfo.qh" #include "../common/teams.qh" -#include "../csqcmodellib/cl_model.qh" +#include "../lib/csqcmodel/cl_model.qh" // self.isactive = player is in range and coordinates/status (health and armor) are up to date // self.origin = player origin TODO: should maybe move this so it's the origin of the shownames tag already in SSQC for culling? diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc index 9bb99f41d..f4096b87a 100644 --- a/qcsrc/client/t_items.qc +++ b/qcsrc/client/t_items.qc @@ -2,7 +2,7 @@ #include "../common/buffs/all.qh" #include "../common/movetypes/movetypes.qh" #include "../common/weapons/all.qh" -#include "../csqcmodellib/cl_model.qh" -#include "../csqcmodellib/common.qh" +#include "../lib/csqcmodel/cl_model.qh" +#include "../lib/csqcmodel/common.qh" #include "../server/t_items.qc" diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index d429d2005..c866a1b73 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -4,7 +4,7 @@ #include "../common/mutators/mutator/waypoints/all.qh" -#include "../csqcmodellib/interpolate.qh" +#include "../lib/csqcmodel/interpolate.qh" vector teamradar_3dcoord_to_texcoord(vector in) { diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 6fcc79b24..fad769d01 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -23,10 +23,10 @@ #include "../common/minigames/cl_minigames.qh" #include "../common/minigames/cl_minigames_hud.qh" -#include "../csqcmodellib/cl_player.qh" +#include "../lib/csqcmodel/cl_player.qh" -#include "../warpzonelib/client.qh" -#include "../warpzonelib/common.qh" +#include "../lib/warpzone/client.qh" +#include "../lib/warpzone/common.qh" entity porto; vector polyline[16]; diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc index b97f757a7..9da9bb5b6 100644 --- a/qcsrc/client/wall.qc +++ b/qcsrc/client/wall.qc @@ -3,7 +3,7 @@ #include "bgmscript.qh" -#include "../csqcmodellib/interpolate.qh" +#include "../lib/csqcmodel/interpolate.qh" .float alpha; .float scale; diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index b52a3fac1..807d95cb4 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -9,9 +9,9 @@ #include "../../common/nades/all.qh" #include "../../common/movetypes/movetypes.qh" -#include "../../csqcmodellib/interpolate.qh" +#include "../../lib/csqcmodel/interpolate.qh" -#include "../../warpzonelib/anglestransform.qh" +#include "../../lib/warpzone/anglestransform.qh" .float alpha; .float scale; diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index 84253b1e9..b4559269d 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -9,7 +9,7 @@ #include "../../server/weapons/tracing.qh" #include "../../server/weapons/weaponsystem.qh" #include "../mutators/mutator/waypoints/waypointsprites.qh" -#include "../../warpzonelib/server.qh" +#include "../../lib/warpzone/server.qh" #endif // special spawn flags diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index b8bff0201..e42908fbd 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -1,7 +1,7 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../warpzonelib/common.qh" + #include "../../lib/warpzone/common.qh" #include "../constants.qh" #include "../teams.qh" #include "../util.qh" @@ -20,7 +20,7 @@ #include "../../server/command/common.qh" #include "../../server/command/cmd.qh" #include "../triggers/triggers.qh" - #include "../../csqcmodellib/sv_model.qh" + #include "../../lib/csqcmodel/sv_model.qh" #include "../../server/round_handler.qh" #endif diff --git a/qcsrc/common/movetypes/movetypes.qc b/qcsrc/common/movetypes/movetypes.qc index 0fed28f15..8c96174f2 100644 --- a/qcsrc/common/movetypes/movetypes.qc +++ b/qcsrc/common/movetypes/movetypes.qc @@ -6,7 +6,7 @@ #include "../stats.qh" #include "../util.qh" #include "movetypes.qh" - #include "../../csqcmodellib/common.qh" + #include "../../lib/csqcmodel/common.qh" #include "../../server/t_items.qh" #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/nades/all.qc b/qcsrc/common/nades/all.qc index 724837b25..30ad1782f 100644 --- a/qcsrc/common/nades/all.qc +++ b/qcsrc/common/nades/all.qc @@ -4,7 +4,7 @@ #include "../buffs/all.qh" #include "../movetypes/movetypes.qh" #include "../../client/main.qh" - #include "../../csqcmodellib/cl_model.qh" + #include "../../lib/csqcmodel/cl_model.qh" #elif defined(MENUQC) #elif defined(SVQC) #include "../constants.qh" diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc index a0d266ce5..2effa1676 100644 --- a/qcsrc/common/triggers/func/breakable.qc +++ b/qcsrc/common/triggers/func/breakable.qc @@ -4,7 +4,7 @@ #include "../../../server/g_damage.qh" #include "../../../server/bot/bot.qh" #include "../../../common/csqcmodel_settings.qh" -#include "../../../csqcmodellib/sv_model.qh" +#include "../../../lib/csqcmodel/sv_model.qh" #include "../../../server/weapons/common.qh" .entity sprite; diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc index cc15516d1..54029cd6c 100644 --- a/qcsrc/common/triggers/misc/laser.qc +++ b/qcsrc/common/triggers/misc/laser.qc @@ -1,8 +1,8 @@ #if defined(CSQC) #include "../../buffs/all.qh" - #include "../../../csqcmodellib/interpolate.qh" + #include "../../../lib/csqcmodel/interpolate.qh" #include "../../../client/main.qh" - #include "../../../csqcmodellib/cl_model.qh" + #include "../../../lib/csqcmodel/cl_model.qh" #elif defined(MENUQC) #elif defined(SVQC) #endif diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc index 438292a43..b4b210384 100644 --- a/qcsrc/common/triggers/teleporters.qc +++ b/qcsrc/common/triggers/teleporters.qc @@ -3,9 +3,9 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../warpzonelib/common.qh" - #include "../../warpzonelib/util_server.qh" - #include "../../warpzonelib/server.qh" + #include "../../lib/warpzone/common.qh" + #include "../../lib/warpzone/util_server.qh" + #include "../../lib/warpzone/server.qh" #include "../constants.qh" #include "../triggers/subs.qh" #include "../util.qh" diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc index 029ee9630..33241aafd 100644 --- a/qcsrc/common/triggers/trigger/swamp.qc +++ b/qcsrc/common/triggers/trigger/swamp.qc @@ -1,7 +1,7 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../../warpzonelib/util_server.qh" + #include "../../../lib/warpzone/util_server.qh" #include "../../weapons/all.qh" #include "../../../server/defs.qh" #include "../../deathtypes.qh" diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc index 00695cfa3..c21fe6b54 100644 --- a/qcsrc/common/triggers/trigger/viewloc.qc +++ b/qcsrc/common/triggers/trigger/viewloc.qc @@ -1,7 +1,7 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../../warpzonelib/util_server.qh" + #include "../../../lib/warpzone/util_server.qh" #include "../../../server/defs.qh" #endif diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 01214331c..37d49b2e2 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -7,23 +7,23 @@ #include "../../client/defs.qh" #include "../constants.qh" #include "../stats.qh" - #include "../../warpzonelib/anglestransform.qh" - #include "../../warpzonelib/common.qh" - #include "../../warpzonelib/client.qh" + #include "../../lib/warpzone/anglestransform.qh" + #include "../../lib/warpzone/common.qh" + #include "../../lib/warpzone/client.qh" #include "../util.qh" #include "../buffs/all.qh" #include "../../client/autocvars.qh" #include "../deathtypes.qh" - #include "../../csqcmodellib/interpolate.qh" + #include "../../lib/csqcmodel/interpolate.qh" #include "../movetypes/movetypes.qh" #include "../../client/main.qh" - #include "../../csqcmodellib/cl_model.qh" + #include "../../lib/csqcmodel/cl_model.qh" #elif defined(MENUQC) #elif defined(SVQC) - #include "../../warpzonelib/anglestransform.qh" - #include "../../warpzonelib/common.qh" - #include "../../warpzonelib/util_server.qh" - #include "../../warpzonelib/server.qh" + #include "../../lib/warpzone/anglestransform.qh" + #include "../../lib/warpzone/common.qh" + #include "../../lib/warpzone/util_server.qh" + #include "../../lib/warpzone/server.qh" #include "../constants.qh" #include "../stats.qh" #include "../teams.qh" @@ -42,7 +42,7 @@ #include "../../server/mutators/mutators_include.qh" #include "../mapinfo.qh" #include "../../server/command/common.qh" - #include "../../csqcmodellib/sv_model.qh" + #include "../../lib/csqcmodel/sv_model.qh" #include "../../server/portals.qh" #include "../../server/g_hook.qh" #endif diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index 66a79c83c..49b8ef779 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -25,7 +25,7 @@ #include "../dpdefs/keycodes.qh" #endif -#include "../warpzonelib/mathlib.qc" +#include "warpzone/mathlib.qc" #include "accumulate.qh" #include "bits.qh" diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/lib/csqcmodel/cl_model.qc similarity index 96% rename from qcsrc/csqcmodellib/cl_model.qc rename to qcsrc/lib/csqcmodel/cl_model.qc index b42f5c4c5..8d3d4ab93 100644 --- a/qcsrc/csqcmodellib/cl_model.qc +++ b/qcsrc/lib/csqcmodel/cl_model.qc @@ -19,18 +19,15 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - #if defined(CSQC) - #include "../client/defs.qh" - #include "../common/util.qh" - #include "../common/animdecide.qh" - #include "interpolate.qh" - #include "../common/csqcmodel_settings.qh" - #include "common.qh" - #include "cl_model.qh" - #include "cl_player.qh" - #elif defined(MENUQC) - #elif defined(SVQC) - #endif +#include "cl_model.qh" + +#include "cl_player.qh" +#include "common.qh" +#include "interpolate.qh" +#include "../../client/defs.qh" +#include "../../common/animdecide.qh" +#include "../../common/csqcmodel_settings.qh" +#include "../../common/util.qh" float autocvar_cl_lerpanim_maxdelta_framegroups = 0.1; float autocvar_cl_nolerp = 0; diff --git a/qcsrc/csqcmodellib/cl_model.qh b/qcsrc/lib/csqcmodel/cl_model.qh similarity index 97% rename from qcsrc/csqcmodellib/cl_model.qh rename to qcsrc/lib/csqcmodel/cl_model.qh index 98f1da03b..55401e4b4 100644 --- a/qcsrc/csqcmodellib/cl_model.qh +++ b/qcsrc/lib/csqcmodel/cl_model.qh @@ -19,8 +19,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef CL_MODEL_H -#define CL_MODEL_H +#ifndef LIB_CSQCMODEL_CL_MODEL_H +#define LIB_CSQCMODEL_CL_MODEL_H #include "common.qh" diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc similarity index 95% rename from qcsrc/csqcmodellib/cl_player.qc rename to qcsrc/lib/csqcmodel/cl_player.qc index 7aedd52e6..ae4e55ac1 100644 --- a/qcsrc/csqcmodellib/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -20,21 +20,18 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#if defined(CSQC) - #include "../client/defs.qh" - #include "../common/constants.qh" - #include "../common/stats.qh" - #include "../common/util.qh" - #include "interpolate.qh" - #include "../client/main.qh" - #include "common.qh" - #include "cl_model.qh" - #include "cl_player.qh" - #include "../common/triggers/trigger/viewloc.qh" - #include "../common/viewloc.qh" -#elif defined(MENUQC) -#elif defined(SVQC) -#endif +#include "cl_player.qh" + +#include "cl_model.qh" +#include "common.qh" +#include "interpolate.qh" +#include "../../client/defs.qh" +#include "../../client/main.qh" +#include "../../common/constants.qh" +#include "../../common/stats.qh" +#include "../../common/triggers/trigger/viewloc.qh" +#include "../../common/util.qh" +#include "../../common/viewloc.qh" float autocvar_cl_movement_errorcompensation = 0; int autocvar_cl_movement = 1; diff --git a/qcsrc/csqcmodellib/cl_player.qh b/qcsrc/lib/csqcmodel/cl_player.qh similarity index 95% rename from qcsrc/csqcmodellib/cl_player.qh rename to qcsrc/lib/csqcmodel/cl_player.qh index e427e6cf3..c9598c880 100644 --- a/qcsrc/csqcmodellib/cl_player.qh +++ b/qcsrc/lib/csqcmodel/cl_player.qh @@ -19,8 +19,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef CL_PLAYER_H -#define CL_PLAYER_H +#ifndef LIB_CSQCMODEL_CL_PLAYER_H +#define LIB_CSQCMODEL_CL_PLAYER_H entity csqcplayer; float csqcplayer_status; diff --git a/qcsrc/csqcmodellib/common.qh b/qcsrc/lib/csqcmodel/common.qh similarity index 97% rename from qcsrc/csqcmodellib/common.qh rename to qcsrc/lib/csqcmodel/common.qh index de02e7a6d..884977f90 100644 --- a/qcsrc/csqcmodellib/common.qh +++ b/qcsrc/lib/csqcmodel/common.qh @@ -19,10 +19,10 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef CSQCMODELLIB_COMMON_H -#define CSQCMODELLIB_COMMON_H +#ifndef LIB_CSQCMODEL_COMMON_H +#define LIB_CSQCMODEL_COMMON_H -#include "../common/csqcmodel_settings.qh" +#include "../../common/csqcmodel_settings.qh" noref string csqcmodel_license = "\ Copyright (c) 2011 Rudolf Polzer\ diff --git a/qcsrc/csqcmodellib/interpolate.qc b/qcsrc/lib/csqcmodel/interpolate.qc similarity index 96% rename from qcsrc/csqcmodellib/interpolate.qc rename to qcsrc/lib/csqcmodel/interpolate.qc index fb1094f72..ca846da0f 100644 --- a/qcsrc/csqcmodellib/interpolate.qc +++ b/qcsrc/lib/csqcmodel/interpolate.qc @@ -19,12 +19,13 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include "interpolate.qh" + #if defined(CSQC) - #include "../client/defs.qh" - #include "../warpzonelib/anglestransform.qh" - #include "../client/autocvars.qh" - #include "interpolate.qh" - #include "cl_model.qh" +// #include "../../client/defs.qh" +// #include "../warpzone/anglestransform.qh" +// #include "../../client/autocvars.qh" +// #include "cl_model.qh" #elif defined(MENUQC) #elif defined(SVQC) #endif diff --git a/qcsrc/csqcmodellib/interpolate.qh b/qcsrc/lib/csqcmodel/interpolate.qh similarity index 96% rename from qcsrc/csqcmodellib/interpolate.qh rename to qcsrc/lib/csqcmodel/interpolate.qh index 5ee57850c..e07ad4ade 100644 --- a/qcsrc/csqcmodellib/interpolate.qh +++ b/qcsrc/lib/csqcmodel/interpolate.qh @@ -19,8 +19,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef INTERPOLATE_H -#define INTERPOLATE_H +#ifndef LIB_CSQCMODEL_INTERPOLATE_H +#define LIB_CSQCMODEL_INTERPOLATE_H .int iflags; const int IFLAG_VELOCITY = 1; diff --git a/qcsrc/csqcmodellib/settings.qh b/qcsrc/lib/csqcmodel/settings.qh similarity index 93% rename from qcsrc/csqcmodellib/settings.qh rename to qcsrc/lib/csqcmodel/settings.qh index b30d7e94b..128da850f 100644 --- a/qcsrc/csqcmodellib/settings.qh +++ b/qcsrc/lib/csqcmodel/settings.qh @@ -1,5 +1,5 @@ -#ifndef CSQCMODELLIB_SETTINGS_H -#define CSQCMODELLIB_SETTINGS_H +#ifndef LIB_CSQCMODEL_SETTINGS_H +#define LIB_CSQCMODEL_SETTINGS_H // define this if svqc code wants to use .frame2 and .lerpfrac //#define CSQCMODEL_HAVE_TWO_FRAMES diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/lib/csqcmodel/sv_model.qc similarity index 93% rename from qcsrc/csqcmodellib/sv_model.qc rename to qcsrc/lib/csqcmodel/sv_model.qc index 0fc2ad8b6..8fcdcfbee 100644 --- a/qcsrc/csqcmodellib/sv_model.qc +++ b/qcsrc/lib/csqcmodel/sv_model.qc @@ -19,18 +19,14 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include "sv_model.qh" -#if defined(CSQC) -#elif defined(MENUQC) -#elif defined(SVQC) - #include "../common/constants.qh" - #include "../common/util.qh" - #include "../common/animdecide.qh" - #include "../server/constants.qh" - #include "../server/defs.qh" - #include "common.qh" - #include "sv_model.qh" -#endif +#include "common.qh" +#include "../../common/animdecide.qh" +#include "../../common/constants.qh" +#include "../../common/util.qh" +#include "../../server/constants.qh" +#include "../../server/defs.qh" // generic CSQC model code diff --git a/qcsrc/csqcmodellib/sv_model.qh b/qcsrc/lib/csqcmodel/sv_model.qh similarity index 94% rename from qcsrc/csqcmodellib/sv_model.qh rename to qcsrc/lib/csqcmodel/sv_model.qh index 713e8c224..3e043d353 100644 --- a/qcsrc/csqcmodellib/sv_model.qh +++ b/qcsrc/lib/csqcmodel/sv_model.qh @@ -19,10 +19,10 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - #ifndef SV_MODEL_H - #define SV_MODEL_H +#ifndef LIB_CSQCMODEL_SV_MODEL_H +#define LIB_CSQCMODEL_SV_MODEL_H - #include "common.qh" +#include "common.qh" // generic CSQC model code diff --git a/qcsrc/warpzonelib/COPYING b/qcsrc/lib/warpzone/COPYING similarity index 100% rename from qcsrc/warpzonelib/COPYING rename to qcsrc/lib/warpzone/COPYING diff --git a/qcsrc/warpzonelib/TODO b/qcsrc/lib/warpzone/TODO similarity index 100% rename from qcsrc/warpzonelib/TODO rename to qcsrc/lib/warpzone/TODO diff --git a/qcsrc/warpzonelib/anglestransform.qc b/qcsrc/lib/warpzone/anglestransform.qc similarity index 98% rename from qcsrc/warpzonelib/anglestransform.qc rename to qcsrc/lib/warpzone/anglestransform.qc index f92947f5b..d6423f177 100644 --- a/qcsrc/warpzonelib/anglestransform.qc +++ b/qcsrc/lib/warpzone/anglestransform.qc @@ -1,10 +1,5 @@ #include "anglestransform.qh" -#if defined(CSQC) -#elif defined(MENUQC) -#elif defined(SVQC) -#endif - #ifdef POSITIVE_PITCH_IS_DOWN vector fixedvectoangles(vector a) { diff --git a/qcsrc/warpzonelib/anglestransform.qh b/qcsrc/lib/warpzone/anglestransform.qh similarity index 95% rename from qcsrc/warpzonelib/anglestransform.qh rename to qcsrc/lib/warpzone/anglestransform.qh index 053847101..5c356ea7f 100644 --- a/qcsrc/warpzonelib/anglestransform.qh +++ b/qcsrc/lib/warpzone/anglestransform.qh @@ -1,5 +1,5 @@ -#ifndef ANGLETRANSFORM_H -#define ANGLETRANSFORM_H +#ifndef LIB_WARPZONE_ANGLETRANSFORM_H +#define LIB_WARPZONE_ANGLETRANSFORM_H #define POSITIVE_PITCH_IS_DOWN diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/lib/warpzone/client.qc similarity index 98% rename from qcsrc/warpzonelib/client.qc rename to qcsrc/lib/warpzone/client.qc index 68c2984db..aba39c2cb 100644 --- a/qcsrc/warpzonelib/client.qc +++ b/qcsrc/lib/warpzone/client.qc @@ -2,8 +2,8 @@ #include "common.qh" #if defined(CSQC) - #include "../client/autocvars.qh" - #include "../csqcmodellib/cl_model.qh" + #include "../../client/autocvars.qh" + #include "../csqcmodel/cl_model.qh" #elif defined(MENUQC) #elif defined(SVQC) #endif diff --git a/qcsrc/warpzonelib/client.qh b/qcsrc/lib/warpzone/client.qh similarity index 84% rename from qcsrc/warpzonelib/client.qh rename to qcsrc/lib/warpzone/client.qh index a9f0fe1c2..016ac5882 100644 --- a/qcsrc/warpzonelib/client.qh +++ b/qcsrc/lib/warpzone/client.qh @@ -1,5 +1,5 @@ -#ifndef CLIENT_H -#define CLIENT_H +#ifndef LIB_WARPZONE_CLIENT_H +#define LIB_WARPZONE_CLIENT_H void WarpZone_Read(float bIsNewEntity); void WarpZone_Camera_Read(float bIsNewEntity); diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/lib/warpzone/common.qc similarity index 99% rename from qcsrc/warpzonelib/common.qc rename to qcsrc/lib/warpzone/common.qc index 044b4d864..6fe901bd8 100644 --- a/qcsrc/warpzonelib/common.qc +++ b/qcsrc/lib/warpzone/common.qc @@ -1,10 +1,10 @@ #include "common.qh" #if defined(CSQC) - #include "../server/t_items.qh" + #include "../../server/t_items.qh" #elif defined(MENUQC) #elif defined(SVQC) - #include "../common/weapons/all.qh" + #include "../../common/weapons/all.qh" #endif void WarpZone_Accumulator_Clear(entity acc) diff --git a/qcsrc/warpzonelib/common.qh b/qcsrc/lib/warpzone/common.qh similarity index 98% rename from qcsrc/warpzonelib/common.qh rename to qcsrc/lib/warpzone/common.qh index 3e2b7c7c6..d0c1f22ea 100644 --- a/qcsrc/warpzonelib/common.qh +++ b/qcsrc/lib/warpzone/common.qh @@ -1,5 +1,5 @@ -#ifndef WARPZONELIB_COMMON_H -#define WARPZONELIB_COMMON_H +#ifndef LIB_WARPZONE_COMMON_H +#define LIB_WARPZONE_COMMON_H // uncomment this if your mod uses the roll angle in fixangle // #define KEEP_ROLL diff --git a/qcsrc/warpzonelib/mathlib.qc b/qcsrc/lib/warpzone/mathlib.qc similarity index 100% rename from qcsrc/warpzonelib/mathlib.qc rename to qcsrc/lib/warpzone/mathlib.qc diff --git a/qcsrc/warpzonelib/mathlib.qh b/qcsrc/lib/warpzone/mathlib.qh similarity index 98% rename from qcsrc/warpzonelib/mathlib.qh rename to qcsrc/lib/warpzone/mathlib.qh index 6f7adf44f..9acece2ab 100644 --- a/qcsrc/warpzonelib/mathlib.qh +++ b/qcsrc/lib/warpzone/mathlib.qh @@ -1,5 +1,5 @@ -#ifndef MATHLIB_H -#define MATHLIB_H +#ifndef LIB_WARPZONE_MATHLIB_H +#define LIB_WARPZONE_MATHLIB_H // diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/lib/warpzone/server.qc similarity index 99% rename from qcsrc/warpzonelib/server.qc rename to qcsrc/lib/warpzone/server.qc index 033594d2e..e21e4cab4 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -4,12 +4,12 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../common/constants.qh" - #include "../common/triggers/subs.qh" - #include "../common/util.qh" - #include "../server/command/common.qh" - #include "../server/constants.qh" - #include "../server/defs.qh" + #include "../../common/constants.qh" + #include "../../common/triggers/subs.qh" + #include "../../common/util.qh" + #include "../../server/command/common.qh" + #include "../../server/constants.qh" + #include "../../server/defs.qh" #endif #ifdef WARPZONELIB_KEEPDEBUG diff --git a/qcsrc/warpzonelib/server.qh b/qcsrc/lib/warpzone/server.qh similarity index 89% rename from qcsrc/warpzonelib/server.qh rename to qcsrc/lib/warpzone/server.qh index 88ad6f508..943f0322a 100644 --- a/qcsrc/warpzonelib/server.qh +++ b/qcsrc/lib/warpzone/server.qh @@ -1,5 +1,5 @@ -#ifndef SERVER_H -#define SERVER_H +#ifndef LIB_WARPZONE_SERVER_H +#define LIB_WARPZONE_SERVER_H void WarpZone_StartFrame(); float WarpZone_Projectile_Touch(); diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/lib/warpzone/util_server.qc similarity index 95% rename from qcsrc/warpzonelib/util_server.qc rename to qcsrc/lib/warpzone/util_server.qc index 61c063667..742ec3e20 100644 --- a/qcsrc/warpzonelib/util_server.qc +++ b/qcsrc/lib/warpzone/util_server.qc @@ -5,7 +5,7 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../csqcmodellib/sv_model.qh" + #include "../csqcmodel/sv_model.qh" #endif #include "common.qh" diff --git a/qcsrc/warpzonelib/util_server.qh b/qcsrc/lib/warpzone/util_server.qh similarity index 68% rename from qcsrc/warpzonelib/util_server.qh rename to qcsrc/lib/warpzone/util_server.qh index 0a42d7d12..75df5d862 100644 --- a/qcsrc/warpzonelib/util_server.qh +++ b/qcsrc/lib/warpzone/util_server.qh @@ -1,5 +1,5 @@ -#ifndef UTIL_SERVER_H -#define UTIL_SERVER_H +#ifndef LIB_WARPZONE_UTIL_SERVER_H +#define LIB_WARPZONE_UTIL_SERVER_H float WarpZoneLib_MoveOutOfSolid(entity e); float WarpZoneLib_ExactTrigger_Touch(); diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc index dbcd90052..3b2af5d92 100644 --- a/qcsrc/server/bot/bot.qc +++ b/qcsrc/server/bot/bot.qc @@ -30,10 +30,10 @@ #include "../../common/weapons/all.qh" -#include "../../csqcmodellib/sv_model.qh" +#include "../../lib/csqcmodel/sv_model.qh" -#include "../../warpzonelib/common.qh" -#include "../../warpzonelib/util_server.qh" +#include "../../lib/warpzone/common.qh" +#include "../../lib/warpzone/util_server.qh" entity bot_spawn() {SELFPARAM(); diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index ec27e3e94..ced6463c2 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -11,7 +11,7 @@ #include "../../../common/triggers/trigger/jumppads.qh" -#include "../../../warpzonelib/common.qh" +#include "../../../lib/warpzone/common.qh" .float speed; diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc index ffd78e931..156ad79fc 100644 --- a/qcsrc/server/bot/waypoints.qc +++ b/qcsrc/server/bot/waypoints.qc @@ -7,8 +7,8 @@ #include "../../common/constants.qh" -#include "../../warpzonelib/common.qh" -#include "../../warpzonelib/util_server.qh" +#include "../../lib/warpzone/common.qh" +#include "../../lib/warpzone/util_server.qh" // create a new spawnfunc_waypoint and automatically link it to other waypoints, and link // them back to it as well diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index c17a1d0c8..0f43d92c0 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -20,10 +20,10 @@ #include "../common/triggers/func/breakable.qh" -#include "../csqcmodellib/sv_model.qh" +#include "../lib/csqcmodel/sv_model.qh" -#include "../warpzonelib/anglestransform.qh" -#include "../warpzonelib/util_server.qh" +#include "../lib/warpzone/anglestransform.qh" +#include "../lib/warpzone/util_server.qh" void CopyBody(float keepvelocity); diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index ad0d71db3..ddbc18da6 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -46,7 +46,7 @@ #include "../common/monsters/sv_monsters.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/server.qh" void send_CSQC_teamnagger() { diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 13d7b6227..dafd7d2a6 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -15,7 +15,7 @@ #include "../common/deathtypes.qh" #include "../common/triggers/subs.qh" #include "../common/playerstats.qh" -#include "../csqcmodellib/sv_model.qh" +#include "../lib/csqcmodel/sv_model.qh" #include "../common/minigames/sv_minigames.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 9cf020d33..3cd7f23cf 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -33,7 +33,7 @@ #include "../../common/monsters/spawn.qh" #include "../../common/monsters/sv_monsters.qh" -#include "../../warpzonelib/common.qh" +#include "../../lib/warpzone/common.qh" void ClientKill_TeamChange (float targetteam); // 0 = don't change, -1 = auto, -2 = spec diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 7dea85ee6..4d390e7d9 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -5,7 +5,7 @@ #include "../../common/monsters/all.qh" #include "../../common/notifications.qh" -#include "../../warpzonelib/common.qh" +#include "../../lib/warpzone/common.qh" // ==================================================== diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 50b09f799..60e6bde62 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -6,7 +6,7 @@ #include "../../common/util.qh" -#include "../../csqcmodellib/sv_model.qh" +#include "../../lib/csqcmodel/sv_model.qh" // =============================================== // Generates radar map images for use in the HUD diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 8f9b30504..845fd56f6 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -21,8 +21,8 @@ #include "../common/teams.qh" #include "../common/util.qh" #include "../common/weapons/all.qh" -#include "../csqcmodellib/sv_model.qh" -#include "../warpzonelib/common.qh" +#include "../lib/csqcmodel/sv_model.qh" +#include "../lib/warpzone/common.qh" bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf) { diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index 6e0f5b579..064d31ff9 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -4,7 +4,7 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../warpzonelib/common.qh" + #include "../lib/warpzone/common.qh" #include "../common/constants.qh" #include "../common/teams.qh" #include "../common/util.qh" @@ -21,7 +21,7 @@ #include "mutators/mutators_include.qh" #include "../common/turrets/sv_turrets.qh" #include "../common/vehicles/all.qh" - #include "../csqcmodellib/sv_model.qh" + #include "../lib/csqcmodel/sv_model.qh" #include "../common/playerstats.qh" #include "g_hook.qh" #include "scores.qh" diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index d372d3516..7a77d4aff 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -12,8 +12,8 @@ #include "../common/constants.qh" #include "../common/util.qh" #include "../common/weapons/all.qh" -#include "../warpzonelib/common.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/common.qh" +#include "../lib/warpzone/server.qh" .int state; diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index a9353cfe1..8bc538736 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -11,7 +11,7 @@ class(BGMScript) .float bgmscriptsustain; class(BGMScript) .float bgmscriptrelease; #include "../common/constants.qh" -#include "../csqcmodellib/sv_model.qh" +#include "../lib/csqcmodel/sv_model.qh" .float modelscale; diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 8544cd926..af1cf7cc2 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -2,7 +2,7 @@ #include "antilag.qh" #include "command/common.qh" -#include "../warpzonelib/common.qh" +#include "../lib/warpzone/common.qh" #include "../common/triggers/subs.qh" spawnfunc(info_null) diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index fc0dbd422..8df6e3b46 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -4,7 +4,7 @@ #include "../common/monsters/all.qh" #include "../common/notifications.qh" #include "../common/util.qh" -#include "../warpzonelib/util_server.qh" +#include "../lib/warpzone/util_server.qh" /* TODO: diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index ccefc4c1e..4c8fdeaaf 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -23,9 +23,9 @@ #include "../common/vehicles/sv_vehicles.qh" #include "../common/vehicles/vehicle.qh" #include "../common/items/all.qc" -#include "../csqcmodellib/sv_model.qh" -#include "../warpzonelib/anglestransform.qh" -#include "../warpzonelib/server.qh" +#include "../lib/csqcmodel/sv_model.qh" +#include "../lib/warpzone/anglestransform.qh" +#include "../lib/warpzone/server.qh" void crosshair_trace(entity pl) { diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 2ee316d8c..9de38eae7 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -37,8 +37,8 @@ #include "../../common/stats.qh" #include "../../common/teams.qh" -#include "../../warpzonelib/server.qh" -#include "../../warpzonelib/util_server.qh" +#include "../../lib/warpzone/server.qh" +#include "../../lib/warpzone/util_server.qh" .float lastground; float total_players; diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 78c192433..eff581154 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -7,7 +7,7 @@ #include "../teamplay.qh" #endif -#include "../../warpzonelib/common.qh" +#include "../../lib/warpzone/common.qh" void ctf_FakeTimeLimit(entity e, float t) { diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index 39adb175c..ac60070e5 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -38,8 +38,8 @@ #include "../../common/monsters/all.qh" -#include "../../warpzonelib/anglestransform.qh" -#include "../../warpzonelib/server.qh" -#include "../../warpzonelib/util_server.qh" +#include "../../lib/warpzone/anglestransform.qh" +#include "../../lib/warpzone/server.qh" +#include "../../lib/warpzone/util_server.qh" #endif diff --git a/qcsrc/server/mutators/mutators_include.qc b/qcsrc/server/mutators/mutators_include.qc index e948ab688..fe8fe0fa5 100644 --- a/qcsrc/server/mutators/mutators_include.qc +++ b/qcsrc/server/mutators/mutators_include.qc @@ -1,10 +1,10 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../warpzonelib/anglestransform.qh" - #include "../../warpzonelib/common.qh" - #include "../../warpzonelib/util_server.qh" - #include "../../warpzonelib/server.qh" + #include "../../lib/warpzone/anglestransform.qh" + #include "../../lib/warpzone/common.qh" + #include "../../lib/warpzone/util_server.qh" + #include "../../lib/warpzone/server.qh" #include "../../common/constants.qh" #include "../../common/stats.qh" #include "../../common/teams.qh" @@ -52,8 +52,8 @@ #include "../command/cmd.qh" #include "../command/sv_cmd.qh" #include "../../common/csqcmodel_settings.qh" - #include "../../csqcmodellib/common.qh" - #include "../../csqcmodellib/sv_model.qh" + #include "../../lib/csqcmodel/common.qh" + #include "../../lib/csqcmodel/sv_model.qh" #include "../anticheat.qh" #include "../cheats.qh" #include "../../common/playerstats.qh" diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 09776c4d6..ec5d688f6 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -9,10 +9,10 @@ #include "../common/triggers/subs.qh" #include "../common/util.qh" #include "../common/weapons/all.qh" -#include "../csqcmodellib/sv_model.qh" -#include "../warpzonelib/anglestransform.qh" -#include "../warpzonelib/util_server.qh" -#include "../warpzonelib/common.qh" +#include "../lib/csqcmodel/sv_model.qh" +#include "../lib/warpzone/anglestransform.qh" +#include "../lib/warpzone/util_server.qh" +#include "../lib/warpzone/common.qh" #include "../common/vehicles/vehicle.qh" #include "../common/vehicles/sv_vehicles.qh" diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index ee891aa4d..2adaf838f 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -94,12 +94,12 @@ #include "../common/turrets/targettrigger.qc" #include "../common/weapons/config.qc" -#include "../csqcmodellib/sv_model.qc" +#include "../lib/csqcmodel/sv_model.qc" -#include "../warpzonelib/anglestransform.qc" -#include "../warpzonelib/common.qc" -#include "../warpzonelib/server.qc" -#include "../warpzonelib/util_server.qc" +#include "../lib/warpzone/anglestransform.qc" +#include "../lib/warpzone/common.qc" +#include "../lib/warpzone/server.qc" +#include "../lib/warpzone/util_server.qc" #if BUILD_MOD #include "../../mod/server/progs.inc" diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 3ac5582d6..d9d8d55c5 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -11,8 +11,8 @@ #include "../common/notifications.qh" #include "../common/mapinfo.qh" #include "../common/triggers/subs.qh" -#include "../warpzonelib/util_server.qh" -#include "../warpzonelib/common.qh" +#include "../lib/warpzone/util_server.qh" +#include "../lib/warpzone/common.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" void W_Porto_Fail(float failhard); diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index ead90d30b..6980a9e94 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -7,8 +7,8 @@ #include "../common/teams.qh" #include "../common/triggers/subs.qh" #include "../common/util.qh" -#include "../warpzonelib/common.qh" -#include "../warpzonelib/util_server.qh" +#include "../lib/warpzone/common.qh" +#include "../lib/warpzone/util_server.qh" bool SpawnPoint_Send(entity this, entity to, int sf) { diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 05fee86da..8b9e1c8b0 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -19,10 +19,10 @@ #include "../common/vehicles/all.qh" #include "../common/weapons/all.qh" -#include "../csqcmodellib/sv_model.qh" +#include "../lib/csqcmodel/sv_model.qh" -#include "../warpzonelib/common.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/common.qh" +#include "../lib/warpzone/server.qh" .float lastground; .int state; diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index eee53e616..89d6b06ca 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -23,7 +23,7 @@ #include "../common/weapons/all.qh" - #include "../warpzonelib/util_server.qh" + #include "../lib/warpzone/util_server.qh" #endif #ifdef CSQC diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index b88acaa51..4c9e0e34c 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -14,7 +14,7 @@ #include "../../common/weapons/all.qh" -#include "../../warpzonelib/common.qh" +#include "../../lib/warpzone/common.qh" // this function calculates w_shotorg and w_shotdir based on the weapon model // offset, trueaim and antilag, and won't put w_shotorg inside a wall. diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 3f74034f1..dd7e2b599 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -12,7 +12,7 @@ #include "../../common/notifications.qh" #include "../../common/util.qh" #include "../../common/weapons/all.qh" -#include "../../csqcmodellib/sv_model.qh" +#include "../../lib/csqcmodel/sv_model.qh" /* =========================================================================== -- 2.39.2