From: nveid <nveid@cobramush.org>
Date: Wed, 4 Apr 2007 05:42:41 +0000 (+0000)
Subject: Flags stored in the main database could not be loaded correctly cause flagdb-flags... 
X-Git-Tag: 0.72p4~24
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=72c5d610730d19ddc33153dedd1c26cb3f9234e1;p=cobramush.git

Flags stored in the main database could not be loaded correctly cause flagdb-flags was automatically 0, cause it didn't use its own file.  flagdb_flags made to equal indb_flags in such a case.
(cherry picked from commit 0dc2e30a81e226ad53ce1d201e13b712f295defd)
---

diff --git a/game/txt/changes/0.72p4 b/game/txt/changes/0.72p4
index d0e20df..9560420 100644
--- a/game/txt/changes/0.72p4
+++ b/game/txt/changes/0.72p4
@@ -9,4 +9,4 @@ CobraMUSH Version 0.72p4
   It is the fourth bugfix/maintenance release in that series.
 
   Fixes:
-
+    * Flags stored in the main database were not being loaded correctly. [RLB]
diff --git a/src/db.c b/src/db.c
index 0937cb9..4e398d0 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1,7 +1,7 @@
 /**
  * \file db.c
  *
- * \brief Loading and saving the PennMUSH object database.
+ * \brief Loading and saving the CobraMUSH object database.
  *
  *
  */
@@ -1703,6 +1703,9 @@ db_read(FILE * f)
     return -1;
   }
   indb_flags = ((getref(f) - 2) / 256) - 5;
+  /* give us some brains.. for if we're using the flagfile or not */
+  if(!use_flagfile)
+    flagdb_flags = indb_flags;
   /* if you want to read in an old-style database, use an earlier
    * patchlevel to upgrade.
    */