diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 2 | ||||
| -rw-r--r-- | src/gameplay.cpp | 3 | ||||
| -rw-r--r-- | src/world.cpp | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 57a20ef..2cb83a8 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -77,7 +77,7 @@ Player::Player(){ //sets all of the player specific traits on object creation subtype = 0; health = maxHealth = 100; speed = 1; - tex = new Texturec(3, "assets/player1.png", "assets/player.png", "assets/player2.png"); + tex = new Texturec(3, "assets/player1.png", "assets/playerk.png", "assets/player2.png"); //tex = new Texturec(3, "assets/maybeplayer.png", "assets/maybeplayer.png", "assets/maybeplayer.png"); inv = new Inventory(PLAYER_INV_SIZE); } diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 6637d23..10de69d 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -32,6 +32,7 @@ typedef struct { char *file; } WorldXML; + typedef struct { NPC *npc; unsigned int index; @@ -98,7 +99,7 @@ void initEverything(void){ for(auto x : xmlFiles){ if(strncmp(x.c_str(),".",1) && strncmp(x.c_str(),"..",2)){ - file = new char[4 + x.size()]; + file = new char[5 + x.size()]; strncpy(file,"xml/",4); strcpy(file+4,x.c_str()); xml.LoadFile(file); diff --git a/src/world.cpp b/src/world.cpp index e97ec56..fea0e3e 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -770,10 +770,9 @@ LOOP2: cline[i].y-=(yoff-DRAW_Y_OFFSET); } //glEnd(); - //glUseProgram(0); + glUseProgram(0); glDisable(GL_TEXTURE_2D); - //glUseProgram(0); /* * Draw non-structure entities. |