From f2611cad8bf1c1f4664ae5f328ffa6934a4d1d16 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 15 Jul 2007 13:25:10 +0000 Subject: fixed so that the editor works again --- src/game/game.h | 8 ++------ src/game/server/game_server.cpp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/game') diff --git a/src/game/game.h b/src/game/game.h index 9f5aeda3..917abab1 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -181,11 +181,7 @@ enum ITEM_WEAPON_ROCKET=0x00010003, ITEM_WEAPON_SNIPER=0x00010004, ITEM_WEAPON_HAMMER=0x00010005, - ITEM_HEALTH_1 =0x00020001, - ITEM_HEALTH_5 =0x00020005, - ITEM_HEALTH_10=0x00020010, - ITEM_ARMOR_1=0x00030001, - ITEM_ARMOR_5=0x00030005, - ITEM_ARMOR_10=0x00030010, + ITEM_HEALTH =0x00020001, + ITEM_ARMOR=0x00030001, ITEM_NINJA=0x00040001, }; diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index 8cd36f77..c1f7b3c5 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1261,11 +1261,11 @@ void mods_init() subtype = WEAPON_TYPE_MELEE; break; - case ITEM_HEALTH_1: + case ITEM_HEALTH: type = POWERUP_TYPE_HEALTH; break; - case ITEM_ARMOR_1: + case ITEM_ARMOR: type = POWERUP_TYPE_ARMOR; break; }; -- cgit 1.4.1