From 6f94f5de458d2e8f20ca1fb95661ee1d0cd330c9 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 5 Oct 2016 23:36:15 +1000 Subject: [PATCH] Fix compilation unit test --- qcsrc/client/_all.qh | 1 + qcsrc/client/view.qc | 1 - qcsrc/client/view.qh | 2 ++ qcsrc/server/bot/default/havocbot/havocbot.qc | 1 + qcsrc/server/bot/default/scripting.qc | 1 + qcsrc/server/miscfunctions.qc | 1 + qcsrc/server/player.qc | 1 + qcsrc/server/weapons/hitplot.qc | 1 + qcsrc/server/weapons/selection.qc | 1 + qcsrc/server/weapons/throwing.qc | 1 + qcsrc/server/weapons/weaponsystem.qc | 1 + 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh index 5593af1892..5935342ae4 100644 --- a/qcsrc/client/_all.qh +++ b/qcsrc/client/_all.qh @@ -11,6 +11,7 @@ #include "defs.qh" #include "main.qh" #include "miscfunctions.qh" +#include "view.qh" #include #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 2dcd241eca..a485240470 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -354,7 +354,6 @@ void viewmodel_draw(entity this) setorigin(this, this.origin); } -entity viewmodels[MAX_WEAPONSLOTS]; STATIC_INIT(viewmodel) { for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) viewmodels[slot] = new(viewmodel); diff --git a/qcsrc/client/view.qh b/qcsrc/client/view.qh index f8c8bd26b6..01d4546374 100644 --- a/qcsrc/client/view.qh +++ b/qcsrc/client/view.qh @@ -1,3 +1,5 @@ #pragma once vector crosshair_getcolor(entity this, float health_stat); + +entity viewmodels[MAX_WEAPONSLOTS]; diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index db395b9c36..806ffc9c4a 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc index 66dc91b259..4b3fc6266e 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -4,6 +4,7 @@ #include #include +#include #include "bot.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 0237a75ad9..35f0f227e7 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -25,6 +25,7 @@ #include "../common/items/_mod.qh" #include "../common/state.qh" #include "../common/effects/qc/globalsound.qh" +#include "../common/wepent.qh" #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/anglestransform.qh" #include "../lib/warpzone/server.qh" diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 25ad24686d..8aa67fc064 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -24,6 +24,7 @@ #include "../common/effects/qc/all.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" #include "../common/triggers/include.qh" +#include "../common/wepent.qh" #include "weapons/weaponstats.qh" diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc index 0173c6d9d6..d148ab54f4 100644 --- a/qcsrc/server/weapons/hitplot.qc +++ b/qcsrc/server/weapons/hitplot.qc @@ -4,6 +4,7 @@ #include "../g_subs.qh" #include #include +#include vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v) { diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index bd05832abd..b3075928cb 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -8,6 +8,7 @@ #include #include #include +#include // switch between weapons void Send_WeaponComplain(entity e, float wpn, float type) diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index a9fabf50a4..4114c3c58b 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -11,6 +11,7 @@ #include #include #include +#include void thrown_wep_think(entity this) { diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 1a223cec28..3b51adb998 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -14,6 +14,7 @@ #include #include #include +#include .int state; -- 2.39.5