Small fixes.

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index 22f291f6b22971c94ce0b2772d34d246216a6fa5..e59152076b754552eb266411710fdbab1e4efcbb 100644 (file)
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -8,7 +8,6 @@
 #endif
 
 #ifdef SVQC
-#include <server/defs.qh>
 #include <server/items.qh>
 #endif
 
@@ -57,7 +56,7 @@ const int IT_PICKUPMASK                       = IT_UNLIMITED_AMMO | IT_JETPACK | IT_FU
        { \
                if (!Item_IsDefinitionAllowed(item)) \
                { \
-                       /*startitem_failed = true;*/ \
+                       startitem_failed = true; \
                        delete(this); \
                        return; \
                } \

diff --git a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qh b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qh
index 575336301caff14b1df586142768a672d8a4f539..9ac738ca68ede11020c348c1a681d0b65a0eb7ca 100644 (file)
--- a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qh
+++ b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qh
@@ -9,12 +9,12 @@ bool autocvar_g_random_items; ///< Whether to enable random items.
 
 enum
 {
-       RANDOM_ITEM_TYPE_HEALTH = BIT(1),
-       RANDOM_ITEM_TYPE_ARMOR = BIT(2),
-       RANDOM_ITEM_TYPE_RESOURCE = BIT(3),
-       RANDOM_ITEM_TYPE_WEAPON = BIT(4),
-       RANDOM_ITEM_TYPE_POWERUP = BIT(5),
-       RANDOM_ITEM_TYPE_ALL = BITS(6)
+       RANDOM_ITEM_TYPE_HEALTH = BIT(0),
+       RANDOM_ITEM_TYPE_ARMOR = BIT(1),
+       RANDOM_ITEM_TYPE_RESOURCE = BIT(2),
+       RANDOM_ITEM_TYPE_WEAPON = BIT(3),
+       RANDOM_ITEM_TYPE_POWERUP = BIT(4),
+       RANDOM_ITEM_TYPE_ALL = BITS(5)
 };
 
 /// \brief Returns a random classname of the item.

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 4b600e3fceeab8743b14388eae44ba48c55c0d09..138752f13198a83f4cbabd8f8b538379ab18d262 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -182,8 +182,6 @@ float default_weapon_alpha;
 
 string gamemode_name;
 
-float startitem_failed;
-
 string W_Apply_Weaponreplace(string in);
 
 void FixIntermissionClient(entity e);

diff --git a/qcsrc/server/items.qh b/qcsrc/server/items.qh
index d8703370c2e570c501f51260aa21db7f231531f1..b52449e7158dffab62269d6b17d32a6a7cdcc439 100644 (file)
--- a/qcsrc/server/items.qh
+++ b/qcsrc/server/items.qh
@@ -4,6 +4,8 @@
 /// \brief Header file that describes the functions related to game items.
 /// \copyright GNU GPLv2 or any later version.
 
+bool startitem_failed;
+
 /// \brief Returns the item definition corresponding to the given class name.
 /// \param[in] class_name Class name to search for.
 /// \return Item definition corresponding to the given class name or NULL is not