From: Martin Taibr Date: Sun, 6 Nov 2016 14:47:13 +0000 (+0100) Subject: Merge branch 'master' into martin-t/msnt X-Git-Tag: xonotic-v0.8.2~456^2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=7908f6be3a5bcdb29c7fc4ca663b919ed023b1f3;hp=ac5b1ea89f95a78dbdeffa4c551fb1705a6a7e50 Merge branch 'master' into martin-t/msnt --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 8eaf852e7f..5df6d59bb4 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -791,6 +791,7 @@ seta cl_damagetext_alpha_lifetime "3" "Damage text lifetime in seconds" seta cl_damagetext_velocity "0 0 20" "Damage text move direction" seta cl_damagetext_offset "0 -40 0" "Damage text offset" seta cl_damagetext_accumulate_range "30" "Damage text spawned within this range is accumulated" +seta cl_damagetext_accumulate_alpha_rel "0.65" "Only update existing damage text when it's above this much percentage (0 to 1) of the starting alpha" seta cl_damagetext_friendlyfire "1" "Show damage text for friendlyfire too" seta cl_damagetext_friendlyfire_color "1 0 0" "Damage text color for friendlyfire" diff --git a/monsters.cfg b/monsters.cfg index b5a97f87a5..1c87a716da 100644 --- a/monsters.cfg +++ b/monsters.cfg @@ -88,7 +88,7 @@ set g_monster_shambler_speed_walk 150 // {{{ Misc set g_monsters 1 set g_monsters_edit 0 -set g_monsters_think_delay 0.1 +set g_monsters_think_delay 0.03333 set g_monsters_skill 1 "Monster skill (affecting some of their attributes). 1 - easy, 2 - medium, 3 - hard, 4 - insane, 5 - nightmare" set g_monsters_miniboss_chance 5 set g_monsters_miniboss_healthboost 100 diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index 182f6ace74..437e1dd75b 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -27,7 +27,7 @@ float dmg_take; .int team; .int team_size; -float vid_conwidth, vid_conheight; +float vid_conheight; int binddb; // QUALIFYING @@ -88,7 +88,7 @@ vector lightning_shotorigin[4]; float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power; #endif -float servertime, serverprevtime, serverdeltatime; +float serverprevtime, serverdeltatime; float ticrate; diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 117badbec4..ef68e21b20 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -3,6 +3,7 @@ #include "quickmenu.qh" #include #include +#include #include #include #include diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 9bcfd4e7a9..36ca217240 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 327df77c25..738831a5d0 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -2,9 +2,9 @@ #if XONOTIC #include -#endif #include +#endif #ifdef BUILD_MOD #include diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 75ef40521e..6a4515ac14 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 3134a24ed2..12f4c6a1d0 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,6 +22,8 @@ #include #include +#include + #include #include #include @@ -311,6 +314,12 @@ void viewmodel_draw(entity this) { static string name_last; string name = wep.mdl; + if(wep == WEP_TUBA) + { + name = (this.tuba_instrument == 0) ? "tuba" : + (this.tuba_instrument == 1) ? "akordeon" : + "kleinbottle"; + } bool swap = name != name_last; // if (swap) { diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 6d58ac77a2..1f88bc8d60 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -6,6 +6,7 @@ #include "../mutators/events.qh" #include +#include #include #include diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 29f96aa449..f3acfed4e1 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -1,60 +1,7 @@ #pragma once -REGISTER_NET_TEMP(TE_CSQC_PICTURE) -REGISTER_NET_TEMP(TE_CSQC_RACE) -REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER) -REGISTER_NET_TEMP(TE_CSQC_PINGPLREPORT) -REGISTER_NET_TEMP(TE_CSQC_WEAPONCOMPLAIN) -REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP) - -const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder -const int RACE_NET_CHECKPOINT_CLEAR = 1; -const int RACE_NET_CHECKPOINT_NEXT_QUALIFYING = 2; // byte nextcheckpoint, short recordtime, string recordholder -const int RACE_NET_CHECKPOINT_HIT_RACE = 3; // byte checkpoint, short delta, byte lapsdelta, string opponent -const int RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT = 4; // byte checkpoint, short delta, byte lapsdelta, string opponent -const int RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING = 5; // byte nextcheckpoint, float laptime, short recordtime, string recordholder -const int RACE_NET_PENALTY_RACE = 6; // byte penaltytime, string reason -const int RACE_NET_PENALTY_QUALIFYING = 7; // byte penaltytime, string reason -const int RACE_NET_SERVER_RECORD = 8; // server record, sent to client -const int RACE_NET_SPEED_AWARD = 9; // speed award, sent to client -const int RACE_NET_SPEED_AWARD_BEST = 10; // all time best speed award, sent to client -const int RACE_NET_SERVER_RANKINGS = 11; -const int RACE_NET_SERVER_STATUS = 12; const int RANKINGS_CNT = 15; -REGISTER_NET_LINKED(_ENT_CLIENT_INIT) -#ifdef CSQC -NET_HANDLE(_ENT_CLIENT_INIT, bool isnew) { make_pure(this); return true; } -#endif -/** Sent as a temp entity from a persistent linked entity */ -REGISTER_NET_TEMP(ENT_CLIENT_INIT) - -REGISTER_NET_LINKED(ENT_CLIENT_SCORES_INFO) -REGISTER_NET_LINKED(ENT_CLIENT_SCORES) -REGISTER_NET_LINKED(ENT_CLIENT_TEAMSCORES) -REGISTER_NET_LINKED(ENT_CLIENT_NAGGER) // flags [votecalledvote] -REGISTER_NET_LINKED(ENT_CLIENT_RADARLINK) // flags [startorigin] [endorigin] [startcolor+16*endcolor] -REGISTER_NET_LINKED(ENT_CLIENT_PROJECTILE) -REGISTER_NET_LINKED(ENT_CLIENT_MAPVOTE) -REGISTER_NET_LINKED(ENT_CLIENT_CLIENTDATA) -REGISTER_NET_LINKED(ENT_CLIENT_RANDOMSEED) -REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY) -REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS) - -REGISTER_NET_LINKED(ENT_CLIENT_MODEL) - -REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE) -REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_CAMERA) -REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_TELEPORTED) - -REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM) -REGISTER_NET_LINKED(ENT_CLIENT_HOOK) -REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE) - -REGISTER_NET_LINKED(ENT_CLIENT_SPAWNPOINT) -REGISTER_NET_LINKED(ENT_CLIENT_SPAWNEVENT) -REGISTER_NET_LINKED(ENT_CLIENT_WALL) - const int SPRITERULE_DEFAULT = 0; const int SPRITERULE_TEAMPLAY = 1; const int SPRITERULE_SPECTATOR = 2; diff --git a/qcsrc/common/net_linked.qh b/qcsrc/common/net_linked.qh new file mode 100644 index 0000000000..9cd2094a68 --- /dev/null +++ b/qcsrc/common/net_linked.qh @@ -0,0 +1,55 @@ +#pragma once + +REGISTER_NET_TEMP(TE_CSQC_PICTURE) +REGISTER_NET_TEMP(TE_CSQC_RACE) +REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER) +REGISTER_NET_TEMP(TE_CSQC_PINGPLREPORT) +REGISTER_NET_TEMP(TE_CSQC_WEAPONCOMPLAIN) +REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP) + +const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder +const int RACE_NET_CHECKPOINT_CLEAR = 1; +const int RACE_NET_CHECKPOINT_NEXT_QUALIFYING = 2; // byte nextcheckpoint, short recordtime, string recordholder +const int RACE_NET_CHECKPOINT_HIT_RACE = 3; // byte checkpoint, short delta, byte lapsdelta, string opponent +const int RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT = 4; // byte checkpoint, short delta, byte lapsdelta, string opponent +const int RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING = 5; // byte nextcheckpoint, float laptime, short recordtime, string recordholder +const int RACE_NET_PENALTY_RACE = 6; // byte penaltytime, string reason +const int RACE_NET_PENALTY_QUALIFYING = 7; // byte penaltytime, string reason +const int RACE_NET_SERVER_RECORD = 8; // server record, sent to client +const int RACE_NET_SPEED_AWARD = 9; // speed award, sent to client +const int RACE_NET_SPEED_AWARD_BEST = 10; // all time best speed award, sent to client +const int RACE_NET_SERVER_RANKINGS = 11; +const int RACE_NET_SERVER_STATUS = 12; + +REGISTER_NET_LINKED(_ENT_CLIENT_INIT) +#ifdef CSQC +NET_HANDLE(_ENT_CLIENT_INIT, bool isnew) { make_pure(this); return true; } +#endif +/** Sent as a temp entity from a persistent linked entity */ +REGISTER_NET_TEMP(ENT_CLIENT_INIT) + +REGISTER_NET_LINKED(ENT_CLIENT_SCORES_INFO) +REGISTER_NET_LINKED(ENT_CLIENT_SCORES) +REGISTER_NET_LINKED(ENT_CLIENT_TEAMSCORES) +REGISTER_NET_LINKED(ENT_CLIENT_NAGGER) // flags [votecalledvote] +REGISTER_NET_LINKED(ENT_CLIENT_RADARLINK) // flags [startorigin] [endorigin] [startcolor+16*endcolor] +REGISTER_NET_LINKED(ENT_CLIENT_PROJECTILE) +REGISTER_NET_LINKED(ENT_CLIENT_MAPVOTE) +REGISTER_NET_LINKED(ENT_CLIENT_CLIENTDATA) +REGISTER_NET_LINKED(ENT_CLIENT_RANDOMSEED) +REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY) +REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS) + +REGISTER_NET_LINKED(ENT_CLIENT_MODEL) + +REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE) +REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_CAMERA) +REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_TELEPORTED) + +REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM) +REGISTER_NET_LINKED(ENT_CLIENT_HOOK) +REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE) + +REGISTER_NET_LINKED(ENT_CLIENT_SPAWNPOINT) +REGISTER_NET_LINKED(ENT_CLIENT_SPAWNEVENT) +REGISTER_NET_LINKED(ENT_CLIENT_WALL) diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index dd5f3a164b..5cf3e1c6b1 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -4,6 +4,7 @@ #elif defined(MENUQC) #elif defined(SVQC) #include + #include #include #include #include diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc index b6dcd01f88..dc2e6f7dc0 100644 --- a/qcsrc/common/triggers/func/breakable.qc +++ b/qcsrc/common/triggers/func/breakable.qc @@ -89,8 +89,6 @@ void func_breakable_colormod(entity this) this.colormod = '1 0 0' + '0 1 0' * (2 * h - 0.5); else this.colormod = '1 1 1'; - - CSQCMODEL_AUTOUPDATE(this); } void func_breakable_look_destroyed(entity this) @@ -113,8 +111,6 @@ void func_breakable_look_destroyed(entity this) this.effects &= ~EF_NODRAW; } - CSQCMODEL_AUTOUPDATE(this); - this.solid = SOLID_NOT; } @@ -127,8 +123,6 @@ void func_breakable_look_restore(entity this) if(this.mdl_dead != "") // only do this if we use mdl_dead, to behave better with misc_follow setorigin(this, this.dropped_origin); - CSQCMODEL_AUTOUPDATE(this); - this.solid = SOLID_BSP; } @@ -148,6 +142,12 @@ void func_breakable_behave_destroyed(entity this) stopsound (this, CH_TRIGGER_SINGLE); } +void func_breakable_think(entity this) +{ + this.nextthink = time; + CSQCMODEL_AUTOUPDATE(this); +} + void func_breakable_destroy(entity this, entity actor, entity trigger); void func_breakable_behave_restore(entity this) { @@ -168,7 +168,9 @@ void func_breakable_behave_restore(entity this) if(this.spawnflags & 4) this.use = func_breakable_destroy; // don't need to set it usually, as .use isn't reset this.state = 0; - this.nextthink = 0; // cancel auto respawn + //this.nextthink = 0; // cancel auto respawn + setthink(this, func_breakable_think); + this.nextthink = time + 0.1; func_breakable_colormod(this); if (this.noise1) _sound (this, CH_TRIGGER_SINGLE, this.noise1, VOL_BASE, ATTEN_NORM); @@ -187,16 +189,12 @@ void func_breakable_destroyed(entity this) { func_breakable_look_destroyed(this); func_breakable_behave_destroyed(this); - - CSQCMODEL_AUTOUPDATE(this); } void func_breakable_restore(entity this, entity actor, entity trigger) { func_breakable_look_restore(this); func_breakable_behave_restore(this); - - CSQCMODEL_AUTOUPDATE(this); } void func_breakable_restore_self(entity this) @@ -231,6 +229,7 @@ void func_breakable_destroy(entity this, entity actor, entity trigger) if(this.respawntime) { + CSQCMODEL_AUTOUPDATE(this); setthink(this, func_breakable_restore_self); this.nextthink = time + this.respawntime + crandom() * this.respawntimejitter; } @@ -281,6 +280,7 @@ void func_breakable_damage(entity this, entity inflictor, entity attacker, float // do not explode NOW but in the NEXT FRAME! // because recursive calls to RadiusDamage are not allowed this.nextthink = time; + CSQCMODEL_AUTOUPDATE(this); setthink(this, func_breakable_destroy_self); } } @@ -293,8 +293,6 @@ void func_breakable_reset(entity this) func_breakable_behave_destroyed(this); else func_breakable_behave_restore(this); - - CSQCMODEL_AUTOUPDATE(this); } // destructible walls that can be used to trigger target_objective_decrease diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc index 0fde9e0439..1f8cb00cb5 100644 --- a/qcsrc/common/triggers/target/music.qc +++ b/qcsrc/common/triggers/target/music.qc @@ -3,6 +3,7 @@ #elif defined(MENUQC) #elif defined(SVQC) #include + #include #include #include #endif diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 7f1bce0ace..1f01ef0413 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -396,10 +396,12 @@ METHOD(Tuba, wr_think, void(Tuba this, entity actor, .entity weaponentity, int f } } +void tuba_instrument_send(entity this, int instr); METHOD(Tuba, wr_setup, void(Tuba this, entity actor)) { actor.ammo_field = ammo_none; actor.tuba_instrument = 0; + tuba_instrument_send(actor, actor.tuba_instrument); } #endif @@ -412,6 +414,7 @@ NET_HANDLE(tuba_instrument, bool) string s = (i == 0) ? "tuba" : (i == 1) ? "akordeon" : "kleinbottle" ; + viewmodel.tuba_instrument = i; CL_WeaponEntity_SetModel(viewmodel, s, true); } #endif @@ -494,13 +497,6 @@ const int TUBA_MIN = -18; const int TUBA_MAX = 27; const int TUBA_INSTRUMENTS = 3; -entityclass(Tuba); -class(Tuba) .int note; -class(Tuba) .bool tuba_attenuate; -class(Tuba) .float tuba_volume; -class(Tuba) .float tuba_volume_initial; -class(Tuba) .int tuba_instrument; - int Tuba_PitchStep; void tubasound(entity e, bool restart) diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh index 6f70f09bee..ce6b6ede73 100644 --- a/qcsrc/common/weapons/weapon/tuba.qh +++ b/qcsrc/common/weapons/weapon/tuba.qh @@ -1 +1,10 @@ #pragma once + +#ifdef CSQC +entityclass(Tuba); +class(Tuba) .int note; +class(Tuba) .bool tuba_attenuate; +class(Tuba) .float tuba_volume; +class(Tuba) .float tuba_volume_initial; +class(Tuba) .int tuba_instrument; +#endif diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index b6c3c9e01b..6408d6e3f2 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -266,6 +266,8 @@ void make_safe_for_remove(entity this); #endif #undef ENGINE_EVENT +#if XONOTIC #ifdef GAMEQC #include #endif +#endif diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index 4cc8458d51..66613b5322 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/lib/csqcmodel/sv_model.qc b/qcsrc/lib/csqcmodel/sv_model.qc index 0f8ef06ac8..dd8d5d33aa 100644 --- a/qcsrc/lib/csqcmodel/sv_model.qc +++ b/qcsrc/lib/csqcmodel/sv_model.qc @@ -24,6 +24,7 @@ #include "common.qh" #include #include +#include #include #include #include diff --git a/qcsrc/lib/draw.qh b/qcsrc/lib/draw.qh index 698c926237..fbb4a09b55 100644 --- a/qcsrc/lib/draw.qh +++ b/qcsrc/lib/draw.qh @@ -5,7 +5,7 @@ #include "i18n.qh" #include "vector.qh" - #include + float vid_conwidth; void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float theAlpha, float drawflag, vector vieworg) { diff --git a/qcsrc/lib/matrix/_mod.inc b/qcsrc/lib/matrix/_mod.inc index 4854f092a0..d68dc7d968 100644 --- a/qcsrc/lib/matrix/_mod.inc +++ b/qcsrc/lib/matrix/_mod.inc @@ -1,3 +1,5 @@ // generated file; do not modify -#include +#if XONOTIC + #include +#endif #include diff --git a/qcsrc/lib/matrix/_mod.qh b/qcsrc/lib/matrix/_mod.qh index 9658122972..c351afe8f7 100644 --- a/qcsrc/lib/matrix/_mod.qh +++ b/qcsrc/lib/matrix/_mod.qh @@ -1,3 +1,5 @@ // generated file; do not modify -#include +#if XONOTIC + #include +#endif #include diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh index 30ab014ec9..56c80e02d1 100644 --- a/qcsrc/lib/net.qh +++ b/qcsrc/lib/net.qh @@ -298,6 +298,7 @@ USING(Stream, int); #define APPROXPASTTIME_RANGE (64 * APPROXPASTTIME_ACCURACY_REQUIREMENT) #ifdef CSQC + float servertime; entity ReadCSQCEntity() { int f = ReadShort(); @@ -313,7 +314,7 @@ USING(Stream, int); #define ReadInt48_t() vec3(ReadInt24_t(), ReadInt24_t(), 0) #define ReadInt72_t() vec3(ReadInt24_t(), ReadInt24_t(), ReadInt24_t()) - int _ReadSByte; + noref int _ReadSByte; #define ReadSByte() (_ReadSByte = ReadByte(), (_ReadSByte & BIT(7) ? -128 : 0) + (_ReadSByte & BITS(7))) #define ReadFloat() ReadCoord() #define ReadVector() vec3(ReadFloat(), ReadFloat(), ReadFloat()) diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index 51d0e15ee5..116ad00023 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -5,9 +5,9 @@ #elif defined(MENUQC) #elif defined(SVQC) #include + #include #include #include - #include #include #include #endif diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index bdde55b9aa..2a7478dee2 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -27,6 +27,7 @@ #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 45051b6c27..56c36c0745 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -9,6 +9,7 @@ #include "../waypoints.qh" #include +#include #include #include #include diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 17f61af141..7c71720c4c 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -10,6 +10,7 @@ #include #include +#include #include .float speed; diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 5fb923799a..c83d0f63c5 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -10,6 +10,7 @@ #include "../../antilag.qh" #include +#include #include #include diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index b563f354f9..da66ece3bb 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -36,6 +36,7 @@ #include "weapons/weaponsystem.qh" #include "../common/net_notice.qh" +#include "../common/net_linked.qh" #include "../common/physics/player.qh" #include "../common/items/_mod.qh" diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 9380fc4cde..5017e81aba 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -5,6 +5,7 @@ #include "../race.qh" #include +#include #include #include diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index a329ac9965..cbc65680a0 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -21,6 +21,7 @@ #include "../mutators/_mod.qh" #include +#include #include #include #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 361f128443..d1cdb7e59d 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -13,6 +13,7 @@ #include "../mutators/_mod.qh" #include +#include #include #include #include diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 12760bc550..fd725ad35e 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -13,6 +13,7 @@ #include "../common/vehicles/all.qh" #include "../common/constants.qh" #include "../common/util.qh" +#include #include #include "../lib/warpzone/common.qh" #include "../lib/warpzone/server.qh" diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index 58fb26a4ed..3ca062b784 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -1,6 +1,7 @@ #include "g_models.qh" #include "g_subs.qh" +#include #include "../common/triggers/subs.qh" #include "../common/triggers/triggers.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 48b587e5eb..8edcf3b8f5 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -19,6 +19,7 @@ #include "teamplay.qh" #include "weapons/weaponstats.qh" #include "../common/constants.qh" +#include #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" #include "../common/monsters/_mod.qh" diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index 7c7c02018c..2ea425692c 100644 --- a/qcsrc/server/mapvoting.qc +++ b/qcsrc/server/mapvoting.qc @@ -4,6 +4,7 @@ #include "command/cmd.qh" #include "command/getreplies.qh" #include "../common/constants.qh" +#include #include "../common/mapinfo.qh" #include "../common/playerstats.qh" #include "../common/util.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 4b3d404bf3..e90dbeb966 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -11,6 +11,7 @@ #include "weapons/selection.qh" #include "../common/command/_mod.qh" #include "../common/constants.qh" +#include #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" #include "../common/notifications/all.qh" diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index 1000a5105b..1a8ada45fe 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -2,9 +2,9 @@ #if XONOTIC #include -#endif #include +#endif #ifdef BUILD_MOD #include diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 8fc38aa2c5..545fb2a859 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -9,6 +9,7 @@ #include "../common/deathtypes/all.qh" #include "../common/notifications/all.qh" #include "../common/mapinfo.qh" +#include #include "../common/triggers/subs.qh" #include "../lib/warpzone/util_server.qh" #include "../lib/warpzone/common.qh" diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 94bea2b44a..e6264b8693 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -2,6 +2,7 @@ #include "command/common.qh" #include "mutators/_mod.qh" +#include #include "../common/playerstats.qh" #include "../common/teams.qh" diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 18d32c2f06..517bc1892c 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -4,6 +4,7 @@ #include "g_world.qh" #include "race.qh" #include "../common/constants.qh" +#include #include "../common/teams.qh" #include "../common/triggers/subs.qh" #include "../common/util.qh" diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index ed9006bb25..7cc06da3e6 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -2,6 +2,7 @@ #include "../mutators/_mod.qh" #include +#include #include #include #include diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index 03031c1580..6d16375506 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index a8a893e217..9fcfd34c20 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -5,6 +5,7 @@ #include "../command/common.qh" #include +#include #include .float csqcprojectile_type; diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index 56df6c3a2c..539371a53c 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -3,6 +3,7 @@ #include "weaponsystem.qh" #include #include +#include #include #include #include diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 3b7aa7bf89..b49ed88f59 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -10,6 +10,7 @@ #include "../antilag.qh" #include +#include #include #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 4968d3c31f..c0d302e223 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include