From ab02ec751edbf69850827dca695e60034f9ce915 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 12 Jun 2018 14:02:05 +1000 Subject: [PATCH] Clean up some dangling definitions from the server side --- qcsrc/common/mapobjects/target/music.qh | 2 ++ qcsrc/common/mutators/mutator/buffs/buffs.qh | 1 + qcsrc/common/t_items.qh | 2 ++ qcsrc/common/turrets/util.qh | 6 ++++++ qcsrc/common/vehicles/sv_vehicles.qh | 1 + qcsrc/common/weapons/all.qh | 4 ++++ qcsrc/common/weapons/weapon/crylink.qh | 2 ++ qcsrc/common/weapons/weapon/porto.qc | 2 +- qcsrc/common/weapons/weapon/porto.qh | 2 ++ qcsrc/server/cheats.qc | 16 +--------------- qcsrc/server/cheats.qh | 13 +++++++++++++ qcsrc/server/client.qc | 13 +++---------- qcsrc/server/client.qh | 16 ++++++++++++++++ qcsrc/server/command/banning.qh | 5 ----- qcsrc/server/command/cmd.qc | 5 +---- qcsrc/server/command/sv_cmd.qc | 7 ------- qcsrc/server/command/vote.qh | 1 + qcsrc/server/compat/quake3.qc | 3 +-- qcsrc/server/compat/quake3.qh | 2 ++ qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_hook.qc | 1 - qcsrc/server/g_hook.qh | 1 + qcsrc/server/g_world.qc | 16 ++++------------ qcsrc/server/g_world.qh | 2 ++ qcsrc/server/ipban.qc | 2 -- qcsrc/server/ipban.qh | 5 +++++ qcsrc/server/item_key.qc | 8 ++++---- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/pathlib/debug.qc | 4 +--- qcsrc/server/pathlib/debug.qh | 6 ++++++ qcsrc/server/pathlib/main.qc | 4 +--- qcsrc/server/pathlib/pathlib.qh | 5 ----- qcsrc/server/portals.qc | 1 - qcsrc/server/portals.qh | 2 ++ qcsrc/server/race.qc | 5 +---- qcsrc/server/race.qh | 2 ++ qcsrc/server/scores_rules.qc | 2 -- qcsrc/server/sv_main.qc | 3 +-- qcsrc/server/weapons/weaponsystem.qc | 2 -- 39 files changed, 91 insertions(+), 87 deletions(-) diff --git a/qcsrc/common/mapobjects/target/music.qh b/qcsrc/common/mapobjects/target/music.qh index ccf3f674e..fac00152a 100644 --- a/qcsrc/common/mapobjects/target/music.qh +++ b/qcsrc/common/mapobjects/target/music.qh @@ -25,4 +25,6 @@ void Ent_TriggerMusic_Remove(entity this); #elif defined(SVQC) void target_music_kill(); + +void TargetMusic_RestoreGame(); #endif diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh index d6cf1ca82..35005e7a8 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh @@ -64,6 +64,7 @@ STATIC_INIT(REGISTER_BUFFS) { #endif string Buff_UndeprecateName(string buffname); +entity buff_FirstFromFlags(int _buffs); REGISTER_BUFF(Null); BUFF_SPAWNFUNCS(random, BUFF_Null) diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh index bd46599aa..50228a0a8 100644 --- a/qcsrc/common/t_items.qh +++ b/qcsrc/common/t_items.qh @@ -124,6 +124,8 @@ void GiveSound(entity e, float v0, float v1, float t, Sound snd_incr, Sound snd_ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .float regenfield, float regentime); +spawnfunc(target_items); + #define PREGIVE_WEAPONS(e) WepSet save_weapons; save_weapons = STAT(WEAPONS, e) #define PREGIVE(e,f) float save_##f; save_##f = (e).f #define POSTGIVE_WEAPON(e,b,snd_incr,snd_decr) GiveSound((e), !!(save_weapons & WepSet_FromWeapon(b)), !!(STAT(WEAPONS, e) & WepSet_FromWeapon(b)), 0, snd_incr, snd_decr) diff --git a/qcsrc/common/turrets/util.qh b/qcsrc/common/turrets/util.qh index 4c84f268d..4e5cb0d5b 100644 --- a/qcsrc/common/turrets/util.qh +++ b/qcsrc/common/turrets/util.qh @@ -5,4 +5,10 @@ float turret_tag_fire_update(entity this); void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax, float bforce, float f_dmg, float f_velfactor, float deathtype); +#ifdef TURRET_DEBUG +void mark_error(vector where,float lifetime); +void mark_info(vector where,float lifetime); +entity mark_misc(vector where,float lifetime); +#endif + #endif diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh index 0ddd02aa7..d0f63c96a 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@ -107,6 +107,7 @@ bool vehicle_initialize(entity this, Vehicle info, float nodrop); bool vehicle_impulse(entity this, int imp); bool vehicles_crushable(entity e); float vehicle_altitude(entity this, float amax); +void vehicles_enter(entity pl, entity veh); IntrusiveList g_vehicle_returners; STATIC_INIT(g_vehicle_returners) { g_vehicle_returners = IL_NEW(); } diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 2a151d1af..9b4c0b468 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -367,4 +367,8 @@ ENUMCLASS_END(WFRAME) vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn); void CL_WeaponEntity_SetModel(entity this, string name, bool _anim); + +#ifdef SVQC +void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim); +#endif #endif diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh index e48bf5fb3..77e0b734e 100644 --- a/qcsrc/common/weapons/weapon/crylink.qh +++ b/qcsrc/common/weapons/weapon/crylink.qh @@ -71,4 +71,6 @@ SPAWNFUNC_WEAPON(weapon_crylink, WEP_CRYLINK) .entity queuenext; .entity queueprev; + +void W_Crylink_Dequeue(entity e); #endif diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 9f79bf440..243f5bc34 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -2,6 +2,7 @@ #ifdef SVQC #include +#include REGISTER_MUTATOR(porto_ticker, true); MUTATOR_HOOKFUNCTION(porto_ticker, SV_StartFrame) { @@ -20,7 +21,6 @@ void W_Porto_Success(entity this) delete(this); } -string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo, .entity weaponentity); void W_Porto_Fail(entity this, float failhard) { if(this.realowner == NULL) diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh index 93b3a6e9f..a77093944 100644 --- a/qcsrc/common/weapons/weapon/porto.qh +++ b/qcsrc/common/weapons/weapon/porto.qh @@ -44,4 +44,6 @@ SPAWNFUNC_WEAPON(weapon_porto, WEP_PORTO) .float porto_v_angle_held; .vector right_vector; .float porto_forbidden; + +void W_Porto_Fail(entity this, float failhard); #endif diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index f71cb494b..1dcdab738 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -6,6 +6,7 @@ #include #include "g_damage.qh" +#include "player.qh" #include "race.qh" #include "../common/mapobjects/teleporters.qh" @@ -33,8 +34,6 @@ #include "../lib/warpzone/anglestransform.qh" #include "../lib/warpzone/util_server.qh" -void CopyBody(entity this, float keepvelocity); - #ifdef NOCHEATS float CheatImpulse(entity this, int imp) { return 0; } @@ -292,7 +291,6 @@ float CheatImpulse(entity this, int imp) END_CHEAT_FUNCTION(); } -void DragBox_Think(entity this); float drag_lastcnt; float CheatCommand(entity this, int argc) { @@ -712,18 +710,6 @@ float CheatCommand(entity this, int argc) END_CHEAT_FUNCTION(); } -float Drag(entity this, float force_allow_pick, float ischeat); -void Drag_Begin(entity dragger, entity draggee, vector touchpoint); -void Drag_Finish(entity dragger); -float Drag_IsDraggable(entity draggee); -float Drag_MayChangeAngles(entity draggee); -void Drag_MoveForward(entity dragger); -void Drag_SetSpeed(entity dragger, float s); -void Drag_MoveBackward(entity dragger); -void Drag_Update(entity dragger); -float Drag_CanDrag(entity dragger); -float Drag_IsDragging(entity dragger); -void Drag_MoveDrag(entity from, entity to); .entity dragentity; float CheatFrame(entity this) diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh index 1bf080641..0dc6a92d9 100644 --- a/qcsrc/server/cheats.qh +++ b/qcsrc/server/cheats.qh @@ -15,3 +15,16 @@ float CheatFrame(entity this); const float CHRAME_DRAG = 8; void Drag_MoveDrag(entity from, entity to); // call this from CopyBody +void DragBox_Think(entity this); +float Drag(entity this, float force_allow_pick, float ischeat); +void Drag_Begin(entity dragger, entity draggee, vector touchpoint); +void Drag_Finish(entity dragger); +float Drag_IsDraggable(entity draggee); +float Drag_MayChangeAngles(entity draggee); +void Drag_MoveForward(entity dragger); +void Drag_SetSpeed(entity dragger, float s); +void Drag_MoveBackward(entity dragger); +void Drag_Update(entity dragger); +float Drag_CanDrag(entity dragger); +float Drag_IsDragging(entity dragger); +void Drag_MoveDrag(entity from, entity to); diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 5d35527ed..93d037aad 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -17,6 +17,7 @@ #include "handicap.qh" #include "g_hook.qh" #include "command/common.qh" +#include "command/vote.qh" #include "cheats.qh" #include "g_world.qh" #include "race.qh" @@ -46,6 +47,8 @@ #include "../common/net_linked.qh" #include "../common/physics/player.qh" +#include + #include "../common/items/_mod.qh" #include "../common/mutators/mutator/waypoints/all.qh" @@ -75,8 +78,6 @@ STATIC_METHOD(Client, Add, void(Client this, int _team)) PutClientInServer(this); } -void PutObserverInServer(entity this); - STATIC_METHOD(Client, Remove, void(Client this)) { TRANSMUTE(Observer, this); @@ -167,9 +168,6 @@ void ClientData_Touch(entity e) }); } -void SetSpectatee(entity this, entity spectatee); -void SetSpectatee_status(entity this, int spectatee_num); - /* ============= @@ -223,7 +221,6 @@ void setplayermodel(entity e, string modelname) UpdatePlayerSounds(e); } -void FixPlayermodel(entity player); /** putting a client as observer in the server */ void PutObserverInServer(entity this) { @@ -791,8 +788,6 @@ void PutClientInServer(entity this) } } -void ClientInit_misc(entity this); - // TODO do we need all these fields, or should we stop autodetecting runtime // changes and just have a console command to update this? bool ClientInit_SendEntity(entity this, entity to, int sf) @@ -1332,7 +1327,6 @@ Called when a client disconnects from the server ============= */ .entity chatbubbleentity; -void ReadyCount(); void ClientDisconnect(entity this) { assert(IS_CLIENT(this), return); @@ -2449,7 +2443,6 @@ void SpectatorThink(entity this) this.flags |= FL_CLIENT | FL_NOTARGET; } -void vehicles_enter (entity pl, entity veh); void PlayerUseKey(entity this) { if (!IS_PLAYER(this)) diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index 95696fda1..2d3a099b3 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -263,5 +263,21 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re bool Spectate(entity this, entity pl); +void ClientInit_Spawn(); + +void PutObserverInServer(entity this); + +void SetSpectatee(entity this, entity spectatee); +void SetSpectatee_status(entity this, int spectatee_num); + +void FixPlayermodel(entity player); + +void ClientInit_misc(entity this); + +void ClientKill_TeamChange(entity this, float targetteam); // 0 = don't change, -1 = auto, -2 = spec + +bool joinAllowed(entity this); +void Join(entity this); + #define SPECTATE_COPY() ACCUMULATE void SpectateCopy(entity this, entity spectatee) #define SPECTATE_COPYFIELD(fld) SPECTATE_COPY() { this.(fld) = spectatee.(fld); } diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh index d6b1ae60f..3cbaaf978 100644 --- a/qcsrc/server/command/banning.qh +++ b/qcsrc/server/command/banning.qh @@ -8,11 +8,6 @@ #define GET_BAN_ARG(v, d) if (argc > reason_arg) { if ((v = stof(argv(reason_arg))) != 0) ++reason_arg; else v = d; } else { v = d; } #define GET_BAN_REASON(v, d) if (argc > reason_arg) v = substring(command, argv_start_index(reason_arg), strlen(command) - argv_start_index(reason_arg)); else v = d; -void Ban_KickBanClient(entity client, float bantime, float masksize, string reason); -void Ban_View(); -float Ban_Insert(string ip, float bantime, string reason, float dosync); -float Ban_Delete(float i); - // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file void BanCommand_macro_write_aliases(float fh); diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 8111a64ef..9b7a0f657 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -10,6 +10,7 @@ #include "../campaign.qh" #include "../cheats.qh" +#include "../client.qh" #include "../player.qh" #include "../ipban.qh" #include "../mapvoting.qh" @@ -41,8 +42,6 @@ #include -void ClientKill_TeamChange(entity this, float targetteam); // 0 = don't change, -1 = auto, -2 = spec - // ========================================================= // Server side networked commands code, reworked by Samual // Last updated: December 28th, 2011 @@ -166,8 +165,6 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc) // i } } -bool joinAllowed(entity this); -void Join(entity this); void ClientCommand_join(entity caller, float request) { switch (request) diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 0471cff07..29b300885 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -32,13 +32,6 @@ #include - -void PutObserverInServer(entity this); - -// ===================================================== -// Server side game commands code, reworked by Samual -// ===================================================== - // used by GameCommand_make_mapinfo() void make_mapinfo_Think(entity this) { diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index 7b10b37eb..d5c3bc0ad 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -54,3 +54,4 @@ void reset_map(float dorespawn); void ReadyCount(); void ReadyRestart_force(); void VoteCount(float first_count); +void Nagger_Init(); diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index de069be87..85b063a68 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -4,11 +4,10 @@ #include #include #include +#include #include #include -spawnfunc(target_items); - //*********************** //QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons //*********************** diff --git a/qcsrc/server/compat/quake3.qh b/qcsrc/server/compat/quake3.qh index 6f70f09be..342a829a1 100644 --- a/qcsrc/server/compat/quake3.qh +++ b/qcsrc/server/compat/quake3.qh @@ -1 +1,3 @@ #pragma once + +bool DoesQ3ARemoveThisEntity(entity this); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index cefeb316a..4bb38780d 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -14,6 +14,7 @@ #include "../common/items/_mod.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" #include "../common/mutators/mutator/instagib/sv_instagib.qh" +#include "../common/mutators/mutator/buffs/buffs.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" @@ -221,7 +222,6 @@ bool frag_centermessage_override(entity attacker, entity targ, int deathtype, in return MUTATOR_CALLHOOK(FragCenterMessage, attacker, targ, deathtype, kill_count_to_attacker, kill_count_to_target); } -entity buff_FirstFromFlags(int _buffs); void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .entity weaponentity) { // Sanity check diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 0d732e0ca..09135d482 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -110,7 +110,6 @@ void GrapplingHookReset(entity this) RemoveHook(this); } -void GrapplingHookThink(entity this); void GrapplingHook_Stop(entity this) { Send_Effect(EFFECT_HOOK_IMPACT, this.origin, '0 0 0', 1); diff --git a/qcsrc/server/g_hook.qh b/qcsrc/server/g_hook.qh index 719bf5b60..c0df31662 100644 --- a/qcsrc/server/g_hook.qh +++ b/qcsrc/server/g_hook.qh @@ -2,6 +2,7 @@ // Wazat's grappling hook .entity hook; +void GrapplingHookThink(entity this); void RemoveGrapplingHooks(entity pl); void RemoveHook(entity this); // (note: you can change the hook impulse #'s to whatever you please) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 842f5b53c..cf0f5d33b 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -92,8 +92,6 @@ const float SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS = 1; string redirection_target; float world_initialized; -void ShuffleMaplist(); - void SetDefaultAlpha() { if (!MUTATOR_CALLHOOK(SetDefaultAlpha)) @@ -578,12 +576,7 @@ STATIC_INIT_EARLY(maxclients) } } -void Map_MarkAsRecent(string m); float world_already_spawned; -void Nagger_Init(); -void ClientInit_Spawn(); -void WeaponStats_Init(); -void WeaponStats_Shutdown(); spawnfunc(worldspawn) { server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated"))); @@ -1057,7 +1050,7 @@ void Map_Goto(float reinit) // return codes of map selectors: // -1 = temporary failure (that is, try some method that is guaranteed to succeed) // -2 = permanent failure -float() MaplistMethod_Iterate = // usual method +float MaplistMethod_Iterate() // usual method { float pass, i; @@ -1076,7 +1069,7 @@ float() MaplistMethod_Iterate = // usual method return -1; } -float() MaplistMethod_Repeat = // fallback method +float MaplistMethod_Repeat() // fallback method { LOG_TRACE("Trying MaplistMethod_Repeat"); @@ -1085,7 +1078,7 @@ float() MaplistMethod_Repeat = // fallback method return -2; } -float() MaplistMethod_Random = // random map selection +float MaplistMethod_Random() // random map selection { float i, imax; @@ -1103,7 +1096,7 @@ float() MaplistMethod_Random = // random map selection return -1; } -float(float exponent) MaplistMethod_Shuffle = // more clever shuffling +float MaplistMethod_Shuffle(float exponent) // more clever shuffling // the exponent sets a bias on the map selection: // the higher the exponent, the less likely "shortly repeated" same maps are { @@ -2108,7 +2101,6 @@ float RedirectionThink() return true; } -void TargetMusic_RestoreGame(); void RestoreGame() { // Loaded from a save game diff --git a/qcsrc/server/g_world.qh b/qcsrc/server/g_world.qh index 35ea5fe7d..c0c35589a 100644 --- a/qcsrc/server/g_world.qh +++ b/qcsrc/server/g_world.qh @@ -24,5 +24,7 @@ string GetNextMap(); void ShuffleMaplist(); void Map_Goto_SetStr(string nextmapname); void Map_Goto(float reinit); +void Map_MarkAsRecent(string m); float DoNextMapOverride(float reinit); void CheckRules_World(); +float RedirectionThink(); diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc index cf0eb13b7..2c0af1c8f 100644 --- a/qcsrc/server/ipban.qc +++ b/qcsrc/server/ipban.qc @@ -31,8 +31,6 @@ #define MAX_IPBAN_URIS (URI_GET_IPBAN_END - URI_GET_IPBAN + 1) -float Ban_Insert(string ip, float bantime, string reason, float dosync); - void OnlineBanList_SendBan(string ip, float bantime, string reason) { string uri; diff --git a/qcsrc/server/ipban.qh b/qcsrc/server/ipban.qh index 946f44f93..330d8b7df 100644 --- a/qcsrc/server/ipban.qh +++ b/qcsrc/server/ipban.qh @@ -6,4 +6,9 @@ float Ban_MaybeEnforceBan(entity client); float Ban_MaybeEnforceBanOnce(entity client); float BanCommand(string command); +float Ban_Insert(string ip, float bantime, string reason, float dosync); +void Ban_KickBanClient(entity client, float bantime, float masksize, string reason); +void Ban_View(); +float Ban_Delete(float i); + void OnlineBanList_URI_Get_Callback(float id, float status, string data); diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index e939a5faa..2bfdc49b7 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -87,7 +87,7 @@ void item_key_touch(entity this, entity toucher) this.message = ""; SUB_UseTargets(this, toucher, toucher); // TODO: should we be using toucher for the trigger here? this.message = oldmsg; -}; +} /** * Spawn a key with given model, key code and color. @@ -124,7 +124,7 @@ void spawn_item_key(entity this) } settouch(this, item_key_touch); -}; +} /*QUAKED item_key (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING @@ -265,7 +265,7 @@ spawnfunc(item_key1) this.classname = "item_key"; this.itemkeys = ITEM_KEY_BIT(1); spawnfunc_item_key(this); -}; +} /*QUAKED item_key2 (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING GOLD key. @@ -284,4 +284,4 @@ spawnfunc(item_key2) this.classname = "item_key"; this.itemkeys = ITEM_KEY_BIT(0); spawnfunc_item_key(this); -}; +} diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index d6d3c63b6..ecaf2faab 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -16,6 +16,7 @@ #include "../common/command/_mod.qh" #include "../common/constants.qh" #include +#include #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" #include "../common/notifications/all.qh" @@ -1085,7 +1086,6 @@ bool SUB_NoImpactCheck(entity this, entity toucher) #define SUB_OwnerCheck(ent,oth) ((oth) && ((oth) == (ent).owner)) -void W_Crylink_Dequeue(entity e); bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher) { if(SUB_OwnerCheck(this, toucher)) diff --git a/qcsrc/server/pathlib/debug.qc b/qcsrc/server/pathlib/debug.qc index b84ae6414..13dbda520 100644 --- a/qcsrc/server/pathlib/debug.qc +++ b/qcsrc/server/pathlib/debug.qc @@ -8,9 +8,7 @@ MODEL(SQUARE_BAD, "models/pathlib/badsquare.md3"); MODEL(EDGE, "models/pathlib/edge.md3"); #ifdef TURRET_DEBUG -void mark_error(vector where,float lifetime); -void mark_info(vector where,float lifetime); -entity mark_misc(vector where,float lifetime); +#include #endif void pathlib_showpath(entity start) diff --git a/qcsrc/server/pathlib/debug.qh b/qcsrc/server/pathlib/debug.qh index 811c031af..6f1bd9895 100644 --- a/qcsrc/server/pathlib/debug.qh +++ b/qcsrc/server/pathlib/debug.qh @@ -1,2 +1,8 @@ #pragma once #include "pathlib.qh" + +#if DEBUGPATHING +void pathlib_showpath(entity start); +void pathlib_showpath2(entity path); +void pathlib_showsquare(vector where,float goodsquare,float _lifetime); +#endif diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc index c2f332603..1aeae109c 100644 --- a/qcsrc/server/pathlib/main.qc +++ b/qcsrc/server/pathlib/main.qc @@ -30,9 +30,7 @@ void dumpnode(entity n) } #if DEBUGPATHING -void pathlib_showpath(entity start); -void pathlib_showpath2(entity path); -void pathlib_showsquare(vector where,float goodsquare,float _lifetime); +#include "debug.qh" #endif diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh index 21ef8b3cb..d1bafe392 100644 --- a/qcsrc/server/pathlib/pathlib.qh +++ b/qcsrc/server/pathlib/pathlib.qh @@ -15,11 +15,6 @@ const vector PLIB_FORWARD = '0 1 0'; const vector PLIB_RIGHT = '1 0 0'; //#define PLIB_LEFT '-1 0 0' -#if DEBUGPATHING -void pathlib_showpath(entity start); -void pathlib_showpath2(entity path); -#endif - entity openlist; entity closedlist; diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 758c69bcc..64d7f0a8e 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -323,7 +323,6 @@ void Portal_Touch(entity this, entity toucher) toucher.effects += EF_BLUE - EF_RED; } -void Portal_Think(entity this); void Portal_MakeBrokenPortal(entity portal) { portal.skin = 2; diff --git a/qcsrc/server/portals.qh b/qcsrc/server/portals.qh index f3528d081..20a2bd930 100644 --- a/qcsrc/server/portals.qh +++ b/qcsrc/server/portals.qh @@ -11,3 +11,5 @@ void Portal_ClearWithID(entity own, float id); vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle); void Portal_ClearAll_PortalsOnly(entity own); + +void Portal_Think(entity this); diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 183da23f9..5286032fb 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -14,6 +14,7 @@ #include #include #include +#include #include "../common/mapobjects/subs.qh" #include #include "../lib/warpzone/util_server.qh" @@ -30,8 +31,6 @@ void race_InitSpectator() race_SendNextCheckpoint(msg_entity.enemy, 1); } -void W_Porto_Fail(entity this, float failhard); - float race_readTime(string map, float pos) { string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD)); @@ -105,8 +104,6 @@ string race_readName(string map, float pos) const float MAX_CHECKPOINTS = 255; -spawnfunc(target_checkpoint); - .float race_penalty; .float race_penalty_accumulator; .string race_penalty_reason; diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh index 32edca781..4402e2256 100644 --- a/qcsrc/server/race.qh +++ b/qcsrc/server/race.qh @@ -70,3 +70,5 @@ void race_SendRankings(float pos, float prevpos, float del, float msg); void race_RetractPlayer(entity this); void race_InitSpectator(); + +spawnfunc(target_checkpoint); diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 64c94001f..160b5df5e 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -9,8 +9,6 @@ int ScoreRules_teams; -void CheckAllowedTeams (entity for_whom); - int NumTeams(int teams) { return boolean(teams & BIT(0)) + boolean(teams & BIT(1)) + boolean(teams & BIT(2)) + boolean(teams & BIT(3)); diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 326c8d960..539b30d29 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -11,6 +11,7 @@ #include #include "weapons/csqcprojectile.qh" +#include #include "../common/constants.qh" #include "../common/deathtypes/all.qh" @@ -167,7 +168,6 @@ Called before each frame by the server bool game_delay_last; bool autocvar_sv_autopause = false; -float RedirectionThink(); void systems_update(); void sys_phys_update(entity this, float dt); void StartFrame() @@ -248,7 +248,6 @@ void StartFrame() .float anglejitter; .string gametypefilter; .string cvarfilter; -bool DoesQ3ARemoveThisEntity(entity this); /** * Evaluate an expression of the form: [+ | -]? [var[op]val | [op]var | val | var] ... diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 9c62ec22e..ab600f331 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -332,8 +332,6 @@ bool weapon_prepareattack(Weapon thiswep, entity actor, .entity weaponentity, bo return false; } -void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim); - /** * @param t defer thinking until time + t * @param func next think function -- 2.39.2