Merge branch 'master' of https://github.com/rheit/zdoom

src/d_main.cpp

@@ -1981,6 +1981,9 @@ static void D_DoomInit()
 	}
 		
 	FRandom::StaticClearRandom ();
+
+	Printf ("M_LoadDefaults: Load system defaults.\n");
+	M_LoadDefaults ();			// load before initing other systems
 }
 
 //==========================================================================
@@ -2247,8 +2250,8 @@ void D_DoomMain (void)
 	iwad_man = new FIWadManager;
 	iwad_man->ParseIWadInfos(basewad);
 
-	Printf ("M_LoadDefaults: Load system defaults.\n");
-	M_LoadDefaults (iwad_man);			// load before initing other systems
+	// Now that we have the IWADINFO, initialize the autoload ini sections.
+	GameConfig->DoAutoloadSetup(iwad_man);
 
 	PClass::StaticInit ();
 	atterm(FinalGC);

src/gameconfigfile.cpp

@@ -76,7 +76,7 @@ EXTERN_CVAR (Color, am_cdwallcolor)
 EXTERN_CVAR (Float, spc_amp)
 EXTERN_CVAR (Bool, wi_percents)
 
-FGameConfigFile::FGameConfigFile (FIWadManager *iwad_man)
+FGameConfigFile::FGameConfigFile ()
 {
 #ifdef __APPLE__
 	FString user_docs, user_app_support, local_app_support;
@@ -161,6 +161,27 @@ FGameConfigFile::FGameConfigFile (FIWadManager *iwad_man)
 		SetValueForKey ("Path", "$DOOMWADDIR", true);
 	}
 
+	// Add some self-documentation.
+	SetSectionNote("IWADSearch.Directories",
+		"# These are the directories to automatically search for IWADs.\n"
+		"# Each directory should be on a separate line, preceded by Path=\n");
+	SetSectionNote("FileSearch.Directories",
+		"# These are the directories to search for wads added with the -file\n"
+		"# command line parameter, if they cannot be found with the path\n"
+		"# as-is. Layout is the same as for IWADSearch.Directories\n");
+}
+
+FGameConfigFile::~FGameConfigFile ()
+{
+}
+
+void FGameConfigFile::WriteCommentHeader (FILE *file) const
+{
+	fprintf (file, "# This file was generated by " GAMENAME " %s on %s\n", GetVersionString(), myasctime());
+}
+
+void FGameConfigFile::DoAutoloadSetup (FIWadManager *iwad_man)
+{
 	// Create auto-load sections, so users know what's available.
 	// Note that this totem pole is the reverse of the order that
 	// they will appear in the file.
@@ -220,14 +241,6 @@ FGameConfigFile::FGameConfigFile (FIWadManager *iwad_man)
 	MoveSectionToStart("FileSearch.Directories");
 	MoveSectionToStart("IWADSearch.Directories");
 
-	// Add some self-documentation.
-	SetSectionNote("IWADSearch.Directories",
-		"# These are the directories to automatically search for IWADs.\n"
-		"# Each directory should be on a separate line, preceded by Path=\n");
-	SetSectionNote("FileSearch.Directories",
-		"# These are the directories to search for wads added with the -file\n"
-		"# command line parameter, if they cannot be found with the path\n"
-		"# as-is. Layout is the same as for IWADSearch.Directories\n");
 	SetSectionNote("Doom.AutoExec",
 		"# Files to automatically execute when running the corresponding game.\n"
 		"# Each file should be on its own line, preceded by Path=\n\n");
@@ -245,15 +258,6 @@ FGameConfigFile::FGameConfigFile (FIWadManager *iwad_man)
 		"# 'doom.doom2.commercial.Autoload' only when playing doom2.wad.\n\n");
 }
 
-FGameConfigFile::~FGameConfigFile ()
-{
-}
-
-void FGameConfigFile::WriteCommentHeader (FILE *file) const
-{
-	fprintf (file, "# This file was generated by " GAMENAME " %s on %s\n", GetVersionString(), myasctime());
-}
-
 void FGameConfigFile::DoGlobalSetup ()
 {
 	if (SetSection ("GlobalSettings.Unknown"))

src/gameconfigfile.h

@@ -43,9 +43,10 @@ class FIWadManager;
 class FGameConfigFile : public FConfigFile
 {
 public:
-	FGameConfigFile (FIWadManager *iwad_man);
+	FGameConfigFile ();
 	~FGameConfigFile ();
 
+	void DoAutoloadSetup (FIWadManager *iwad_man);
 	void DoGlobalSetup ();
 	void DoGameSetup (const char *gamename);
 	void DoKeySetup (const char *gamename);

src/m_misc.cpp

@@ -410,9 +410,9 @@ CCMD (writeini)
 // M_LoadDefaults
 //
 
-void M_LoadDefaults (FIWadManager *iwad_man)
+void M_LoadDefaults ()
 {
-	GameConfig = new FGameConfigFile(iwad_man);
+	GameConfig = new FGameConfigFile;
 	GameConfig->DoGlobalSetup ();
 	atterm (M_SaveDefaultsFinal);
 }

src/m_misc.h

@@ -41,7 +41,7 @@ void M_FindResponseFile (void);
 //		Pass a NULL to get the original behavior.
 void M_ScreenShot (const char *filename);
 
-void M_LoadDefaults (FIWadManager *iwad_man);
+void M_LoadDefaults ();
 
 bool M_SaveDefaults (const char *filename);
 void M_SaveCustomKeys (FConfigFile *config, char *section, char *subsection, size_t sublen);

src/oplsynth/music_opldumper_mididevice.cpp

@@ -113,7 +113,7 @@ public:
 		BYTE chipnum = reg >> 8;
 		if (chipnum != CurChip)
 		{
-			BYTE switcher[2] = { chipnum + 1, 2 };
+			BYTE switcher[2] = { (BYTE)(chipnum + 1), 2 };
 			fwrite(switcher, 1, 2, File);
 		}
 		reg &= 255;
@@ -192,7 +192,7 @@ public:
 			   "\0\0\0\0"	// Total milliseconds
 			   "\0\0\0",	// Total data
 			   1, 20, File);
-		char type[4] = { Dual * 2, 0, 0, 0 };	// Single or dual OPL-2
+		char type[4] = { (char)(Dual * 2), 0, 0, 0 };	// Single or dual OPL-2
 		fwrite(type, 1, 4, File);
 	}
 	virtual ~OPL_DOSBOXdump()

wadsrc/static/mapinfo/common.txt

@@ -37,6 +37,7 @@ DoomEdNums
   5001 = PointPusher
   5002 = PointPuller
   5004 = FS_Mapspot
+  5006 = SkyCamCompat
   5061 = InvisibleBridge32
   5064 = InvisibleBridge16
   5065 = InvisibleBridge8