Created
June 4, 2013 05:06
-
-
Save kahrl/5703714 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/tile.cpp b/src/tile.cpp | |
index 098a963..f176d15 100644 | |
--- a/src/tile.cpp | |
+++ b/src/tile.cpp | |
@@ -364,14 +364,14 @@ class TextureSource : public IWritableTextureSource | |
// Gets a separate texture | |
video::ITexture* getTextureRaw(const std::string &name) | |
{ | |
- AtlasPointer ap = getTexture(name + "^[forcesingle"); | |
+ AtlasPointer ap = getTexture(name + m_forcesingle_suffix); | |
return ap.atlas; | |
} | |
// Gets a separate texture atlas pointer | |
AtlasPointer getTextureRawAP(const AtlasPointer &ap) | |
{ | |
- return getTexture(getTextureName(ap.id) + "^[forcesingle"); | |
+ return getTexture(getTextureName(ap.id) + m_forcesingle_suffix); | |
} | |
// Returns a pointer to the irrlicht device | |
@@ -437,6 +437,7 @@ class TextureSource : public IWritableTextureSource | |
// Main texture atlas. This is filled at startup and is then not touched. | |
video::IImage *m_main_atlas_image; | |
video::ITexture *m_main_atlas_texture; | |
+ std::string m_forcesingle_suffix; | |
// Queued texture fetches (to be processed by the main thread) | |
RequestQueue<std::string, u32, u8, u8> m_get_texture_queue; | |
@@ -1137,6 +1138,8 @@ void TextureSource::buildMainAtlas(class IGameDef *gamedef) | |
<<atlaspath<<std::endl; | |
fs::RecursiveDelete(atlaspath); | |
driver->writeImageToFile(atlas_img, atlaspath.c_str());*/ | |
+ | |
+ m_forcesingle_suffix = "^[forcesingle"; | |
} | |
video::IImage* generate_image_from_scratch(std::string name, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment