From: Mario <mario@smbclan.net>
Date: Tue, 19 Jun 2018 01:55:27 +0000 (+1000)
Subject: Fix the compilation unit, apparently
X-Git-Tag: xonotic-v0.8.5~2009
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94f902ca9783e2d69fbe87a8a02e78b363b7c940;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the compilation unit, apparently
---

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index a95acd573..69c3fa3d2 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -114,7 +114,6 @@ const int MAX_SPECTATORS = 7;
 int spectatorlist[MAX_SPECTATORS];
 
 int framecount;
-.float health;
 
 float GetSpeedUnitFactor(int speed_unit);
 string GetSpeedUnit(int speed_unit);
diff --git a/qcsrc/client/resources.qc b/qcsrc/client/resources.qc
index 29a9cae1b..285ebad63 100644
--- a/qcsrc/client/resources.qc
+++ b/qcsrc/client/resources.qc
@@ -1,4 +1,5 @@
 #include "resources.qh"
+#include <common/items/item/ammo.qh>
 
 /// \file
 /// \brief Source file that contains implementation of the resource system.
diff --git a/qcsrc/client/resources.qh b/qcsrc/client/resources.qh
index 6d4f46ed2..3aaa8aab5 100644
--- a/qcsrc/client/resources.qh
+++ b/qcsrc/client/resources.qh
@@ -55,3 +55,7 @@ int GetResourceType(.float resource_field);
 /// \param[in] resource_type Type of the resource.
 /// \return Entity field for that resource.
 .float GetResourceField(int resource_type);
+
+/// \brief Legacy fields for the resources. To be removed.
+.float health;
+.float armorvalue;
diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh
index f59bcad22..dcf5a32f4 100644
--- a/qcsrc/common/items/item/ammo.qh
+++ b/qcsrc/common/items/item/ammo.qh
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pickup.qh"
+#include <common/items/all.qh>
 #ifdef SVQC
     #include <common/t_items.qh>
     #include <server/resources.qh>