commit 6082686b

sago007 · 2017-04-22 08:39
6082686bdf3960ac115c5c46c9415824fa0cc190 patch · browse files
parent 1de94c36262682f35ff0c59bb670c9f0425d3ba9

Now calls the handlers "handler" instead of "holder" consistently

Changed files

M	source/code/sago/SagoDataHolder.cpp before
M	source/code/sago/SagoDataHolder.hpp before
M	source/code/sago/SagoSprite.cpp before

diff --git a/source/code/sago/SagoDataHolder.cpp b/source/code/sago/SagoDataHolder.cpp index d06d04b..61961a8 100644 --- a/source/code/sago/SagoDataHolder.cpp +++ b/source/code/sago/SagoDataHolder.cpp

@@ -286,7 +286,7 @@ SDL_Texture* TextureHandler::get() {

return data;

}

-TextureHandler SagoDataHolder::getTextureHolder(const std::string &textureName) const {

+TextureHandler SagoDataHolder::getTextureHandler(const std::string &textureName) const {

return TextureHandler(this, textureName);

}

diff --git a/source/code/sago/SagoDataHolder.hpp b/source/code/sago/SagoDataHolder.hpp index 05d0308..f771599 100644 --- a/source/code/sago/SagoDataHolder.hpp +++ b/source/code/sago/SagoDataHolder.hpp

@@ -62,7 +62,7 @@ public:

* @return Pointer to the loaded texture

SDL_Texture* getTexturePtr(const std::string &textureName) const;

- TextureHandler getTextureHolder(const std::string &textureName) const;

+ TextureHandler getTextureHandler(const std::string &textureName) const;

TTF_Font* getFontPtr(const std::string &fontName, int ptsize) const;

Mix_Music* getMusicPtr(const std::string &musicName) const;

Mix_Chunk* getSoundPtr(const std::string &soundName) const;

diff --git a/source/code/sago/SagoSprite.cpp b/source/code/sago/SagoSprite.cpp index 4c0f57e..2ddcd14 100644 --- a/source/code/sago/SagoSprite.cpp +++ b/source/code/sago/SagoSprite.cpp

@@ -41,7 +41,7 @@ SagoSprite::SagoSprite() {

SagoSprite::SagoSprite(const SagoDataHolder& texHolder, const std::string& texture,const SDL_Rect& initImage,const int animationFrames, const int animationFrameLength) {

data = new SagoSpriteData();

- data->tex = texHolder.getTextureHolder(texture);

+ data->tex = texHolder.getTextureHandler(texture);

data->imgCord = initImage;

data->aniFrames = animationFrames;

data->aniFrameTime = animationFrameLength;