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/gameplay.cpp | 7 |
5 files changed, 16 insertions, 6 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 038bf42..5713c56 100644 --- a/include/common.h +++ b/include/common.h @@ -70,7 +70,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/gameplay.cpp b/src/gameplay.cpp index 7dbe98e..5184136 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -137,7 +137,12 @@ void initEverything(void){ worldSpawnHill3 = new World(); worldSpawnHill3->generateFunc(1000,gen_worldSpawnHill3); worldSpawnHill3->setBackground(BG_FOREST); - worldSpawnHill3->setBGM("assets/music/ozone.wav"); + worldSpawnHill3->setBGM("assets/music/embark.wav"); + //worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet); + //worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee); + worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300); + //worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave); + worldSpawnHill3->addHole(800,1000); worldSpawnHill1->toRight = worldSpawnHill2; |
