radiant/about: do not use full height empty lines between paragraphs

[xonotic/netradiant.git] / radiant / image.cpp

diff --git a/radiant/image.cpp b/radiant/image.cpp
index c9014294f639c0dc07c762355b414b0a87b310cc..9d74d348fd637ebdfb16b578fddf335213fcdd94 100644 (file)
--- a/radiant/image.cpp
+++ b/radiant/image.cpp
@@ -50,7 +50,19 @@ public:
                        StringOutputStream fullname( 256 );
                        fullname << m_name << '.' << name;
                        ArchiveFile* file = GlobalFileSystem().openFile( fullname.c_str() );
+
+                       // also look for .dds image in dds/ prefix like Doom3 or DarkPlaces
+                       if ( file == 0 && !string_compare( name, "dds" ) )
+                       {
+                               fullname.clear();
+                               fullname << name << '/' << m_name << '.' << name;
+                               file = GlobalFileSystem().openFile( fullname.c_str() );
+                       }
+
                        if ( file != 0 ) {
+                               // tell user which image file is found for the given texture path
+                               globalOutputStream() << "Found image file: " << makeQuoted( fullname.c_str() ) << "\n";
+
                                m_image = table.loadImage( *file );
                                file->release();
                        }