+ 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
{
dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.wav", track);
if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.ogg", track);
{
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), "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
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), "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)))
{
}
if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, true)))
{
// GAME_EDU2P
// COMMANDLINEOPTION: Game: -edu2p runs the game Edu2 prototype
{ "edu2p", "-edu2p", "EDU2 Prototype", "id1", "edu2", "edu2_p", "edu2prototype" },
// 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" },
-// 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" },
{ "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)
};
void COM_InitGameType (void)
GAME_DARSANA,
GAME_CONTAGIONTHEORY,
GAME_EDU2P,
GAME_DARSANA,
GAME_CONTAGIONTHEORY,
GAME_EDU2P,
GAME_PROPHECY,
GAME_BLOODOMNICIDE,
GAME_PROPHECY,
GAME_BLOODOMNICIDE,
+ GAME_STEELSTORM, // added by motorsep
[Project]\r
FileName=darkplaces-sdl.dev\r
Name=DarkPlaces\r
[Project]\r
FileName=darkplaces-sdl.dev\r
Name=DarkPlaces\r
+<<<<<<< .mine\r
+<<<<<<< .mine\r
+UnitCount=182\r
+=======\r
+UnitCount=175\r
+=======\r
+>>>>>>> .r9892\r
+>>>>>>> .r9586\r
Type=0\r
Ver=1\r
ObjFiles=\r
Type=0\r
Ver=1\r
ObjFiles=\r
BuildCmd=\r
\r
[Unit182]\r
BuildCmd=\r
\r
[Unit182]\r
+FileName=intoverflow.h\r
CompileCpp=0\r
Folder=Header Files\r
Compile=1\r
CompileCpp=0\r
Folder=Header Files\r
Compile=1\r