Compile q3map2

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

diff --git a/radiant/textures.cpp b/radiant/textures.cpp
index b223e2ee1318a87c40d0b7ccbab788f13a72f1c1..a0aa029b0bd927204d6a04b69415243536b7b329 100644 (file)
--- a/radiant/textures.cpp
+++ b/radiant/textures.cpp
@@ -321,7 +321,7 @@ class TestHashtable
 {
 public:
 TestHashtable(){
-       HashTable<CopiedString, CopiedString, HashStringNoCase, StringEqualNoCase> strings;
+       HashTable<std::string, std::string, HashStringNoCase, StringEqualNoCase> strings;
        strings["Monkey"] = "bleh";
        strings["MonkeY"] = "blah";
 }
@@ -331,7 +331,7 @@ const TestHashtable g_testhashtable;
 
 #endif
 
-typedef std::pair<LoadImageCallback, CopiedString> TextureKey;
+typedef std::pair<LoadImageCallback, std::string> TextureKey;
 
 void qtexture_realise( qtexture_t& texture, const TextureKey& key ){
        texture.texture_number = 0;
@@ -505,8 +505,8 @@ void realise(){
 
                for ( qtextures_t::iterator i = m_qtextures.begin(); i != m_qtextures.end(); ++i )
                {
-                       if ( !( *i ).value.empty() ) {
-                               qtexture_realise( *( *i ).value, ( *i ).key );
+                       if ( !( *i ).second.empty() ) {
+                               qtexture_realise( *( *i ).second, ( *i ).first );
                        }
                }
                if ( m_observer != 0 ) {
@@ -521,8 +521,8 @@ void unrealise(){
                }
                for ( qtextures_t::iterator i = m_qtextures.begin(); i != m_qtextures.end(); ++i )
                {
-                       if ( !( *i ).value.empty() ) {
-                               qtexture_unrealise( *( *i ).value );
+                       if ( !( *i ).second.empty() ) {
+                               qtexture_unrealise( *( *i ).second );
                        }
                }
        }
@@ -560,7 +560,7 @@ void Textures_ModeChanged(){
 
                for ( TexturesMap::iterator i = g_texturesmap->begin(); i != g_texturesmap->end(); ++i )
                {
-                       glBindTexture( GL_TEXTURE_2D, ( *i ).value->texture_number );
+                       glBindTexture( GL_TEXTURE_2D, ( *i ).second->texture_number );
                        SetTexParameters( g_texture_mode );
                }