diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:32:15 -0400 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:32:15 -0400 |
commit | a45daeda3633bdf25267a0186b39618269dca970 (patch) | |
tree | dea5bfdbadadc6d7cbd51fb0c760e5a5760959fb /main.cpp | |
parent | ba627aebb20e19b800133abe24fb7d9e650055c3 (diff) |
XML folder changing
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -154,6 +154,8 @@ Menu *currentMenu; Menu optionsMenu; Menu pauseMenu; +std::string xmlFolder; + extern WorldWeather weather; extern int fadeIntensity; // ui.cpp @@ -227,7 +229,7 @@ int main(int argc, char *argv[]){ * textures for the entities and stuff. */ - if(!(IMG_Init(IMG_INIT_PNG) & IMG_INIT_PNG)){ + if(!(IMG_Init(IMG_INIT_PNG) & IMG_INIT_PNG) | !(IMG_Init(IMG_INIT_JPG) & IMG_INIT_JPG)){ std::cout << "Could not init image libraries! Error: " << IMG_GetError() << std::endl; return -1; } @@ -389,7 +391,9 @@ int main(int argc, char *argv[]){ fadeIntensity = 250; + std::cout << "emem" << std::endl; initEverything(); + std::cout << "meme" << std::endl; if(!currentWorld){ std::cout<<"currentWorld == NULL!"<<std::endl; |