From 9bd3168705c1ff2690e7e531dbe4a49bb893041d Mon Sep 17 00:00:00 2001 From: Lyberta Date: Sat, 7 Oct 2017 16:48:44 +0300 Subject: [PATCH] Start random items enums from 1. --- .../mutator/random_items/sv_random_items.qc | 16 ++++++++-------- qcsrc/common/t_items.qc | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc index f470408f2..eb4a34c22 100644 --- a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc +++ b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc @@ -7,7 +7,7 @@ enum { - RANDOM_ITEM_TYPE_HEALTH, + RANDOM_ITEM_TYPE_HEALTH = 1, RANDOM_ITEM_TYPE_ARMOR, RANDOM_ITEM_TYPE_RESOURCE, RANDOM_ITEM_TYPE_WEAPON, @@ -16,7 +16,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_HEALTH_SMALL, + RANDOM_ITEM_SUBTYPE_HEALTH_SMALL = 1, RANDOM_ITEM_SUBTYPE_HEALTH_MEDIUM, RANDOM_ITEM_SUBTYPE_HEALTH_BIG, RANDOM_ITEM_SUBTYPE_HEALTH_MEGA @@ -24,7 +24,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_ARMOR_SMALL, + RANDOM_ITEM_SUBTYPE_ARMOR_SMALL = 1, RANDOM_ITEM_SUBTYPE_ARMOR_MEDIUM, RANDOM_ITEM_SUBTYPE_ARMOR_BIG, RANDOM_ITEM_SUBTYPE_ARMOR_MEGA @@ -32,7 +32,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_RESOURCE_SHELLS, + RANDOM_ITEM_SUBTYPE_RESOURCE_SHELLS = 1, RANDOM_ITEM_SUBTYPE_RESOURCE_BULLETS, RANDOM_ITEM_SUBTYPE_RESOURCE_ROCKETS, RANDOM_ITEM_SUBTYPE_RESOURCE_CELLS, @@ -42,7 +42,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_WEAPON_BLASTER, + RANDOM_ITEM_SUBTYPE_WEAPON_BLASTER = 1, RANDOM_ITEM_SUBTYPE_WEAPON_SHOTGUN, RANDOM_ITEM_SUBTYPE_WEAPON_MACHINEGUN, RANDOM_ITEM_SUBTYPE_WEAPON_MORTAR, @@ -66,7 +66,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_POWERUP_STRENGTH, + RANDOM_ITEM_SUBTYPE_POWERUP_STRENGTH = 1, RANDOM_ITEM_SUBTYPE_POWERUP_SHIELD, RANDOM_ITEM_SUBTYPE_POWERUP_FUEL_REGEN, RANDOM_ITEM_SUBTYPE_POWERUP_JETPACK @@ -74,7 +74,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_INSTAGIB_VAPORIZER_CELLS, + RANDOM_ITEM_SUBTYPE_INSTAGIB_VAPORIZER_CELLS = 1, RANDOM_ITEM_SUBTYPE_INSTAGIB_INVISIBILITY, RANDOM_ITEM_SUBTYPE_INSTAGIB_EXTRA_LIFE, RANDOM_ITEM_SUBTYPE_INSTAGIB_SPEED @@ -82,7 +82,7 @@ enum enum { - RANDOM_ITEM_SUBTYPE_OVERKILL_HEALTH_MEGA, + RANDOM_ITEM_SUBTYPE_OVERKILL_HEALTH_MEGA = 1, RANDOM_ITEM_SUBTYPE_OVERKILL_ARMOR_SMALL, RANDOM_ITEM_SUBTYPE_OVERKILL_ARMOR_MEDIUM, RANDOM_ITEM_SUBTYPE_OVERKILL_ARMOR_BIG, diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index e6fa5ddfd..1575fc993 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1443,8 +1443,6 @@ void setItemGroupCount() } } -// support old misnamed entities - void target_items_use(entity this, entity actor, entity trigger) { if(actor.classname == "droppedweapon") -- 2.39.2