- First commit of archive split - preserve original assets

- Added: d_main.cpp now searches for "gzdoom_optional_assets.pk3" - this can be changed in version.h for fork authors.
- Updated forum links to point to ZDoom.org.

CMakeLists.txt

@@ -330,6 +330,7 @@ add_subdirectory( gdtoa )
 add_subdirectory( wadsrc )
 add_subdirectory( wadsrc_bm )
 add_subdirectory( wadsrc_lights )
+add_subdirectory( wadsrc_optionalassets )
 add_subdirectory( src )
 
 if( NOT CMAKE_CROSSCOMPILING )

src/d_main.cpp

@@ -2087,6 +2087,11 @@ static void AddAutoloadFiles(const char *autoname)
 {
 	LumpFilterIWAD.Format("%s.", autoname);	// The '.' is appened to simplify parsing the string 
 
+	// [SP] Load non-free assets if available.
+	const char *optionalassets = BaseFileSearch(OPTIONALWAD, NULL);
+	if (optionalassets)
+		D_AddFile(allwads, optionalassets);
+
 	// [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices
 	if (!(gameinfo.flags & GI_SHAREWARE))
 	{

src/version.h

@@ -96,13 +96,14 @@ const char *GetVersionString();
 // This is so that derivates can use the same savegame versions without worrying about engine compatibility
 #define GAMESIG "GZDOOM"
 #define BASEWAD "gzdoom.pk3"
+#define OPTIONALWAD "gzdoom_optional_assets.pk3"
 #define BASESF "gzdoom.sf2"
 
 // More stuff that needs to be different for derivatives.
 #define GAMENAME "GZDoom"
 #define GAMENAMELOWERCASE "gzdoom"
-#define FORUM_URL "http://forum.drdteam.org"
-#define BUGS_FORUM_URL	"http://forum.drdteam.org/viewforum.php?f=24"
+#define FORUM_URL "http://forum.zdoom.org/"
+#define BUGS_FORUM_URL	"http://forum.zdoom.org/viewforum.php?f=2"
 
 #if defined(__APPLE__) || defined(_WIN32)
 #define GAME_DIR GAMENAME

wadsrc_optionalassets/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required( VERSION 2.8.7 )
+
+add_pk3(gzdoom_optional_assets.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)