From e9b9764d1f6fc803319b7046a15f8d88aa2891b5 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 31 May 2014 20:46:54 +0200 Subject: Corrected GM level override checks for Nouse and Trade - Values are now clamped to the [0,100] range. Removed useless positivity check for item_usage.override (fixes a compiler warning). - Special thanks to KeiKun, ossi0110. Signed-off-by: Haru --- src/map/itemdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/itemdb.c') diff --git a/src/map/itemdb.c b/src/map/itemdb.c index a095495d0..61b77748a 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -1430,7 +1430,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) { entry->flag.trade_restriction = ITR_NONE; } - if (entry->gm_lv_trade_override < 0) { + if (entry->gm_lv_trade_override < 0 || entry->gm_lv_trade_override > 100) { ShowWarning("itemdb_validate_entry: Invalid trade-override GM level %d for item %d (%s) in '%s', defaulting to none.\n", entry->gm_lv_trade_override, entry->nameid, entry->jname, source); entry->gm_lv_trade_override = 0; @@ -1446,7 +1446,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) { entry->item_usage.flag = INR_NONE; } - if (entry->item_usage.override < 0) { + if (entry->item_usage.override > 100) { ShowWarning("itemdb_validate_entry: Invalid nouse-override GM level %d for item %d (%s) in '%s', defaulting to none.\n", entry->item_usage.override, entry->nameid, entry->jname, source); entry->item_usage.override = 0; -- cgit v1.2.3-60-g2f50