Fix the compilation unit, apparently

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index a95acd5739672b5fe096b1e2891220ab92fe3f40..69c3fa3d2b300eb4f54f6fd2a9bf4b8e68db62bf 100644 (file)
--- 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 29a9cae1bb2dc9145a5b10148485042de85e0e26..285ebad639c4ea4f66cdfeeb2394280f5e711d32 100644 (file)
--- 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 6d4f46ed2f44143acef17fcf3fc3a4452befe36a..3aaa8aab593786ffd7b15f46909258899f6f7772 100644 (file)
--- 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 f59bcad22403a65fd5ae46d818284cd18f46015b..dcf5a32f4628c07886bcbaa2bc49e3d39e5218cb 100644 (file)
--- 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>