From e994ae01077e9a308a02e7ad3eb32d3d1dd31c4c Mon Sep 17 00:00:00 2001 From: nveid Date: Wed, 4 Apr 2007 05:42:41 +0000 Subject: [PATCH] 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) --- game/txt/changes/0.72p4 | 2 +- src/db.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 9322171..ed277dd 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. * * */ @@ -1700,6 +1700,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. */ -- 2.30.2