From c0c1b00235b45479e03e986108d9be52ac248227 Mon Sep 17 00:00:00 2001
From: Fizban <fizban@tbamud.com>
Date: Thu, 15 Jan 2009 21:35:53 +0000
Subject: [PATCH] Just a grammar fix to the rent message

---
 src/act.offensive.c | 5 +++++
 src/genmob.c        | 7 ++++++-
 src/objsave.c       | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/act.offensive.c b/src/act.offensive.c
index c46021a..ccdd2bd 100644
--- a/src/act.offensive.c
+++ b/src/act.offensive.c
@@ -347,6 +347,11 @@ ACMD(do_rescue)
   for (tmp_ch = world[IN_ROOM(ch)].people; tmp_ch &&
        (FIGHTING(tmp_ch) != vict); tmp_ch = tmp_ch->next_in_room);
 
+  if ((FIGHTING(ch) == FIGHTING(vict)) && (FIGHTING(tmp_ch) == ch)) {
+     send_to_char(ch, "You have already rescued %s from %s.\r\n", GET_NAME(vict), GET_NAME(FIGHTING(ch)));
+     return;
+  }
+
   if (!tmp_ch) {
     act("But nobody is fighting $M!", FALSE, ch, 0, vict, TO_CHAR);
     return;
diff --git a/src/genmob.c b/src/genmob.c
index 066f873..65d2b3a 100644
--- a/src/genmob.c
+++ b/src/genmob.c
@@ -16,13 +16,14 @@
 #include "genmob.h"
 #include "genzon.h"
 #include "dg_olc.h"
+#include "quest.h"
 
 /* local functions */
 static void extract_mobile_all(mob_vnum vnum);
 
 int add_mobile(struct char_data *mob, mob_vnum vnum)
 {
-  int rnum, i, found = FALSE, shop, cmd_no;
+  int rnum, i, found = FALSE, shop, cmd_no, qnum;
   zone_rnum zone;
   struct char_data *live_mob;
 
@@ -85,6 +86,10 @@ int add_mobile(struct char_data *mob, mob_vnum vnum)
     for (shop = 0; shop <= top_shop; shop++)
       SHOP_KEEPER(shop) += (SHOP_KEEPER(shop) != NOTHING && SHOP_KEEPER(shop) >= found);
 
+  /* Update quest masters */
+    for (qnum = 0; qnum < total_quests; qnum++)
+        QST_MASTER(qnum) += (real_mobile(QST_MASTER(qnum)) >= found);
+
   add_to_save_list(zone_table[real_zone_by_thing(vnum)].number, SL_MOB);
   return found;
 }
diff --git a/src/objsave.c b/src/objsave.c
index 4d418de..ee1dfc3 100644
--- a/src/objsave.c
+++ b/src/objsave.c
@@ -1245,8 +1245,8 @@ static int Crash_load_objs(struct char_data *ch) {
 	}
 
   /* Little hoarding check. -gg 3/1/98 */
- mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d objects (max %d).",
-         GET_NAME(ch), GET_LEVEL(ch), num_objs, CONFIG_MAX_OBJ_SAVE);
+ mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d %s (max %d).",
+         GET_NAME(ch), GET_LEVEL(ch), num_objs, num_objs > 1 ? "objects" : "object", CONFIG_MAX_OBJ_SAVE);
 
   fclose(fl);