+ 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

diff --git a/cd_shared.c b/cd_shared.c
index e7e395305e29a3c792e9f35fcce7cb1fed2a5bed..fb37315c8c40c178e187e90399ccb958320c71e2 100644 (file)
--- 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 3b7135a50da9bb2bdc71e7dfed11f5df0c876760..04de68b959d28ceeebdc23a5027379f8b25ed288 100644 (file)
--- 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 a31e822cc5fead2764828b0b3765956eac34701b..45cf7de54be886c202609a77f7e1e87e43b64208 100644 (file)
--- 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 e4d71d8d7731a10326712bdfecb167cc232f4f1e..78227ada02aef8a79ad10ec3790908ef9d749ee7 100755 (executable)
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,7 +1,15 @@
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r
+<<<<<<< .mine\r
+<<<<<<< .mine\r
+UnitCount=182\r
+=======\r
+UnitCount=175\r
+=======\r
 UnitCount=181\r
+>>>>>>> .r9892\r
+>>>>>>> .r9586\r
 Type=0\r
 Ver=1\r
 ObjFiles=\r
@@ -1778,7 +1786,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit182]\r
-FileName=SDLMain.h\r
+FileName=intoverflow.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r