1 files changed, 22 insertions, 5 deletions

@@ -353,7 +353,7 @@ void Game::recalculateRender() {
         map.at(x,y).dirtyRender = false;
 
         if (map.tile(x,y) == Tile::Floor && (!map.at(x,y).lit || !map.at(x,y).wasLit)) {
-          int renderDesc = 0;
+          /*int renderDesc = 0;
           if (isTileSetOrNotLit(map, x-1, y-1)) renderDesc |= (1 << 7);
           if (isTileSetOrNotLit(map, x  , y-1)) renderDesc |= (1 << 6);
           if (isTileSetOrNotLit(map, x+1, y-1)) renderDesc |= (1 << 5);
@@ -361,9 +361,9 @@ void Game::recalculateRender() {
           if (isTileSetOrNotLit(map, x+1, y+1)) renderDesc |= (1 << 3);
           if (isTileSetOrNotLit(map, x  , y+1)) renderDesc |= (1 << 2);
           if (isTileSetOrNotLit(map, x-1, y+1)) renderDesc |= (1 << 1);
-          if (isTileSetOrNotLit(map, x-1, y  )) renderDesc |= (1 << 0);
+          if (isTileSetOrNotLit(map, x-1, y  )) renderDesc |= (1 << 0);*/
 
-          if (/*renderDesc == 0 && */map.at(x,y).sign) {
+          if (/*renderDesc == 0 && */map.at(x,y).sign && !storyDone) {
             map.at(x,y).renderId = TilesetIndex(24, 13);
           } else if (std::bernoulli_distribution(0.05)(rng)) {
             static const std::vector<int> furnishings {
@@ -373,7 +373,7 @@ void Game::recalculateRender() {
               TilesetIndex(21, 3),
               TilesetIndex(22, 3)};
 
-            if (/*renderDesc == 0 &&*/ !(x == player_x && y == player_y) && std::bernoulli_distribution(0.005)(rng)) {
+            if (/*renderDesc == 0 &&*/ !storyDone && !(x == player_x && y == player_y) && std::bernoulli_distribution(0.005)(rng)) {
               map.at(x,y).renderId = TilesetIndex(24, 13);
               map.at(x,y).sign = true;
             } else {
@@ -385,6 +385,8 @@ void Game::recalculateRender() {
             map.at(x,y).renderId = -1;
           }
         } else if (map.tile(x,y) == Tile::Wall) {
+          map.at(x,y).sign = false;
+
           static bool initWalls = false;
           static std::vector<int> wallRenders(256, TilesetIndex(21, 12));
           if (!initWalls) {
@@ -477,6 +479,7 @@ void Game::recalculateRender() {
           }
         } else {
           map.at(x,y).renderId = -1;
+          map.at(x,y).sign = false;
         }
       }
     }
@@ -783,7 +786,7 @@ void Game::updatePlaying(size_t frameTime) {
               if (lookTile.text.empty()) {
                 int lineToRead = nextSignIndex++;
                 if (nextSignIndex >= signTexts.size()) {
-                  nextSignIndex = 0;
+                  storyDone = true;
                 }
                 lookTile.text = signTexts[lineToRead];
               }
@@ -1098,6 +1101,20 @@ void Game::update(size_t frameTime) {
     menu.update(frameTime, *this);
   } else if (sign.signDisplayState != SignInstructionState::Hidden) {
     sign.update(frameTime, *this);
+
+    if (!clearedSigns && storyDone && sign.signDisplayState == SignInstructionState::FadingOut) {
+      for (int y = map.getTop(); y < map.getBottom(); y++) {
+        for (int x = map.getLeft(); x < map.getRight(); x++) {
+          if (map.at(x,y).sign) {
+            map.at(x,y).sign = false;
+            map.at(x,y).renderId = -1;
+          }
+        }
+      }
+
+      muxer.playSound("dash");
+      clearedSigns = true;
+    }
   } else {
     updatePlaying(frameTime);
   }