Refactor: Began updating gl_texmanager.c to C++

skyjake · Nov 27, 2012 · f60c494 · f60c494
1 parent 8c28298
commit f60c494
Show file tree

Hide file tree

Showing 6 changed files with 804 additions and 807 deletions.
diff --git a/doomsday/engine/include/gl/gl_texmanager.h b/doomsday/engine/include/gl/gl_texmanager.h
@@ -200,8 +200,6 @@ uint8_t* GL_LoadImageStr(struct image_s* img, const ddstring_t* filePath);
 TexSource GL_LoadRawTex(struct image_s* image, const rawtex_t* r);
 
 TexSource GL_LoadExtTexture(struct image_s* image, const char* name, gfxmode_t mode);
-TexSource GL_LoadExtTextureEX(struct image_s* image, const char* searchPath,
-    const char* optionalSuffix, boolean quiet);
 
 TexSource GL_LoadFlatLump(struct image_s* image, FileHandle* file);
 

diff --git a/doomsday/engine/include/resource/patchname.h b/doomsday/engine/include/resource/patchname.h
@@ -36,13 +36,13 @@ namespace de {
 class PatchName : public IReadable
 {
 public:
-    explicit PatchName(String _name = "", lumpnum_t _lumpNum = -2);
+    explicit PatchName(String percentEncodedName = "", lumpnum_t _lumpNum = -2);
 
     /// Returns the percent-endcoded symbolic name of the patch.
-    String name() const;
+    String percentEncodedName() const;
 
     /// Returns the percent-endcoded symbolic name of the patch.
-    String const &nameRef() const;
+    String const &percentEncodedNameRef() const;
 
     /// Returns the lump number of the associated patch.
     /// @pre The global patchNames data is available.
@@ -52,7 +52,8 @@ class PatchName : public IReadable
     void operator << (Reader &from);
 
 private:
-    String name_;
+    String name;
+
     lumpnum_t lumpNum_;
 };