diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
commit | cd48894563052baeddff64f6bbc13ccc7fa6e081 (patch) | |
tree | c7ab2a9b4cbb7ac0d921cf486aef00c5b5623144 /src/mapview.h | |
parent | c1b1558256997df22678f6405ea320ae454ad5b4 (diff) | |
download | therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.gz therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.bz2 therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.zip |
Added CRT mesh!
Also a character sprite, changed up the map file format, fixed some shader bugs
Diffstat (limited to 'src/mapview.h')
-rw-r--r-- | src/mapview.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapview.h b/src/mapview.h index 70ffb3b..06309e3 100644 --- a/src/mapview.h +++ b/src/mapview.h | |||
@@ -16,6 +16,7 @@ const int MAP_WIDTH = GAME_WIDTH/TILE_WIDTH; | |||
16 | const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT; | 16 | const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT; |
17 | 17 | ||
18 | const int FRAMES_PER_SECOND = 60; | 18 | const int FRAMES_PER_SECOND = 60; |
19 | const double SECONDS_PER_FRAME = 1.0 / FRAMES_PER_SECOND; | ||
19 | 20 | ||
20 | enum direction_t { | 21 | enum direction_t { |
21 | up, left, down, right | 22 | up, left, down, right |
@@ -47,12 +48,17 @@ class MapView : public State { | |||
47 | list<collision_t> down_collisions; | 48 | list<collision_t> down_collisions; |
48 | 49 | ||
49 | Texture* bg = NULL; | 50 | Texture* bg = NULL; |
51 | Texture* chara; | ||
52 | Texture* tiles; | ||
50 | 53 | ||
51 | bool holding_left = false; | 54 | bool holding_left = false; |
52 | bool holding_right = false; | 55 | bool holding_right = false; |
56 | bool holding_down = false; | ||
53 | mob_t* player; | 57 | mob_t* player; |
54 | 58 | ||
55 | Map* curMap; | 59 | Map* curMap; |
60 | |||
61 | int animFrame = 0; | ||
56 | }; | 62 | }; |
57 | 63 | ||
58 | #endif | 64 | #endif |