From b3030be8791663d54406b82fd5d307c948bd8bdd Mon Sep 17 00:00:00 2001
From: motorsep <motorsep@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 10 Feb 2010 21:16:52 +0000
Subject: [PATCH] + Added Steel Storm game + Added ability to play fake CD
 tracks from /music or /music/cdtracks

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9950 d7cf8633-e32d-0410-b094-e92efae38249
---
 cd_shared.c        |  6 ++++++
 common.c           |  8 ++++----
 common.h           |  2 +-
 darkplaces-sdl.dev | 10 +++++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/cd_shared.c b/cd_shared.c
index e7e39530..fb37315c 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -301,8 +301,12 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr
 	{
 		                              dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.wav", track);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.ogg", track);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/track%03u.ogg", track);// added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/track%03u.ogg", track);// added by motorsep
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.wav", track);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.ogg", track);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/track%02u.ogg", track);// added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/track%02u.ogg", track);// added by motorsep
 	}
 	else
 	{
@@ -315,6 +319,8 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s", trackname);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.wav", trackname);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.ogg", trackname);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/%s.ogg", trackname); // added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/%s.ogg", trackname); // added by motorsep
 	}
 	if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, true)))
 	{
diff --git a/common.c b/common.c
index 3b7135a5..04de68b9 100644
--- a/common.c
+++ b/common.c
@@ -1498,15 +1498,15 @@ static const gamemode_info_t gamemode_info [GAME_COUNT] =
 // GAME_EDU2P
 // COMMANDLINEOPTION: Game: -edu2p runs the game Edu2 prototype
 { "edu2p", "-edu2p", "EDU2 Prototype", "id1", "edu2", "edu2_p", "edu2prototype" },
-// GAME_BLADEMASTER
-// COMMANDLINEOPTION: Game: -blademaster runs the game Prophecy: Return of the BladeMaster
-{ "blademaster", "-blademaster", "Prophecy: Return of the BladeMaster", "basebm", NULL, "blademaster", "blademaster" },
 // GAME_PROPHECY
-// COMMANDLINEOPTION: Game: -prophecy runs the game Quake (default)
+// COMMANDLINEOPTION: Game: -prophecy runs the game Prophecy
 { "prophecy",				"-prophecy",		"Prophecy",		"data",		NULL,			"prophecy",			"prophecy" },
 // GAME_BLOODOMNICIDE
 // COMMANDLINEOPTION: Game: -omnicide runs the game Blood Omnicide
 { "omnicide", "-omnicide", "Blood Omnicide", "kain", NULL, "omnicide", "omnicide" },
+// GAME_STEELSTORM
+// COMMANDLINEOPTION: Game: -steelstorm runs the game Steel Storm
+{ "steelstorm",				"-steelstorm",		"Steel Storm",		"gamedata",		NULL,			"steelstorm",			"steelstorm" },
 };
 
 void COM_InitGameType (void)
diff --git a/common.h b/common.h
index a31e822c..45cf7de5 100644
--- a/common.h
+++ b/common.h
@@ -268,9 +268,9 @@ typedef enum gamemode_e
 	GAME_DARSANA,
 	GAME_CONTAGIONTHEORY,
 	GAME_EDU2P,
-	GAME_BLADEMASTER,
 	GAME_PROPHECY,
 	GAME_BLOODOMNICIDE,
+	GAME_STEELSTORM, // added by motorsep
 	GAME_COUNT
 }
 gamemode_t;
diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index e4d71d8d..78227ada 100755
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,7 +1,15 @@
 [Project]
 FileName=darkplaces-sdl.dev
 Name=DarkPlaces
+<<<<<<< .mine
+<<<<<<< .mine
+UnitCount=182
+=======
+UnitCount=175
+=======
 UnitCount=181
+>>>>>>> .r9892
+>>>>>>> .r9586
 Type=0
 Ver=1
 ObjFiles=
@@ -1778,7 +1786,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit182]
-FileName=SDLMain.h
+FileName=intoverflow.h
 CompileCpp=0
 Folder=Header Files
 Compile=1
-- 
2.39.2