commit e297a2e8
No longer prints loaded information unless verbose is set
Changed files
| M | source/code/main.cpp before |
| M | source/code/sago/SagoDataHolder.cpp before |
| M | source/code/sago/SagoDataHolder.hpp before |
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 54c74e4..8b2a6b8 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -2033,6 +2033,7 @@ int main(int argc, char* argv[]) {
PHYSFS_addToSearchPath( ((string) PHYSFS_getBaseDir()+"/data").c_str(), 1);
//Load default theme
sago::SagoDataHolder d(renderer);
+ d.setVerbose(false);
sago::SagoSpriteHolder spriteholder(d);
loadTheme(spriteholder, Config::getInstance()->getString("themename"));
SetSDLIcon(sdlWindow);
diff --git a/source/code/sago/SagoDataHolder.cpp b/source/code/sago/SagoDataHolder.cpp
index a872ea4..da774d9 100644
--- a/source/code/sago/SagoDataHolder.cpp
+++ b/source/code/sago/SagoDataHolder.cpp
@@ -40,9 +40,14 @@ struct SagoDataHolder::SagoDataHolderData {
std::map<std::string, Mix_Chunk*> sounds;
std::vector<SDL_RWops*> rwOpsToFree;
std::vector<std::unique_ptr<char[]>> dataToFree;
+ bool verbose = false;
SDL_Renderer* renderer = nullptr;
};
+static void printFileWeLoad(const std::string& value) {
+ std::cout << "Loading " << value << std::endl;
+}
+
SagoDataHolder::SagoDataHolder(SDL_Renderer* renderer) {
data = new SagoDataHolderData();
data->renderer = renderer;
@@ -75,6 +80,9 @@ SDL_Texture* SagoDataHolder::getTexturePtr(const std::string& textureName) const
return ret;
}
std::string path = "textures/"+textureName+".png";
+ if (data->verbose) {
+ printFileWeLoad(path);
+ }
if (!PHYSFS_exists(path.c_str())) {
std::cerr << "getTextureFailed - Texture does not exists: " << path << std::endl;
exit(1);
@@ -106,7 +114,6 @@ SDL_Texture* SagoDataHolder::getTexturePtr(const std::string& textureName) const
std::cerr << "getTextureFailed to load " << path << std::endl;
}
SDL_FreeSurface(surface);
- std::cerr << path << " loaded" << std::endl;
data->textures[textureName] = ret;
return ret;
}
@@ -117,6 +124,9 @@ TTF_Font* SagoDataHolder::getFontPtr(const std::string& fontName, int ptsize) co
return ret;
}
std::string path = "fonts/"+fontName+".ttf";
+ if (data->verbose) {
+ printFileWeLoad(path);
+ }
if (!PHYSFS_exists(path.c_str())) {
std::cerr << "getFontPtr - Font does not exists: " << path << std::endl;
return ret;
@@ -158,6 +168,9 @@ Mix_Music* SagoDataHolder::getMusicPtr(const std::string& musicName) const {
return ret;
}
std::string path = "music/"+musicName+".ogg";
+ if (data->verbose) {
+ printFileWeLoad(path);
+ }
if (!PHYSFS_exists(path.c_str())) {
std::cerr << "getMusicPtr - Music file does not exists: " << path << std::endl;
return ret;
@@ -186,7 +199,6 @@ Mix_Music* SagoDataHolder::getMusicPtr(const std::string& musicName) const {
if (!ret) {
std::cerr << "getMusicPtr to load " << path << " because: " << Mix_GetError() << std::endl;
}
- std::cout << path << " loaded" << std::endl;
data->music[musicName] = ret;
data->dataToFree.push_back(std::move(m_data));
return ret;
@@ -199,6 +211,9 @@ Mix_Chunk* SagoDataHolder::getSoundPtr(const std::string& soundName) const {
return ret;
}
std::string path = "sounds/"+soundName+".ogg";
+ if (data->verbose) {
+ printFileWeLoad(path);
+ }
if (!PHYSFS_exists(path.c_str())) {
std::cerr << "getSoundPtr - Sound file does not exists: " << path << std::endl;
return ret;
@@ -223,11 +238,13 @@ Mix_Chunk* SagoDataHolder::getSoundPtr(const std::string& soundName) const {
}
ret = Mix_LoadWAV_RW(rw, SDL_TRUE);
-
- std::cout << path << " loaded" << std::endl;
data->sounds[soundName] = ret;
data->dataToFree.push_back(std::move(m_data));
return ret;
}
+void SagoDataHolder::setVerbose(bool value) {
+ data->verbose = value;
+}
+
} //name space sago
diff --git a/source/code/sago/SagoDataHolder.hpp b/source/code/sago/SagoDataHolder.hpp
index 10fb36f..8dcd84a 100644
--- a/source/code/sago/SagoDataHolder.hpp
+++ b/source/code/sago/SagoDataHolder.hpp
@@ -46,6 +46,7 @@ public:
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;
+ void setVerbose(bool value);
virtual ~SagoDataHolder();
private:
SagoDataHolder(const SagoDataHolder& base) = delete;