- summondragon parameter list

- number of new players.

src/common/kernel/faction.h

@@ -46,6 +46,8 @@ typedef struct shortpwd {
 #define FFL_NOTIMEOUT     (1<<29) /* ignore MaxAge() */
 #define FFL_GM            (1<<30) /* eine Partei mit Sonderrechten */
 
+#define FFL_SAVEMASK (FFL_GM|FFL_NOTIMEOUT|FFL_DBENTRY|FFL_NOTIMEOUT)
+
 typedef struct faction {
 	struct faction *next;
 	struct faction *nexthash;

src/common/kernel/save.c

@@ -1539,7 +1539,6 @@ readfaction(FILE * F)
 #endif /* KARMA_MODULE */
 
   f->flags = ri(F);
-  freset(f, FFL_OVERRIDE);
 
   a_read(F, &f->attribs);
   if (global.data_version>=CLAIM_VERSION) {
@@ -1635,15 +1634,15 @@ writefaction(FILE * F, const faction * f)
   wi(F, 0);
 #endif /* KARMA_MODULE */
 
-	wi(F, f->flags);
+	wi(F, f->flags&FFL_SAVEMASK);
 	a_write(F, f->attribs);
 	wnl(F);
 #if RELEASE_VERSION>=CLAIM_VERSION
   write_items(F, f->items);
   wnl(F);
 #endif
-        fputs("end ", F);
-        wnl(F);
+  fputs("end ", F);
+  wnl(F);
 	wi(F, listlen(f->ursprung));
 	for(ur = f->ursprung;ur;ur=ur->next) {
 		wi(F, ur->id);

src/common/modules/modules.vcproj

@@ -317,9 +317,6 @@
 		<File
 			RelativePath=".\infocmd.c">
 		</File>
-		<File
-			RelativePath=".\museum.c">
-		</File>
 		<File
 			RelativePath=".\score.c">
 		</File>

src/common/races/races.vcproj

@@ -287,6 +287,9 @@
 		<File
 			RelativePath=".\illusion.c">
 		</File>
+		<File
+			RelativePath="..\modules\museum.c">
+		</File>
 		<File
 			RelativePath=".\zombies.c">
 		</File>

src/common/spells/spells.c

@@ -2703,7 +2703,7 @@ sp_summondragon(castorder *co)
   }
 
   ADDMSG(&mage->faction->msgs, msg_message(
-        "summondragon", "unit region command region",
+        "summondragon", "unit region command target",
         mage, mage->region, co->order, co->rt));
 
   free_regionlist(rl);
@@ -4882,7 +4882,7 @@ sp_dragonsong(castorder *co)
   }
 
   ADDMSG(&mage->faction->msgs, msg_message(
-        "summondragon", "unit region command region",
+        "summondragon", "unit region command target",
         mage, mage->region, co->order, co->rt));
 
   free_regionlist(rl);