From 5d7226fdf346c9456f122541c1f8db5e39398508 Mon Sep 17 00:00:00 2001 From: Rumble Date: Wed, 22 Aug 2012 22:59:57 +0000 Subject: [PATCH] Moved cedit load_config of no_mort_to_immort to its proper place. --Rumble --- changelog | 2 ++ lib/world/obj/175.obj | 2 +- src/db.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 763670e..63e8483 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,8 @@ TbaMUD is currently being developed by The Builder Academy. If you need any help, find any bugs, or have ideas for improvement please stop by TBA at telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble @ +[Aug 22 2012] - Rumble + bug: moved cedit load_config of no_mort_to_immort to its proper place. (thanks Liko) [Aug 12 2012] - Vatiken bug: fixed typo in dg_variables.c (Thanks Zusuk) [Aug 08 2012] - Vatiken diff --git a/lib/world/obj/175.obj b/lib/world/obj/175.obj index 59756e5..9436ce7 100644 --- a/lib/world/obj/175.obj +++ b/lib/world/obj/175.obj @@ -95,7 +95,7 @@ a lesser Kraken's spike~ A lesser Kraken's spike bobs in a rock pool here.~ ~ 5 g 0 0 0 ano 0 0 0 0 0 0 0 -3 8 5 14 +3 8 5 11 5 50 5 0 0 E spike~ diff --git a/src/db.c b/src/db.c index 9097d5b..2ff4121 100644 --- a/src/db.c +++ b/src/db.c @@ -3935,8 +3935,6 @@ void load_config( void ) CONFIG_IDLE_RENT_TIME = num; else if (!str_cmp(tag, "idle_max_level")) CONFIG_IDLE_MAX_LEVEL = num; - else if (!str_cmp(tag, "no_mort_to_immort")) - CONFIG_NO_MORT_TO_IMMORT = num; else if (!str_cmp(tag, "immort_start_room")) CONFIG_IMMORTAL_START = num; else if (!str_cmp(tag, "ibt_autosave")) @@ -3996,6 +3994,8 @@ void load_config( void ) case 'n': if (!str_cmp(tag, "nameserver_is_slow")) CONFIG_NS_IS_SLOW = num; + else if (!str_cmp(tag, "no_mort_to_immort")) + CONFIG_NO_MORT_TO_IMMORT = num; else if (!str_cmp(tag, "noperson")) { char tmp[READ_SIZE]; if (CONFIG_NOPERSON)