From 9a66589d6acbd35df28b897d603709b435b78710 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 29 Aug 2013 22:40:39 +1000 Subject: [PATCH] Clean up filenames a bit --- qcsrc/client/progs.src | 12 +++---- .../monsters/cl_monsters.qc} | 5 +++ .../monsters/cl_monsters.qh} | 0 qcsrc/common/monsters/lib/monsters_early.qh | 35 ------------------- qcsrc/common/monsters/monsters.qc | 8 +---- qcsrc/common/monsters/monsters.qh | 14 ++++++++ qcsrc/common/monsters/{lib => }/spawn.qc | 0 qcsrc/common/monsters/spawn.qh | 1 + .../{lib/monsters.qc => sv_monsters.qc} | 5 +-- .../monsters/{lib/defs.qh => sv_monsters.qh} | 17 +++++++++ qcsrc/server/progs.src | 7 ++-- 11 files changed, 52 insertions(+), 52 deletions(-) rename qcsrc/{client/monsters.qc => common/monsters/cl_monsters.qc} (96%) rename qcsrc/{client/monsters.qh => common/monsters/cl_monsters.qh} (100%) delete mode 100644 qcsrc/common/monsters/lib/monsters_early.qh rename qcsrc/common/monsters/{lib => }/spawn.qc (100%) create mode 100644 qcsrc/common/monsters/spawn.qh rename qcsrc/common/monsters/{lib/monsters.qc => sv_monsters.qc} (99%) rename qcsrc/common/monsters/{lib/defs.qh => sv_monsters.qh} (78%) diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index bc1ec35eb..0b68e7e96 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -27,9 +27,11 @@ Defs.qc ../common/command/shared_defs.qh ../common/urllib.qh ../common/animdecide.qh -../common/monsters/monsters.qh command/cl_cmd.qh +../common/monsters/cl_monsters.qh +../common/monsters/monsters.qh + autocvars.qh ../common/notifications.qh // must be after autocvars @@ -48,8 +50,6 @@ bgmscript.qh noise.qh tturrets.qh ../server/tturrets/include/turrets_early.qh -monsters.qh -../common/monsters/lib/monsters_early.qh ../server/movelib.qc ../server/generator.qh main.qh @@ -115,9 +115,11 @@ noise.qc ../server/w_all.qc ../common/explosion_equation.qc ../common/urllib.qc -../common/monsters/monsters.qc command/cl_cmd.qc +../common/monsters/cl_monsters.qc +../common/monsters/monsters.qc + ../warpzonelib/anglestransform.qc ../warpzonelib/mathlib.qc ../warpzonelib/common.qc @@ -126,8 +128,6 @@ tturrets.qc ../server/generator.qc -monsters.qc - player_skeleton.qc ../common/animdecide.qc diff --git a/qcsrc/client/monsters.qc b/qcsrc/common/monsters/cl_monsters.qc similarity index 96% rename from qcsrc/client/monsters.qc rename to qcsrc/common/monsters/cl_monsters.qc index 0dfbcf4c0..869842c8a 100644 --- a/qcsrc/client/monsters.qc +++ b/qcsrc/common/monsters/cl_monsters.qc @@ -1,3 +1,8 @@ +// ========================= +// CSQC Monster Properties +// ========================= + + .vector glowmod; void monster_changeteam() { diff --git a/qcsrc/client/monsters.qh b/qcsrc/common/monsters/cl_monsters.qh similarity index 100% rename from qcsrc/client/monsters.qh rename to qcsrc/common/monsters/cl_monsters.qh diff --git a/qcsrc/common/monsters/lib/monsters_early.qh b/qcsrc/common/monsters/lib/monsters_early.qh deleted file mode 100644 index f690cdc59..000000000 --- a/qcsrc/common/monsters/lib/monsters_early.qh +++ /dev/null @@ -1,35 +0,0 @@ -// for definitions used outside the monsters folder - -#ifdef SVQC -.string spawnmob; -.float monster_attack; - -float monster_skill; -float spawncode_first_load; // used to tell the player the monster database is loading (TODO: fix this?) - -.entity monster_owner; // new monster owner entity, fixes non-solid monsters -.float monstercount; // per player monster count - -.float stat_monsters_killed; // stats -.float stat_monsters_total; -float monsters_total; -float monsters_killed; -void monsters_setstatus(); // monsters.qc -.float monster_moveflags; // checks where to move when not attacking - -#endif // SVQC - -#ifndef MENUQC - -.float anim_start_time; - -float MSF_UPDATE = 2; -float MSF_STATUS = 4; -float MSF_SETUP = 8; -float MSF_ANG = 16; -float MSF_MOVE = 32; -float MSF_ANIM = 64; - -float MSF_FULL_UPDATE = 16777215; - -#endif // CSQC/SVQC diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/monsters.qc index 4320f62e8..7f43df51f 100644 --- a/qcsrc/common/monsters/monsters.qc +++ b/qcsrc/common/monsters/monsters.qc @@ -1,9 +1,3 @@ -#ifdef SVQC -#include "lib/defs.qh" -#include "lib/monsters.qc" -#include "lib/spawn.qc" -#endif - #include "all.qh" // MONSTER PLUGIN SYSTEM @@ -50,4 +44,4 @@ entity get_monsterinfo(float id) if(m) return m; return dummy_monster_info; -} +} \ No newline at end of file diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh index ae994ae1b..0c9d4b888 100644 --- a/qcsrc/common/monsters/monsters.qh +++ b/qcsrc/common/monsters/monsters.qh @@ -24,6 +24,20 @@ const float MON_FLAG_SUPERMONSTER = 2048; // incredibly powerful monster .string model; // full name of model .float spawnflags; +// csqc linking +#ifndef MENUQC +.float anim_start_time; + +float MSF_UPDATE = 2; +float MSF_STATUS = 4; +float MSF_SETUP = 8; +float MSF_ANG = 16; +float MSF_MOVE = 32; +float MSF_ANIM = 64; + +float MSF_FULL_UPDATE = 16777215; +#endif + // other useful macros #define MON_ACTION(monstertype,mrequest) (get_monsterinfo(monstertype)).monster_func(mrequest) #define M_NAME(monstertype) (get_monsterinfo(monstertype)).monster_name diff --git a/qcsrc/common/monsters/lib/spawn.qc b/qcsrc/common/monsters/spawn.qc similarity index 100% rename from qcsrc/common/monsters/lib/spawn.qc rename to qcsrc/common/monsters/spawn.qc diff --git a/qcsrc/common/monsters/spawn.qh b/qcsrc/common/monsters/spawn.qh new file mode 100644 index 000000000..7d8410368 --- /dev/null +++ b/qcsrc/common/monsters/spawn.qh @@ -0,0 +1 @@ +entity spawnmonster (string monster, float mnster, entity spawnedby, entity own, vector orig, float respwn, float moveflag); diff --git a/qcsrc/common/monsters/lib/monsters.qc b/qcsrc/common/monsters/sv_monsters.qc similarity index 99% rename from qcsrc/common/monsters/lib/monsters.qc rename to qcsrc/common/monsters/sv_monsters.qc index e423b55ed..0f81f283e 100644 --- a/qcsrc/common/monsters/lib/monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -1,6 +1,7 @@ -// TODO: clean up this file? +// ========================= +// SVQC Monster Properties +// ========================= -void() spawnfunc_item_minst_cells; void M_Item_Touch () { diff --git a/qcsrc/common/monsters/lib/defs.qh b/qcsrc/common/monsters/sv_monsters.qh similarity index 78% rename from qcsrc/common/monsters/lib/defs.qh rename to qcsrc/common/monsters/sv_monsters.qh index 1f5fe1293..0ceb95852 100644 --- a/qcsrc/common/monsters/lib/defs.qh +++ b/qcsrc/common/monsters/sv_monsters.qh @@ -1,3 +1,19 @@ +.string spawnmob; +.float monster_attack; + +float monster_skill; +float spawncode_first_load; // used to tell the player the monster database is loading (TODO: fix this?) + +.entity monster_owner; // new monster owner entity, fixes non-solid monsters +.float monstercount; // per player monster count + +.float stat_monsters_killed; // stats +.float stat_monsters_total; +float monsters_total; +float monsters_killed; +void monsters_setstatus(); // monsters.qc +.float monster_moveflags; // checks where to move when not attacking + .float(float attack_type) monster_attackfunc; const float MONSTER_ATTACK_MELEE = 1; const float MONSTER_ATTACK_RANGED = 2; @@ -49,3 +65,4 @@ const float MONSTER_MOVE_ENEMY = 5; // used only as a movestate const float MONSTER_STATE_ATTACK_LEAP = 1; const float MONSTER_STATE_ATTACK_MELEE = 2; + diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index 32b61aac0..b8ce21ec2 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -29,6 +29,8 @@ sys-post.qh ../common/monsters/config.qh ../common/monsters/monsters.qh +../common/monsters/sv_monsters.qh +../common/monsters/spawn.qh autocvars.qh @@ -57,8 +59,6 @@ mutators/mutator_nades.qh tturrets/include/turrets_early.qh vehicles/vehicles_def.qh -../common/monsters/lib/monsters_early.qh - generator.qh campaign.qh @@ -237,9 +237,12 @@ round_handler.qc ../common/explosion_equation.qc +../common/monsters/sv_monsters.qc ../common/monsters/config.qc ../common/monsters/monsters.qc +../common/monsters/spawn.qc + mutators/base.qc mutators/gamemode_assault.qc mutators/gamemode_arena.qc -- 2.39.2