Revert "game mode as option to disable timeout termination"

This reverts commit 974f2e2.

Author: Sebastian-Griesbach

src/ale/games/supported/Pitfall.cpp

@@ -28,7 +28,6 @@
 #include "ale/games/supported/Pitfall.hpp"
 
 #include "ale/games/RomUtils.hpp"
-#include "ale/environment/stella_environment_wrapper.hpp"
 
 namespace ale {
 using namespace stella;
@@ -56,8 +55,7 @@ void PitfallSettings::step(const System& system) {
   int timer_minutes = readRam(&system, 0xD8);
   int timer_seconds = readRam(&system, 0xD9);
   // Game terminates when: (1) all lives lost and logo screen shown, OR (2) timer runs out (00:00)
-  // In legacy mode (mode 1), timer expiration is not checked for backwards compatibility
-  bool timer_expired = m_terminateOnTimeout && (timer_minutes == 0 && timer_seconds == 0);
+  bool timer_expired = (timer_minutes == 0 && timer_seconds == 0);
   m_terminal = (lives_byte == 0 && logo_timer != 0) || timer_expired;
 
   m_lives = (lives_byte == 0xA) ? 3 : ((lives_byte == 0x8) ? 2 : 1);
@@ -102,7 +100,6 @@ void PitfallSettings::reset() {
   m_score = 2000;
   m_terminal = false;
   m_lives = 3;
-  m_terminateOnTimeout = true;
 }
 
 /* saves the state of the rom settings */
@@ -111,7 +108,6 @@ void PitfallSettings::saveState(Serializer& ser) {
   ser.putInt(m_score);
   ser.putBool(m_terminal);
   ser.putInt(m_lives);
-  ser.putBool(m_terminateOnTimeout);
 }
 
 // loads the state of the rom settings
@@ -120,33 +116,10 @@ void PitfallSettings::loadState(Deserializer& ser) {
   m_score = ser.getInt();
   m_terminal = ser.getBool();
   m_lives = ser.getInt();
-  m_terminateOnTimeout = ser.getBool();
 }
 
 ActionVect PitfallSettings::getStartingActions() {
   return {PLAYER_A_UP};
 }
 
-// Returns a list of modes that the game can be played in.
-// Mode 0: Default mode with timer-based termination (terminates when 20-minute timer expires)
-// Mode 1: Legacy mode without timer-based termination (for backwards compatibility)
-ModeVect PitfallSettings::getAvailableModes() {
-  return {0, 1};
-}
-
-// Set the mode of the game.
-void PitfallSettings::setMode(
-    game_mode_t m, System& system,
-    std::unique_ptr<StellaEnvironmentWrapper> environment) {
-  if (m == 0) {
-    // Default mode: terminate when 20-minute timer expires
-    m_terminateOnTimeout = true;
-  } else if (m == 1) {
-    // Legacy mode: do not terminate on timer expiration (original buggy behavior)
-    m_terminateOnTimeout = false;
-  } else {
-    throw std::runtime_error("This mode is not supported for Pitfall.");
-  }
-}
-
 }  // namespace ale

src/ale/games/supported/Pitfall.hpp

@@ -69,23 +69,13 @@ class PitfallSettings : public RomSettings {
 
   ActionVect getStartingActions() override;
 
-  // Returns a list of modes that the game can be played in.
-  // Mode 0: Default mode with timer-based termination (terminates when 20-minute timer expires)
-  // Mode 1: Legacy mode without timer-based termination (for backwards compatibility)
-  ModeVect getAvailableModes() override;
-
-  // Set the mode of the game.
-  void setMode(game_mode_t m, stella::System& system,
-               std::unique_ptr<StellaEnvironmentWrapper> environment) override;
-
   int lives() override { return isTerminal() ? 0 : m_lives; }
 
  private:
   bool m_terminal;
   reward_t m_reward;
   reward_t m_score;
   int m_lives;
-  bool m_terminateOnTimeout;  // If true (default), game terminates when 20-minute timer expires
 };
 
 }  // namespace ale