diff options
| -rw-r--r-- | Changelog | 9 | ||||
| -rw-r--r-- | assets/items/flashlight_off.png | bin | 0 -> 330 bytes | |||
| -rw-r--r-- | config/items.h | 6 | ||||
| -rw-r--r-- | src/gameplay.cpp | 2 |
4 files changed, 12 insertions, 5 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,9 @@ - imrpoved BGM handling - continued work on particles, made a fountain - added sanic +<<<<<<< HEAD +>>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3 +======= ~ Broke 5000 lines of code/doc, now with some file Doxygen'd @@ -420,3 +426,4 @@ - fixed fading bugs - continued fixing general game bugs - fixed structure spawn issues +>>>>>>> e67bfdde0b7e15ac6bc29993a92a89a844474554 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/src/gameplay.cpp b/src/gameplay.cpp index 69ae2cc..70630dd 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -118,7 +118,7 @@ void initEverything(void){ worldSpawnHill3->setBGM("assets/music/embark.wav"); worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet); worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee); - worldSpawnHill3->addObject(TEST_ITEM,false,"",-200,300); + worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300); worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave); worldSpawnHill3->addHole(800,1000); |
