id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug by last filesystem change

Browse source
This commit is contained in:
Robert Beckebans 2022-01-08 18:33:55 +01:00
parent c104fff7ea
commit ef47fc9092
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
neo/framework/DeclManager.cpp
View file

@ -2631,6 +2631,27 @@ void idDeclManagerLocal::ExportDeclsToTrenchBroom_f( const idCmdArgs& args )
file->Printf( "= %s : \"%s\"\n", decl->GetName(), text.c_str() );
file->Printf( "[\n" );
if( idStr::Icmp( decl->GetName(), "light" ) == 0 )
{
// RB: hardcode for now to have proper light styles combobox names
file->Printf(
"\tstyle(Choices) : \"Appearance\" : 0 =\n"
"\t[\n"
"\t\t0 : \"Normal\"\n"
"\t\t10: \"Fluorescent flicker\"\n"
"\t\t2 : \"Slow, strong pulse\"\n"
"\t\t11: \"Slow pulse, noblack\"\n"
"\t\t5 : \"Gentle pulse\"\n"
"\t\t1 : \"Flicker A\"\n"
"\t\t6 : \"Flicker B\"\n"
"\t\t3 : \"Candle A\"\n"
"\t\t7 : \"Candle B\"\n"
"\t\t8 : \"Candle C\"\n"
"\t\t4 : \"Fast strobe\"\n"
"\t\t9 : \"Slow strobe\"\n"
"\t]\n" );
}
for( int i = 0; i < dictToWrite.GetNumKeyVals(); i++ )
{
kv = dictToWrite.GetKeyVal( i );

5
neo/framework/FileSystem.cpp
View file

@ -2279,8 +2279,9 @@ int idFileSystemLocal::GetFileList( const char* relativePath, const idStrList& e
// make sure the file is not in a subdirectory
int j = pathLength;
// RB: subdirectories are good!!!
#if 0
// RB: FIXME expose this to an option for exportModelsToTrenchBroom
// so it doesn't break loading of sounds
#if 1
for( ; rt.filename[j + 1] != '\0'; j++ )
{
if( rt.filename[ j ] == '/' )