From fc6e6d40dcbcf1ca37bc0eda0b72edaaf7b5b94b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 31 Jul 2005 19:44:56 +0000 Subject: [PATCH] when you delete an I_ enum, you must also delete the R_ enum that belongs to it. --- src/common/items/weapons.c | 2 -- src/common/kernel/item.c | 3 +++ src/common/kernel/item.h | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c index 17921cc15..8b2b2a83d 100644 --- a/src/common/items/weapons.c +++ b/src/common/items/weapons.c @@ -273,8 +273,6 @@ enum { AR_RUSTY_CHAIN, AR_SHIELD, AR_RUSTY_SHIELD, - AR_EOGSHIELD, - AR_EOGCHAIN, AR_MAX }; diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index f9fbcfcca..0ccf4fff8 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -2429,4 +2429,7 @@ register_resources(void) register_function((pf_generic)use_snowball, "usesnowball"); register_function((pf_generic)give_horses, "givehorses"); + + /* make sure noone has deleted an I_ tpe without deleting the R_ type that goes with it! */ + assert((int)I_SACK_OF_CONSERVATION == (int)R_SACK_OF_CONSERVATION); } diff --git a/src/common/kernel/item.h b/src/common/kernel/item.h index 397757523..44abf0481 100644 --- a/src/common/kernel/item.h +++ b/src/common/kernel/item.h @@ -412,8 +412,6 @@ enum { R_GREATSWORD, R_AXE, R_EOGSWORD, - R_EOGSHIELD, - R_EOGCHAIN, R_EOG, R_SHIELD, R_LANCE,