1 files changed, 13 insertions, 0 deletions

@@ -9,6 +9,7 @@
 #include "muxer.h"
 #include "timer.h"
 #include "animation.h"
+#include "interpolation.h"
 
 const int GAME_WIDTH = 640*2;
 const int GAME_HEIGHT = 480*2;
@@ -19,6 +20,10 @@ const int ZOOM_X_FACTOR = 8;
 const int ZOOM_Y_FACTOR = 6;
 const int RADIUS = 8;
 
+constexpr int TilesetIndex(int x, int y) {
+  return x + y * 24;
+}
+
 enum class Tile {
   Floor,
   Wall,
@@ -75,6 +80,8 @@ struct MapData {
   Source lightType = Source::None;
   int lightRadius = 0;
   std::set<coord> litTiles;
+  int renderId = -1;
+  bool dirtyRender = true;
 };
 
 class Game {
@@ -97,11 +104,14 @@ public:
   std::list<Kickup> kickups;
   int litSpots = 0;
   bool dirtyLighting = true;
+  bool dirtyRender = true;
   size_t numLamps = 0;
   size_t numDust = 0;
 
   int player_x = 0;
   int player_y = 0;
+  int player_oldx = 0;
+  int player_oldy = 0;
   bool renderPlayer = true;
   Animation playerAnim {"../res/player_anim.txt"};
 
@@ -123,6 +133,9 @@ public:
   Input lastInput;
   bool alreadyBumped = false;
   Timer bumpCooldown = {500};
+  Interpolation moveProgress;
+  bool moving = false;
+  bool queueDash = false;
 
 };