aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-12-03 09:29:46 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-12-03 09:29:46 -0500
commit8a342f76c838b8240d6d5fa99c624726e5d589a8 (patch)
tree566d2c037860ded5aac06ca333df9f0c55c4ca88 /main.cpp
parent8a2f08dc35632a9a8e5272a629e0b4770d567c3a (diff)
parent3c8140152bcf72eb1d64b580bb9c1e139bcbe191 (diff)
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 19d67e7..f24b9bd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -434,10 +434,8 @@ int main(int argc, char *argv[]){
invUI = Texture::loadTexture("assets/invUI.png" );
- //std::cout << "Before invSprites\n";
- //initInventorySprites();
- //std::cout << "After invSprites\n";
-
+ initInventorySprites();
+
/**************************
**** GAMELOOP ****
**************************/