aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-10-22 09:27:55 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-10-22 09:27:55 -0400
commitc99d7fb5e5c047709ccd4823e39ccb16c153eecb (patch)
tree9b77ae63cd8876e8d449ba4cb6ad82ad88b16b55 /main.cpp
parent95f1817ebf57e54ca43181198c1782838f424492 (diff)
parentd15062f7f2563761660e665d0940d9c0d1a7883c (diff)
screw npcs
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 9fc2c01..69cad20 100644
--- a/main.cpp
+++ b/main.cpp
@@ -381,7 +381,7 @@ int main(int argc, char *argv[]){
* Load a temporary background image.
*/
- bgImage=loadTexture("assets/bg.png");
+ bgImage=Texture::loadTexture("assets/bg.png");
/*
* Load sprites used in the inventory menu. See src/inventory.cpp
@@ -625,7 +625,7 @@ void render(){
**************************/
/*
- * These next two function finish the rendering\
+ * These next two function finish the rendering
*
* glPopMatrix This anchors all of the matrices and blends them to a single
* matrix so the renderer can draw this to the screen, since screens
@@ -659,6 +659,7 @@ void logic(){
* click detection is done as well for NPC/player interaction.
*
*/
+ std::cout << "Game Loop: "<< loops << std::endl;
for(int i=0;i<=entity.size();i++){