diff options
| -rw-r--r-- | Changelog | 7 | ||||
| -rw-r--r-- | assets/items/flashlight_off.png | bin | 0 -> 330 bytes | |||
| -rw-r--r-- | config/items.h | 6 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | src/entities.cpp | 2 | ||||
| -rw-r--r-- | src/gameplay.cpp | 3 | ||||
| -rw-r--r-- | src/world.cpp | 3 | ||||
| -rw-r--r-- | test.frag | 1 |
8 files changed, 15 insertions, 9 deletions
@@ -377,7 +377,7 @@ ========== - re-did fullscreen text (importantText) - - began doxygening headers + - began doxygening headersspin a dreidel - fixed entity name reading - fixed entity sprites @@ -387,6 +387,9 @@ - continued to document header files through doxygen - added border to dialogBox - fix entity movement handling; npcs stop when you talk to them +<<<<<<< HEAD + - added sword animation? +======= - added sword animation? 12/9/2015, @@ -408,6 +411,7 @@ - imrpoved BGM handling - continued work on particles, made a fountain - added sanic +======= ~ Broke 5000 lines of code/doc, now with some file Doxygen'd @@ -420,6 +424,7 @@ - fixed fading bugs - continued fixing general game bugs - fixed structure spawn issues +======= 12/15/2015: =========== diff --git a/assets/items/flashlight_off.png b/assets/items/flashlight_off.png Binary files differnew file mode 100644 index 0000000..8f6f204 --- /dev/null +++ b/assets/items/flashlight_off.png diff --git a/config/items.h b/config/items.h index 9012ff6..ee1024c 100644 --- a/config/items.h +++ b/config/items.h @@ -29,10 +29,10 @@ ID PLAYER_BAG ID FLASHLIGHT NAME "Flashlight" TYPE TOOL - WIDTH HLINE*2 - HEIGHT HLINE*4 + WIDTH HLINE*4 + HEIGHT HLINE*8 STACKSIZE 1 - TEX "assets/items/ITEM_TEST.png" + TEX "assets/items/flashlight_off.png" ENI ID SWORD_WOOD diff --git a/include/common.h b/include/common.h index adbd7fa..8552720 100644 --- a/include/common.h +++ b/include/common.h @@ -78,7 +78,7 @@ typedef struct{ * The desired width of the game window. */ -#define SCREEN_WIDTH 1024 +#define SCREEN_WIDTH 1280 /** * The desired height of the game window. 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. @@ -1,3 +1,4 @@ +#version 130
uniform sampler2D sampler;
uniform int numLight;
|
