Merge pull request #612 from lethal-guitar/prep-for-release

Prep for release
lethal-guitar · Nov 28, 2020 · c017d6a · c017d6a
2 parents c8502ba + 64ca101
commit c017d6a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/common/user_profile.cpp b/src/common/user_profile.cpp
@@ -341,7 +341,12 @@ nlohmann::ordered_json serialize(const data::GameOptions& options) {
   serialized["quickSaveKeybinding"] = SDL_GetKeyName(options.mQuickSaveKeybinding);
   serialized["quickLoadKeybinding"] = SDL_GetKeyName(options.mQuickLoadKeybinding);
 
+#if 0
+  // NOTE: This is disabled for now, it's not quite ready yet to be made
+  // user-facing.
   serialized["compatibilityModeOn"] = options.mCompatibilityModeOn;
+#endif
+
   serialized["widescreenModeOn"] = options.mWidescreenModeOn;
   serialized["quickSavingEnabled"] = options.mQuickSavingEnabled;
   return serialized;

diff --git a/src/game_logic/camera.cpp b/src/game_logic/camera.cpp
@@ -47,7 +47,7 @@ constexpr auto MAX_ADJUST_UP = 2;
 constexpr auto MAX_ADJUST_DOWN = 2;
 constexpr auto MAX_ADJUST_DOWN_ELEVATOR = 3;
 
-constexpr auto DEAD_ZONE_START_X = 11;
+constexpr auto DEAD_ZONE_START_X = 10;
 constexpr auto IN_SHIP_DEAD_ZONE_START_X = 12;
 constexpr auto DEAD_ZONE_END_X = 21;
 
@@ -111,8 +111,7 @@ base::Rect<int> normalizedPlayerBounds(
   const auto offsetToCenter = extraTiles / 2;
 
   auto playerBounds = player.worldSpaceCollisionBox();
-  playerBounds.topLeft.x -= offsetToCenter;
-
+  playerBounds.topLeft.x = player.orientedPosition().x - offsetToCenter;
   return playerBounds;
 }
 

diff --git a/src/game_logic/game_world.cpp b/src/game_logic/game_world.cpp
@@ -663,7 +663,7 @@ void GameWorld::processEndOfFrameActions() {
 
 
 void GameWorld::quickSave() {
-  if (!mpOptions->mQuickSavingEnabled) {
+  if (!mpOptions->mQuickSavingEnabled || mpState->mPlayer.isDead()) {
     return;
   }
 

diff --git a/src/game_logic/player.cpp b/src/game_logic/player.cpp
@@ -438,7 +438,7 @@ int Player::animationFrame() const {
 
 
 base::Vector Player::orientedPosition() const {
-  if (stateIs<InShip>() || !mpOptions->compatibilityModeOn()) {
+  if (stateIs<InShip>()) {
     return position();
   }
 
@@ -805,10 +805,7 @@ void Player::updateMovement(
 
         if (movementVector.x != 0 && movementVector.x != walkingDirection) {
           switchOrientation();
-
-          if (mpOptions->compatibilityModeOn()) {
-            position.x -= movementVector.x;
-          }
+          position.x -= movementVector.x;
         }
       } else {
         setVisualState(VisualState::Standing);
@@ -958,10 +955,7 @@ void Player::updateMovement(
 
         if (movementVector.x != 0 && movementVector.x != orientationAsMovement) {
           switchOrientation();
-
-          if (mpOptions->compatibilityModeOn()) {
-            position.x -= movementVector.x;
-          }
+          position.x -= movementVector.x;
         }
 
         if (mJumpRequested && movement > 0) {

diff --git a/src/ui/options_menu.cpp b/src/ui/options_menu.cpp
@@ -272,10 +272,13 @@ void OptionsMenu::updateAndRender(engine::TimeDelta dt) {
       ImGui::EndTabItem();
     }
 
-    if (ImGui::BeginTabItem("Gameplay/Enhancements"))
+    if (ImGui::BeginTabItem("Enhancements"))
     {
       ImGui::NewLine();
 
+#if 0
+      // NOTE: This is disabled for now, it's not quite ready yet to be made
+      // user-facing.
       const auto canUseCompatibilityMode = !mpOptions->mWidescreenModeOn;
 
       withEnabledState(canUseCompatibilityMode, [&]() {
@@ -290,6 +293,7 @@ void OptionsMenu::updateAndRender(engine::TimeDelta dt) {
           mpOptions->mCompatibilityModeOn = gameplayStyleIndex == 0;
         }
       });
+#endif
 
       ImGui::Checkbox("Widescreen mode", &mpOptions->mWidescreenModeOn);
       ImGui::Checkbox("Quick saving", &mpOptions->mQuickSavingEnabled);
-Original file line number
+Diff line change
@@ Expand Up / @@ -663,7 +663,7 @@ void GameWorld::processEndOfFrameActions() { @@
     void GameWorld::quickSave() {
-      if (!mpOptions->mQuickSavingEnabled) {
+      if (!mpOptions->mQuickSavingEnabled || mpState->mPlayer.isDead()) {
         return;
       }
@@ Expand Down @@