dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-23 12:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of ID_ALLOW_D3XP

Browse source 
There're no second class citizens.
This commit is contained in:
dhewg 2011-12-19 16:16:03 +01:00
parent e5ec63ce06
commit 8e34d86f8a
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/framework/BuildDefines.h
View file

@ -115,11 +115,3 @@ If you have questions concerning this license or the applicable additional terms
#ifndef ID_OPENAL_EAX
# define ID_OPENAL_EAX 0
#endif
#ifndef ID_ALLOW_D3XP
# if defined( MACOS_X )
# define ID_ALLOW_D3XP 0
# else
# define ID_ALLOW_D3XP 1
# endif
#endif

14
neo/framework/FileSystem.cpp
View file

@ -2851,15 +2851,6 @@ void idFileSystemLocal::Init( void ) {
common->StartupVariable( "fs_restrict", false );
common->StartupVariable( "fs_searchAddons", false );
#if !ID_ALLOW_D3XP
if ( fs_game.GetString()[0] && !idStr::Icmp( fs_game.GetString(), "d3xp" ) ) {
fs_game.SetString( NULL );
}
if ( fs_game_base.GetString()[0] && !idStr::Icmp( fs_game_base.GetString(), "d3xp" ) ) {
fs_game_base.SetString( NULL );
}
#endif
if ( fs_basepath.GetString()[0] == '\0' ) {
fs_basepath.SetString( Sys_DefaultBasePath() );
}
@ -4007,7 +3998,7 @@ bool idFileSystemLocal::HasD3XP( void ) {
}
}
}
#elif ID_ALLOW_D3XP
#else
// check for d3xp's d3xp/pak000.pk4 in any search path
// checking wether the pak is loaded by checksum wouldn't be enough:
// we may have a different fs_game right now but still need to reply that it's installed
@ -4027,7 +4018,6 @@ bool idFileSystemLocal::HasD3XP( void ) {
}
#endif
#if ID_ALLOW_D3XP
// if we didn't find a pk4 file then the user might have unpacked so look for default.cfg file
// that's the old way mostly used during developement. don't think it hurts to leave it there
ListOSFiles( fs_basepath.GetString(), "/", dirs );
@ -4043,7 +4033,7 @@ bool idFileSystemLocal::HasD3XP( void ) {
}
}
}
#endif
d3xp = -1;
return false;
}