From 7b3a3815008e9c7aaa01dcac7ef59a04ff05384a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 20 Aug 2014 19:26:37 +0200 Subject: [PATCH] increase version number to 3.1 log an error when trying to create an order for a disabled keyword monsters might be trying to TAX in E3? --- src/build.h | 4 ++-- src/kernel/order.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/build.h b/src/build.h index d908582e5..bfc11ffe7 100644 --- a/src/build.h +++ b/src/build.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 -#define VERSION_MINOR 0 -#define VERSION_BUILD 682 +#define VERSION_MINOR 1 +#define VERSION_BUILD 683 diff --git a/src/kernel/order.c b/src/kernel/order.c index c10a256fd..954429936 100644 --- a/src/kernel/order.c +++ b/src/kernel/order.c @@ -257,6 +257,11 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent, order *ord = NULL; int lindex; + if (keyword_disabled(kwd)) { + log_error("trying to create an order for disabled keyword %s.", keyword(kwd)); + return NULL; + } + /* if this is just nonsense, then we skip it. */ if (lomem) { switch (kwd) {