From 4069a485fe27a1cd2cf9d2af4db3eebf014d8628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Aichm=C3=BCller?= Date: Wed, 4 Sep 2024 11:31:48 +0200 Subject: [PATCH] Change project src folder layout to use subfolder 'ale' (#533) Co-authored-by: Mark Towers --- .github/workflows/ci.yml | 1 + .gitignore | 6 +- CMakeLists.txt | 2 +- pyproject.toml | 4 +- scripts/download_unpack_roms.sh | 2 +- src/{ => ale}/CMakeLists.txt | 4 +- src/{ => ale}/ale_interface.cpp | 16 +- src/{ => ale}/ale_interface.hpp | 10 +- src/{ => ale}/common/CMakeLists.txt | 0 src/{ => ale}/common/ColourPalette.cpp | 4 +- src/{ => ale}/common/ColourPalette.hpp | 0 src/{ => ale}/common/Constants.cpp | 2 +- src/{ => ale}/common/Constants.h | 0 src/{ => ale}/common/DynamicLoad.cpp | 2 +- src/{ => ale}/common/DynamicLoad.hpp | 0 src/{ => ale}/common/Log.cpp | 2 +- src/{ => ale}/common/Log.hpp | 0 src/{ => ale}/common/Palettes.hpp | 0 src/{ => ale}/common/SDL2.cpp | 2 +- src/{ => ale}/common/SDL2.hpp | 2 +- src/{ => ale}/common/ScreenExporter.cpp | 4 +- src/{ => ale}/common/ScreenExporter.hpp | 6 +- src/{ => ale}/common/ScreenSDL.cpp | 6 +- src/{ => ale}/common/ScreenSDL.hpp | 12 +- src/{ => ale}/common/SoundExporter.cpp | 2 +- src/{ => ale}/common/SoundExporter.hpp | 0 src/{ => ale}/common/SoundNull.cxx | 8 +- src/{ => ale}/common/SoundNull.hxx | 2 +- src/{ => ale}/common/SoundSDL.cxx | 20 +- src/{ => ale}/common/SoundSDL.hxx | 10 +- src/{ => ale}/emucore/CMakeLists.txt | 0 src/{ => ale}/emucore/Cart.cxx | 52 ++-- src/{ => ale}/emucore/Cart.hxx | 4 +- src/{ => ale}/emucore/Cart0840.cxx | 8 +- src/{ => ale}/emucore/Cart0840.hxx | 2 +- src/{ => ale}/emucore/Cart2K.cxx | 8 +- src/{ => ale}/emucore/Cart2K.hxx | 2 +- src/{ => ale}/emucore/Cart3E.cxx | 10 +- src/{ => ale}/emucore/Cart3E.hxx | 2 +- src/{ => ale}/emucore/Cart3F.cxx | 10 +- src/{ => ale}/emucore/Cart3F.hxx | 2 +- src/{ => ale}/emucore/Cart4A50.cxx | 8 +- src/{ => ale}/emucore/Cart4A50.hxx | 2 +- src/{ => ale}/emucore/Cart4K.cxx | 8 +- src/{ => ale}/emucore/Cart4K.hxx | 2 +- src/{ => ale}/emucore/CartAR.cxx | 10 +- src/{ => ale}/emucore/CartAR.hxx | 2 +- src/{ => ale}/emucore/CartCV.cxx | 8 +- src/{ => ale}/emucore/CartCV.hxx | 2 +- src/{ => ale}/emucore/CartDPC.cxx | 8 +- src/{ => ale}/emucore/CartDPC.hxx | 2 +- src/{ => ale}/emucore/CartE0.cxx | 8 +- src/{ => ale}/emucore/CartE0.hxx | 2 +- src/{ => ale}/emucore/CartE7.cxx | 8 +- src/{ => ale}/emucore/CartE7.hxx | 2 +- src/{ => ale}/emucore/CartF4.cxx | 8 +- src/{ => ale}/emucore/CartF4.hxx | 2 +- src/{ => ale}/emucore/CartF4SC.cxx | 10 +- src/{ => ale}/emucore/CartF4SC.hxx | 2 +- src/{ => ale}/emucore/CartF6.cxx | 8 +- src/{ => ale}/emucore/CartF6.hxx | 2 +- src/{ => ale}/emucore/CartF6SC.cxx | 8 +- src/{ => ale}/emucore/CartF6SC.hxx | 2 +- src/{ => ale}/emucore/CartF8.cxx | 8 +- src/{ => ale}/emucore/CartF8.hxx | 2 +- src/{ => ale}/emucore/CartF8SC.cxx | 8 +- src/{ => ale}/emucore/CartF8SC.hxx | 2 +- src/{ => ale}/emucore/CartFASC.cxx | 8 +- src/{ => ale}/emucore/CartFASC.hxx | 2 +- src/{ => ale}/emucore/CartFE.cxx | 8 +- src/{ => ale}/emucore/CartFE.hxx | 2 +- src/{ => ale}/emucore/CartMB.cxx | 8 +- src/{ => ale}/emucore/CartMB.hxx | 2 +- src/{ => ale}/emucore/CartMC.cxx | 8 +- src/{ => ale}/emucore/CartMC.hxx | 2 +- src/{ => ale}/emucore/CartUA.cxx | 8 +- src/{ => ale}/emucore/CartUA.hxx | 4 +- src/{ => ale}/emucore/Console.cxx | 40 +-- src/{ => ale}/emucore/Console.hxx | 8 +- src/{ => ale}/emucore/Control.cxx | 2 +- src/{ => ale}/emucore/Control.hxx | 0 src/{ => ale}/emucore/DefProps.hxx | 0 src/{ => ale}/emucore/Deserializer.cxx | 2 +- src/{ => ale}/emucore/Deserializer.hxx | 0 src/{ => ale}/emucore/Device.cxx | 2 +- src/{ => ale}/emucore/Device.hxx | 0 src/{ => ale}/emucore/Event.cxx | 2 +- src/{ => ale}/emucore/Event.hxx | 0 src/{ => ale}/emucore/Joystick.cxx | 4 +- src/{ => ale}/emucore/Joystick.hxx | 2 +- src/{ => ale}/emucore/M6502.cxx | 2 +- src/{ => ale}/emucore/M6502.hxx | 2 +- src/{ => ale}/emucore/M6502.m4 | 0 src/{ => ale}/emucore/M6502Hi.cxx | 10 +- src/{ => ale}/emucore/M6502Hi.hxx | 2 +- src/{ => ale}/emucore/M6502Hi.ins | 0 src/{ => ale}/emucore/M6502Hi.m4 | 0 src/{ => ale}/emucore/M6502Low.cxx | 8 +- src/{ => ale}/emucore/M6502Low.hxx | 2 +- src/{ => ale}/emucore/M6502Low.ins | 0 src/{ => ale}/emucore/M6502Low.m4 | 0 src/{ => ale}/emucore/M6532.cxx | 16 +- src/{ => ale}/emucore/M6532.hxx | 4 +- src/{ => ale}/emucore/MD5.cxx | 2 +- src/{ => ale}/emucore/MD5.hxx | 0 src/{ => ale}/emucore/MediaSrc.cxx | 2 +- src/{ => ale}/emucore/MediaSrc.hxx | 0 src/{ => ale}/emucore/NullDev.cxx | 6 +- src/{ => ale}/emucore/NullDev.hxx | 2 +- src/{ => ale}/emucore/OSystem.cxx | 16 +- src/{ => ale}/emucore/OSystem.hxx | 16 +- src/{ => ale}/emucore/Paddles.cxx | 4 +- src/{ => ale}/emucore/Paddles.hxx | 4 +- src/{ => ale}/emucore/Props.cxx | 2 +- src/{ => ale}/emucore/Props.hxx | 0 src/{ => ale}/emucore/PropsSet.cxx | 6 +- src/{ => ale}/emucore/PropsSet.hxx | 0 src/{ => ale}/emucore/Random.cxx | 6 +- src/{ => ale}/emucore/Random.hxx | 0 src/{ => ale}/emucore/Screen.hxx | 0 src/{ => ale}/emucore/Serializer.cxx | 2 +- src/{ => ale}/emucore/Serializer.hxx | 0 src/{ => ale}/emucore/Settings.cxx | 4 +- src/{ => ale}/emucore/Settings.hxx | 0 src/{ => ale}/emucore/Sound.hxx | 0 src/{ => ale}/emucore/Switches.cxx | 6 +- src/{ => ale}/emucore/Switches.hxx | 0 src/{ => ale}/emucore/System.cxx | 14 +- src/{ => ale}/emucore/System.hxx | 6 +- src/{ => ale}/emucore/TIA.cxx | 18 +- src/{ => ale}/emucore/TIA.hxx | 6 +- src/{ => ale}/emucore/TIASnd.cxx | 4 +- src/{ => ale}/emucore/TIASnd.hxx | 0 src/{ => ale}/emucore/stella.pro | 0 src/{ => ale}/environment/CMakeLists.txt | 0 src/{ => ale}/environment/ale_ram.hpp | 0 src/{ => ale}/environment/ale_screen.hpp | 0 src/{ => ale}/environment/ale_state.cpp | 16 +- src/{ => ale}/environment/ale_state.hpp | 10 +- src/{ => ale}/environment/phosphor_blend.cpp | 4 +- src/{ => ale}/environment/phosphor_blend.hpp | 4 +- .../environment/stella_environment.cpp | 4 +- .../environment/stella_environment.hpp | 26 +- .../stella_environment_wrapper.cpp | 4 +- .../stella_environment_wrapper.hpp | 4 +- src/{ => ale}/games/CMakeLists.txt | 0 src/{ => ale}/games/RomSettings.cpp | 2 +- src/{ => ale}/games/RomSettings.hpp | 10 +- src/{ => ale}/games/RomUtils.cpp | 4 +- src/{ => ale}/games/RomUtils.hpp | 0 src/ale/games/Roms.cpp | 249 ++++++++++++++++++ src/{ => ale}/games/Roms.hpp | 2 +- src/{ => ale}/games/supported/Adventure.cpp | 4 +- src/{ => ale}/games/supported/Adventure.hpp | 2 +- src/{ => ale}/games/supported/AirRaid.cpp | 4 +- src/{ => ale}/games/supported/AirRaid.hpp | 2 +- src/{ => ale}/games/supported/Alien.cpp | 4 +- src/{ => ale}/games/supported/Alien.hpp | 2 +- src/{ => ale}/games/supported/Amidar.cpp | 4 +- src/{ => ale}/games/supported/Amidar.hpp | 2 +- src/{ => ale}/games/supported/Assault.cpp | 4 +- src/{ => ale}/games/supported/Assault.hpp | 2 +- src/{ => ale}/games/supported/Asterix.cpp | 4 +- src/{ => ale}/games/supported/Asterix.hpp | 2 +- src/{ => ale}/games/supported/Asteroids.cpp | 4 +- src/{ => ale}/games/supported/Asteroids.hpp | 2 +- src/{ => ale}/games/supported/Atlantis.cpp | 4 +- src/{ => ale}/games/supported/Atlantis.hpp | 2 +- src/{ => ale}/games/supported/Atlantis2.cpp | 4 +- src/{ => ale}/games/supported/Atlantis2.hpp | 2 +- src/{ => ale}/games/supported/Backgammon.cpp | 4 +- src/{ => ale}/games/supported/Backgammon.hpp | 2 +- src/{ => ale}/games/supported/BankHeist.cpp | 4 +- src/{ => ale}/games/supported/BankHeist.hpp | 2 +- src/{ => ale}/games/supported/BasicMath.cpp | 4 +- src/{ => ale}/games/supported/BasicMath.hpp | 2 +- src/{ => ale}/games/supported/BattleZone.cpp | 4 +- src/{ => ale}/games/supported/BattleZone.hpp | 2 +- src/{ => ale}/games/supported/BeamRider.cpp | 4 +- src/{ => ale}/games/supported/BeamRider.hpp | 2 +- src/{ => ale}/games/supported/Berzerk.cpp | 4 +- src/{ => ale}/games/supported/Berzerk.hpp | 2 +- src/{ => ale}/games/supported/Blackjack.cpp | 4 +- src/{ => ale}/games/supported/Blackjack.hpp | 2 +- src/{ => ale}/games/supported/Bowling.cpp | 4 +- src/{ => ale}/games/supported/Bowling.hpp | 2 +- src/{ => ale}/games/supported/Boxing.cpp | 4 +- src/{ => ale}/games/supported/Boxing.hpp | 2 +- src/{ => ale}/games/supported/Breakout.cpp | 4 +- src/{ => ale}/games/supported/Breakout.hpp | 2 +- src/{ => ale}/games/supported/CMakeLists.txt | 0 src/{ => ale}/games/supported/Carnival.cpp | 4 +- src/{ => ale}/games/supported/Carnival.hpp | 2 +- src/{ => ale}/games/supported/Casino.cpp | 6 +- src/{ => ale}/games/supported/Casino.hpp | 2 +- src/{ => ale}/games/supported/Centipede.cpp | 4 +- src/{ => ale}/games/supported/Centipede.hpp | 2 +- .../games/supported/ChopperCommand.cpp | 4 +- .../games/supported/ChopperCommand.hpp | 2 +- .../games/supported/CrazyClimber.cpp | 4 +- .../games/supported/CrazyClimber.hpp | 2 +- src/{ => ale}/games/supported/Crossbow.cpp | 4 +- src/{ => ale}/games/supported/Crossbow.hpp | 2 +- .../games/supported/DarkChambers.cpp | 4 +- .../games/supported/DarkChambers.hpp | 2 +- src/{ => ale}/games/supported/Defender.cpp | 4 +- src/{ => ale}/games/supported/Defender.hpp | 2 +- src/{ => ale}/games/supported/DemonAttack.cpp | 4 +- src/{ => ale}/games/supported/DemonAttack.hpp | 2 +- src/{ => ale}/games/supported/DonkeyKong.cpp | 4 +- src/{ => ale}/games/supported/DonkeyKong.hpp | 2 +- src/{ => ale}/games/supported/DoubleDunk.cpp | 4 +- src/{ => ale}/games/supported/DoubleDunk.hpp | 2 +- src/{ => ale}/games/supported/Earthworld.cpp | 4 +- src/{ => ale}/games/supported/Earthworld.hpp | 2 +- .../games/supported/ElevatorAction.cpp | 4 +- .../games/supported/ElevatorAction.hpp | 2 +- src/{ => ale}/games/supported/Enduro.cpp | 4 +- src/{ => ale}/games/supported/Enduro.hpp | 2 +- src/{ => ale}/games/supported/Entombed.cpp | 4 +- src/{ => ale}/games/supported/Entombed.hpp | 2 +- src/{ => ale}/games/supported/Et.cpp | 4 +- src/{ => ale}/games/supported/Et.hpp | 2 +- .../games/supported/FishingDerby.cpp | 4 +- .../games/supported/FishingDerby.hpp | 2 +- src/{ => ale}/games/supported/FlagCapture.cpp | 4 +- src/{ => ale}/games/supported/FlagCapture.hpp | 2 +- src/{ => ale}/games/supported/Freeway.cpp | 4 +- src/{ => ale}/games/supported/Freeway.hpp | 4 +- src/{ => ale}/games/supported/Frogger.cpp | 4 +- src/{ => ale}/games/supported/Frogger.hpp | 2 +- src/{ => ale}/games/supported/Frostbite.cpp | 4 +- src/{ => ale}/games/supported/Frostbite.hpp | 2 +- src/{ => ale}/games/supported/Galaxian.cpp | 4 +- src/{ => ale}/games/supported/Galaxian.hpp | 2 +- src/{ => ale}/games/supported/Gopher.cpp | 4 +- src/{ => ale}/games/supported/Gopher.hpp | 2 +- src/{ => ale}/games/supported/Gravitar.cpp | 4 +- src/{ => ale}/games/supported/Gravitar.hpp | 2 +- src/{ => ale}/games/supported/Hangman.cpp | 4 +- src/{ => ale}/games/supported/Hangman.hpp | 2 +- .../games/supported/HauntedHouse.cpp | 4 +- .../games/supported/HauntedHouse.hpp | 2 +- src/{ => ale}/games/supported/Hero.cpp | 4 +- src/{ => ale}/games/supported/Hero.hpp | 2 +- .../games/supported/HumanCannonball.cpp | 4 +- .../games/supported/HumanCannonball.hpp | 2 +- src/{ => ale}/games/supported/IceHockey.cpp | 4 +- src/{ => ale}/games/supported/IceHockey.hpp | 2 +- src/{ => ale}/games/supported/JamesBond.cpp | 4 +- src/{ => ale}/games/supported/JamesBond.hpp | 2 +- .../games/supported/JourneyEscape.cpp | 4 +- .../games/supported/JourneyEscape.hpp | 2 +- src/{ => ale}/games/supported/Kaboom.cpp | 4 +- src/{ => ale}/games/supported/Kaboom.hpp | 2 +- src/{ => ale}/games/supported/Kangaroo.cpp | 4 +- src/{ => ale}/games/supported/Kangaroo.hpp | 2 +- .../games/supported/KeystoneKapers.cpp | 4 +- .../games/supported/KeystoneKapers.hpp | 2 +- src/{ => ale}/games/supported/Kingkong.cpp | 4 +- src/{ => ale}/games/supported/Kingkong.hpp | 2 +- src/{ => ale}/games/supported/Klax.cpp | 6 +- src/{ => ale}/games/supported/Klax.hpp | 2 +- src/{ => ale}/games/supported/Koolaid.cpp | 4 +- src/{ => ale}/games/supported/Koolaid.hpp | 2 +- src/{ => ale}/games/supported/Krull.cpp | 4 +- src/{ => ale}/games/supported/Krull.hpp | 2 +- .../games/supported/KungFuMaster.cpp | 4 +- .../games/supported/KungFuMaster.hpp | 2 +- src/{ => ale}/games/supported/LaserGates.cpp | 4 +- src/{ => ale}/games/supported/LaserGates.hpp | 2 +- src/{ => ale}/games/supported/LostLuggage.cpp | 4 +- src/{ => ale}/games/supported/LostLuggage.hpp | 2 +- src/{ => ale}/games/supported/MarioBros.cpp | 4 +- src/{ => ale}/games/supported/MarioBros.hpp | 2 +- .../games/supported/MiniatureGolf.cpp | 4 +- .../games/supported/MiniatureGolf.hpp | 2 +- .../games/supported/MontezumaRevenge.cpp | 4 +- .../games/supported/MontezumaRevenge.hpp | 2 +- src/{ => ale}/games/supported/MrDo.cpp | 4 +- src/{ => ale}/games/supported/MrDo.hpp | 2 +- src/{ => ale}/games/supported/MsPacman.cpp | 4 +- src/{ => ale}/games/supported/MsPacman.hpp | 2 +- .../games/supported/NameThisGame.cpp | 4 +- .../games/supported/NameThisGame.hpp | 2 +- src/{ => ale}/games/supported/Othello.cpp | 4 +- src/{ => ale}/games/supported/Othello.hpp | 2 +- src/{ => ale}/games/supported/Pacman.cpp | 4 +- src/{ => ale}/games/supported/Pacman.hpp | 2 +- src/{ => ale}/games/supported/Phoenix.cpp | 4 +- src/{ => ale}/games/supported/Phoenix.hpp | 2 +- src/{ => ale}/games/supported/Pitfall.cpp | 4 +- src/{ => ale}/games/supported/Pitfall.hpp | 2 +- src/{ => ale}/games/supported/Pitfall2.cpp | 4 +- src/{ => ale}/games/supported/Pitfall2.hpp | 2 +- src/{ => ale}/games/supported/Pong.cpp | 4 +- src/{ => ale}/games/supported/Pong.hpp | 2 +- src/{ => ale}/games/supported/Pooyan.cpp | 4 +- src/{ => ale}/games/supported/Pooyan.hpp | 2 +- src/{ => ale}/games/supported/PrivateEye.cpp | 4 +- src/{ => ale}/games/supported/PrivateEye.hpp | 2 +- src/{ => ale}/games/supported/QBert.cpp | 4 +- src/{ => ale}/games/supported/QBert.hpp | 2 +- src/{ => ale}/games/supported/RiverRaid.cpp | 4 +- src/{ => ale}/games/supported/RiverRaid.hpp | 2 +- src/{ => ale}/games/supported/RoadRunner.cpp | 4 +- src/{ => ale}/games/supported/RoadRunner.hpp | 2 +- src/{ => ale}/games/supported/RoboTank.cpp | 4 +- src/{ => ale}/games/supported/RoboTank.hpp | 2 +- src/{ => ale}/games/supported/Seaquest.cpp | 4 +- src/{ => ale}/games/supported/Seaquest.hpp | 2 +- src/{ => ale}/games/supported/SirLancelot.cpp | 4 +- src/{ => ale}/games/supported/SirLancelot.hpp | 2 +- src/{ => ale}/games/supported/Skiing.cpp | 4 +- src/{ => ale}/games/supported/Skiing.hpp | 2 +- src/{ => ale}/games/supported/Solaris.cpp | 4 +- src/{ => ale}/games/supported/Solaris.hpp | 2 +- .../games/supported/SpaceInvaders.cpp | 4 +- .../games/supported/SpaceInvaders.hpp | 2 +- src/{ => ale}/games/supported/SpaceWar.cpp | 4 +- src/{ => ale}/games/supported/SpaceWar.hpp | 2 +- src/{ => ale}/games/supported/StarGunner.cpp | 4 +- src/{ => ale}/games/supported/StarGunner.hpp | 2 +- src/{ => ale}/games/supported/Superman.cpp | 4 +- src/{ => ale}/games/supported/Superman.hpp | 2 +- src/{ => ale}/games/supported/Surround.cpp | 4 +- src/{ => ale}/games/supported/Surround.hpp | 2 +- src/{ => ale}/games/supported/Tennis.cpp | 4 +- src/{ => ale}/games/supported/Tennis.hpp | 2 +- src/{ => ale}/games/supported/Tetris.cpp | 4 +- src/{ => ale}/games/supported/Tetris.hpp | 2 +- src/{ => ale}/games/supported/TicTacToe3d.cpp | 4 +- src/{ => ale}/games/supported/TicTacToe3d.hpp | 2 +- src/{ => ale}/games/supported/TimePilot.cpp | 4 +- src/{ => ale}/games/supported/TimePilot.hpp | 2 +- src/{ => ale}/games/supported/Trondead.cpp | 4 +- src/{ => ale}/games/supported/Trondead.hpp | 2 +- src/{ => ale}/games/supported/Turmoil.cpp | 4 +- src/{ => ale}/games/supported/Turmoil.hpp | 2 +- src/{ => ale}/games/supported/Tutankham.cpp | 4 +- src/{ => ale}/games/supported/Tutankham.hpp | 2 +- src/{ => ale}/games/supported/UpNDown.cpp | 4 +- src/{ => ale}/games/supported/UpNDown.hpp | 2 +- src/{ => ale}/games/supported/Venture.cpp | 4 +- src/{ => ale}/games/supported/Venture.hpp | 2 +- .../games/supported/VideoCheckers.cpp | 4 +- .../games/supported/VideoCheckers.hpp | 2 +- src/{ => ale}/games/supported/VideoChess.cpp | 4 +- src/{ => ale}/games/supported/VideoChess.hpp | 2 +- src/{ => ale}/games/supported/VideoCube.cpp | 4 +- src/{ => ale}/games/supported/VideoCube.hpp | 2 +- .../games/supported/VideoPinball.cpp | 4 +- .../games/supported/VideoPinball.hpp | 2 +- src/{ => ale}/games/supported/WizardOfWor.cpp | 4 +- src/{ => ale}/games/supported/WizardOfWor.hpp | 2 +- src/{ => ale}/games/supported/WordZapper.cpp | 4 +- src/{ => ale}/games/supported/WordZapper.hpp | 2 +- src/{ => ale}/games/supported/YarsRevenge.cpp | 4 +- src/{ => ale}/games/supported/YarsRevenge.hpp | 2 +- src/{ => ale}/games/supported/Zaxxon.cpp | 4 +- src/{ => ale}/games/supported/Zaxxon.hpp | 2 +- src/{ => ale}/python/CMakeLists.txt | 0 src/{ => ale}/python/__init__.py | 0 src/{ => ale}/python/__init__.pyi | 0 src/{ => ale}/python/ale_python_interface.cpp | 0 src/{ => ale}/python/ale_python_interface.hpp | 2 +- src/{ => ale}/python/env.py | 0 src/{ => ale}/python/py.typed | 0 src/{ => ale}/python/registration.py | 0 src/{ => ale}/python/roms/__init__.py | 0 src/{ => ale}/python/roms/md5.json | 0 src/{ => ale}/python/roms/tetris.bin | Bin src/{ => ale}/version.hpp.in | 0 src/games/Roms.cpp | 249 ------------------ 374 files changed, 937 insertions(+), 932 deletions(-) rename src/{ => ale}/CMakeLists.txt (95%) rename src/{ => ale}/ale_interface.cpp (97%) rename src/{ => ale}/ale_interface.hpp (97%) rename src/{ => ale}/common/CMakeLists.txt (100%) rename src/{ => ale}/common/ColourPalette.cpp (98%) rename src/{ => ale}/common/ColourPalette.hpp (100%) rename src/{ => ale}/common/Constants.cpp (98%) rename src/{ => ale}/common/Constants.h (100%) rename src/{ => ale}/common/DynamicLoad.cpp (97%) rename src/{ => ale}/common/DynamicLoad.hpp (100%) rename src/{ => ale}/common/Log.cpp (91%) rename src/{ => ale}/common/Log.hpp (100%) rename src/{ => ale}/common/Palettes.hpp (100%) rename src/{ => ale}/common/SDL2.cpp (99%) rename src/{ => ale}/common/SDL2.hpp (99%) rename src/{ => ale}/common/ScreenExporter.cpp (98%) rename src/{ => ale}/common/ScreenExporter.hpp (94%) rename src/{ => ale}/common/ScreenSDL.cpp (98%) rename src/{ => ale}/common/ScreenSDL.hpp (89%) rename src/{ => ale}/common/SoundExporter.cpp (98%) rename src/{ => ale}/common/SoundExporter.hpp (100%) rename src/{ => ale}/common/SoundNull.cxx (92%) rename src/{ => ale}/common/SoundNull.hxx (99%) rename src/{ => ale}/common/SoundSDL.cxx (98%) rename src/{ => ale}/common/SoundSDL.hxx (97%) rename src/{ => ale}/emucore/CMakeLists.txt (100%) rename src/{ => ale}/emucore/Cart.cxx (93%) rename src/{ => ale}/emucore/Cart.hxx (99%) rename src/{ => ale}/emucore/Cart0840.cxx (94%) rename src/{ => ale}/emucore/Cart0840.hxx (99%) rename src/{ => ale}/emucore/Cart2K.cxx (96%) rename src/{ => ale}/emucore/Cart2K.hxx (99%) rename src/{ => ale}/emucore/Cart3E.cxx (97%) rename src/{ => ale}/emucore/Cart3E.hxx (99%) rename src/{ => ale}/emucore/Cart3F.cxx (97%) rename src/{ => ale}/emucore/Cart3F.hxx (99%) rename src/{ => ale}/emucore/Cart4A50.cxx (94%) rename src/{ => ale}/emucore/Cart4A50.hxx (99%) rename src/{ => ale}/emucore/Cart4K.cxx (96%) rename src/{ => ale}/emucore/Cart4K.hxx (99%) rename src/{ => ale}/emucore/CartAR.cxx (98%) rename src/{ => ale}/emucore/CartAR.hxx (99%) rename src/{ => ale}/emucore/CartCV.cxx (97%) rename src/{ => ale}/emucore/CartCV.hxx (99%) rename src/{ => ale}/emucore/CartDPC.cxx (99%) rename src/{ => ale}/emucore/CartDPC.hxx (99%) rename src/{ => ale}/emucore/CartE0.cxx (98%) rename src/{ => ale}/emucore/CartE0.hxx (99%) rename src/{ => ale}/emucore/CartE7.cxx (98%) rename src/{ => ale}/emucore/CartE7.hxx (99%) rename src/{ => ale}/emucore/CartF4.cxx (97%) rename src/{ => ale}/emucore/CartF4.hxx (99%) rename src/{ => ale}/emucore/CartF4SC.cxx (97%) rename src/{ => ale}/emucore/CartF4SC.hxx (99%) rename src/{ => ale}/emucore/CartF6.cxx (97%) rename src/{ => ale}/emucore/CartF6.hxx (99%) rename src/{ => ale}/emucore/CartF6SC.cxx (97%) rename src/{ => ale}/emucore/CartF6SC.hxx (99%) rename src/{ => ale}/emucore/CartF8.cxx (97%) rename src/{ => ale}/emucore/CartF8.hxx (99%) rename src/{ => ale}/emucore/CartF8SC.cxx (97%) rename src/{ => ale}/emucore/CartF8SC.hxx (99%) rename src/{ => ale}/emucore/CartFASC.cxx (97%) rename src/{ => ale}/emucore/CartFASC.hxx (99%) rename src/{ => ale}/emucore/CartFE.cxx (96%) rename src/{ => ale}/emucore/CartFE.hxx (99%) rename src/{ => ale}/emucore/CartMB.cxx (97%) rename src/{ => ale}/emucore/CartMB.hxx (99%) rename src/{ => ale}/emucore/CartMC.cxx (98%) rename src/{ => ale}/emucore/CartMC.hxx (99%) rename src/{ => ale}/emucore/CartUA.cxx (97%) rename src/{ => ale}/emucore/CartUA.hxx (98%) rename src/{ => ale}/emucore/Console.cxx (90%) rename src/{ => ale}/emucore/Console.hxx (97%) rename src/{ => ale}/emucore/Control.cxx (98%) rename src/{ => ale}/emucore/Control.hxx (100%) rename src/{ => ale}/emucore/DefProps.hxx (100%) rename src/{ => ale}/emucore/Deserializer.cxx (98%) rename src/{ => ale}/emucore/Deserializer.hxx (100%) rename src/{ => ale}/emucore/Device.cxx (97%) rename src/{ => ale}/emucore/Device.hxx (100%) rename src/{ => ale}/emucore/Event.cxx (98%) rename src/{ => ale}/emucore/Event.hxx (100%) rename src/{ => ale}/emucore/Joystick.cxx (97%) rename src/{ => ale}/emucore/Joystick.hxx (98%) rename src/{ => ale}/emucore/M6502.cxx (99%) rename src/{ => ale}/emucore/M6502.hxx (99%) rename src/{ => ale}/emucore/M6502.m4 (100%) rename src/{ => ale}/emucore/M6502Hi.cxx (97%) rename src/{ => ale}/emucore/M6502Hi.hxx (99%) rename src/{ => ale}/emucore/M6502Hi.ins (100%) rename src/{ => ale}/emucore/M6502Hi.m4 (100%) rename src/{ => ale}/emucore/M6502Low.cxx (98%) rename src/{ => ale}/emucore/M6502Low.hxx (99%) rename src/{ => ale}/emucore/M6502Low.ins (100%) rename src/{ => ale}/emucore/M6502Low.m4 (100%) rename src/{ => ale}/emucore/M6532.cxx (97%) rename src/{ => ale}/emucore/M6532.hxx (98%) rename src/{ => ale}/emucore/MD5.cxx (99%) rename src/{ => ale}/emucore/MD5.hxx (100%) rename src/{ => ale}/emucore/MediaSrc.cxx (97%) rename src/{ => ale}/emucore/MediaSrc.hxx (100%) rename src/{ => ale}/emucore/NullDev.cxx (95%) rename src/{ => ale}/emucore/NullDev.hxx (98%) rename src/{ => ale}/emucore/OSystem.cxx (96%) rename src/{ => ale}/emucore/OSystem.hxx (95%) rename src/{ => ale}/emucore/Paddles.cxx (97%) rename src/{ => ale}/emucore/Paddles.hxx (97%) rename src/{ => ale}/emucore/Props.cxx (99%) rename src/{ => ale}/emucore/Props.hxx (100%) rename src/{ => ale}/emucore/PropsSet.cxx (98%) rename src/{ => ale}/emucore/PropsSet.hxx (100%) rename src/{ => ale}/emucore/Random.cxx (96%) rename src/{ => ale}/emucore/Random.hxx (100%) rename src/{ => ale}/emucore/Screen.hxx (100%) rename src/{ => ale}/emucore/Serializer.cxx (98%) rename src/{ => ale}/emucore/Serializer.hxx (100%) rename src/{ => ale}/emucore/Settings.cxx (99%) rename src/{ => ale}/emucore/Settings.hxx (100%) rename src/{ => ale}/emucore/Sound.hxx (100%) rename src/{ => ale}/emucore/Switches.cxx (95%) rename src/{ => ale}/emucore/Switches.hxx (100%) rename src/{ => ale}/emucore/System.cxx (96%) rename src/{ => ale}/emucore/System.hxx (99%) rename src/{ => ale}/emucore/TIA.cxx (99%) rename src/{ => ale}/emucore/TIA.hxx (99%) rename src/{ => ale}/emucore/TIASnd.cxx (99%) rename src/{ => ale}/emucore/TIASnd.hxx (100%) rename src/{ => ale}/emucore/stella.pro (100%) rename src/{ => ale}/environment/CMakeLists.txt (100%) rename src/{ => ale}/environment/ale_ram.hpp (100%) rename src/{ => ale}/environment/ale_screen.hpp (100%) rename src/{ => ale}/environment/ale_state.cpp (98%) rename src/{ => ale}/environment/ale_state.hpp (97%) rename src/{ => ale}/environment/phosphor_blend.cpp (97%) rename src/{ => ale}/environment/phosphor_blend.hpp (94%) rename src/{ => ale}/environment/stella_environment.cpp (99%) rename src/{ => ale}/environment/stella_environment.hpp (93%) rename src/{ => ale}/environment/stella_environment_wrapper.cpp (88%) rename src/{ => ale}/environment/stella_environment_wrapper.hpp (95%) rename src/{ => ale}/games/CMakeLists.txt (100%) rename src/{ => ale}/games/RomSettings.cpp (98%) rename src/{ => ale}/games/RomSettings.hpp (95%) rename src/{ => ale}/games/RomUtils.cpp (98%) rename src/{ => ale}/games/RomUtils.hpp (100%) create mode 100644 src/ale/games/Roms.cpp rename src/{ => ale}/games/Roms.hpp (95%) rename src/{ => ale}/games/supported/Adventure.cpp (98%) rename src/{ => ale}/games/supported/Adventure.hpp (98%) rename src/{ => ale}/games/supported/AirRaid.cpp (97%) rename src/{ => ale}/games/supported/AirRaid.hpp (98%) rename src/{ => ale}/games/supported/Alien.cpp (98%) rename src/{ => ale}/games/supported/Alien.hpp (98%) rename src/{ => ale}/games/supported/Amidar.cpp (97%) rename src/{ => ale}/games/supported/Amidar.hpp (98%) rename src/{ => ale}/games/supported/Assault.cpp (97%) rename src/{ => ale}/games/supported/Assault.hpp (98%) rename src/{ => ale}/games/supported/Asterix.cpp (97%) rename src/{ => ale}/games/supported/Asterix.hpp (98%) rename src/{ => ale}/games/supported/Asteroids.cpp (98%) rename src/{ => ale}/games/supported/Asteroids.hpp (98%) rename src/{ => ale}/games/supported/Atlantis.cpp (98%) rename src/{ => ale}/games/supported/Atlantis.hpp (98%) rename src/{ => ale}/games/supported/Atlantis2.cpp (97%) rename src/{ => ale}/games/supported/Atlantis2.hpp (98%) rename src/{ => ale}/games/supported/Backgammon.cpp (98%) rename src/{ => ale}/games/supported/Backgammon.hpp (98%) rename src/{ => ale}/games/supported/BankHeist.cpp (98%) rename src/{ => ale}/games/supported/BankHeist.hpp (98%) rename src/{ => ale}/games/supported/BasicMath.cpp (97%) rename src/{ => ale}/games/supported/BasicMath.hpp (98%) rename src/{ => ale}/games/supported/BattleZone.cpp (98%) rename src/{ => ale}/games/supported/BattleZone.hpp (98%) rename src/{ => ale}/games/supported/BeamRider.cpp (97%) rename src/{ => ale}/games/supported/BeamRider.hpp (98%) rename src/{ => ale}/games/supported/Berzerk.cpp (98%) rename src/{ => ale}/games/supported/Berzerk.hpp (98%) rename src/{ => ale}/games/supported/Blackjack.cpp (97%) rename src/{ => ale}/games/supported/Blackjack.hpp (98%) rename src/{ => ale}/games/supported/Bowling.cpp (97%) rename src/{ => ale}/games/supported/Bowling.hpp (98%) rename src/{ => ale}/games/supported/Boxing.cpp (97%) rename src/{ => ale}/games/supported/Boxing.hpp (98%) rename src/{ => ale}/games/supported/Breakout.cpp (98%) rename src/{ => ale}/games/supported/Breakout.hpp (98%) rename src/{ => ale}/games/supported/CMakeLists.txt (100%) rename src/{ => ale}/games/supported/Carnival.cpp (96%) rename src/{ => ale}/games/supported/Carnival.hpp (98%) rename src/{ => ale}/games/supported/Casino.cpp (98%) rename src/{ => ale}/games/supported/Casino.hpp (98%) rename src/{ => ale}/games/supported/Centipede.cpp (98%) rename src/{ => ale}/games/supported/Centipede.hpp (98%) rename src/{ => ale}/games/supported/ChopperCommand.cpp (98%) rename src/{ => ale}/games/supported/ChopperCommand.hpp (98%) rename src/{ => ale}/games/supported/CrazyClimber.cpp (98%) rename src/{ => ale}/games/supported/CrazyClimber.hpp (98%) rename src/{ => ale}/games/supported/Crossbow.cpp (98%) rename src/{ => ale}/games/supported/Crossbow.hpp (98%) rename src/{ => ale}/games/supported/DarkChambers.cpp (98%) rename src/{ => ale}/games/supported/DarkChambers.hpp (98%) rename src/{ => ale}/games/supported/Defender.cpp (98%) rename src/{ => ale}/games/supported/Defender.hpp (98%) rename src/{ => ale}/games/supported/DemonAttack.cpp (98%) rename src/{ => ale}/games/supported/DemonAttack.hpp (98%) rename src/{ => ale}/games/supported/DonkeyKong.cpp (97%) rename src/{ => ale}/games/supported/DonkeyKong.hpp (98%) rename src/{ => ale}/games/supported/DoubleDunk.cpp (98%) rename src/{ => ale}/games/supported/DoubleDunk.hpp (99%) rename src/{ => ale}/games/supported/Earthworld.cpp (97%) rename src/{ => ale}/games/supported/Earthworld.hpp (98%) rename src/{ => ale}/games/supported/ElevatorAction.cpp (97%) rename src/{ => ale}/games/supported/ElevatorAction.hpp (98%) rename src/{ => ale}/games/supported/Enduro.cpp (97%) rename src/{ => ale}/games/supported/Enduro.hpp (98%) rename src/{ => ale}/games/supported/Entombed.cpp (97%) rename src/{ => ale}/games/supported/Entombed.hpp (98%) rename src/{ => ale}/games/supported/Et.cpp (98%) rename src/{ => ale}/games/supported/Et.hpp (98%) rename src/{ => ale}/games/supported/FishingDerby.cpp (97%) rename src/{ => ale}/games/supported/FishingDerby.hpp (98%) rename src/{ => ale}/games/supported/FlagCapture.cpp (97%) rename src/{ => ale}/games/supported/FlagCapture.hpp (98%) rename src/{ => ale}/games/supported/Freeway.cpp (97%) rename src/{ => ale}/games/supported/Freeway.hpp (97%) rename src/{ => ale}/games/supported/Frogger.cpp (97%) rename src/{ => ale}/games/supported/Frogger.hpp (98%) rename src/{ => ale}/games/supported/Frostbite.cpp (98%) rename src/{ => ale}/games/supported/Frostbite.hpp (98%) rename src/{ => ale}/games/supported/Galaxian.cpp (98%) rename src/{ => ale}/games/supported/Galaxian.hpp (98%) rename src/{ => ale}/games/supported/Gopher.cpp (98%) rename src/{ => ale}/games/supported/Gopher.hpp (98%) rename src/{ => ale}/games/supported/Gravitar.cpp (98%) rename src/{ => ale}/games/supported/Gravitar.hpp (98%) rename src/{ => ale}/games/supported/Hangman.cpp (99%) rename src/{ => ale}/games/supported/Hangman.hpp (98%) rename src/{ => ale}/games/supported/HauntedHouse.cpp (98%) rename src/{ => ale}/games/supported/HauntedHouse.hpp (98%) rename src/{ => ale}/games/supported/Hero.cpp (98%) rename src/{ => ale}/games/supported/Hero.hpp (98%) rename src/{ => ale}/games/supported/HumanCannonball.cpp (98%) rename src/{ => ale}/games/supported/HumanCannonball.hpp (98%) rename src/{ => ale}/games/supported/IceHockey.cpp (97%) rename src/{ => ale}/games/supported/IceHockey.hpp (98%) rename src/{ => ale}/games/supported/JamesBond.cpp (98%) rename src/{ => ale}/games/supported/JamesBond.hpp (98%) rename src/{ => ale}/games/supported/JourneyEscape.cpp (97%) rename src/{ => ale}/games/supported/JourneyEscape.hpp (98%) rename src/{ => ale}/games/supported/Kaboom.cpp (96%) rename src/{ => ale}/games/supported/Kaboom.hpp (97%) rename src/{ => ale}/games/supported/Kangaroo.cpp (98%) rename src/{ => ale}/games/supported/Kangaroo.hpp (98%) rename src/{ => ale}/games/supported/KeystoneKapers.cpp (96%) rename src/{ => ale}/games/supported/KeystoneKapers.hpp (98%) rename src/{ => ale}/games/supported/Kingkong.cpp (98%) rename src/{ => ale}/games/supported/Kingkong.hpp (98%) rename src/{ => ale}/games/supported/Klax.cpp (98%) rename src/{ => ale}/games/supported/Klax.hpp (98%) rename src/{ => ale}/games/supported/Koolaid.cpp (96%) rename src/{ => ale}/games/supported/Koolaid.hpp (97%) rename src/{ => ale}/games/supported/Krull.cpp (97%) rename src/{ => ale}/games/supported/Krull.hpp (98%) rename src/{ => ale}/games/supported/KungFuMaster.cpp (97%) rename src/{ => ale}/games/supported/KungFuMaster.hpp (98%) rename src/{ => ale}/games/supported/LaserGates.cpp (96%) rename src/{ => ale}/games/supported/LaserGates.hpp (98%) rename src/{ => ale}/games/supported/LostLuggage.cpp (98%) rename src/{ => ale}/games/supported/LostLuggage.hpp (98%) rename src/{ => ale}/games/supported/MarioBros.cpp (98%) rename src/{ => ale}/games/supported/MarioBros.hpp (98%) rename src/{ => ale}/games/supported/MiniatureGolf.cpp (98%) rename src/{ => ale}/games/supported/MiniatureGolf.hpp (98%) rename src/{ => ale}/games/supported/MontezumaRevenge.cpp (97%) rename src/{ => ale}/games/supported/MontezumaRevenge.hpp (98%) rename src/{ => ale}/games/supported/MrDo.cpp (97%) rename src/{ => ale}/games/supported/MrDo.hpp (98%) rename src/{ => ale}/games/supported/MsPacman.cpp (98%) rename src/{ => ale}/games/supported/MsPacman.hpp (98%) rename src/{ => ale}/games/supported/NameThisGame.cpp (97%) rename src/{ => ale}/games/supported/NameThisGame.hpp (98%) rename src/{ => ale}/games/supported/Othello.cpp (98%) rename src/{ => ale}/games/supported/Othello.hpp (98%) rename src/{ => ale}/games/supported/Pacman.cpp (98%) rename src/{ => ale}/games/supported/Pacman.hpp (98%) rename src/{ => ale}/games/supported/Phoenix.cpp (97%) rename src/{ => ale}/games/supported/Phoenix.hpp (98%) rename src/{ => ale}/games/supported/Pitfall.cpp (97%) rename src/{ => ale}/games/supported/Pitfall.hpp (98%) rename src/{ => ale}/games/supported/Pitfall2.cpp (98%) rename src/{ => ale}/games/supported/Pitfall2.hpp (98%) rename src/{ => ale}/games/supported/Pong.cpp (97%) rename src/{ => ale}/games/supported/Pong.hpp (98%) rename src/{ => ale}/games/supported/Pooyan.cpp (98%) rename src/{ => ale}/games/supported/Pooyan.hpp (98%) rename src/{ => ale}/games/supported/PrivateEye.cpp (97%) rename src/{ => ale}/games/supported/PrivateEye.hpp (98%) rename src/{ => ale}/games/supported/QBert.cpp (98%) rename src/{ => ale}/games/supported/QBert.hpp (98%) rename src/{ => ale}/games/supported/RiverRaid.cpp (98%) rename src/{ => ale}/games/supported/RiverRaid.hpp (98%) rename src/{ => ale}/games/supported/RoadRunner.cpp (97%) rename src/{ => ale}/games/supported/RoadRunner.hpp (98%) rename src/{ => ale}/games/supported/RoboTank.cpp (97%) rename src/{ => ale}/games/supported/RoboTank.hpp (98%) rename src/{ => ale}/games/supported/Seaquest.cpp (97%) rename src/{ => ale}/games/supported/Seaquest.hpp (98%) rename src/{ => ale}/games/supported/SirLancelot.cpp (96%) rename src/{ => ale}/games/supported/SirLancelot.hpp (98%) rename src/{ => ale}/games/supported/Skiing.cpp (97%) rename src/{ => ale}/games/supported/Skiing.hpp (98%) rename src/{ => ale}/games/supported/Solaris.cpp (97%) rename src/{ => ale}/games/supported/Solaris.hpp (98%) rename src/{ => ale}/games/supported/SpaceInvaders.cpp (98%) rename src/{ => ale}/games/supported/SpaceInvaders.hpp (98%) rename src/{ => ale}/games/supported/SpaceWar.cpp (98%) rename src/{ => ale}/games/supported/SpaceWar.hpp (98%) rename src/{ => ale}/games/supported/StarGunner.cpp (98%) rename src/{ => ale}/games/supported/StarGunner.hpp (98%) rename src/{ => ale}/games/supported/Superman.cpp (97%) rename src/{ => ale}/games/supported/Superman.hpp (98%) rename src/{ => ale}/games/supported/Surround.cpp (98%) rename src/{ => ale}/games/supported/Surround.hpp (98%) rename src/{ => ale}/games/supported/Tennis.cpp (98%) rename src/{ => ale}/games/supported/Tennis.hpp (98%) rename src/{ => ale}/games/supported/Tetris.cpp (97%) rename src/{ => ale}/games/supported/Tetris.hpp (98%) rename src/{ => ale}/games/supported/TicTacToe3d.cpp (98%) rename src/{ => ale}/games/supported/TicTacToe3d.hpp (98%) rename src/{ => ale}/games/supported/TimePilot.cpp (97%) rename src/{ => ale}/games/supported/TimePilot.hpp (98%) rename src/{ => ale}/games/supported/Trondead.cpp (97%) rename src/{ => ale}/games/supported/Trondead.hpp (98%) rename src/{ => ale}/games/supported/Turmoil.cpp (97%) rename src/{ => ale}/games/supported/Turmoil.hpp (98%) rename src/{ => ale}/games/supported/Tutankham.cpp (98%) rename src/{ => ale}/games/supported/Tutankham.hpp (98%) rename src/{ => ale}/games/supported/UpNDown.cpp (97%) rename src/{ => ale}/games/supported/UpNDown.hpp (98%) rename src/{ => ale}/games/supported/Venture.cpp (97%) rename src/{ => ale}/games/supported/Venture.hpp (98%) rename src/{ => ale}/games/supported/VideoCheckers.cpp (98%) rename src/{ => ale}/games/supported/VideoCheckers.hpp (98%) rename src/{ => ale}/games/supported/VideoChess.cpp (98%) rename src/{ => ale}/games/supported/VideoChess.hpp (98%) rename src/{ => ale}/games/supported/VideoCube.cpp (99%) rename src/{ => ale}/games/supported/VideoCube.hpp (98%) rename src/{ => ale}/games/supported/VideoPinball.cpp (98%) rename src/{ => ale}/games/supported/VideoPinball.hpp (98%) rename src/{ => ale}/games/supported/WizardOfWor.cpp (97%) rename src/{ => ale}/games/supported/WizardOfWor.hpp (98%) rename src/{ => ale}/games/supported/WordZapper.cpp (98%) rename src/{ => ale}/games/supported/WordZapper.hpp (98%) rename src/{ => ale}/games/supported/YarsRevenge.cpp (98%) rename src/{ => ale}/games/supported/YarsRevenge.hpp (98%) rename src/{ => ale}/games/supported/Zaxxon.cpp (98%) rename src/{ => ale}/games/supported/Zaxxon.hpp (98%) rename src/{ => ale}/python/CMakeLists.txt (100%) rename src/{ => ale}/python/__init__.py (100%) rename src/{ => ale}/python/__init__.pyi (100%) rename src/{ => ale}/python/ale_python_interface.cpp (100%) rename src/{ => ale}/python/ale_python_interface.hpp (99%) rename src/{ => ale}/python/env.py (100%) rename src/{ => ale}/python/py.typed (100%) rename src/{ => ale}/python/registration.py (100%) rename src/{ => ale}/python/roms/__init__.py (100%) rename src/{ => ale}/python/roms/md5.json (100%) rename src/{ => ale}/python/roms/tetris.bin (100%) rename src/{ => ale}/version.hpp.in (100%) delete mode 100644 src/games/Roms.cpp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4abac4cec..4cfe03b1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,6 +202,7 @@ jobs: needs: [build-wheels, build-scratch] strategy: + fail-fast: false matrix: include: # example wheel names (if the wheel names change, look at the `ls wheels/` for the new names) diff --git a/.gitignore b/.gitignore index a7d15b73c..bfa77a1eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ ## ALE -ale build doc/examples/*Example + # Don't save roms in repo *.tar.gz.b64 *.tar.gz @@ -164,3 +164,7 @@ cython_debug/ # Docs /docs/_build/ + +# CLion project settings and build-folders +cmake-build-* +.idea diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b2032e58..5ccf632a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ project(ale VERSION ${ALE_DEFAULT_VERSION} LANGUAGES CXX) # Main ALE src directory -add_subdirectory(src) +add_subdirectory(src/ale) # Only include tests in the main project if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) diff --git a/pyproject.toml b/pyproject.toml index 250e26901..75cff00ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", ] dependencies = [ - "numpy", + "numpy<2.0", "importlib-metadata>=4.10.0; python_version < '3.10'", "importlib-resources; python_version < '3.9'", "typing-extensions; python_version < '3.11'" @@ -60,7 +60,7 @@ packages = [ "ale_py", "ale_py.roms", ] -package-dir = {ale_py = "src/python"} +package-dir = {ale_py = "src/ale/python"} package-data = {"ale_py" = ["py.typed", "*.pyi", "**/*.pyi"], "ale_py.roms" = ["md5.json", "*.bin"]} [tool.pytest.ini_options] diff --git a/scripts/download_unpack_roms.sh b/scripts/download_unpack_roms.sh index 71070c9ec..88fb9da0f 100755 --- a/scripts/download_unpack_roms.sh +++ b/scripts/download_unpack_roms.sh @@ -3,7 +3,7 @@ # define some directories base_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)/.." unpack_dir="${base_dir}/unpack_dir" -target_dir="${base_dir}/src/python/roms" +target_dir="${base_dir}/src/ale/python/roms" # make the directory where we will do the unpacking mkdir $unpack_dir diff --git a/src/CMakeLists.txt b/src/ale/CMakeLists.txt similarity index 95% rename from src/CMakeLists.txt rename to src/ale/CMakeLists.txt index b7bac3906..af7b8b83e 100644 --- a/src/CMakeLists.txt +++ b/src/ale/CMakeLists.txt @@ -1,5 +1,5 @@ # Include src/ and cmake binary directory (for version.hpp) -include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}) # Project specific target properties set(CMAKE_CXX_STANDARD 17) @@ -102,7 +102,7 @@ if (UNIX AND BUILD_CPP_LIB) # Configure installable cmake config configure_package_config_file( - ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/${PROJECT_NAME}-config.cmake.in + ${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in ${PROJECT_NAME}-config.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) diff --git a/src/ale_interface.cpp b/src/ale/ale_interface.cpp similarity index 97% rename from src/ale_interface.cpp rename to src/ale/ale_interface.cpp index 9799bd67f..6f4f5624a 100644 --- a/src/ale_interface.cpp +++ b/src/ale/ale_interface.cpp @@ -28,7 +28,7 @@ * The shared library interface. **************************************************************************** */ -#include "ale_interface.hpp" +#include "ale/ale_interface.hpp" #include #include @@ -44,13 +44,13 @@ #include #include -#include "common/ColourPalette.hpp" -#include "common/Constants.h" -#include "emucore/Console.hxx" -#include "emucore/Props.hxx" -#include "emucore/MD5.hxx" -#include "environment/ale_screen.hpp" -#include "games/RomSettings.hpp" +#include "ale/common/ColourPalette.hpp" +#include "ale/common/Constants.h" +#include "ale/emucore/Console.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/MD5.hxx" +#include "ale/environment/ale_screen.hpp" +#include "ale/games/RomSettings.hpp" namespace fs = std::filesystem; diff --git a/src/ale_interface.hpp b/src/ale/ale_interface.hpp similarity index 97% rename from src/ale_interface.hpp rename to src/ale/ale_interface.hpp index f7b4d3f1c..17e6b8e93 100644 --- a/src/ale_interface.hpp +++ b/src/ale/ale_interface.hpp @@ -31,11 +31,11 @@ #ifndef __ALE_INTERFACE_HPP__ #define __ALE_INTERFACE_HPP__ -#include "emucore/OSystem.hxx" -#include "games/Roms.hpp" -#include "environment/stella_environment.hpp" -#include "common/ScreenExporter.hpp" -#include "common/Log.hpp" +#include "ale/emucore/OSystem.hxx" +#include "ale/games/Roms.hpp" +#include "ale/environment/stella_environment.hpp" +#include "ale/common/ScreenExporter.hpp" +#include "ale/common/Log.hpp" #include "version.hpp" #include diff --git a/src/common/CMakeLists.txt b/src/ale/common/CMakeLists.txt similarity index 100% rename from src/common/CMakeLists.txt rename to src/ale/common/CMakeLists.txt diff --git a/src/common/ColourPalette.cpp b/src/ale/common/ColourPalette.cpp similarity index 98% rename from src/common/ColourPalette.cpp rename to src/ale/common/ColourPalette.cpp index 11eb69b7f..f7bd8dab3 100644 --- a/src/common/ColourPalette.cpp +++ b/src/ale/common/ColourPalette.cpp @@ -13,7 +13,7 @@ * Enables conversion from NTSC/SECAM/PAL to RGB via the OSystem's palette. **************************************************************************** */ -#include "common/ColourPalette.hpp" +#include "ale/common/ColourPalette.hpp" #include #include @@ -23,7 +23,7 @@ #include #include -#include "common/Palettes.hpp" +#include "ale/common/Palettes.hpp" namespace ale { namespace { diff --git a/src/common/ColourPalette.hpp b/src/ale/common/ColourPalette.hpp similarity index 100% rename from src/common/ColourPalette.hpp rename to src/ale/common/ColourPalette.hpp diff --git a/src/common/Constants.cpp b/src/ale/common/Constants.cpp similarity index 98% rename from src/common/Constants.cpp rename to src/ale/common/Constants.cpp index 927c054b8..0566bffb7 100644 --- a/src/common/Constants.cpp +++ b/src/ale/common/Constants.cpp @@ -13,7 +13,7 @@ * **************************************************************************** */ -#include "common/Constants.h" +#include "ale/common/Constants.h" #include #include diff --git a/src/common/Constants.h b/src/ale/common/Constants.h similarity index 100% rename from src/common/Constants.h rename to src/ale/common/Constants.h diff --git a/src/common/DynamicLoad.cpp b/src/ale/common/DynamicLoad.cpp similarity index 97% rename from src/common/DynamicLoad.cpp rename to src/ale/common/DynamicLoad.cpp index d7784f8db..202d021ce 100644 --- a/src/common/DynamicLoad.cpp +++ b/src/ale/common/DynamicLoad.cpp @@ -12,7 +12,7 @@ * * Helper functions to manage dynamic loading libraries. **************************************************************************** */ -#include "common/DynamicLoad.hpp" +#include "ale/common/DynamicLoad.hpp" #if defined(WIN32) #include diff --git a/src/common/DynamicLoad.hpp b/src/ale/common/DynamicLoad.hpp similarity index 100% rename from src/common/DynamicLoad.hpp rename to src/ale/common/DynamicLoad.hpp diff --git a/src/common/Log.cpp b/src/ale/common/Log.cpp similarity index 91% rename from src/common/Log.cpp rename to src/ale/common/Log.cpp index e313e2824..75f67eff9 100644 --- a/src/common/Log.cpp +++ b/src/ale/common/Log.cpp @@ -1,4 +1,4 @@ -#include "common/Log.hpp" +#include "ale/common/Log.hpp" #include diff --git a/src/common/Log.hpp b/src/ale/common/Log.hpp similarity index 100% rename from src/common/Log.hpp rename to src/ale/common/Log.hpp diff --git a/src/common/Palettes.hpp b/src/ale/common/Palettes.hpp similarity index 100% rename from src/common/Palettes.hpp rename to src/ale/common/Palettes.hpp diff --git a/src/common/SDL2.cpp b/src/ale/common/SDL2.cpp similarity index 99% rename from src/common/SDL2.cpp rename to src/ale/common/SDL2.cpp index e3880aa9c..1f494b37b 100644 --- a/src/common/SDL2.cpp +++ b/src/ale/common/SDL2.cpp @@ -22,7 +22,7 @@ * manual definition is more clear. */ #ifdef SDL_DYNLOAD -#include "common/SDL2.hpp" +#include "ale/common/SDL2.hpp" namespace ale { diff --git a/src/common/SDL2.hpp b/src/ale/common/SDL2.hpp similarity index 99% rename from src/common/SDL2.hpp rename to src/ale/common/SDL2.hpp index 77075063c..df1b56d1f 100644 --- a/src/common/SDL2.hpp +++ b/src/ale/common/SDL2.hpp @@ -24,7 +24,7 @@ // define some macros to shim the SDL functions // we use in the ALE. #ifdef SDL_DYNLOAD - #include "common/DynamicLoad.hpp" + #include "ale/common/DynamicLoad.hpp" // Try the default dynamic library name per platform // if SDL2_LIBRARY_NAME is not defined. diff --git a/src/common/ScreenExporter.cpp b/src/ale/common/ScreenExporter.cpp similarity index 98% rename from src/common/ScreenExporter.cpp rename to src/ale/common/ScreenExporter.cpp index 1d4a2c8e4..5d16f4c14 100644 --- a/src/common/ScreenExporter.cpp +++ b/src/ale/common/ScreenExporter.cpp @@ -14,7 +14,7 @@ * **************************************************************************** */ -#include "common/ScreenExporter.hpp" +#include "ale/common/ScreenExporter.hpp" #include #include @@ -24,7 +24,7 @@ #include #include -#include "common/Log.hpp" +#include "ale/common/Log.hpp" namespace ale { diff --git a/src/common/ScreenExporter.hpp b/src/ale/common/ScreenExporter.hpp similarity index 94% rename from src/common/ScreenExporter.hpp rename to src/ale/common/ScreenExporter.hpp index e925dc3a1..2ee98bfdb 100644 --- a/src/common/ScreenExporter.hpp +++ b/src/ale/common/ScreenExporter.hpp @@ -19,9 +19,9 @@ #include -#include "common/Constants.h" -#include "common/ColourPalette.hpp" -#include "environment/ale_screen.hpp" +#include "ale/common/Constants.h" +#include "ale/common/ColourPalette.hpp" +#include "ale/environment/ale_screen.hpp" namespace ale { diff --git a/src/common/ScreenSDL.cpp b/src/ale/common/ScreenSDL.cpp similarity index 98% rename from src/common/ScreenSDL.cpp rename to src/ale/common/ScreenSDL.cpp index ee618ca57..7357b53f7 100644 --- a/src/common/ScreenSDL.cpp +++ b/src/ale/common/ScreenSDL.cpp @@ -14,10 +14,10 @@ * Supports displaying the screen via SDL. **************************************************************************** */ #ifdef SDL_SUPPORT -#include "common/SDL2.hpp" +#include "ale/common/SDL2.hpp" -#include "common/ScreenSDL.hpp" -#include "common/Log.hpp" +#include "ale/common/ScreenSDL.hpp" +#include "ale/common/Log.hpp" #include diff --git a/src/common/ScreenSDL.hpp b/src/ale/common/ScreenSDL.hpp similarity index 89% rename from src/common/ScreenSDL.hpp rename to src/ale/common/ScreenSDL.hpp index baed6e2b7..ecc02a726 100644 --- a/src/common/ScreenSDL.hpp +++ b/src/ale/common/ScreenSDL.hpp @@ -19,12 +19,12 @@ #ifdef SDL_SUPPORT -#include "common/Constants.h" -#include "common/ColourPalette.hpp" -#include "emucore/Screen.hxx" -#include "emucore/OSystem.hxx" -#include "emucore/MediaSrc.hxx" -#include "common/SDL2.hpp" +#include "ale/common/Constants.h" +#include "ale/common/ColourPalette.hpp" +#include "ale/emucore/Screen.hxx" +#include "ale/emucore/OSystem.hxx" +#include "ale/emucore/MediaSrc.hxx" +#include "ale/common/SDL2.hpp" namespace ale { diff --git a/src/common/SoundExporter.cpp b/src/ale/common/SoundExporter.cpp similarity index 98% rename from src/common/SoundExporter.cpp rename to src/ale/common/SoundExporter.cpp index 33183cea7..32319f3bb 100644 --- a/src/common/SoundExporter.cpp +++ b/src/ale/common/SoundExporter.cpp @@ -1,4 +1,4 @@ -#include "common/SoundExporter.hpp" +#include "ale/common/SoundExporter.hpp" #include diff --git a/src/common/SoundExporter.hpp b/src/ale/common/SoundExporter.hpp similarity index 100% rename from src/common/SoundExporter.hpp rename to src/ale/common/SoundExporter.hpp diff --git a/src/common/SoundNull.cxx b/src/ale/common/SoundNull.cxx similarity index 92% rename from src/common/SoundNull.cxx rename to src/ale/common/SoundNull.cxx index d9a5ae579..e50dabf16 100644 --- a/src/common/SoundNull.cxx +++ b/src/ale/common/SoundNull.cxx @@ -16,12 +16,12 @@ // $Id: SoundNull.cxx,v 1.6 2007/01/01 18:04:40 stephena Exp $ //============================================================================ -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" -#include "emucore/Settings.hxx" -#include "common/SoundNull.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/common/SoundNull.hxx" namespace ale { using namespace stella; // Settings, Serializer, Deserializer diff --git a/src/common/SoundNull.hxx b/src/ale/common/SoundNull.hxx similarity index 99% rename from src/common/SoundNull.hxx rename to src/ale/common/SoundNull.hxx index aceb66916..06da56393 100644 --- a/src/common/SoundNull.hxx +++ b/src/ale/common/SoundNull.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Sound.hxx" +#include "ale/emucore/Sound.hxx" namespace ale { diff --git a/src/common/SoundSDL.cxx b/src/ale/common/SoundSDL.cxx similarity index 98% rename from src/common/SoundSDL.cxx rename to src/ale/common/SoundSDL.cxx index e3ce3fd9a..af74cd461 100644 --- a/src/common/SoundSDL.cxx +++ b/src/ale/common/SoundSDL.cxx @@ -22,16 +22,16 @@ #include #include -#include "emucore/TIASnd.hxx" -// #include "FrameBuffer.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Settings.hxx" -#include "emucore/System.hxx" - -#include "common/SDL2.hpp" -#include "common/SoundSDL.hxx" -#include "common/Log.hpp" +#include "ale/emucore/TIASnd.hxx" +// #include "ale/FrameBuffer.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/emucore/System.hxx" + +#include "ale/common/SDL2.hpp" +#include "ale/common/SoundSDL.hxx" +#include "ale/common/Log.hpp" namespace ale { using namespace stella; // Settings, Serializer, Deserializer diff --git a/src/common/SoundSDL.hxx b/src/ale/common/SoundSDL.hxx similarity index 97% rename from src/common/SoundSDL.hxx rename to src/ale/common/SoundSDL.hxx index 93b78f079..37fe7e7b0 100644 --- a/src/common/SoundSDL.hxx +++ b/src/ale/common/SoundSDL.hxx @@ -29,13 +29,13 @@ class Settings; } // namespace stella } // namespace ale -#include "emucore/Sound.hxx" -#include "emucore/MediaSrc.hxx" -#include "emucore/TIASnd.hxx" +#include "ale/emucore/Sound.hxx" +#include "ale/emucore/MediaSrc.hxx" +#include "ale/emucore/TIASnd.hxx" -#include "common/SDL2.hpp" +#include "ale/common/SDL2.hpp" // If desired, we save sound to disk -#include "common/SoundExporter.hpp" +#include "ale/common/SoundExporter.hpp" #include namespace ale { diff --git a/src/emucore/CMakeLists.txt b/src/ale/emucore/CMakeLists.txt similarity index 100% rename from src/emucore/CMakeLists.txt rename to src/ale/emucore/CMakeLists.txt diff --git a/src/emucore/Cart.cxx b/src/ale/emucore/Cart.cxx similarity index 93% rename from src/emucore/Cart.cxx rename to src/ale/emucore/Cart.cxx index 9eb8699cf..75d4691bc 100644 --- a/src/emucore/Cart.cxx +++ b/src/ale/emucore/Cart.cxx @@ -22,32 +22,32 @@ #include #include -#include "emucore/Cart.hxx" -#include "emucore/Cart0840.hxx" -#include "emucore/Cart2K.hxx" -#include "emucore/Cart3E.hxx" -#include "emucore/Cart3F.hxx" -#include "emucore/Cart4A50.hxx" -#include "emucore/Cart4K.hxx" -#include "emucore/CartAR.hxx" -#include "emucore/CartDPC.hxx" -#include "emucore/CartE0.hxx" -#include "emucore/CartE7.hxx" -#include "emucore/CartF4.hxx" -#include "emucore/CartF4SC.hxx" -#include "emucore/CartF6.hxx" -#include "emucore/CartF6SC.hxx" -#include "emucore/CartF8.hxx" -#include "emucore/CartF8SC.hxx" -#include "emucore/CartFASC.hxx" -#include "emucore/CartFE.hxx" -#include "emucore/CartMC.hxx" -#include "emucore/CartMB.hxx" -#include "emucore/CartCV.hxx" -#include "emucore/CartUA.hxx" -#include "emucore/MD5.hxx" -#include "emucore/Props.hxx" -#include "emucore/Settings.hxx" +#include "ale/emucore/Cart.hxx" +#include "ale/emucore/Cart0840.hxx" +#include "ale/emucore/Cart2K.hxx" +#include "ale/emucore/Cart3E.hxx" +#include "ale/emucore/Cart3F.hxx" +#include "ale/emucore/Cart4A50.hxx" +#include "ale/emucore/Cart4K.hxx" +#include "ale/emucore/CartAR.hxx" +#include "ale/emucore/CartDPC.hxx" +#include "ale/emucore/CartE0.hxx" +#include "ale/emucore/CartE7.hxx" +#include "ale/emucore/CartF4.hxx" +#include "ale/emucore/CartF4SC.hxx" +#include "ale/emucore/CartF6.hxx" +#include "ale/emucore/CartF6SC.hxx" +#include "ale/emucore/CartF8.hxx" +#include "ale/emucore/CartF8SC.hxx" +#include "ale/emucore/CartFASC.hxx" +#include "ale/emucore/CartFE.hxx" +#include "ale/emucore/CartMC.hxx" +#include "ale/emucore/CartMB.hxx" +#include "ale/emucore/CartCV.hxx" +#include "ale/emucore/CartUA.hxx" +#include "ale/emucore/MD5.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/Settings.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart.hxx b/src/ale/emucore/Cart.hxx similarity index 99% rename from src/emucore/Cart.hxx rename to src/ale/emucore/Cart.hxx index 410065aff..fca1796f4 100644 --- a/src/emucore/Cart.hxx +++ b/src/ale/emucore/Cart.hxx @@ -31,8 +31,8 @@ class Settings; } // namespace ale #include -#include "emucore/Device.hxx" -#include "common/Log.hpp" +#include "ale/emucore/Device.hxx" +#include "ale/common/Log.hpp" namespace ale { namespace stella { diff --git a/src/emucore/Cart0840.cxx b/src/ale/emucore/Cart0840.cxx similarity index 94% rename from src/emucore/Cart0840.cxx rename to src/ale/emucore/Cart0840.cxx index 5d7e941d6..d1f3437da 100644 --- a/src/emucore/Cart0840.cxx +++ b/src/ale/emucore/Cart0840.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart0840.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart0840.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart0840.hxx b/src/ale/emucore/Cart0840.hxx similarity index 99% rename from src/emucore/Cart0840.hxx rename to src/ale/emucore/Cart0840.hxx index 0e990b903..d43d66a56 100644 --- a/src/emucore/Cart0840.hxx +++ b/src/ale/emucore/Cart0840.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart2K.cxx b/src/ale/emucore/Cart2K.cxx similarity index 96% rename from src/emucore/Cart2K.cxx rename to src/ale/emucore/Cart2K.cxx index de45a50da..0c6a3d617 100644 --- a/src/emucore/Cart2K.cxx +++ b/src/ale/emucore/Cart2K.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart2K.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart2K.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart2K.hxx b/src/ale/emucore/Cart2K.hxx similarity index 99% rename from src/emucore/Cart2K.hxx rename to src/ale/emucore/Cart2K.hxx index c320f9a16..328e569bf 100644 --- a/src/emucore/Cart2K.hxx +++ b/src/ale/emucore/Cart2K.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart3E.cxx b/src/ale/emucore/Cart3E.cxx similarity index 97% rename from src/emucore/Cart3E.cxx rename to src/ale/emucore/Cart3E.cxx index a010ea968..97b404de4 100644 --- a/src/emucore/Cart3E.cxx +++ b/src/ale/emucore/Cart3E.cxx @@ -18,11 +18,11 @@ #include -#include "emucore/System.hxx" -#include "emucore/TIA.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart3E.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart3E.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart3E.hxx b/src/ale/emucore/Cart3E.hxx similarity index 99% rename from src/emucore/Cart3E.hxx rename to src/ale/emucore/Cart3E.hxx index 4723f62a7..d62166f6b 100644 --- a/src/emucore/Cart3E.hxx +++ b/src/ale/emucore/Cart3E.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart3F.cxx b/src/ale/emucore/Cart3F.cxx similarity index 97% rename from src/emucore/Cart3F.cxx rename to src/ale/emucore/Cart3F.cxx index 346e6d826..7ee0b2632 100644 --- a/src/emucore/Cart3F.cxx +++ b/src/ale/emucore/Cart3F.cxx @@ -18,11 +18,11 @@ #include -#include "emucore/System.hxx" -#include "emucore/TIA.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart3F.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart3F.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart3F.hxx b/src/ale/emucore/Cart3F.hxx similarity index 99% rename from src/emucore/Cart3F.hxx rename to src/ale/emucore/Cart3F.hxx index f51b00ea1..d952c130a 100644 --- a/src/emucore/Cart3F.hxx +++ b/src/ale/emucore/Cart3F.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart4A50.cxx b/src/ale/emucore/Cart4A50.cxx similarity index 94% rename from src/emucore/Cart4A50.cxx rename to src/ale/emucore/Cart4A50.cxx index baf5c754b..80c71da35 100644 --- a/src/emucore/Cart4A50.cxx +++ b/src/ale/emucore/Cart4A50.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart4A50.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart4A50.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart4A50.hxx b/src/ale/emucore/Cart4A50.hxx similarity index 99% rename from src/emucore/Cart4A50.hxx rename to src/ale/emucore/Cart4A50.hxx index 383591345..4798be5a1 100644 --- a/src/emucore/Cart4A50.hxx +++ b/src/ale/emucore/Cart4A50.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart4K.cxx b/src/ale/emucore/Cart4K.cxx similarity index 96% rename from src/emucore/Cart4K.cxx rename to src/ale/emucore/Cart4K.cxx index ca4b37137..c42381a6d 100644 --- a/src/emucore/Cart4K.cxx +++ b/src/ale/emucore/Cart4K.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Cart4K.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Cart4K.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Cart4K.hxx b/src/ale/emucore/Cart4K.hxx similarity index 99% rename from src/emucore/Cart4K.hxx rename to src/ale/emucore/Cart4K.hxx index 1742af9b0..51097fbb2 100644 --- a/src/emucore/Cart4K.hxx +++ b/src/ale/emucore/Cart4K.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartAR.cxx b/src/ale/emucore/CartAR.cxx similarity index 98% rename from src/emucore/CartAR.cxx rename to src/ale/emucore/CartAR.cxx index 2398411c6..70e6a7499 100644 --- a/src/emucore/CartAR.cxx +++ b/src/ale/emucore/CartAR.cxx @@ -20,11 +20,11 @@ #include #include -#include "emucore/M6502Hi.hxx" -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartAR.hxx" +#include "ale/emucore/M6502Hi.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartAR.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartAR.hxx b/src/ale/emucore/CartAR.hxx similarity index 99% rename from src/emucore/CartAR.hxx rename to src/ale/emucore/CartAR.hxx index 44d46ec16..b6c0cfa07 100644 --- a/src/emucore/CartAR.hxx +++ b/src/ale/emucore/CartAR.hxx @@ -30,7 +30,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartCV.cxx b/src/ale/emucore/CartCV.cxx similarity index 97% rename from src/emucore/CartCV.cxx rename to src/ale/emucore/CartCV.cxx index a26868d7e..bd8157459 100644 --- a/src/emucore/CartCV.cxx +++ b/src/ale/emucore/CartCV.cxx @@ -19,10 +19,10 @@ #include #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartCV.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartCV.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartCV.hxx b/src/ale/emucore/CartCV.hxx similarity index 99% rename from src/emucore/CartCV.hxx rename to src/ale/emucore/CartCV.hxx index f7c908882..28646b7f6 100644 --- a/src/emucore/CartCV.hxx +++ b/src/ale/emucore/CartCV.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartDPC.cxx b/src/ale/emucore/CartDPC.cxx similarity index 99% rename from src/emucore/CartDPC.cxx rename to src/ale/emucore/CartDPC.cxx index e589cc63b..4df23081c 100644 --- a/src/emucore/CartDPC.cxx +++ b/src/ale/emucore/CartDPC.cxx @@ -18,10 +18,10 @@ #include #include -#include "emucore/CartDPC.hxx" -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/CartDPC.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartDPC.hxx b/src/ale/emucore/CartDPC.hxx similarity index 99% rename from src/emucore/CartDPC.hxx rename to src/ale/emucore/CartDPC.hxx index 4f964dd05..0707df6f5 100644 --- a/src/emucore/CartDPC.hxx +++ b/src/ale/emucore/CartDPC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartE0.cxx b/src/ale/emucore/CartE0.cxx similarity index 98% rename from src/emucore/CartE0.cxx rename to src/ale/emucore/CartE0.cxx index 59d53c548..f094c2767 100644 --- a/src/emucore/CartE0.cxx +++ b/src/ale/emucore/CartE0.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartE0.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartE0.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartE0.hxx b/src/ale/emucore/CartE0.hxx similarity index 99% rename from src/emucore/CartE0.hxx rename to src/ale/emucore/CartE0.hxx index 3f48fec42..1ffbba33d 100644 --- a/src/emucore/CartE0.hxx +++ b/src/ale/emucore/CartE0.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartE7.cxx b/src/ale/emucore/CartE7.cxx similarity index 98% rename from src/emucore/CartE7.cxx rename to src/ale/emucore/CartE7.cxx index 0143d846f..e6f98ea5a 100644 --- a/src/emucore/CartE7.cxx +++ b/src/ale/emucore/CartE7.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartE7.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartE7.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartE7.hxx b/src/ale/emucore/CartE7.hxx similarity index 99% rename from src/emucore/CartE7.hxx rename to src/ale/emucore/CartE7.hxx index 656fbaf5b..7ba145c09 100644 --- a/src/emucore/CartE7.hxx +++ b/src/ale/emucore/CartE7.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF4.cxx b/src/ale/emucore/CartF4.cxx similarity index 97% rename from src/emucore/CartF4.cxx rename to src/ale/emucore/CartF4.cxx index 5ce5fa49a..f3bd9e6b9 100644 --- a/src/emucore/CartF4.cxx +++ b/src/ale/emucore/CartF4.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF4.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF4.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF4.hxx b/src/ale/emucore/CartF4.hxx similarity index 99% rename from src/emucore/CartF4.hxx rename to src/ale/emucore/CartF4.hxx index c1c0c2226..e45d88a3b 100644 --- a/src/emucore/CartF4.hxx +++ b/src/ale/emucore/CartF4.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF4SC.cxx b/src/ale/emucore/CartF4SC.cxx similarity index 97% rename from src/emucore/CartF4SC.cxx rename to src/ale/emucore/CartF4SC.cxx index 35e2aeaab..97413245f 100644 --- a/src/emucore/CartF4SC.cxx +++ b/src/ale/emucore/CartF4SC.cxx @@ -18,11 +18,11 @@ #include -#include "emucore/Random.hxx" -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF4SC.hxx" +#include "ale/emucore/Random.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF4SC.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF4SC.hxx b/src/ale/emucore/CartF4SC.hxx similarity index 99% rename from src/emucore/CartF4SC.hxx rename to src/ale/emucore/CartF4SC.hxx index 3ed50d5d1..260f6feba 100644 --- a/src/emucore/CartF4SC.hxx +++ b/src/ale/emucore/CartF4SC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF6.cxx b/src/ale/emucore/CartF6.cxx similarity index 97% rename from src/emucore/CartF6.cxx rename to src/ale/emucore/CartF6.cxx index 151730f04..7fb86fe4e 100644 --- a/src/emucore/CartF6.cxx +++ b/src/ale/emucore/CartF6.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF6.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF6.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF6.hxx b/src/ale/emucore/CartF6.hxx similarity index 99% rename from src/emucore/CartF6.hxx rename to src/ale/emucore/CartF6.hxx index 09a0c01f4..a0f5bfc2a 100644 --- a/src/emucore/CartF6.hxx +++ b/src/ale/emucore/CartF6.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF6SC.cxx b/src/ale/emucore/CartF6SC.cxx similarity index 97% rename from src/emucore/CartF6SC.cxx rename to src/ale/emucore/CartF6SC.cxx index 7fb51d058..c1a347e79 100644 --- a/src/emucore/CartF6SC.cxx +++ b/src/ale/emucore/CartF6SC.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF6SC.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF6SC.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF6SC.hxx b/src/ale/emucore/CartF6SC.hxx similarity index 99% rename from src/emucore/CartF6SC.hxx rename to src/ale/emucore/CartF6SC.hxx index 2fc0c1a3e..e84a4c0b8 100644 --- a/src/emucore/CartF6SC.hxx +++ b/src/ale/emucore/CartF6SC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF8.cxx b/src/ale/emucore/CartF8.cxx similarity index 97% rename from src/emucore/CartF8.cxx rename to src/ale/emucore/CartF8.cxx index 85be2e294..3be11e491 100644 --- a/src/emucore/CartF8.cxx +++ b/src/ale/emucore/CartF8.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF8.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF8.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF8.hxx b/src/ale/emucore/CartF8.hxx similarity index 99% rename from src/emucore/CartF8.hxx rename to src/ale/emucore/CartF8.hxx index 9d976ddbb..7c47d068c 100644 --- a/src/emucore/CartF8.hxx +++ b/src/ale/emucore/CartF8.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF8SC.cxx b/src/ale/emucore/CartF8SC.cxx similarity index 97% rename from src/emucore/CartF8SC.cxx rename to src/ale/emucore/CartF8SC.cxx index 615f19054..9a27497a1 100644 --- a/src/emucore/CartF8SC.cxx +++ b/src/ale/emucore/CartF8SC.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartF8SC.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartF8SC.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartF8SC.hxx b/src/ale/emucore/CartF8SC.hxx similarity index 99% rename from src/emucore/CartF8SC.hxx rename to src/ale/emucore/CartF8SC.hxx index b6c251352..d8cac05c4 100644 --- a/src/emucore/CartF8SC.hxx +++ b/src/ale/emucore/CartF8SC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartFASC.cxx b/src/ale/emucore/CartFASC.cxx similarity index 97% rename from src/emucore/CartFASC.cxx rename to src/ale/emucore/CartFASC.cxx index 9633d6a44..153d04f99 100644 --- a/src/emucore/CartFASC.cxx +++ b/src/ale/emucore/CartFASC.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartFASC.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartFASC.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartFASC.hxx b/src/ale/emucore/CartFASC.hxx similarity index 99% rename from src/emucore/CartFASC.hxx rename to src/ale/emucore/CartFASC.hxx index 48e5d5d67..318554148 100644 --- a/src/emucore/CartFASC.hxx +++ b/src/ale/emucore/CartFASC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartFE.cxx b/src/ale/emucore/CartFE.cxx similarity index 96% rename from src/emucore/CartFE.cxx rename to src/ale/emucore/CartFE.cxx index 501b3446a..6b974914b 100644 --- a/src/emucore/CartFE.cxx +++ b/src/ale/emucore/CartFE.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartFE.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartFE.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartFE.hxx b/src/ale/emucore/CartFE.hxx similarity index 99% rename from src/emucore/CartFE.hxx rename to src/ale/emucore/CartFE.hxx index 86c776a59..4069d5aea 100644 --- a/src/emucore/CartFE.hxx +++ b/src/ale/emucore/CartFE.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartMB.cxx b/src/ale/emucore/CartMB.cxx similarity index 97% rename from src/emucore/CartMB.cxx rename to src/ale/emucore/CartMB.cxx index 05a4c30dc..250702388 100644 --- a/src/emucore/CartMB.cxx +++ b/src/ale/emucore/CartMB.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartMB.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartMB.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartMB.hxx b/src/ale/emucore/CartMB.hxx similarity index 99% rename from src/emucore/CartMB.hxx rename to src/ale/emucore/CartMB.hxx index 80669baf8..c8586221f 100644 --- a/src/emucore/CartMB.hxx +++ b/src/ale/emucore/CartMB.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartMC.cxx b/src/ale/emucore/CartMC.cxx similarity index 98% rename from src/emucore/CartMC.cxx rename to src/ale/emucore/CartMC.cxx index c950052ad..590d01bcc 100644 --- a/src/emucore/CartMC.cxx +++ b/src/ale/emucore/CartMC.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartMC.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartMC.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartMC.hxx b/src/ale/emucore/CartMC.hxx similarity index 99% rename from src/emucore/CartMC.hxx rename to src/ale/emucore/CartMC.hxx index 6b16921ef..376610acc 100644 --- a/src/emucore/CartMC.hxx +++ b/src/ale/emucore/CartMC.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartUA.cxx b/src/ale/emucore/CartUA.cxx similarity index 97% rename from src/emucore/CartUA.cxx rename to src/ale/emucore/CartUA.cxx index b814c78ae..e0dd266ec 100644 --- a/src/emucore/CartUA.cxx +++ b/src/ale/emucore/CartUA.cxx @@ -18,10 +18,10 @@ #include -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/CartUA.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/CartUA.hxx" namespace ale { namespace stella { diff --git a/src/emucore/CartUA.hxx b/src/ale/emucore/CartUA.hxx similarity index 98% rename from src/emucore/CartUA.hxx rename to src/ale/emucore/CartUA.hxx index 3e2a5f03d..74f896054 100644 --- a/src/emucore/CartUA.hxx +++ b/src/ale/emucore/CartUA.hxx @@ -29,8 +29,8 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Cart.hxx" -#include "emucore/System.hxx" +#include "ale/emucore/Cart.hxx" +#include "ale/emucore/System.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Console.cxx b/src/ale/emucore/Console.cxx similarity index 90% rename from src/emucore/Console.cxx rename to src/ale/emucore/Console.cxx index 9d891acaf..3b3c57aa3 100644 --- a/src/emucore/Console.cxx +++ b/src/ale/emucore/Console.cxx @@ -22,26 +22,26 @@ #include #include -#include "emucore/Cart.hxx" -#include "emucore/Console.hxx" -#include "emucore/Control.hxx" -#include "emucore/Event.hxx" -#include "emucore/Joystick.hxx" -#include "emucore/M6502Hi.hxx" -#include "emucore/M6502Low.hxx" -#include "emucore/M6532.hxx" -#include "emucore/MediaSrc.hxx" -#include "emucore/Paddles.hxx" -#include "emucore/Props.hxx" -#include "emucore/PropsSet.hxx" -#include "emucore/Settings.hxx" -#include "emucore/Sound.hxx" -#include "emucore/Switches.hxx" -#include "emucore/System.hxx" -#include "emucore/TIA.hxx" -#include "emucore/OSystem.hxx" - -#include "common/Log.hpp" +#include "ale/emucore/Cart.hxx" +#include "ale/emucore/Console.hxx" +#include "ale/emucore/Control.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Joystick.hxx" +#include "ale/emucore/M6502Hi.hxx" +#include "ale/emucore/M6502Low.hxx" +#include "ale/emucore/M6532.hxx" +#include "ale/emucore/MediaSrc.hxx" +#include "ale/emucore/Paddles.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/PropsSet.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/emucore/Sound.hxx" +#include "ale/emucore/Switches.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/OSystem.hxx" + +#include "ale/common/Log.hpp" namespace ale { namespace stella { diff --git a/src/emucore/Console.hxx b/src/ale/emucore/Console.hxx similarity index 97% rename from src/emucore/Console.hxx rename to src/ale/emucore/Console.hxx index d318485f8..843220ccc 100644 --- a/src/emucore/Console.hxx +++ b/src/ale/emucore/Console.hxx @@ -33,10 +33,10 @@ class System; } // namespace stella } // namespace ale -#include "emucore/Control.hxx" -#include "emucore/Props.hxx" -#include "emucore/TIA.hxx" -#include "emucore/Cart.hxx" +#include "ale/emucore/Control.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/Cart.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Control.cxx b/src/ale/emucore/Control.cxx similarity index 98% rename from src/emucore/Control.cxx rename to src/ale/emucore/Control.cxx index 582bac658..6a7b2551d 100644 --- a/src/emucore/Control.cxx +++ b/src/ale/emucore/Control.cxx @@ -17,7 +17,7 @@ //============================================================================ #include -#include "emucore/Control.hxx" +#include "ale/emucore/Control.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Control.hxx b/src/ale/emucore/Control.hxx similarity index 100% rename from src/emucore/Control.hxx rename to src/ale/emucore/Control.hxx diff --git a/src/emucore/DefProps.hxx b/src/ale/emucore/DefProps.hxx similarity index 100% rename from src/emucore/DefProps.hxx rename to src/ale/emucore/DefProps.hxx diff --git a/src/emucore/Deserializer.cxx b/src/ale/emucore/Deserializer.cxx similarity index 98% rename from src/emucore/Deserializer.cxx rename to src/ale/emucore/Deserializer.cxx index ca6a55345..5d8a4a770 100644 --- a/src/emucore/Deserializer.cxx +++ b/src/ale/emucore/Deserializer.cxx @@ -16,7 +16,7 @@ // $Id: Deserializer.cxx,v 1.12 2007/01/01 18:04:47 stephena Exp $ //============================================================================ -#include "emucore/Deserializer.hxx" +#include "ale/emucore/Deserializer.hxx" #include namespace ale { diff --git a/src/emucore/Deserializer.hxx b/src/ale/emucore/Deserializer.hxx similarity index 100% rename from src/emucore/Deserializer.hxx rename to src/ale/emucore/Deserializer.hxx diff --git a/src/emucore/Device.cxx b/src/ale/emucore/Device.cxx similarity index 97% rename from src/emucore/Device.cxx rename to src/ale/emucore/Device.cxx index 36c0a6aaa..22a1e4215 100644 --- a/src/emucore/Device.cxx +++ b/src/ale/emucore/Device.cxx @@ -16,7 +16,7 @@ // $Id: Device.cxx,v 1.4 2007/01/01 18:04:50 stephena Exp $ //============================================================================ -#include "emucore/Device.hxx" +#include "ale/emucore/Device.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Device.hxx b/src/ale/emucore/Device.hxx similarity index 100% rename from src/emucore/Device.hxx rename to src/ale/emucore/Device.hxx diff --git a/src/emucore/Event.cxx b/src/ale/emucore/Event.cxx similarity index 98% rename from src/emucore/Event.cxx rename to src/ale/emucore/Event.cxx index 03f341b55..0adc3ea9a 100644 --- a/src/emucore/Event.cxx +++ b/src/ale/emucore/Event.cxx @@ -16,7 +16,7 @@ // $Id: Event.cxx,v 1.11 2007/01/01 18:04:47 stephena Exp $ //============================================================================ -#include "emucore/Event.hxx" +#include "ale/emucore/Event.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Event.hxx b/src/ale/emucore/Event.hxx similarity index 100% rename from src/emucore/Event.hxx rename to src/ale/emucore/Event.hxx diff --git a/src/emucore/Joystick.cxx b/src/ale/emucore/Joystick.cxx similarity index 97% rename from src/emucore/Joystick.cxx rename to src/ale/emucore/Joystick.cxx index 66ef47f2a..19f0249ba 100644 --- a/src/emucore/Joystick.cxx +++ b/src/ale/emucore/Joystick.cxx @@ -17,8 +17,8 @@ //============================================================================ #include -#include "emucore/Event.hxx" -#include "emucore/Joystick.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Joystick.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Joystick.hxx b/src/ale/emucore/Joystick.hxx similarity index 98% rename from src/emucore/Joystick.hxx rename to src/ale/emucore/Joystick.hxx index ffa5761d6..65e3dd8c8 100644 --- a/src/emucore/Joystick.hxx +++ b/src/ale/emucore/Joystick.hxx @@ -19,7 +19,7 @@ #ifndef JOYSTICK_HXX #define JOYSTICK_HXX -#include "emucore/Control.hxx" +#include "ale/emucore/Control.hxx" namespace ale { namespace stella { diff --git a/src/emucore/M6502.cxx b/src/ale/emucore/M6502.cxx similarity index 99% rename from src/emucore/M6502.cxx rename to src/ale/emucore/M6502.cxx index 5a6a2a1e6..a2bdfe0eb 100644 --- a/src/emucore/M6502.cxx +++ b/src/ale/emucore/M6502.cxx @@ -16,7 +16,7 @@ // $Id: M6502.cxx,v 1.21 2007/01/01 18:04:50 stephena Exp $ //============================================================================ -#include "emucore/M6502.hxx" +#include "ale/emucore/M6502.hxx" #include #include diff --git a/src/emucore/M6502.hxx b/src/ale/emucore/M6502.hxx similarity index 99% rename from src/emucore/M6502.hxx rename to src/ale/emucore/M6502.hxx index d2a36eb6f..9859e160a 100644 --- a/src/emucore/M6502.hxx +++ b/src/ale/emucore/M6502.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/System.hxx" +#include "ale/emucore/System.hxx" #include namespace ale { diff --git a/src/emucore/M6502.m4 b/src/ale/emucore/M6502.m4 similarity index 100% rename from src/emucore/M6502.m4 rename to src/ale/emucore/M6502.m4 diff --git a/src/emucore/M6502Hi.cxx b/src/ale/emucore/M6502Hi.cxx similarity index 97% rename from src/emucore/M6502Hi.cxx rename to src/ale/emucore/M6502Hi.cxx index d531c50ec..5373a97e5 100644 --- a/src/emucore/M6502Hi.cxx +++ b/src/ale/emucore/M6502Hi.cxx @@ -16,11 +16,11 @@ // $Id: M6502Hi.cxx,v 1.19 2007/01/01 18:04:51 stephena Exp $ //============================================================================ -#include "emucore/M6502Hi.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/M6502Hi.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" -#include "common/Log.hpp" +#include "ale/common/Log.hpp" namespace ale { namespace stella { @@ -99,7 +99,7 @@ bool M6502High::execute(uint32_t number) switch(IR) { // 6502 instruction emulation is generated by an M4 macro file - #include "emucore/M6502Hi.ins" + #include "ale/emucore/M6502Hi.ins" default: // Oops, illegal instruction executed so set fatal error flag diff --git a/src/emucore/M6502Hi.hxx b/src/ale/emucore/M6502Hi.hxx similarity index 99% rename from src/emucore/M6502Hi.hxx rename to src/ale/emucore/M6502Hi.hxx index 6c3b634c2..b62fb51e2 100644 --- a/src/emucore/M6502Hi.hxx +++ b/src/ale/emucore/M6502Hi.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/M6502.hxx" +#include "ale/emucore/M6502.hxx" namespace ale { namespace stella { diff --git a/src/emucore/M6502Hi.ins b/src/ale/emucore/M6502Hi.ins similarity index 100% rename from src/emucore/M6502Hi.ins rename to src/ale/emucore/M6502Hi.ins diff --git a/src/emucore/M6502Hi.m4 b/src/ale/emucore/M6502Hi.m4 similarity index 100% rename from src/emucore/M6502Hi.m4 rename to src/ale/emucore/M6502Hi.m4 diff --git a/src/emucore/M6502Low.cxx b/src/ale/emucore/M6502Low.cxx similarity index 98% rename from src/emucore/M6502Low.cxx rename to src/ale/emucore/M6502Low.cxx index a3bba1a1a..707046a0b 100644 --- a/src/emucore/M6502Low.cxx +++ b/src/ale/emucore/M6502Low.cxx @@ -16,9 +16,9 @@ // $Id: M6502Low.cxx,v 1.12 2007/01/01 18:04:51 stephena Exp $ //============================================================================ -#include "emucore/M6502Low.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/M6502Low.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" #include @@ -86,7 +86,7 @@ bool M6502Low::execute(uint32_t number) switch(IR) { // 6502 instruction emulation is generated by an M4 macro file - #include "emucore/M6502Low.ins" + #include "ale/emucore/M6502Low.ins" default: // Oops, illegal instruction executed so set fatal error flag diff --git a/src/emucore/M6502Low.hxx b/src/ale/emucore/M6502Low.hxx similarity index 99% rename from src/emucore/M6502Low.hxx rename to src/ale/emucore/M6502Low.hxx index 4772ffb86..6e228fc35 100644 --- a/src/emucore/M6502Low.hxx +++ b/src/ale/emucore/M6502Low.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/M6502.hxx" +#include "ale/emucore/M6502.hxx" namespace ale { namespace stella { diff --git a/src/emucore/M6502Low.ins b/src/ale/emucore/M6502Low.ins similarity index 100% rename from src/emucore/M6502Low.ins rename to src/ale/emucore/M6502Low.ins diff --git a/src/emucore/M6502Low.m4 b/src/ale/emucore/M6502Low.m4 similarity index 100% rename from src/emucore/M6502Low.m4 rename to src/ale/emucore/M6502Low.m4 diff --git a/src/emucore/M6532.cxx b/src/ale/emucore/M6532.cxx similarity index 97% rename from src/emucore/M6532.cxx rename to src/ale/emucore/M6532.cxx index d1511f115..9163404ce 100644 --- a/src/emucore/M6532.cxx +++ b/src/ale/emucore/M6532.cxx @@ -19,14 +19,14 @@ #include #include -#include "emucore/Console.hxx" -#include "emucore/M6532.hxx" -#include "emucore/Switches.hxx" -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/OSystem.hxx" -#include "common/Log.hpp" +#include "ale/emucore/Console.hxx" +#include "ale/emucore/M6532.hxx" +#include "ale/emucore/Switches.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/OSystem.hxx" +#include "ale/common/Log.hpp" namespace ale { namespace stella { diff --git a/src/emucore/M6532.hxx b/src/ale/emucore/M6532.hxx similarity index 98% rename from src/emucore/M6532.hxx rename to src/ale/emucore/M6532.hxx index a788c6a14..ded6dca78 100644 --- a/src/emucore/M6532.hxx +++ b/src/ale/emucore/M6532.hxx @@ -30,8 +30,8 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Device.hxx" -#include "emucore/Random.hxx" +#include "ale/emucore/Device.hxx" +#include "ale/emucore/Random.hxx" namespace ale { namespace stella { diff --git a/src/emucore/MD5.cxx b/src/ale/emucore/MD5.cxx similarity index 99% rename from src/emucore/MD5.cxx rename to src/ale/emucore/MD5.cxx index 0c35ceca2..01403dd70 100644 --- a/src/emucore/MD5.cxx +++ b/src/ale/emucore/MD5.cxx @@ -19,7 +19,7 @@ // $Id: MD5.cxx,v 1.7 2007/01/01 18:04:48 stephena Exp $ //============================================================================ -#include "emucore/MD5.hxx" +#include "ale/emucore/MD5.hxx" /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All diff --git a/src/emucore/MD5.hxx b/src/ale/emucore/MD5.hxx similarity index 100% rename from src/emucore/MD5.hxx rename to src/ale/emucore/MD5.hxx diff --git a/src/emucore/MediaSrc.cxx b/src/ale/emucore/MediaSrc.cxx similarity index 97% rename from src/emucore/MediaSrc.cxx rename to src/ale/emucore/MediaSrc.cxx index f6bb83bad..ce02717e9 100644 --- a/src/emucore/MediaSrc.cxx +++ b/src/ale/emucore/MediaSrc.cxx @@ -17,7 +17,7 @@ //============================================================================ #include -#include "emucore/MediaSrc.hxx" +#include "ale/emucore/MediaSrc.hxx" namespace ale { namespace stella { diff --git a/src/emucore/MediaSrc.hxx b/src/ale/emucore/MediaSrc.hxx similarity index 100% rename from src/emucore/MediaSrc.hxx rename to src/ale/emucore/MediaSrc.hxx diff --git a/src/emucore/NullDev.cxx b/src/ale/emucore/NullDev.cxx similarity index 95% rename from src/emucore/NullDev.cxx rename to src/ale/emucore/NullDev.cxx index 555a0d161..9d2cb8337 100644 --- a/src/emucore/NullDev.cxx +++ b/src/ale/emucore/NullDev.cxx @@ -16,9 +16,9 @@ // $Id: NullDev.cxx,v 1.5 2007/01/01 18:04:51 stephena Exp $ //============================================================================ -#include "emucore/NullDev.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/NullDev.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" #include diff --git a/src/emucore/NullDev.hxx b/src/ale/emucore/NullDev.hxx similarity index 98% rename from src/emucore/NullDev.hxx rename to src/ale/emucore/NullDev.hxx index fa45bb844..43fa57cca 100644 --- a/src/emucore/NullDev.hxx +++ b/src/ale/emucore/NullDev.hxx @@ -29,7 +29,7 @@ class Deserializer; } // namespace stella } // namespace ale -#include "emucore/Device.hxx" +#include "ale/emucore/Device.hxx" namespace ale { namespace stella { diff --git a/src/emucore/OSystem.cxx b/src/ale/emucore/OSystem.cxx similarity index 96% rename from src/emucore/OSystem.cxx rename to src/ale/emucore/OSystem.cxx index 69f8a3423..e2311fefc 100644 --- a/src/emucore/OSystem.cxx +++ b/src/ale/emucore/OSystem.cxx @@ -24,16 +24,16 @@ #include #include -#include "emucore/MD5.hxx" -#include "emucore/Settings.hxx" -#include "emucore/PropsSet.hxx" -#include "emucore/Event.hxx" -#include "emucore/OSystem.hxx" -#include "emucore/System.hxx" +#include "ale/emucore/MD5.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/emucore/PropsSet.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/OSystem.hxx" +#include "ale/emucore/System.hxx" #ifdef SDL_SUPPORT - #include "common/ScreenSDL.hpp" - #include "common/SoundSDL.hxx" + #include "ale/common/ScreenSDL.hpp" + #include "ale/common/SoundSDL.hxx" #endif #define MAX_ROM_SIZE 512 * 1024 diff --git a/src/emucore/OSystem.hxx b/src/ale/emucore/OSystem.hxx similarity index 95% rename from src/emucore/OSystem.hxx rename to src/ale/emucore/OSystem.hxx index 26a552dc9..10c9b4a9f 100644 --- a/src/emucore/OSystem.hxx +++ b/src/ale/emucore/OSystem.hxx @@ -29,14 +29,14 @@ class PropertiesSet; #include -#include "emucore/Sound.hxx" -#include "emucore/Screen.hxx" -#include "common/SoundNull.hxx" -#include "emucore/Settings.hxx" -#include "emucore/Console.hxx" -#include "emucore/Event.hxx" //ALE -#include "common/ColourPalette.hpp" -#include "common/Log.hpp" +#include "ale/emucore/Sound.hxx" +#include "ale/emucore/Screen.hxx" +#include "ale/common/SoundNull.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/emucore/Console.hxx" +#include "ale/emucore/Event.hxx" //ALE +#include "ale/common/ColourPalette.hpp" +#include "ale/common/Log.hpp" namespace fs = std::filesystem; diff --git a/src/emucore/Paddles.cxx b/src/ale/emucore/Paddles.cxx similarity index 97% rename from src/emucore/Paddles.cxx rename to src/ale/emucore/Paddles.cxx index 5b1c6e2b5..3bc4cf82f 100644 --- a/src/emucore/Paddles.cxx +++ b/src/ale/emucore/Paddles.cxx @@ -16,8 +16,8 @@ // $Id: Paddles.cxx,v 1.8 2007/01/05 17:54:23 stephena Exp $ //============================================================================ -#include "emucore/Event.hxx" -#include "emucore/Paddles.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Paddles.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Paddles.hxx b/src/ale/emucore/Paddles.hxx similarity index 97% rename from src/emucore/Paddles.hxx rename to src/ale/emucore/Paddles.hxx index 43ec1db08..184a386a3 100644 --- a/src/emucore/Paddles.hxx +++ b/src/ale/emucore/Paddles.hxx @@ -19,8 +19,8 @@ #ifndef PADDLES_HXX #define PADDLES_HXX -#include "emucore/Control.hxx" -#include "emucore/Event.hxx" +#include "ale/emucore/Control.hxx" +#include "ale/emucore/Event.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Props.cxx b/src/ale/emucore/Props.cxx similarity index 99% rename from src/emucore/Props.cxx rename to src/ale/emucore/Props.cxx index f5922fc33..c7af37d47 100644 --- a/src/emucore/Props.cxx +++ b/src/ale/emucore/Props.cxx @@ -23,7 +23,7 @@ #include #include -#include "emucore/Props.hxx" +#include "ale/emucore/Props.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Props.hxx b/src/ale/emucore/Props.hxx similarity index 100% rename from src/emucore/Props.hxx rename to src/ale/emucore/Props.hxx diff --git a/src/emucore/PropsSet.cxx b/src/ale/emucore/PropsSet.cxx similarity index 98% rename from src/emucore/PropsSet.cxx rename to src/ale/emucore/PropsSet.cxx index 044317856..9d197a847 100644 --- a/src/emucore/PropsSet.cxx +++ b/src/ale/emucore/PropsSet.cxx @@ -21,9 +21,9 @@ #include #include -#include "emucore/DefProps.hxx" -#include "emucore/Props.hxx" -#include "emucore/PropsSet.hxx" +#include "ale/emucore/DefProps.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/PropsSet.hxx" namespace ale { namespace stella { diff --git a/src/emucore/PropsSet.hxx b/src/ale/emucore/PropsSet.hxx similarity index 100% rename from src/emucore/PropsSet.hxx rename to src/ale/emucore/PropsSet.hxx diff --git a/src/emucore/Random.cxx b/src/ale/emucore/Random.cxx similarity index 96% rename from src/emucore/Random.cxx rename to src/ale/emucore/Random.cxx index 7c2b67848..9c92e501b 100644 --- a/src/emucore/Random.cxx +++ b/src/ale/emucore/Random.cxx @@ -17,9 +17,9 @@ //============================================================================ #include -#include "emucore/Random.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" +#include "ale/emucore/Random.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" // This uses C++11. #include diff --git a/src/emucore/Random.hxx b/src/ale/emucore/Random.hxx similarity index 100% rename from src/emucore/Random.hxx rename to src/ale/emucore/Random.hxx diff --git a/src/emucore/Screen.hxx b/src/ale/emucore/Screen.hxx similarity index 100% rename from src/emucore/Screen.hxx rename to src/ale/emucore/Screen.hxx diff --git a/src/emucore/Serializer.cxx b/src/ale/emucore/Serializer.cxx similarity index 98% rename from src/emucore/Serializer.cxx rename to src/ale/emucore/Serializer.cxx index 7df3902c5..700e76854 100644 --- a/src/emucore/Serializer.cxx +++ b/src/ale/emucore/Serializer.cxx @@ -16,7 +16,7 @@ // $Id: Serializer.cxx,v 1.11 2007/01/01 18:04:49 stephena Exp $ //============================================================================ -#include "emucore/Serializer.hxx" +#include "ale/emucore/Serializer.hxx" namespace ale { diff --git a/src/emucore/Serializer.hxx b/src/ale/emucore/Serializer.hxx similarity index 100% rename from src/emucore/Serializer.hxx rename to src/ale/emucore/Serializer.hxx diff --git a/src/emucore/Settings.cxx b/src/ale/emucore/Settings.cxx similarity index 99% rename from src/emucore/Settings.cxx rename to src/ale/emucore/Settings.cxx index 8e9193aae..15226c225 100644 --- a/src/emucore/Settings.cxx +++ b/src/ale/emucore/Settings.cxx @@ -23,8 +23,8 @@ #include #include -#include "emucore/OSystem.hxx" -#include "emucore/Settings.hxx" +#include "ale/emucore/OSystem.hxx" +#include "ale/emucore/Settings.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Settings.hxx b/src/ale/emucore/Settings.hxx similarity index 100% rename from src/emucore/Settings.hxx rename to src/ale/emucore/Settings.hxx diff --git a/src/emucore/Sound.hxx b/src/ale/emucore/Sound.hxx similarity index 100% rename from src/emucore/Sound.hxx rename to src/ale/emucore/Sound.hxx diff --git a/src/emucore/Switches.cxx b/src/ale/emucore/Switches.cxx similarity index 95% rename from src/emucore/Switches.cxx rename to src/ale/emucore/Switches.cxx index d80d8cebe..0fa0ea963 100644 --- a/src/emucore/Switches.cxx +++ b/src/ale/emucore/Switches.cxx @@ -16,9 +16,9 @@ // $Id: Switches.cxx,v 1.7 2007/01/01 18:04:50 stephena Exp $ //============================================================================ -#include "emucore/Event.hxx" -#include "emucore/Props.hxx" -#include "emucore/Switches.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Props.hxx" +#include "ale/emucore/Switches.hxx" namespace ale { namespace stella { diff --git a/src/emucore/Switches.hxx b/src/ale/emucore/Switches.hxx similarity index 100% rename from src/emucore/Switches.hxx rename to src/ale/emucore/Switches.hxx diff --git a/src/emucore/System.cxx b/src/ale/emucore/System.cxx similarity index 96% rename from src/emucore/System.cxx rename to src/ale/emucore/System.cxx index fc656beb8..d281e4c90 100644 --- a/src/emucore/System.cxx +++ b/src/ale/emucore/System.cxx @@ -19,13 +19,13 @@ #include #include -#include "emucore/Device.hxx" -#include "emucore/M6502.hxx" -#include "emucore/TIA.hxx" -#include "emucore/System.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Settings.hxx" +#include "ale/emucore/Device.hxx" +#include "ale/emucore/M6502.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Settings.hxx" namespace ale { namespace stella { diff --git a/src/emucore/System.hxx b/src/ale/emucore/System.hxx similarity index 99% rename from src/emucore/System.hxx rename to src/ale/emucore/System.hxx index 0343c7182..bb1d5901c 100644 --- a/src/emucore/System.hxx +++ b/src/ale/emucore/System.hxx @@ -33,9 +33,9 @@ class Settings; } // namespace stella } // namespace ale -#include "emucore/Device.hxx" -#include "emucore/NullDev.hxx" -#include "emucore/Random.hxx" +#include "ale/emucore/Device.hxx" +#include "ale/emucore/NullDev.hxx" +#include "ale/emucore/Random.hxx" #include diff --git a/src/emucore/TIA.cxx b/src/ale/emucore/TIA.cxx similarity index 99% rename from src/emucore/TIA.cxx rename to src/ale/emucore/TIA.cxx index 7749b9fba..3dad8f1d9 100644 --- a/src/emucore/TIA.cxx +++ b/src/ale/emucore/TIA.cxx @@ -22,15 +22,15 @@ #include #include -#include "emucore/Console.hxx" -#include "emucore/Control.hxx" -#include "emucore/M6502.hxx" -#include "emucore/System.hxx" -#include "emucore/TIA.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Settings.hxx" -#include "emucore/Sound.hxx" +#include "ale/emucore/Console.hxx" +#include "ale/emucore/Control.hxx" +#include "ale/emucore/M6502.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/TIA.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/emucore/Sound.hxx" #define HBLANK 68 diff --git a/src/emucore/TIA.hxx b/src/ale/emucore/TIA.hxx similarity index 99% rename from src/emucore/TIA.hxx rename to src/ale/emucore/TIA.hxx index 2a2a9cb57..03b49a527 100644 --- a/src/emucore/TIA.hxx +++ b/src/ale/emucore/TIA.hxx @@ -31,9 +31,9 @@ class Settings; } // namespace stella } // namespace ale -#include "emucore/Sound.hxx" -#include "emucore/Device.hxx" -#include "emucore/MediaSrc.hxx" +#include "ale/emucore/Sound.hxx" +#include "ale/emucore/Device.hxx" +#include "ale/emucore/MediaSrc.hxx" namespace ale { namespace stella { diff --git a/src/emucore/TIASnd.cxx b/src/ale/emucore/TIASnd.cxx similarity index 99% rename from src/emucore/TIASnd.cxx rename to src/ale/emucore/TIASnd.cxx index e844f0056..3789a12c7 100644 --- a/src/emucore/TIASnd.cxx +++ b/src/ale/emucore/TIASnd.cxx @@ -16,8 +16,8 @@ // $Id: TIASnd.cxx,v 1.6 2007/01/01 18:04:50 stephena Exp $ //============================================================================ -#include "emucore/System.hxx" -#include "emucore/TIASnd.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/TIASnd.hxx" #include namespace ale { diff --git a/src/emucore/TIASnd.hxx b/src/ale/emucore/TIASnd.hxx similarity index 100% rename from src/emucore/TIASnd.hxx rename to src/ale/emucore/TIASnd.hxx diff --git a/src/emucore/stella.pro b/src/ale/emucore/stella.pro similarity index 100% rename from src/emucore/stella.pro rename to src/ale/emucore/stella.pro diff --git a/src/environment/CMakeLists.txt b/src/ale/environment/CMakeLists.txt similarity index 100% rename from src/environment/CMakeLists.txt rename to src/ale/environment/CMakeLists.txt diff --git a/src/environment/ale_ram.hpp b/src/ale/environment/ale_ram.hpp similarity index 100% rename from src/environment/ale_ram.hpp rename to src/ale/environment/ale_ram.hpp diff --git a/src/environment/ale_screen.hpp b/src/ale/environment/ale_screen.hpp similarity index 100% rename from src/environment/ale_screen.hpp rename to src/ale/environment/ale_screen.hpp diff --git a/src/environment/ale_state.cpp b/src/ale/environment/ale_state.cpp similarity index 98% rename from src/environment/ale_state.cpp rename to src/ale/environment/ale_state.cpp index 4b19c4622..f15309546 100644 --- a/src/environment/ale_state.cpp +++ b/src/ale/environment/ale_state.cpp @@ -10,7 +10,7 @@ * ***************************************************************************** */ -#include "environment/ale_state.hpp" +#include "ale/environment/ale_state.hpp" #include #include @@ -18,13 +18,13 @@ #include #include -#include "emucore/System.hxx" -#include "emucore/Event.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Serializer.hxx" -#include "emucore/Random.hxx" -#include "common/Constants.h" -#include "games/RomSettings.hpp" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Random.hxx" +#include "ale/common/Constants.h" +#include "ale/games/RomSettings.hpp" namespace ale { using namespace stella; // System, Event, Deserializer, Serializer, Random diff --git a/src/environment/ale_state.hpp b/src/ale/environment/ale_state.hpp similarity index 97% rename from src/environment/ale_state.hpp rename to src/ale/environment/ale_state.hpp index 3c0d2a529..e8ffba9a3 100644 --- a/src/environment/ale_state.hpp +++ b/src/ale/environment/ale_state.hpp @@ -21,11 +21,11 @@ #include #include -#include "common/Constants.h" -#include "emucore/OSystem.hxx" -#include "emucore/Event.hxx" -#include "emucore/Random.hxx" -#include "common/Log.hpp" +#include "ale/common/Constants.h" +#include "ale/emucore/OSystem.hxx" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/Random.hxx" +#include "ale/common/Log.hpp" namespace ale { diff --git a/src/environment/phosphor_blend.cpp b/src/ale/environment/phosphor_blend.cpp similarity index 97% rename from src/environment/phosphor_blend.cpp rename to src/ale/environment/phosphor_blend.cpp index 577b619da..5a7a68559 100644 --- a/src/environment/phosphor_blend.cpp +++ b/src/ale/environment/phosphor_blend.cpp @@ -14,9 +14,9 @@ * **************************************************************************** */ -#include "environment/phosphor_blend.hpp" +#include "ale/environment/phosphor_blend.hpp" -#include "emucore/Console.hxx" +#include "ale/emucore/Console.hxx" namespace ale { using namespace stella; // OSystem diff --git a/src/environment/phosphor_blend.hpp b/src/ale/environment/phosphor_blend.hpp similarity index 94% rename from src/environment/phosphor_blend.hpp rename to src/ale/environment/phosphor_blend.hpp index c959561e4..c3ce6f7c8 100644 --- a/src/environment/phosphor_blend.hpp +++ b/src/ale/environment/phosphor_blend.hpp @@ -17,8 +17,8 @@ #ifndef __PHOSPHOR_BLEND_HPP__ #define __PHOSPHOR_BLEND_HPP__ -#include "emucore/OSystem.hxx" -#include "environment/ale_screen.hpp" +#include "ale/emucore/OSystem.hxx" +#include "ale/environment/ale_screen.hpp" namespace ale { diff --git a/src/environment/stella_environment.cpp b/src/ale/environment/stella_environment.cpp similarity index 99% rename from src/environment/stella_environment.cpp rename to src/ale/environment/stella_environment.cpp index 3c16e9f9e..4e7deb60e 100644 --- a/src/environment/stella_environment.cpp +++ b/src/ale/environment/stella_environment.cpp @@ -15,14 +15,14 @@ * **************************************************************************** */ -#include "environment/stella_environment.hpp" +#include "ale/environment/stella_environment.hpp" #include #include #include #include -#include "emucore/System.hxx" +#include "ale/emucore/System.hxx" namespace ale { using namespace stella; // OSystem, Random diff --git a/src/environment/stella_environment.hpp b/src/ale/environment/stella_environment.hpp similarity index 93% rename from src/environment/stella_environment.hpp rename to src/ale/environment/stella_environment.hpp index f2a59a0b2..a0632103b 100644 --- a/src/environment/stella_environment.hpp +++ b/src/ale/environment/stella_environment.hpp @@ -18,19 +18,19 @@ #ifndef __STELLA_ENVIRONMENT_HPP__ #define __STELLA_ENVIRONMENT_HPP__ -#include "environment/ale_ram.hpp" -#include "environment/ale_screen.hpp" -#include "environment/ale_state.hpp" -#include "environment/phosphor_blend.hpp" -#include "environment/stella_environment_wrapper.hpp" -#include "emucore/Event.hxx" -#include "emucore/OSystem.hxx" -#include "emucore/System.hxx" -#include "emucore/Random.hxx" -#include "common/Constants.h" -#include "games/RomSettings.hpp" -#include "common/Log.hpp" -#include "common/ScreenExporter.hpp" +#include "ale/environment/ale_ram.hpp" +#include "ale/environment/ale_screen.hpp" +#include "ale/environment/ale_state.hpp" +#include "ale/environment/phosphor_blend.hpp" +#include "ale/environment/stella_environment_wrapper.hpp" +#include "ale/emucore/Event.hxx" +#include "ale/emucore/OSystem.hxx" +#include "ale/emucore/System.hxx" +#include "ale/emucore/Random.hxx" +#include "ale/common/Constants.h" +#include "ale/games/RomSettings.hpp" +#include "ale/common/Log.hpp" +#include "ale/common/ScreenExporter.hpp" #include #include diff --git a/src/environment/stella_environment_wrapper.cpp b/src/ale/environment/stella_environment_wrapper.cpp similarity index 88% rename from src/environment/stella_environment_wrapper.cpp rename to src/ale/environment/stella_environment_wrapper.cpp index 34fe8da7c..4039c62a3 100644 --- a/src/environment/stella_environment_wrapper.cpp +++ b/src/ale/environment/stella_environment_wrapper.cpp @@ -1,6 +1,6 @@ -#include "environment/stella_environment_wrapper.hpp" +#include "ale/environment/stella_environment_wrapper.hpp" -#include "environment/stella_environment.hpp" +#include "ale/environment/stella_environment.hpp" namespace ale { using namespace stella; // Random diff --git a/src/environment/stella_environment_wrapper.hpp b/src/ale/environment/stella_environment_wrapper.hpp similarity index 95% rename from src/environment/stella_environment_wrapper.hpp rename to src/ale/environment/stella_environment_wrapper.hpp index 9e97ee031..e58850ade 100644 --- a/src/environment/stella_environment_wrapper.hpp +++ b/src/ale/environment/stella_environment_wrapper.hpp @@ -17,8 +17,8 @@ #ifndef __STELLA_ENVIRONMENT_WRAPPER_HPP__ #define __STELLA_ENVIRONMENT_WRAPPER_HPP__ -#include "common/Constants.h" -#include "emucore/Random.hxx" +#include "ale/common/Constants.h" +#include "ale/emucore/Random.hxx" namespace ale { diff --git a/src/games/CMakeLists.txt b/src/ale/games/CMakeLists.txt similarity index 100% rename from src/games/CMakeLists.txt rename to src/ale/games/CMakeLists.txt diff --git a/src/games/RomSettings.cpp b/src/ale/games/RomSettings.cpp similarity index 98% rename from src/games/RomSettings.cpp rename to src/ale/games/RomSettings.cpp index 3842aee11..aa6089e3b 100644 --- a/src/games/RomSettings.cpp +++ b/src/ale/games/RomSettings.cpp @@ -16,7 +16,7 @@ * ***************************************************************************** */ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" #include diff --git a/src/games/RomSettings.hpp b/src/ale/games/RomSettings.hpp similarity index 95% rename from src/games/RomSettings.hpp rename to src/ale/games/RomSettings.hpp index 34447665c..bec8215fe 100644 --- a/src/games/RomSettings.hpp +++ b/src/ale/games/RomSettings.hpp @@ -38,11 +38,11 @@ #include #include -#include "common/Constants.h" -#include "emucore/Serializer.hxx" -#include "emucore/Deserializer.hxx" -#include "emucore/Settings.hxx" -#include "environment/stella_environment_wrapper.hpp" +#include "ale/common/Constants.h" +#include "ale/emucore/Serializer.hxx" +#include "ale/emucore/Deserializer.hxx" +#include "ale/emucore/Settings.hxx" +#include "ale/environment/stella_environment_wrapper.hpp" namespace ale { diff --git a/src/games/RomUtils.cpp b/src/ale/games/RomUtils.cpp similarity index 98% rename from src/games/RomUtils.cpp rename to src/ale/games/RomUtils.cpp index ea6828d63..485becd25 100644 --- a/src/games/RomUtils.cpp +++ b/src/ale/games/RomUtils.cpp @@ -15,9 +15,9 @@ * ***************************************************************************** */ -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" -#include "emucore/System.hxx" +#include "ale/emucore/System.hxx" namespace ale { using namespace stella; // System diff --git a/src/games/RomUtils.hpp b/src/ale/games/RomUtils.hpp similarity index 100% rename from src/games/RomUtils.hpp rename to src/ale/games/RomUtils.hpp diff --git a/src/ale/games/Roms.cpp b/src/ale/games/Roms.cpp new file mode 100644 index 000000000..bcefaf8f2 --- /dev/null +++ b/src/ale/games/Roms.cpp @@ -0,0 +1,249 @@ +/* ***************************************************************************** + * A.L.E (Arcade Learning Environment) + * Copyright (c) 2009-2013 by Yavar Naddaf, Joel Veness, Marc G. Bellemare and + * the Reinforcement Learning and Artificial Intelligence Laboratory + * Released under the GNU General Public License; see License.txt for details. + * + * Based on: Stella -- "An Atari 2600 VCS Emulator" + * Copyright (c) 1995-2007 by Bradford W. Mott and the Stella team + * + * ***************************************************************************** + */ + +#include + +#include "ale/games/Roms.hpp" +#include "ale/games/RomUtils.hpp" + +// include the game implementations +#include "ale/games/supported/Adventure.hpp" +#include "ale/games/supported/AirRaid.hpp" +#include "ale/games/supported/Alien.hpp" +#include "ale/games/supported/Amidar.hpp" +#include "ale/games/supported/Assault.hpp" +#include "ale/games/supported/Asterix.hpp" +#include "ale/games/supported/Asteroids.hpp" +#include "ale/games/supported/Atlantis.hpp" +#include "ale/games/supported/Atlantis2.hpp" +#include "ale/games/supported/Backgammon.hpp" +#include "ale/games/supported/BankHeist.hpp" +#include "ale/games/supported/BasicMath.hpp" +#include "ale/games/supported/BattleZone.hpp" +#include "ale/games/supported/BeamRider.hpp" +#include "ale/games/supported/Berzerk.hpp" +#include "ale/games/supported/Blackjack.hpp" +#include "ale/games/supported/Bowling.hpp" +#include "ale/games/supported/Boxing.hpp" +#include "ale/games/supported/Breakout.hpp" +#include "ale/games/supported/Carnival.hpp" +#include "ale/games/supported/Casino.hpp" +#include "ale/games/supported/Centipede.hpp" +#include "ale/games/supported/ChopperCommand.hpp" +#include "ale/games/supported/CrazyClimber.hpp" +#include "ale/games/supported/Crossbow.hpp" +#include "ale/games/supported/DarkChambers.hpp" +#include "ale/games/supported/Defender.hpp" +#include "ale/games/supported/DemonAttack.hpp" +#include "ale/games/supported/DonkeyKong.hpp" +#include "ale/games/supported/DoubleDunk.hpp" +#include "ale/games/supported/Earthworld.hpp" +#include "ale/games/supported/ElevatorAction.hpp" +#include "ale/games/supported/Enduro.hpp" +#include "ale/games/supported/Entombed.hpp" +#include "ale/games/supported/Et.hpp" +#include "ale/games/supported/FishingDerby.hpp" +#include "ale/games/supported/FlagCapture.hpp" +#include "ale/games/supported/Freeway.hpp" +#include "ale/games/supported/Frogger.hpp" +#include "ale/games/supported/Frostbite.hpp" +#include "ale/games/supported/Galaxian.hpp" +#include "ale/games/supported/Gopher.hpp" +#include "ale/games/supported/Gravitar.hpp" +#include "ale/games/supported/Hangman.hpp" +#include "ale/games/supported/HauntedHouse.hpp" +#include "ale/games/supported/Hero.hpp" +#include "ale/games/supported/HumanCannonball.hpp" +#include "ale/games/supported/IceHockey.hpp" +#include "ale/games/supported/JamesBond.hpp" +#include "ale/games/supported/JourneyEscape.hpp" +#include "ale/games/supported/Kaboom.hpp" +#include "ale/games/supported/Kangaroo.hpp" +#include "ale/games/supported/KeystoneKapers.hpp" +#include "ale/games/supported/Kingkong.hpp" +#include "ale/games/supported/Klax.hpp" +#include "ale/games/supported/Koolaid.hpp" +#include "ale/games/supported/Krull.hpp" +#include "ale/games/supported/KungFuMaster.hpp" +#include "ale/games/supported/LaserGates.hpp" +#include "ale/games/supported/LostLuggage.hpp" +#include "ale/games/supported/MarioBros.hpp" +#include "ale/games/supported/MiniatureGolf.hpp" +#include "ale/games/supported/MontezumaRevenge.hpp" +#include "ale/games/supported/MrDo.hpp" +#include "ale/games/supported/MsPacman.hpp" +#include "ale/games/supported/NameThisGame.hpp" +#include "ale/games/supported/Othello.hpp" +#include "ale/games/supported/Pacman.hpp" +#include "ale/games/supported/Phoenix.hpp" +#include "ale/games/supported/Pitfall.hpp" +#include "ale/games/supported/Pitfall2.hpp" +#include "ale/games/supported/Pong.hpp" +#include "ale/games/supported/Pooyan.hpp" +#include "ale/games/supported/PrivateEye.hpp" +#include "ale/games/supported/QBert.hpp" +#include "ale/games/supported/RiverRaid.hpp" +#include "ale/games/supported/RoadRunner.hpp" +#include "ale/games/supported/RoboTank.hpp" +#include "ale/games/supported/Seaquest.hpp" +#include "ale/games/supported/SirLancelot.hpp" +#include "ale/games/supported/Skiing.hpp" +#include "ale/games/supported/Solaris.hpp" +#include "ale/games/supported/SpaceInvaders.hpp" +#include "ale/games/supported/SpaceWar.hpp" +#include "ale/games/supported/StarGunner.hpp" +#include "ale/games/supported/Superman.hpp" +#include "ale/games/supported/Surround.hpp" +#include "ale/games/supported/Tennis.hpp" +#include "ale/games/supported/Tetris.hpp" +#include "ale/games/supported/TicTacToe3d.hpp" +#include "ale/games/supported/TimePilot.hpp" +#include "ale/games/supported/Trondead.hpp" +#include "ale/games/supported/Turmoil.hpp" +#include "ale/games/supported/Tutankham.hpp" +#include "ale/games/supported/UpNDown.hpp" +#include "ale/games/supported/Venture.hpp" +#include "ale/games/supported/VideoCheckers.hpp" +#include "ale/games/supported/VideoChess.hpp" +#include "ale/games/supported/VideoCube.hpp" +#include "ale/games/supported/VideoPinball.hpp" +#include "ale/games/supported/WizardOfWor.hpp" +#include "ale/games/supported/WordZapper.hpp" +#include "ale/games/supported/YarsRevenge.hpp" +#include "ale/games/supported/Zaxxon.hpp" + +namespace fs = std::filesystem; + +namespace ale { + +/* list of supported games */ +static const RomSettings* roms[] = { + new AdventureSettings(), + new AirRaidSettings(), + new AlienSettings(), + new AmidarSettings(), + new AssaultSettings(), + new AsterixSettings(), + new AsteroidsSettings(), + new AtlantisSettings(), + new Atlantis2Settings(), + new BackgammonSettings(), + new BankHeistSettings(), + new BasicMathSettings(), + new BattleZoneSettings(), + new BeamRiderSettings(), + new BerzerkSettings(), + new BlackjackSettings(), + new BowlingSettings(), + new BoxingSettings(), + new BreakoutSettings(), + new CarnivalSettings(), + new CasinoSettings(), + new CentipedeSettings(), + new ChopperCommandSettings(), + new CrazyClimberSettings(), + new CrossbowSettings(), + new DarkChambersSettings(), + new DefenderSettings(), + new DemonAttackSettings(), + new DonkeyKongSettings(), + new DoubleDunkSettings(), + new EarthworldSettings(), + new ElevatorActionSettings(), + new EnduroSettings(), + new EntombedSettings(), + new EtSettings(), + new FishingDerbySettings(), + new FlagCaptureSettings(), + new FreewaySettings(), + new FroggerSettings(), + new FrostbiteSettings(), + new GalaxianSettings(), + new GopherSettings(), + new GravitarSettings(), + new HangmanSettings(), + new HauntedHouseSettings(), + new HeroSettings(), + new HumanCannonballSettings(), + new IceHockeySettings(), + new JamesBondSettings(), + new JourneyEscapeSettings(), + new KaboomSettings(), + new KangarooSettings(), + new KoolaidSettings(), + new KeystoneKapersSettings(), + new KingkongSettings(), + new KlaxSettings(), + new KrullSettings(), + new KungFuMasterSettings(), + new LaserGatesSettings(), + new LostLuggageSettings(), + new MarioBrosSettings(), + new MiniatureGolfSettings(), + new MontezumaRevengeSettings(), + new MrDoSettings(), + new MsPacmanSettings(), + new NameThisGameSettings(), + new OthelloSettings(), + new PacmanSettings(), + new PhoenixSettings(), + new PitfallSettings(), + new Pitfall2Settings(), + new PongSettings(), + new PooyanSettings(), + new PrivateEyeSettings(), + new QBertSettings(), + new RiverRaidSettings(), + new RoadRunnerSettings(), + new RoboTankSettings(), + new SeaquestSettings(), + new SirLancelotSettings(), + new SkiingSettings(), + new SolarisSettings(), + new SpaceInvadersSettings(), + new SpaceWarSettings(), + new StarGunnerSettings(), + new SupermanSettings(), + new SurroundSettings(), + new TennisSettings(), + new TetrisSettings(), + new TicTacToe3dSettings(), + new TimePilotSettings(), + new TurmoilSettings(), + new TrondeadSettings(), + new TutankhamSettings(), + new UpNDownSettings(), + new VentureSettings(), + new VideoCheckersSettings(), + new VideoChessSettings(), + new VideoCubeSettings(), + new VideoPinballSettings(), + new WizardOfWorSettings(), + new WordZapperSettings(), + new YarsRevengeSettings(), + new ZaxxonSettings(), +}; +/* looks for the RL wrapper corresponding to a particular rom filename, + * and optionally md5. returns null if neither match */ +RomSettings* buildRomRLWrapper(const fs::path& rom, const std::string rom_md5 = std::string()){ + // Stem is filename excluding the extension. + std::string rom_str = rom.stem().string(); + std::transform(rom_str.begin(), rom_str.end(), rom_str.begin(), ::tolower); + + for (size_t i = 0; i < sizeof(roms) / sizeof(roms[0]); i++) { + if (rom_md5 == roms[i]->md5() || rom_str == roms[i]->rom()) + return roms[i]->clone(); + } + return NULL; +} + +} // namespace ale diff --git a/src/games/Roms.hpp b/src/ale/games/Roms.hpp similarity index 95% rename from src/games/Roms.hpp rename to src/ale/games/Roms.hpp index ed5821b24..5f908c99e 100644 --- a/src/games/Roms.hpp +++ b/src/ale/games/Roms.hpp @@ -16,7 +16,7 @@ #include #include -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace fs = std::filesystem; diff --git a/src/games/supported/Adventure.cpp b/src/ale/games/supported/Adventure.cpp similarity index 98% rename from src/games/supported/Adventure.cpp rename to src/ale/games/supported/Adventure.cpp index eaf867e60..f09ad4588 100644 --- a/src/games/supported/Adventure.cpp +++ b/src/ale/games/supported/Adventure.cpp @@ -24,9 +24,9 @@ * ***************************************************************************** */ -#include "games/supported/Adventure.hpp" +#include "ale/games/supported/Adventure.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Adventure.hpp b/src/ale/games/supported/Adventure.hpp similarity index 98% rename from src/games/supported/Adventure.hpp rename to src/ale/games/supported/Adventure.hpp index 25219ee43..6f102ee17 100644 --- a/src/games/supported/Adventure.hpp +++ b/src/ale/games/supported/Adventure.hpp @@ -27,7 +27,7 @@ #ifndef __ADVENTURE_HPP__ #define __ADVENTURE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/AirRaid.cpp b/src/ale/games/supported/AirRaid.cpp similarity index 97% rename from src/games/supported/AirRaid.cpp rename to src/ale/games/supported/AirRaid.cpp index da4a69568..6fb8fd209 100644 --- a/src/games/supported/AirRaid.cpp +++ b/src/ale/games/supported/AirRaid.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/AirRaid.hpp" +#include "ale/games/supported/AirRaid.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/AirRaid.hpp b/src/ale/games/supported/AirRaid.hpp similarity index 98% rename from src/games/supported/AirRaid.hpp rename to src/ale/games/supported/AirRaid.hpp index 28bd89e3c..3b534f933 100644 --- a/src/games/supported/AirRaid.hpp +++ b/src/ale/games/supported/AirRaid.hpp @@ -13,7 +13,7 @@ #ifndef __AIRRAID_HPP__ #define __AIRRAID_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Alien.cpp b/src/ale/games/supported/Alien.cpp similarity index 98% rename from src/games/supported/Alien.cpp rename to src/ale/games/supported/Alien.cpp index 481956913..c92db4dc8 100644 --- a/src/games/supported/Alien.cpp +++ b/src/ale/games/supported/Alien.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Alien.hpp" +#include "ale/games/supported/Alien.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Alien.hpp b/src/ale/games/supported/Alien.hpp similarity index 98% rename from src/games/supported/Alien.hpp rename to src/ale/games/supported/Alien.hpp index edb365cb2..650351592 100644 --- a/src/games/supported/Alien.hpp +++ b/src/ale/games/supported/Alien.hpp @@ -28,7 +28,7 @@ #ifndef __ALIEN_HPP__ #define __ALIEN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Amidar.cpp b/src/ale/games/supported/Amidar.cpp similarity index 97% rename from src/games/supported/Amidar.cpp rename to src/ale/games/supported/Amidar.cpp index 511a8c4d8..58362c8ff 100644 --- a/src/games/supported/Amidar.cpp +++ b/src/ale/games/supported/Amidar.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Amidar.hpp" +#include "ale/games/supported/Amidar.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Amidar.hpp b/src/ale/games/supported/Amidar.hpp similarity index 98% rename from src/games/supported/Amidar.hpp rename to src/ale/games/supported/Amidar.hpp index 1df05b81f..c78663964 100644 --- a/src/games/supported/Amidar.hpp +++ b/src/ale/games/supported/Amidar.hpp @@ -28,7 +28,7 @@ #ifndef __AMIDAR_HPP__ #define __AMIDAR_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Assault.cpp b/src/ale/games/supported/Assault.cpp similarity index 97% rename from src/games/supported/Assault.cpp rename to src/ale/games/supported/Assault.cpp index 52b9b9ad6..f55e7b54f 100644 --- a/src/games/supported/Assault.cpp +++ b/src/ale/games/supported/Assault.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Assault.hpp" +#include "ale/games/supported/Assault.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Assault.hpp b/src/ale/games/supported/Assault.hpp similarity index 98% rename from src/games/supported/Assault.hpp rename to src/ale/games/supported/Assault.hpp index 379aa8d4a..218cdac35 100644 --- a/src/games/supported/Assault.hpp +++ b/src/ale/games/supported/Assault.hpp @@ -28,7 +28,7 @@ #ifndef __ASSAULT_HPP__ #define __ASSAULT_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Asterix.cpp b/src/ale/games/supported/Asterix.cpp similarity index 97% rename from src/games/supported/Asterix.cpp rename to src/ale/games/supported/Asterix.cpp index 764b437fc..94346598d 100644 --- a/src/games/supported/Asterix.cpp +++ b/src/ale/games/supported/Asterix.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Asterix.hpp" +#include "ale/games/supported/Asterix.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Asterix.hpp b/src/ale/games/supported/Asterix.hpp similarity index 98% rename from src/games/supported/Asterix.hpp rename to src/ale/games/supported/Asterix.hpp index f0fe055f4..6edd65ef7 100644 --- a/src/games/supported/Asterix.hpp +++ b/src/ale/games/supported/Asterix.hpp @@ -28,7 +28,7 @@ #ifndef __ASTERIX_HPP__ #define __ASTERIX_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Asteroids.cpp b/src/ale/games/supported/Asteroids.cpp similarity index 98% rename from src/games/supported/Asteroids.cpp rename to src/ale/games/supported/Asteroids.cpp index fc0d2e0fa..7554fef12 100644 --- a/src/games/supported/Asteroids.cpp +++ b/src/ale/games/supported/Asteroids.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Asteroids.hpp" +#include "ale/games/supported/Asteroids.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Asteroids.hpp b/src/ale/games/supported/Asteroids.hpp similarity index 98% rename from src/games/supported/Asteroids.hpp rename to src/ale/games/supported/Asteroids.hpp index 684064943..5b9869128 100644 --- a/src/games/supported/Asteroids.hpp +++ b/src/ale/games/supported/Asteroids.hpp @@ -28,7 +28,7 @@ #ifndef __ASTEROIDS_HPP__ #define __ASTEROIDS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Atlantis.cpp b/src/ale/games/supported/Atlantis.cpp similarity index 98% rename from src/games/supported/Atlantis.cpp rename to src/ale/games/supported/Atlantis.cpp index bfd662526..b039613fb 100644 --- a/src/games/supported/Atlantis.cpp +++ b/src/ale/games/supported/Atlantis.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Atlantis.hpp" +#include "ale/games/supported/Atlantis.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Atlantis.hpp b/src/ale/games/supported/Atlantis.hpp similarity index 98% rename from src/games/supported/Atlantis.hpp rename to src/ale/games/supported/Atlantis.hpp index e83737e79..b05cec981 100644 --- a/src/games/supported/Atlantis.hpp +++ b/src/ale/games/supported/Atlantis.hpp @@ -28,7 +28,7 @@ #ifndef __ATLANTIS_HPP__ #define __ATLANTIS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Atlantis2.cpp b/src/ale/games/supported/Atlantis2.cpp similarity index 97% rename from src/games/supported/Atlantis2.cpp rename to src/ale/games/supported/Atlantis2.cpp index fcf0462f3..d27362141 100644 --- a/src/games/supported/Atlantis2.cpp +++ b/src/ale/games/supported/Atlantis2.cpp @@ -28,9 +28,9 @@ * ***************************************************************************** */ -#include "games/supported/Atlantis2.hpp" +#include "ale/games/supported/Atlantis2.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Atlantis2.hpp b/src/ale/games/supported/Atlantis2.hpp similarity index 98% rename from src/games/supported/Atlantis2.hpp rename to src/ale/games/supported/Atlantis2.hpp index 16867fd0f..e2e5a3e00 100644 --- a/src/games/supported/Atlantis2.hpp +++ b/src/ale/games/supported/Atlantis2.hpp @@ -31,7 +31,7 @@ #ifndef __ATLANTIS2_HPP__ #define __ATLANTIS2_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Backgammon.cpp b/src/ale/games/supported/Backgammon.cpp similarity index 98% rename from src/games/supported/Backgammon.cpp rename to src/ale/games/supported/Backgammon.cpp index 32ff0f68d..c9c43856f 100644 --- a/src/games/supported/Backgammon.cpp +++ b/src/ale/games/supported/Backgammon.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Backgammon.hpp" +#include "ale/games/supported/Backgammon.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Backgammon.hpp b/src/ale/games/supported/Backgammon.hpp similarity index 98% rename from src/games/supported/Backgammon.hpp rename to src/ale/games/supported/Backgammon.hpp index c35fc6bae..2e1a596a3 100644 --- a/src/games/supported/Backgammon.hpp +++ b/src/ale/games/supported/Backgammon.hpp @@ -28,7 +28,7 @@ #ifndef __BACKGAMMON_HPP__ #define __BACKGAMMON_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/BankHeist.cpp b/src/ale/games/supported/BankHeist.cpp similarity index 98% rename from src/games/supported/BankHeist.cpp rename to src/ale/games/supported/BankHeist.cpp index f35f25ddc..1854ab5eb 100644 --- a/src/games/supported/BankHeist.cpp +++ b/src/ale/games/supported/BankHeist.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/BankHeist.hpp" +#include "ale/games/supported/BankHeist.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/BankHeist.hpp b/src/ale/games/supported/BankHeist.hpp similarity index 98% rename from src/games/supported/BankHeist.hpp rename to src/ale/games/supported/BankHeist.hpp index 4b325c5b9..8108f7bb2 100644 --- a/src/games/supported/BankHeist.hpp +++ b/src/ale/games/supported/BankHeist.hpp @@ -28,7 +28,7 @@ #ifndef __BANKHEIST_HPP__ #define __BANKHEIST_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/BasicMath.cpp b/src/ale/games/supported/BasicMath.cpp similarity index 97% rename from src/games/supported/BasicMath.cpp rename to src/ale/games/supported/BasicMath.cpp index f276f48dc..bb28c1ff8 100644 --- a/src/games/supported/BasicMath.cpp +++ b/src/ale/games/supported/BasicMath.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/BasicMath.hpp" +#include "ale/games/supported/BasicMath.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/BasicMath.hpp b/src/ale/games/supported/BasicMath.hpp similarity index 98% rename from src/games/supported/BasicMath.hpp rename to src/ale/games/supported/BasicMath.hpp index 2dff445c8..7dab429ee 100644 --- a/src/games/supported/BasicMath.hpp +++ b/src/ale/games/supported/BasicMath.hpp @@ -26,7 +26,7 @@ #ifndef __BASIC_MATH_HPP__ #define __BASIC_MATH_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/BattleZone.cpp b/src/ale/games/supported/BattleZone.cpp similarity index 98% rename from src/games/supported/BattleZone.cpp rename to src/ale/games/supported/BattleZone.cpp index 78c252430..1b5307393 100644 --- a/src/games/supported/BattleZone.cpp +++ b/src/ale/games/supported/BattleZone.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/BattleZone.hpp" +#include "ale/games/supported/BattleZone.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/BattleZone.hpp b/src/ale/games/supported/BattleZone.hpp similarity index 98% rename from src/games/supported/BattleZone.hpp rename to src/ale/games/supported/BattleZone.hpp index b2c4d0f5e..0968cb02d 100644 --- a/src/games/supported/BattleZone.hpp +++ b/src/ale/games/supported/BattleZone.hpp @@ -28,7 +28,7 @@ #ifndef __BATTLEZONE_HPP__ #define __BATTLEZONE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/BeamRider.cpp b/src/ale/games/supported/BeamRider.cpp similarity index 97% rename from src/games/supported/BeamRider.cpp rename to src/ale/games/supported/BeamRider.cpp index 021428b0a..dcc1037ed 100644 --- a/src/games/supported/BeamRider.cpp +++ b/src/ale/games/supported/BeamRider.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/BeamRider.hpp" +#include "ale/games/supported/BeamRider.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/BeamRider.hpp b/src/ale/games/supported/BeamRider.hpp similarity index 98% rename from src/games/supported/BeamRider.hpp rename to src/ale/games/supported/BeamRider.hpp index f38902556..c51b6e14a 100644 --- a/src/games/supported/BeamRider.hpp +++ b/src/ale/games/supported/BeamRider.hpp @@ -28,7 +28,7 @@ #ifndef __BEAMRIDER_HPP__ #define __BEAMRIDER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Berzerk.cpp b/src/ale/games/supported/Berzerk.cpp similarity index 98% rename from src/games/supported/Berzerk.cpp rename to src/ale/games/supported/Berzerk.cpp index 324fd3aae..aaf18e752 100644 --- a/src/games/supported/Berzerk.cpp +++ b/src/ale/games/supported/Berzerk.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Berzerk.hpp" +#include "ale/games/supported/Berzerk.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Berzerk.hpp b/src/ale/games/supported/Berzerk.hpp similarity index 98% rename from src/games/supported/Berzerk.hpp rename to src/ale/games/supported/Berzerk.hpp index ca756c18c..ec8aab2ee 100644 --- a/src/games/supported/Berzerk.hpp +++ b/src/ale/games/supported/Berzerk.hpp @@ -28,7 +28,7 @@ #ifndef __BERZERK_HPP__ #define __BERZERK_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Blackjack.cpp b/src/ale/games/supported/Blackjack.cpp similarity index 97% rename from src/games/supported/Blackjack.cpp rename to src/ale/games/supported/Blackjack.cpp index 6675d79ea..9986949b3 100644 --- a/src/games/supported/Blackjack.cpp +++ b/src/ale/games/supported/Blackjack.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Blackjack.hpp" +#include "ale/games/supported/Blackjack.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Blackjack.hpp b/src/ale/games/supported/Blackjack.hpp similarity index 98% rename from src/games/supported/Blackjack.hpp rename to src/ale/games/supported/Blackjack.hpp index 3f4473815..1b9eb975e 100644 --- a/src/games/supported/Blackjack.hpp +++ b/src/ale/games/supported/Blackjack.hpp @@ -26,7 +26,7 @@ #ifndef __BLACKJACK_HPP__ #define __BLACKJACK_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Bowling.cpp b/src/ale/games/supported/Bowling.cpp similarity index 97% rename from src/games/supported/Bowling.cpp rename to src/ale/games/supported/Bowling.cpp index 74f7c6c5a..ee453c608 100644 --- a/src/games/supported/Bowling.cpp +++ b/src/ale/games/supported/Bowling.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Bowling.hpp" +#include "ale/games/supported/Bowling.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Bowling.hpp b/src/ale/games/supported/Bowling.hpp similarity index 98% rename from src/games/supported/Bowling.hpp rename to src/ale/games/supported/Bowling.hpp index a114a9d9d..75f32ffe8 100644 --- a/src/games/supported/Bowling.hpp +++ b/src/ale/games/supported/Bowling.hpp @@ -28,7 +28,7 @@ #ifndef __BOWLING_HPP__ #define __BOWLING_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Boxing.cpp b/src/ale/games/supported/Boxing.cpp similarity index 97% rename from src/games/supported/Boxing.cpp rename to src/ale/games/supported/Boxing.cpp index a8daa9ce4..5d41cc836 100644 --- a/src/games/supported/Boxing.cpp +++ b/src/ale/games/supported/Boxing.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Boxing.hpp" +#include "ale/games/supported/Boxing.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Boxing.hpp b/src/ale/games/supported/Boxing.hpp similarity index 98% rename from src/games/supported/Boxing.hpp rename to src/ale/games/supported/Boxing.hpp index c5e06fb82..942bc8ec3 100644 --- a/src/games/supported/Boxing.hpp +++ b/src/ale/games/supported/Boxing.hpp @@ -28,7 +28,7 @@ #ifndef __BOXING_HPP__ #define __BOXING_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Breakout.cpp b/src/ale/games/supported/Breakout.cpp similarity index 98% rename from src/games/supported/Breakout.cpp rename to src/ale/games/supported/Breakout.cpp index b32911294..2a35d1d4b 100644 --- a/src/games/supported/Breakout.cpp +++ b/src/ale/games/supported/Breakout.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Breakout.hpp" +#include "ale/games/supported/Breakout.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Breakout.hpp b/src/ale/games/supported/Breakout.hpp similarity index 98% rename from src/games/supported/Breakout.hpp rename to src/ale/games/supported/Breakout.hpp index a87879d53..a686741ef 100644 --- a/src/games/supported/Breakout.hpp +++ b/src/ale/games/supported/Breakout.hpp @@ -28,7 +28,7 @@ #ifndef __BREAKOUT_HPP__ #define __BREAKOUT_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/CMakeLists.txt b/src/ale/games/supported/CMakeLists.txt similarity index 100% rename from src/games/supported/CMakeLists.txt rename to src/ale/games/supported/CMakeLists.txt diff --git a/src/games/supported/Carnival.cpp b/src/ale/games/supported/Carnival.cpp similarity index 96% rename from src/games/supported/Carnival.cpp rename to src/ale/games/supported/Carnival.cpp index d88094e4e..21cecafad 100644 --- a/src/games/supported/Carnival.cpp +++ b/src/ale/games/supported/Carnival.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Carnival.hpp" +#include "ale/games/supported/Carnival.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Carnival.hpp b/src/ale/games/supported/Carnival.hpp similarity index 98% rename from src/games/supported/Carnival.hpp rename to src/ale/games/supported/Carnival.hpp index 7c73145ee..6ab6aaa6f 100644 --- a/src/games/supported/Carnival.hpp +++ b/src/ale/games/supported/Carnival.hpp @@ -28,7 +28,7 @@ #ifndef __CARNIVAL_HPP__ #define __CARNIVAL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Casino.cpp b/src/ale/games/supported/Casino.cpp similarity index 98% rename from src/games/supported/Casino.cpp rename to src/ale/games/supported/Casino.cpp index 62eb71967..2688c0706 100644 --- a/src/games/supported/Casino.cpp +++ b/src/ale/games/supported/Casino.cpp @@ -23,10 +23,10 @@ * ***************************************************************************** */ -#include "games/supported/Casino.hpp" +#include "ale/games/supported/Casino.hpp" -#include "games/RomUtils.hpp" -#include "common/Constants.h" +#include "ale/games/RomUtils.hpp" +#include "ale/common/Constants.h" namespace ale { using namespace stella; diff --git a/src/games/supported/Casino.hpp b/src/ale/games/supported/Casino.hpp similarity index 98% rename from src/games/supported/Casino.hpp rename to src/ale/games/supported/Casino.hpp index c7ff42c24..b81e38889 100644 --- a/src/games/supported/Casino.hpp +++ b/src/ale/games/supported/Casino.hpp @@ -26,7 +26,7 @@ #ifndef __CASINO_HPP__ #define __CASINO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Centipede.cpp b/src/ale/games/supported/Centipede.cpp similarity index 98% rename from src/games/supported/Centipede.cpp rename to src/ale/games/supported/Centipede.cpp index 2e2d1e7da..0c2043be2 100644 --- a/src/games/supported/Centipede.cpp +++ b/src/ale/games/supported/Centipede.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Centipede.hpp" +#include "ale/games/supported/Centipede.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Centipede.hpp b/src/ale/games/supported/Centipede.hpp similarity index 98% rename from src/games/supported/Centipede.hpp rename to src/ale/games/supported/Centipede.hpp index ac371c824..92b97243f 100644 --- a/src/games/supported/Centipede.hpp +++ b/src/ale/games/supported/Centipede.hpp @@ -28,7 +28,7 @@ #ifndef __CENTIPEDE_HPP__ #define __CENTIPEDE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/ChopperCommand.cpp b/src/ale/games/supported/ChopperCommand.cpp similarity index 98% rename from src/games/supported/ChopperCommand.cpp rename to src/ale/games/supported/ChopperCommand.cpp index e83bf48c1..9b2533264 100644 --- a/src/games/supported/ChopperCommand.cpp +++ b/src/ale/games/supported/ChopperCommand.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/ChopperCommand.hpp" +#include "ale/games/supported/ChopperCommand.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/ChopperCommand.hpp b/src/ale/games/supported/ChopperCommand.hpp similarity index 98% rename from src/games/supported/ChopperCommand.hpp rename to src/ale/games/supported/ChopperCommand.hpp index c9451a966..56b3e8e58 100644 --- a/src/games/supported/ChopperCommand.hpp +++ b/src/ale/games/supported/ChopperCommand.hpp @@ -28,7 +28,7 @@ #ifndef __CHOPPERCOMMAND_HPP__ #define __CHOPPERCOMMAND_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/CrazyClimber.cpp b/src/ale/games/supported/CrazyClimber.cpp similarity index 98% rename from src/games/supported/CrazyClimber.cpp rename to src/ale/games/supported/CrazyClimber.cpp index ef22f10a8..4569e0e85 100644 --- a/src/games/supported/CrazyClimber.cpp +++ b/src/ale/games/supported/CrazyClimber.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/CrazyClimber.hpp" +#include "ale/games/supported/CrazyClimber.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/CrazyClimber.hpp b/src/ale/games/supported/CrazyClimber.hpp similarity index 98% rename from src/games/supported/CrazyClimber.hpp rename to src/ale/games/supported/CrazyClimber.hpp index 17c02e25d..515853045 100644 --- a/src/games/supported/CrazyClimber.hpp +++ b/src/ale/games/supported/CrazyClimber.hpp @@ -28,7 +28,7 @@ #ifndef __CRAZYCLIMBER_HPP__ #define __CRAZYCLIMBER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Crossbow.cpp b/src/ale/games/supported/Crossbow.cpp similarity index 98% rename from src/games/supported/Crossbow.cpp rename to src/ale/games/supported/Crossbow.cpp index e2a593ec2..9322f2317 100644 --- a/src/games/supported/Crossbow.cpp +++ b/src/ale/games/supported/Crossbow.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Crossbow.hpp" +#include "ale/games/supported/Crossbow.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Crossbow.hpp b/src/ale/games/supported/Crossbow.hpp similarity index 98% rename from src/games/supported/Crossbow.hpp rename to src/ale/games/supported/Crossbow.hpp index 87576b9f8..f09332f1e 100644 --- a/src/games/supported/Crossbow.hpp +++ b/src/ale/games/supported/Crossbow.hpp @@ -26,7 +26,7 @@ #ifndef __CROSSBOW_HPP__ #define __CROSSBOW_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/DarkChambers.cpp b/src/ale/games/supported/DarkChambers.cpp similarity index 98% rename from src/games/supported/DarkChambers.cpp rename to src/ale/games/supported/DarkChambers.cpp index 66fbd5800..7bf25f50b 100644 --- a/src/games/supported/DarkChambers.cpp +++ b/src/ale/games/supported/DarkChambers.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/DarkChambers.hpp" +#include "ale/games/supported/DarkChambers.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/DarkChambers.hpp b/src/ale/games/supported/DarkChambers.hpp similarity index 98% rename from src/games/supported/DarkChambers.hpp rename to src/ale/games/supported/DarkChambers.hpp index 84d05bf25..ceeae7957 100644 --- a/src/games/supported/DarkChambers.hpp +++ b/src/ale/games/supported/DarkChambers.hpp @@ -26,7 +26,7 @@ #ifndef __DARK_CHAMBERS_HPP__ #define __DARK_CHAMBERS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Defender.cpp b/src/ale/games/supported/Defender.cpp similarity index 98% rename from src/games/supported/Defender.cpp rename to src/ale/games/supported/Defender.cpp index b36478803..421e55406 100644 --- a/src/games/supported/Defender.cpp +++ b/src/ale/games/supported/Defender.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Defender.hpp" +#include "ale/games/supported/Defender.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Defender.hpp b/src/ale/games/supported/Defender.hpp similarity index 98% rename from src/games/supported/Defender.hpp rename to src/ale/games/supported/Defender.hpp index 0c1ac6bda..618a941b0 100644 --- a/src/games/supported/Defender.hpp +++ b/src/ale/games/supported/Defender.hpp @@ -28,7 +28,7 @@ #ifndef __DEFENDER_HPP__ #define __DEFENDER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/DemonAttack.cpp b/src/ale/games/supported/DemonAttack.cpp similarity index 98% rename from src/games/supported/DemonAttack.cpp rename to src/ale/games/supported/DemonAttack.cpp index c830aaf10..7ccdd004a 100644 --- a/src/games/supported/DemonAttack.cpp +++ b/src/ale/games/supported/DemonAttack.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/DemonAttack.hpp" +#include "ale/games/supported/DemonAttack.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/DemonAttack.hpp b/src/ale/games/supported/DemonAttack.hpp similarity index 98% rename from src/games/supported/DemonAttack.hpp rename to src/ale/games/supported/DemonAttack.hpp index 7da335731..b1cedf522 100644 --- a/src/games/supported/DemonAttack.hpp +++ b/src/ale/games/supported/DemonAttack.hpp @@ -28,7 +28,7 @@ #ifndef __DEMONATTACK_HPP__ #define __DEMONATTACK_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/DonkeyKong.cpp b/src/ale/games/supported/DonkeyKong.cpp similarity index 97% rename from src/games/supported/DonkeyKong.cpp rename to src/ale/games/supported/DonkeyKong.cpp index aa2542cbd..9caabe795 100644 --- a/src/games/supported/DonkeyKong.cpp +++ b/src/ale/games/supported/DonkeyKong.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/DonkeyKong.hpp" +#include "ale/games/supported/DonkeyKong.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/DonkeyKong.hpp b/src/ale/games/supported/DonkeyKong.hpp similarity index 98% rename from src/games/supported/DonkeyKong.hpp rename to src/ale/games/supported/DonkeyKong.hpp index 41df4a037..e367c0623 100644 --- a/src/games/supported/DonkeyKong.hpp +++ b/src/ale/games/supported/DonkeyKong.hpp @@ -13,7 +13,7 @@ #ifndef __DONKEYKONG_HPP__ #define __DONKEYKONG_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/DoubleDunk.cpp b/src/ale/games/supported/DoubleDunk.cpp similarity index 98% rename from src/games/supported/DoubleDunk.cpp rename to src/ale/games/supported/DoubleDunk.cpp index d7a0d6f86..c2832f8fe 100644 --- a/src/games/supported/DoubleDunk.cpp +++ b/src/ale/games/supported/DoubleDunk.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/DoubleDunk.hpp" +#include "ale/games/supported/DoubleDunk.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/DoubleDunk.hpp b/src/ale/games/supported/DoubleDunk.hpp similarity index 99% rename from src/games/supported/DoubleDunk.hpp rename to src/ale/games/supported/DoubleDunk.hpp index e0421aeef..d8da7ec1d 100644 --- a/src/games/supported/DoubleDunk.hpp +++ b/src/ale/games/supported/DoubleDunk.hpp @@ -28,7 +28,7 @@ #ifndef __DOUBLEDUNK_HPP__ #define __DOUBLEDUNK_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Earthworld.cpp b/src/ale/games/supported/Earthworld.cpp similarity index 97% rename from src/games/supported/Earthworld.cpp rename to src/ale/games/supported/Earthworld.cpp index 9448d7d40..11249d365 100644 --- a/src/games/supported/Earthworld.cpp +++ b/src/ale/games/supported/Earthworld.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Earthworld.hpp" +#include "ale/games/supported/Earthworld.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Earthworld.hpp b/src/ale/games/supported/Earthworld.hpp similarity index 98% rename from src/games/supported/Earthworld.hpp rename to src/ale/games/supported/Earthworld.hpp index 71e970d28..f93f02f6f 100644 --- a/src/games/supported/Earthworld.hpp +++ b/src/ale/games/supported/Earthworld.hpp @@ -26,7 +26,7 @@ #ifndef __EARTHWORLD_HPP__ #define __EARTHWORLD_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/ElevatorAction.cpp b/src/ale/games/supported/ElevatorAction.cpp similarity index 97% rename from src/games/supported/ElevatorAction.cpp rename to src/ale/games/supported/ElevatorAction.cpp index 6c78bba12..25628da0f 100644 --- a/src/games/supported/ElevatorAction.cpp +++ b/src/ale/games/supported/ElevatorAction.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/ElevatorAction.hpp" +#include "ale/games/supported/ElevatorAction.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/ElevatorAction.hpp b/src/ale/games/supported/ElevatorAction.hpp similarity index 98% rename from src/games/supported/ElevatorAction.hpp rename to src/ale/games/supported/ElevatorAction.hpp index 7e1ca1722..f84a9c187 100644 --- a/src/games/supported/ElevatorAction.hpp +++ b/src/ale/games/supported/ElevatorAction.hpp @@ -28,7 +28,7 @@ #ifndef __ELEVATORACTION_HPP__ #define __ELEVATORACTION_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Enduro.cpp b/src/ale/games/supported/Enduro.cpp similarity index 97% rename from src/games/supported/Enduro.cpp rename to src/ale/games/supported/Enduro.cpp index 7b887f3ed..5bf47332f 100644 --- a/src/games/supported/Enduro.cpp +++ b/src/ale/games/supported/Enduro.cpp @@ -10,11 +10,11 @@ * ***************************************************************************** */ -#include "games/supported/Enduro.hpp" +#include "ale/games/supported/Enduro.hpp" #include -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Enduro.hpp b/src/ale/games/supported/Enduro.hpp similarity index 98% rename from src/games/supported/Enduro.hpp rename to src/ale/games/supported/Enduro.hpp index 42661799b..9753088aa 100644 --- a/src/games/supported/Enduro.hpp +++ b/src/ale/games/supported/Enduro.hpp @@ -28,7 +28,7 @@ #ifndef __ENDURO_HPP__ #define __ENDURO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Entombed.cpp b/src/ale/games/supported/Entombed.cpp similarity index 97% rename from src/games/supported/Entombed.cpp rename to src/ale/games/supported/Entombed.cpp index 8bb7d63c8..bc172d3af 100644 --- a/src/games/supported/Entombed.cpp +++ b/src/ale/games/supported/Entombed.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Entombed.hpp" +#include "ale/games/supported/Entombed.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Entombed.hpp b/src/ale/games/supported/Entombed.hpp similarity index 98% rename from src/games/supported/Entombed.hpp rename to src/ale/games/supported/Entombed.hpp index 4db3fec86..cbd873448 100644 --- a/src/games/supported/Entombed.hpp +++ b/src/ale/games/supported/Entombed.hpp @@ -26,7 +26,7 @@ #ifndef __ENTOMBED_HPP__ #define __ENTOMBED_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Et.cpp b/src/ale/games/supported/Et.cpp similarity index 98% rename from src/games/supported/Et.cpp rename to src/ale/games/supported/Et.cpp index 5483b0a56..efa9013ab 100644 --- a/src/games/supported/Et.cpp +++ b/src/ale/games/supported/Et.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Et.hpp" +#include "ale/games/supported/Et.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Et.hpp b/src/ale/games/supported/Et.hpp similarity index 98% rename from src/games/supported/Et.hpp rename to src/ale/games/supported/Et.hpp index 32a1d23e7..ae014eab3 100644 --- a/src/games/supported/Et.hpp +++ b/src/ale/games/supported/Et.hpp @@ -26,7 +26,7 @@ #ifndef __ET_HPP__ #define __ET_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/FishingDerby.cpp b/src/ale/games/supported/FishingDerby.cpp similarity index 97% rename from src/games/supported/FishingDerby.cpp rename to src/ale/games/supported/FishingDerby.cpp index 2d753a114..fa98e5500 100644 --- a/src/games/supported/FishingDerby.cpp +++ b/src/ale/games/supported/FishingDerby.cpp @@ -10,11 +10,11 @@ * ***************************************************************************** */ -#include "games/supported/FishingDerby.hpp" +#include "ale/games/supported/FishingDerby.hpp" #include -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/FishingDerby.hpp b/src/ale/games/supported/FishingDerby.hpp similarity index 98% rename from src/games/supported/FishingDerby.hpp rename to src/ale/games/supported/FishingDerby.hpp index 6b6122e7b..4bbf81be0 100644 --- a/src/games/supported/FishingDerby.hpp +++ b/src/ale/games/supported/FishingDerby.hpp @@ -28,7 +28,7 @@ #ifndef __FISHINGDERBY_HPP__ #define __FISHINGDERBY_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/FlagCapture.cpp b/src/ale/games/supported/FlagCapture.cpp similarity index 97% rename from src/games/supported/FlagCapture.cpp rename to src/ale/games/supported/FlagCapture.cpp index 6489244db..536036dc0 100644 --- a/src/games/supported/FlagCapture.cpp +++ b/src/ale/games/supported/FlagCapture.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/FlagCapture.hpp" +#include "ale/games/supported/FlagCapture.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/FlagCapture.hpp b/src/ale/games/supported/FlagCapture.hpp similarity index 98% rename from src/games/supported/FlagCapture.hpp rename to src/ale/games/supported/FlagCapture.hpp index 40c61052a..4b563ec6a 100644 --- a/src/games/supported/FlagCapture.hpp +++ b/src/ale/games/supported/FlagCapture.hpp @@ -26,7 +26,7 @@ #ifndef __FLAG_CAPTURE_HPP__ #define __FLAG_CAPTURE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Freeway.cpp b/src/ale/games/supported/Freeway.cpp similarity index 97% rename from src/games/supported/Freeway.cpp rename to src/ale/games/supported/Freeway.cpp index 321c4b3ab..dede340cf 100644 --- a/src/games/supported/Freeway.cpp +++ b/src/ale/games/supported/Freeway.cpp @@ -12,9 +12,9 @@ * ***************************************************************************** */ -#include "games/supported/Freeway.hpp" +#include "ale/games/supported/Freeway.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Freeway.hpp b/src/ale/games/supported/Freeway.hpp similarity index 97% rename from src/games/supported/Freeway.hpp rename to src/ale/games/supported/Freeway.hpp index 846e33e9e..d62356caa 100644 --- a/src/games/supported/Freeway.hpp +++ b/src/ale/games/supported/Freeway.hpp @@ -28,8 +28,8 @@ #ifndef __FREEWAY_HPP__ #define __FREEWAY_HPP__ -#include "environment/stella_environment_wrapper.hpp" -#include "games/RomSettings.hpp" +#include "ale/environment/stella_environment_wrapper.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Frogger.cpp b/src/ale/games/supported/Frogger.cpp similarity index 97% rename from src/games/supported/Frogger.cpp rename to src/ale/games/supported/Frogger.cpp index d49ab48b0..d9ab78c71 100644 --- a/src/games/supported/Frogger.cpp +++ b/src/ale/games/supported/Frogger.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Frogger.hpp" +#include "ale/games/supported/Frogger.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Frogger.hpp b/src/ale/games/supported/Frogger.hpp similarity index 98% rename from src/games/supported/Frogger.hpp rename to src/ale/games/supported/Frogger.hpp index 421a0b933..e0ef39c11 100644 --- a/src/games/supported/Frogger.hpp +++ b/src/ale/games/supported/Frogger.hpp @@ -13,7 +13,7 @@ #ifndef __FROGGER_HPP__ #define __FROGGER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Frostbite.cpp b/src/ale/games/supported/Frostbite.cpp similarity index 98% rename from src/games/supported/Frostbite.cpp rename to src/ale/games/supported/Frostbite.cpp index 792cc937b..188e01a6a 100644 --- a/src/games/supported/Frostbite.cpp +++ b/src/ale/games/supported/Frostbite.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Frostbite.hpp" +#include "ale/games/supported/Frostbite.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Frostbite.hpp b/src/ale/games/supported/Frostbite.hpp similarity index 98% rename from src/games/supported/Frostbite.hpp rename to src/ale/games/supported/Frostbite.hpp index 7070fe80e..691ad3e96 100644 --- a/src/games/supported/Frostbite.hpp +++ b/src/ale/games/supported/Frostbite.hpp @@ -28,7 +28,7 @@ #ifndef __FROSTBITE_HPP__ #define __FROSTBITE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Galaxian.cpp b/src/ale/games/supported/Galaxian.cpp similarity index 98% rename from src/games/supported/Galaxian.cpp rename to src/ale/games/supported/Galaxian.cpp index 45966005d..e5f60bbff 100644 --- a/src/games/supported/Galaxian.cpp +++ b/src/ale/games/supported/Galaxian.cpp @@ -24,9 +24,9 @@ * ***************************************************************************** */ -#include "games/supported/Galaxian.hpp" +#include "ale/games/supported/Galaxian.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Galaxian.hpp b/src/ale/games/supported/Galaxian.hpp similarity index 98% rename from src/games/supported/Galaxian.hpp rename to src/ale/games/supported/Galaxian.hpp index 181f33fef..ebe4918e0 100644 --- a/src/games/supported/Galaxian.hpp +++ b/src/ale/games/supported/Galaxian.hpp @@ -27,7 +27,7 @@ #ifndef __GALAXIAN_HPP__ #define __GALAXIAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Gopher.cpp b/src/ale/games/supported/Gopher.cpp similarity index 98% rename from src/games/supported/Gopher.cpp rename to src/ale/games/supported/Gopher.cpp index 1ae7b8ba5..30ad38725 100644 --- a/src/games/supported/Gopher.cpp +++ b/src/ale/games/supported/Gopher.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Gopher.hpp" +#include "ale/games/supported/Gopher.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Gopher.hpp b/src/ale/games/supported/Gopher.hpp similarity index 98% rename from src/games/supported/Gopher.hpp rename to src/ale/games/supported/Gopher.hpp index 99f79793f..02d612e58 100644 --- a/src/games/supported/Gopher.hpp +++ b/src/ale/games/supported/Gopher.hpp @@ -28,7 +28,7 @@ #ifndef __GOPHER_HPP__ #define __GOPHER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Gravitar.cpp b/src/ale/games/supported/Gravitar.cpp similarity index 98% rename from src/games/supported/Gravitar.cpp rename to src/ale/games/supported/Gravitar.cpp index c5595c47d..8437a89d1 100644 --- a/src/games/supported/Gravitar.cpp +++ b/src/ale/games/supported/Gravitar.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Gravitar.hpp" +#include "ale/games/supported/Gravitar.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Gravitar.hpp b/src/ale/games/supported/Gravitar.hpp similarity index 98% rename from src/games/supported/Gravitar.hpp rename to src/ale/games/supported/Gravitar.hpp index e2a48d5c4..60cda3a03 100644 --- a/src/games/supported/Gravitar.hpp +++ b/src/ale/games/supported/Gravitar.hpp @@ -28,7 +28,7 @@ #ifndef __GRAVITAR_HPP__ #define __GRAVITAR_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Hangman.cpp b/src/ale/games/supported/Hangman.cpp similarity index 99% rename from src/games/supported/Hangman.cpp rename to src/ale/games/supported/Hangman.cpp index f4e059a7d..59a1e8af9 100644 --- a/src/games/supported/Hangman.cpp +++ b/src/ale/games/supported/Hangman.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Hangman.hpp" +#include "ale/games/supported/Hangman.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Hangman.hpp b/src/ale/games/supported/Hangman.hpp similarity index 98% rename from src/games/supported/Hangman.hpp rename to src/ale/games/supported/Hangman.hpp index fa9943090..e808626b0 100644 --- a/src/games/supported/Hangman.hpp +++ b/src/ale/games/supported/Hangman.hpp @@ -26,7 +26,7 @@ #ifndef __HANGMAN_HPP__ #define __HANGMAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/HauntedHouse.cpp b/src/ale/games/supported/HauntedHouse.cpp similarity index 98% rename from src/games/supported/HauntedHouse.cpp rename to src/ale/games/supported/HauntedHouse.cpp index 236adb307..ef91bbd0a 100644 --- a/src/games/supported/HauntedHouse.cpp +++ b/src/ale/games/supported/HauntedHouse.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/HauntedHouse.hpp" +#include "ale/games/supported/HauntedHouse.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/HauntedHouse.hpp b/src/ale/games/supported/HauntedHouse.hpp similarity index 98% rename from src/games/supported/HauntedHouse.hpp rename to src/ale/games/supported/HauntedHouse.hpp index 0e4062ed6..5287823ab 100644 --- a/src/games/supported/HauntedHouse.hpp +++ b/src/ale/games/supported/HauntedHouse.hpp @@ -26,7 +26,7 @@ #ifndef __HAUNTED_HOUSE_HPP__ #define __HAUNTED_HOUSE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Hero.cpp b/src/ale/games/supported/Hero.cpp similarity index 98% rename from src/games/supported/Hero.cpp rename to src/ale/games/supported/Hero.cpp index e73b05d9d..dd60104c1 100644 --- a/src/games/supported/Hero.cpp +++ b/src/ale/games/supported/Hero.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Hero.hpp" +#include "ale/games/supported/Hero.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Hero.hpp b/src/ale/games/supported/Hero.hpp similarity index 98% rename from src/games/supported/Hero.hpp rename to src/ale/games/supported/Hero.hpp index 805d9209c..5bb5fdab2 100644 --- a/src/games/supported/Hero.hpp +++ b/src/ale/games/supported/Hero.hpp @@ -28,7 +28,7 @@ #ifndef __HERO_HPP__ #define __HERO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/HumanCannonball.cpp b/src/ale/games/supported/HumanCannonball.cpp similarity index 98% rename from src/games/supported/HumanCannonball.cpp rename to src/ale/games/supported/HumanCannonball.cpp index ad048d0d5..c00e71f1e 100644 --- a/src/games/supported/HumanCannonball.cpp +++ b/src/ale/games/supported/HumanCannonball.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/HumanCannonball.hpp" +#include "ale/games/supported/HumanCannonball.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/HumanCannonball.hpp b/src/ale/games/supported/HumanCannonball.hpp similarity index 98% rename from src/games/supported/HumanCannonball.hpp rename to src/ale/games/supported/HumanCannonball.hpp index 652cf6781..64a812755 100644 --- a/src/games/supported/HumanCannonball.hpp +++ b/src/ale/games/supported/HumanCannonball.hpp @@ -26,7 +26,7 @@ #ifndef __HUMAN_CANNONBALL_HPP__ #define __HUMAN_CANNONBALL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/IceHockey.cpp b/src/ale/games/supported/IceHockey.cpp similarity index 97% rename from src/games/supported/IceHockey.cpp rename to src/ale/games/supported/IceHockey.cpp index d95266e9d..baf3480eb 100644 --- a/src/games/supported/IceHockey.cpp +++ b/src/ale/games/supported/IceHockey.cpp @@ -10,11 +10,11 @@ * ***************************************************************************** */ -#include "games/supported/IceHockey.hpp" +#include "ale/games/supported/IceHockey.hpp" #include -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/IceHockey.hpp b/src/ale/games/supported/IceHockey.hpp similarity index 98% rename from src/games/supported/IceHockey.hpp rename to src/ale/games/supported/IceHockey.hpp index eeb8bc90e..56a30f3a1 100644 --- a/src/games/supported/IceHockey.hpp +++ b/src/ale/games/supported/IceHockey.hpp @@ -28,7 +28,7 @@ #ifndef __ICEHOCKEY_HPP__ #define __ICEHOCKEY_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/JamesBond.cpp b/src/ale/games/supported/JamesBond.cpp similarity index 98% rename from src/games/supported/JamesBond.cpp rename to src/ale/games/supported/JamesBond.cpp index 6c8259962..25234c133 100644 --- a/src/games/supported/JamesBond.cpp +++ b/src/ale/games/supported/JamesBond.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/JamesBond.hpp" +#include "ale/games/supported/JamesBond.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/JamesBond.hpp b/src/ale/games/supported/JamesBond.hpp similarity index 98% rename from src/games/supported/JamesBond.hpp rename to src/ale/games/supported/JamesBond.hpp index 99b92b92d..6a6c704f3 100644 --- a/src/games/supported/JamesBond.hpp +++ b/src/ale/games/supported/JamesBond.hpp @@ -28,7 +28,7 @@ #ifndef __JAMESBOND_HPP__ #define __JAMESBOND_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/JourneyEscape.cpp b/src/ale/games/supported/JourneyEscape.cpp similarity index 97% rename from src/games/supported/JourneyEscape.cpp rename to src/ale/games/supported/JourneyEscape.cpp index 3a71c938f..a478e29b3 100644 --- a/src/games/supported/JourneyEscape.cpp +++ b/src/ale/games/supported/JourneyEscape.cpp @@ -12,9 +12,9 @@ * ***************************************************************************** */ -#include "games/supported/JourneyEscape.hpp" +#include "ale/games/supported/JourneyEscape.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/JourneyEscape.hpp b/src/ale/games/supported/JourneyEscape.hpp similarity index 98% rename from src/games/supported/JourneyEscape.hpp rename to src/ale/games/supported/JourneyEscape.hpp index 7ce3ce151..c3b5af4d8 100644 --- a/src/games/supported/JourneyEscape.hpp +++ b/src/ale/games/supported/JourneyEscape.hpp @@ -28,7 +28,7 @@ #ifndef __JOURNEYESCAPE_HPP__ #define __JOURNEYESCAPE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Kaboom.cpp b/src/ale/games/supported/Kaboom.cpp similarity index 96% rename from src/games/supported/Kaboom.cpp rename to src/ale/games/supported/Kaboom.cpp index e9f91d1e3..77d57af39 100644 --- a/src/games/supported/Kaboom.cpp +++ b/src/ale/games/supported/Kaboom.cpp @@ -10,11 +10,11 @@ * ***************************************************************************** */ -#include "games/supported/Kaboom.hpp" +#include "ale/games/supported/Kaboom.hpp" #include -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Kaboom.hpp b/src/ale/games/supported/Kaboom.hpp similarity index 97% rename from src/games/supported/Kaboom.hpp rename to src/ale/games/supported/Kaboom.hpp index 8d4dd4bed..52e4c4314 100644 --- a/src/games/supported/Kaboom.hpp +++ b/src/ale/games/supported/Kaboom.hpp @@ -13,7 +13,7 @@ #ifndef __KABOOM_HPP__ #define __KABOOM_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Kangaroo.cpp b/src/ale/games/supported/Kangaroo.cpp similarity index 98% rename from src/games/supported/Kangaroo.cpp rename to src/ale/games/supported/Kangaroo.cpp index 42cce1450..68bd45d69 100644 --- a/src/games/supported/Kangaroo.cpp +++ b/src/ale/games/supported/Kangaroo.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Kangaroo.hpp" +#include "ale/games/supported/Kangaroo.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Kangaroo.hpp b/src/ale/games/supported/Kangaroo.hpp similarity index 98% rename from src/games/supported/Kangaroo.hpp rename to src/ale/games/supported/Kangaroo.hpp index dbbba5fc4..2bbc4b72a 100644 --- a/src/games/supported/Kangaroo.hpp +++ b/src/ale/games/supported/Kangaroo.hpp @@ -28,7 +28,7 @@ #ifndef __KANGAROO_HPP__ #define __KANGAROO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/KeystoneKapers.cpp b/src/ale/games/supported/KeystoneKapers.cpp similarity index 96% rename from src/games/supported/KeystoneKapers.cpp rename to src/ale/games/supported/KeystoneKapers.cpp index d1c2c042b..b99f55a3b 100644 --- a/src/games/supported/KeystoneKapers.cpp +++ b/src/ale/games/supported/KeystoneKapers.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/KeystoneKapers.hpp" +#include "ale/games/supported/KeystoneKapers.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/KeystoneKapers.hpp b/src/ale/games/supported/KeystoneKapers.hpp similarity index 98% rename from src/games/supported/KeystoneKapers.hpp rename to src/ale/games/supported/KeystoneKapers.hpp index d50954dae..71745871d 100644 --- a/src/games/supported/KeystoneKapers.hpp +++ b/src/ale/games/supported/KeystoneKapers.hpp @@ -13,7 +13,7 @@ #ifndef __KEYSTONEKAPERS_HPP__ #define __KEYSTONEKAPERS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Kingkong.cpp b/src/ale/games/supported/Kingkong.cpp similarity index 98% rename from src/games/supported/Kingkong.cpp rename to src/ale/games/supported/Kingkong.cpp index 5e42e1ed4..3c7b6fd77 100644 --- a/src/games/supported/Kingkong.cpp +++ b/src/ale/games/supported/Kingkong.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Kingkong.hpp" +#include "ale/games/supported/Kingkong.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Kingkong.hpp b/src/ale/games/supported/Kingkong.hpp similarity index 98% rename from src/games/supported/Kingkong.hpp rename to src/ale/games/supported/Kingkong.hpp index 6c08372d5..59812ae78 100644 --- a/src/games/supported/Kingkong.hpp +++ b/src/ale/games/supported/Kingkong.hpp @@ -28,7 +28,7 @@ #ifndef __KINGKONG_HPP__ #define __KINGKONG_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Klax.cpp b/src/ale/games/supported/Klax.cpp similarity index 98% rename from src/games/supported/Klax.cpp rename to src/ale/games/supported/Klax.cpp index 3e9b9eaf9..d95c4686f 100644 --- a/src/games/supported/Klax.cpp +++ b/src/ale/games/supported/Klax.cpp @@ -23,10 +23,10 @@ * ***************************************************************************** */ -#include "games/supported/Klax.hpp" +#include "ale/games/supported/Klax.hpp" -#include "games/RomUtils.hpp" -#include "common/Constants.h" +#include "ale/games/RomUtils.hpp" +#include "ale/common/Constants.h" namespace ale { using namespace stella; diff --git a/src/games/supported/Klax.hpp b/src/ale/games/supported/Klax.hpp similarity index 98% rename from src/games/supported/Klax.hpp rename to src/ale/games/supported/Klax.hpp index 2a491bcf4..e65457e4c 100644 --- a/src/games/supported/Klax.hpp +++ b/src/ale/games/supported/Klax.hpp @@ -26,7 +26,7 @@ #ifndef __KLAX_HPP__ #define __KLAX_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Koolaid.cpp b/src/ale/games/supported/Koolaid.cpp similarity index 96% rename from src/games/supported/Koolaid.cpp rename to src/ale/games/supported/Koolaid.cpp index dfcf74d0c..faf68479d 100644 --- a/src/games/supported/Koolaid.cpp +++ b/src/ale/games/supported/Koolaid.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Koolaid.hpp" +#include "ale/games/supported/Koolaid.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Koolaid.hpp b/src/ale/games/supported/Koolaid.hpp similarity index 97% rename from src/games/supported/Koolaid.hpp rename to src/ale/games/supported/Koolaid.hpp index 56ebdc61c..467ffcbf8 100644 --- a/src/games/supported/Koolaid.hpp +++ b/src/ale/games/supported/Koolaid.hpp @@ -13,7 +13,7 @@ #ifndef __KOOLAID_HPP__ #define __KOOLAID_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Krull.cpp b/src/ale/games/supported/Krull.cpp similarity index 97% rename from src/games/supported/Krull.cpp rename to src/ale/games/supported/Krull.cpp index fc2f20462..9ea0c16f4 100644 --- a/src/games/supported/Krull.cpp +++ b/src/ale/games/supported/Krull.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Krull.hpp" +#include "ale/games/supported/Krull.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Krull.hpp b/src/ale/games/supported/Krull.hpp similarity index 98% rename from src/games/supported/Krull.hpp rename to src/ale/games/supported/Krull.hpp index c4d085bcc..c694e7ecf 100644 --- a/src/games/supported/Krull.hpp +++ b/src/ale/games/supported/Krull.hpp @@ -28,7 +28,7 @@ #ifndef __KRULL_HPP__ #define __KRULL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/KungFuMaster.cpp b/src/ale/games/supported/KungFuMaster.cpp similarity index 97% rename from src/games/supported/KungFuMaster.cpp rename to src/ale/games/supported/KungFuMaster.cpp index 9c22b023b..2841f0fa1 100644 --- a/src/games/supported/KungFuMaster.cpp +++ b/src/ale/games/supported/KungFuMaster.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/KungFuMaster.hpp" +#include "ale/games/supported/KungFuMaster.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/KungFuMaster.hpp b/src/ale/games/supported/KungFuMaster.hpp similarity index 98% rename from src/games/supported/KungFuMaster.hpp rename to src/ale/games/supported/KungFuMaster.hpp index 419f024e8..64bd89acf 100644 --- a/src/games/supported/KungFuMaster.hpp +++ b/src/ale/games/supported/KungFuMaster.hpp @@ -28,7 +28,7 @@ #ifndef __KUNGFUMASTER_HPP__ #define __KUNGFUMASTER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/LaserGates.cpp b/src/ale/games/supported/LaserGates.cpp similarity index 96% rename from src/games/supported/LaserGates.cpp rename to src/ale/games/supported/LaserGates.cpp index ec3bf82de..910615601 100644 --- a/src/games/supported/LaserGates.cpp +++ b/src/ale/games/supported/LaserGates.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/LaserGates.hpp" +#include "ale/games/supported/LaserGates.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/LaserGates.hpp b/src/ale/games/supported/LaserGates.hpp similarity index 98% rename from src/games/supported/LaserGates.hpp rename to src/ale/games/supported/LaserGates.hpp index d7b116cb2..830142a37 100644 --- a/src/games/supported/LaserGates.hpp +++ b/src/ale/games/supported/LaserGates.hpp @@ -13,7 +13,7 @@ #ifndef __LASERGATES_HPP__ #define __LASERGATES_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/LostLuggage.cpp b/src/ale/games/supported/LostLuggage.cpp similarity index 98% rename from src/games/supported/LostLuggage.cpp rename to src/ale/games/supported/LostLuggage.cpp index 8ab20965c..764d65a55 100644 --- a/src/games/supported/LostLuggage.cpp +++ b/src/ale/games/supported/LostLuggage.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/LostLuggage.hpp" +#include "ale/games/supported/LostLuggage.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/LostLuggage.hpp b/src/ale/games/supported/LostLuggage.hpp similarity index 98% rename from src/games/supported/LostLuggage.hpp rename to src/ale/games/supported/LostLuggage.hpp index 6ac9a1be7..e5eb83e81 100644 --- a/src/games/supported/LostLuggage.hpp +++ b/src/ale/games/supported/LostLuggage.hpp @@ -13,7 +13,7 @@ #ifndef __LOSTLUGGAGE_HPP__ #define __LOSTLUGGAGE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/MarioBros.cpp b/src/ale/games/supported/MarioBros.cpp similarity index 98% rename from src/games/supported/MarioBros.cpp rename to src/ale/games/supported/MarioBros.cpp index 816e614de..04ae805d5 100644 --- a/src/games/supported/MarioBros.cpp +++ b/src/ale/games/supported/MarioBros.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/MarioBros.hpp" +#include "ale/games/supported/MarioBros.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/MarioBros.hpp b/src/ale/games/supported/MarioBros.hpp similarity index 98% rename from src/games/supported/MarioBros.hpp rename to src/ale/games/supported/MarioBros.hpp index 401f22a20..d765c92f9 100644 --- a/src/games/supported/MarioBros.hpp +++ b/src/ale/games/supported/MarioBros.hpp @@ -26,7 +26,7 @@ #ifndef __MARIO_BROS_HPP__ #define __MARIO_BROS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/MiniatureGolf.cpp b/src/ale/games/supported/MiniatureGolf.cpp similarity index 98% rename from src/games/supported/MiniatureGolf.cpp rename to src/ale/games/supported/MiniatureGolf.cpp index c2e343cb5..35ac18672 100644 --- a/src/games/supported/MiniatureGolf.cpp +++ b/src/ale/games/supported/MiniatureGolf.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/MiniatureGolf.hpp" +#include "ale/games/supported/MiniatureGolf.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/MiniatureGolf.hpp b/src/ale/games/supported/MiniatureGolf.hpp similarity index 98% rename from src/games/supported/MiniatureGolf.hpp rename to src/ale/games/supported/MiniatureGolf.hpp index b367c4224..32a8190e3 100644 --- a/src/games/supported/MiniatureGolf.hpp +++ b/src/ale/games/supported/MiniatureGolf.hpp @@ -26,7 +26,7 @@ #ifndef __MINIATURE_GOLF_HPP__ #define __MINIATURE_GOLF_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/MontezumaRevenge.cpp b/src/ale/games/supported/MontezumaRevenge.cpp similarity index 97% rename from src/games/supported/MontezumaRevenge.cpp rename to src/ale/games/supported/MontezumaRevenge.cpp index 0f7594481..2a9febae3 100644 --- a/src/games/supported/MontezumaRevenge.cpp +++ b/src/ale/games/supported/MontezumaRevenge.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/MontezumaRevenge.hpp" +#include "ale/games/supported/MontezumaRevenge.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/MontezumaRevenge.hpp b/src/ale/games/supported/MontezumaRevenge.hpp similarity index 98% rename from src/games/supported/MontezumaRevenge.hpp rename to src/ale/games/supported/MontezumaRevenge.hpp index 10eee0344..ddd1a8e39 100644 --- a/src/games/supported/MontezumaRevenge.hpp +++ b/src/ale/games/supported/MontezumaRevenge.hpp @@ -28,7 +28,7 @@ #ifndef __MONTEZUMAREVENGE_HPP__ #define __MONTEZUMAREVENGE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/MrDo.cpp b/src/ale/games/supported/MrDo.cpp similarity index 97% rename from src/games/supported/MrDo.cpp rename to src/ale/games/supported/MrDo.cpp index 58148bf5a..2df3c0f2d 100644 --- a/src/games/supported/MrDo.cpp +++ b/src/ale/games/supported/MrDo.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/MrDo.hpp" +#include "ale/games/supported/MrDo.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/MrDo.hpp b/src/ale/games/supported/MrDo.hpp similarity index 98% rename from src/games/supported/MrDo.hpp rename to src/ale/games/supported/MrDo.hpp index 23651a063..d41ecd847 100644 --- a/src/games/supported/MrDo.hpp +++ b/src/ale/games/supported/MrDo.hpp @@ -13,7 +13,7 @@ #ifndef __MRDO_HPP__ #define __MRDO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/MsPacman.cpp b/src/ale/games/supported/MsPacman.cpp similarity index 98% rename from src/games/supported/MsPacman.cpp rename to src/ale/games/supported/MsPacman.cpp index 70bd71c26..4bb4aa15f 100644 --- a/src/games/supported/MsPacman.cpp +++ b/src/ale/games/supported/MsPacman.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/MsPacman.hpp" +#include "ale/games/supported/MsPacman.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/MsPacman.hpp b/src/ale/games/supported/MsPacman.hpp similarity index 98% rename from src/games/supported/MsPacman.hpp rename to src/ale/games/supported/MsPacman.hpp index a760f1af0..f1c7605d1 100644 --- a/src/games/supported/MsPacman.hpp +++ b/src/ale/games/supported/MsPacman.hpp @@ -28,7 +28,7 @@ #ifndef __MSPACMAN_HPP__ #define __MSPACMAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/NameThisGame.cpp b/src/ale/games/supported/NameThisGame.cpp similarity index 97% rename from src/games/supported/NameThisGame.cpp rename to src/ale/games/supported/NameThisGame.cpp index 096b0bc4a..cd3f02a53 100644 --- a/src/games/supported/NameThisGame.cpp +++ b/src/ale/games/supported/NameThisGame.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/NameThisGame.hpp" +#include "ale/games/supported/NameThisGame.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/NameThisGame.hpp b/src/ale/games/supported/NameThisGame.hpp similarity index 98% rename from src/games/supported/NameThisGame.hpp rename to src/ale/games/supported/NameThisGame.hpp index f6c0847bc..d20cda2b3 100644 --- a/src/games/supported/NameThisGame.hpp +++ b/src/ale/games/supported/NameThisGame.hpp @@ -28,7 +28,7 @@ #ifndef __NAMETHISGAME_HPP__ #define __NAMETHISGAME_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Othello.cpp b/src/ale/games/supported/Othello.cpp similarity index 98% rename from src/games/supported/Othello.cpp rename to src/ale/games/supported/Othello.cpp index eae89d3a5..1852fe38e 100644 --- a/src/games/supported/Othello.cpp +++ b/src/ale/games/supported/Othello.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Othello.hpp" +#include "ale/games/supported/Othello.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Othello.hpp b/src/ale/games/supported/Othello.hpp similarity index 98% rename from src/games/supported/Othello.hpp rename to src/ale/games/supported/Othello.hpp index 98e898e8c..0ab16e0cc 100644 --- a/src/games/supported/Othello.hpp +++ b/src/ale/games/supported/Othello.hpp @@ -26,7 +26,7 @@ #ifndef __OTHELLO_HPP__ #define __OTHELLO_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Pacman.cpp b/src/ale/games/supported/Pacman.cpp similarity index 98% rename from src/games/supported/Pacman.cpp rename to src/ale/games/supported/Pacman.cpp index 70a657eb7..4be1110f0 100644 --- a/src/games/supported/Pacman.cpp +++ b/src/ale/games/supported/Pacman.cpp @@ -29,9 +29,9 @@ * * ***************************************************************************** */ -#include "games/supported/Pacman.hpp" +#include "ale/games/supported/Pacman.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Pacman.hpp b/src/ale/games/supported/Pacman.hpp similarity index 98% rename from src/games/supported/Pacman.hpp rename to src/ale/games/supported/Pacman.hpp index a5b8c33aa..ea32fe174 100644 --- a/src/games/supported/Pacman.hpp +++ b/src/ale/games/supported/Pacman.hpp @@ -33,7 +33,7 @@ #ifndef _PACMAN_HPP__ #define _PACMAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Phoenix.cpp b/src/ale/games/supported/Phoenix.cpp similarity index 97% rename from src/games/supported/Phoenix.cpp rename to src/ale/games/supported/Phoenix.cpp index d04c4306c..5307520cd 100644 --- a/src/games/supported/Phoenix.cpp +++ b/src/ale/games/supported/Phoenix.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Phoenix.hpp" +#include "ale/games/supported/Phoenix.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Phoenix.hpp b/src/ale/games/supported/Phoenix.hpp similarity index 98% rename from src/games/supported/Phoenix.hpp rename to src/ale/games/supported/Phoenix.hpp index 990ea4929..2f992e39d 100644 --- a/src/games/supported/Phoenix.hpp +++ b/src/ale/games/supported/Phoenix.hpp @@ -28,7 +28,7 @@ #ifndef __PHOENIX_HPP__ #define __PHOENIX_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Pitfall.cpp b/src/ale/games/supported/Pitfall.cpp similarity index 97% rename from src/games/supported/Pitfall.cpp rename to src/ale/games/supported/Pitfall.cpp index 8f537c5c4..7d787d934 100644 --- a/src/games/supported/Pitfall.cpp +++ b/src/ale/games/supported/Pitfall.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Pitfall.hpp" +#include "ale/games/supported/Pitfall.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Pitfall.hpp b/src/ale/games/supported/Pitfall.hpp similarity index 98% rename from src/games/supported/Pitfall.hpp rename to src/ale/games/supported/Pitfall.hpp index 61cb35b7d..bf50acbd7 100644 --- a/src/games/supported/Pitfall.hpp +++ b/src/ale/games/supported/Pitfall.hpp @@ -28,7 +28,7 @@ #ifndef __PITFALL_HPP__ #define __PITFALL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Pitfall2.cpp b/src/ale/games/supported/Pitfall2.cpp similarity index 98% rename from src/games/supported/Pitfall2.cpp rename to src/ale/games/supported/Pitfall2.cpp index 31f2f250b..03af7b446 100644 --- a/src/games/supported/Pitfall2.cpp +++ b/src/ale/games/supported/Pitfall2.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Pitfall2.hpp" +#include "ale/games/supported/Pitfall2.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Pitfall2.hpp b/src/ale/games/supported/Pitfall2.hpp similarity index 98% rename from src/games/supported/Pitfall2.hpp rename to src/ale/games/supported/Pitfall2.hpp index 1a761f8c6..5f0cf5843 100644 --- a/src/games/supported/Pitfall2.hpp +++ b/src/ale/games/supported/Pitfall2.hpp @@ -26,7 +26,7 @@ #ifndef __PITFALL2_HPP__ #define __PITFALL2_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Pong.cpp b/src/ale/games/supported/Pong.cpp similarity index 97% rename from src/games/supported/Pong.cpp rename to src/ale/games/supported/Pong.cpp index 53dad8f19..9a058a380 100644 --- a/src/games/supported/Pong.cpp +++ b/src/ale/games/supported/Pong.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Pong.hpp" +#include "ale/games/supported/Pong.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Pong.hpp b/src/ale/games/supported/Pong.hpp similarity index 98% rename from src/games/supported/Pong.hpp rename to src/ale/games/supported/Pong.hpp index 1efcd8ea3..0e55cc383 100644 --- a/src/games/supported/Pong.hpp +++ b/src/ale/games/supported/Pong.hpp @@ -28,7 +28,7 @@ #ifndef __PONG_HPP__ #define __PONG_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Pooyan.cpp b/src/ale/games/supported/Pooyan.cpp similarity index 98% rename from src/games/supported/Pooyan.cpp rename to src/ale/games/supported/Pooyan.cpp index 4de68d441..a96c6472e 100644 --- a/src/games/supported/Pooyan.cpp +++ b/src/ale/games/supported/Pooyan.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Pooyan.hpp" +#include "ale/games/supported/Pooyan.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Pooyan.hpp b/src/ale/games/supported/Pooyan.hpp similarity index 98% rename from src/games/supported/Pooyan.hpp rename to src/ale/games/supported/Pooyan.hpp index 1c1f7d787..111688e1f 100644 --- a/src/games/supported/Pooyan.hpp +++ b/src/ale/games/supported/Pooyan.hpp @@ -28,7 +28,7 @@ #ifndef __POOYAN_HPP__ #define __POOYAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/PrivateEye.cpp b/src/ale/games/supported/PrivateEye.cpp similarity index 97% rename from src/games/supported/PrivateEye.cpp rename to src/ale/games/supported/PrivateEye.cpp index e9bd89eaa..3ee982f8a 100644 --- a/src/games/supported/PrivateEye.cpp +++ b/src/ale/games/supported/PrivateEye.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/PrivateEye.hpp" +#include "ale/games/supported/PrivateEye.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/PrivateEye.hpp b/src/ale/games/supported/PrivateEye.hpp similarity index 98% rename from src/games/supported/PrivateEye.hpp rename to src/ale/games/supported/PrivateEye.hpp index 2c9eac357..8324cde7e 100644 --- a/src/games/supported/PrivateEye.hpp +++ b/src/ale/games/supported/PrivateEye.hpp @@ -28,7 +28,7 @@ #ifndef __PRIVATEEYE_HPP__ #define __PRIVATEEYE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/QBert.cpp b/src/ale/games/supported/QBert.cpp similarity index 98% rename from src/games/supported/QBert.cpp rename to src/ale/games/supported/QBert.cpp index a7999ea6e..a87fc64e1 100644 --- a/src/games/supported/QBert.cpp +++ b/src/ale/games/supported/QBert.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/QBert.hpp" +#include "ale/games/supported/QBert.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/QBert.hpp b/src/ale/games/supported/QBert.hpp similarity index 98% rename from src/games/supported/QBert.hpp rename to src/ale/games/supported/QBert.hpp index 7c198ad91..c1f416bc9 100644 --- a/src/games/supported/QBert.hpp +++ b/src/ale/games/supported/QBert.hpp @@ -28,7 +28,7 @@ #ifndef __QBERT_HPP__ #define __QBERT_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/RiverRaid.cpp b/src/ale/games/supported/RiverRaid.cpp similarity index 98% rename from src/games/supported/RiverRaid.cpp rename to src/ale/games/supported/RiverRaid.cpp index 09f34025d..f2b69fe3d 100644 --- a/src/games/supported/RiverRaid.cpp +++ b/src/ale/games/supported/RiverRaid.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/RiverRaid.hpp" +#include "ale/games/supported/RiverRaid.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/RiverRaid.hpp b/src/ale/games/supported/RiverRaid.hpp similarity index 98% rename from src/games/supported/RiverRaid.hpp rename to src/ale/games/supported/RiverRaid.hpp index bebe45ac5..8321215ad 100644 --- a/src/games/supported/RiverRaid.hpp +++ b/src/ale/games/supported/RiverRaid.hpp @@ -30,7 +30,7 @@ #include -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/RoadRunner.cpp b/src/ale/games/supported/RoadRunner.cpp similarity index 97% rename from src/games/supported/RoadRunner.cpp rename to src/ale/games/supported/RoadRunner.cpp index 90bfca2b7..a991da736 100644 --- a/src/games/supported/RoadRunner.cpp +++ b/src/ale/games/supported/RoadRunner.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/RoadRunner.hpp" +#include "ale/games/supported/RoadRunner.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/RoadRunner.hpp b/src/ale/games/supported/RoadRunner.hpp similarity index 98% rename from src/games/supported/RoadRunner.hpp rename to src/ale/games/supported/RoadRunner.hpp index 6278fe25d..8df476817 100644 --- a/src/games/supported/RoadRunner.hpp +++ b/src/ale/games/supported/RoadRunner.hpp @@ -28,7 +28,7 @@ #ifndef __ROADRUNNER_HPP__ #define __ROADRUNNER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/RoboTank.cpp b/src/ale/games/supported/RoboTank.cpp similarity index 97% rename from src/games/supported/RoboTank.cpp rename to src/ale/games/supported/RoboTank.cpp index c776df559..005214ee6 100644 --- a/src/games/supported/RoboTank.cpp +++ b/src/ale/games/supported/RoboTank.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/RoboTank.hpp" +#include "ale/games/supported/RoboTank.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/RoboTank.hpp b/src/ale/games/supported/RoboTank.hpp similarity index 98% rename from src/games/supported/RoboTank.hpp rename to src/ale/games/supported/RoboTank.hpp index c6fa92150..0a66d7d3a 100644 --- a/src/games/supported/RoboTank.hpp +++ b/src/ale/games/supported/RoboTank.hpp @@ -28,7 +28,7 @@ #ifndef __ROBOTANK_HPP__ #define __ROBOTANK_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Seaquest.cpp b/src/ale/games/supported/Seaquest.cpp similarity index 97% rename from src/games/supported/Seaquest.cpp rename to src/ale/games/supported/Seaquest.cpp index ae688402c..d04d2e889 100644 --- a/src/games/supported/Seaquest.cpp +++ b/src/ale/games/supported/Seaquest.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Seaquest.hpp" +#include "ale/games/supported/Seaquest.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Seaquest.hpp b/src/ale/games/supported/Seaquest.hpp similarity index 98% rename from src/games/supported/Seaquest.hpp rename to src/ale/games/supported/Seaquest.hpp index 5a4f99f58..26d834877 100644 --- a/src/games/supported/Seaquest.hpp +++ b/src/ale/games/supported/Seaquest.hpp @@ -28,7 +28,7 @@ #ifndef __SEAQUEST_HPP__ #define __SEAQUEST_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/SirLancelot.cpp b/src/ale/games/supported/SirLancelot.cpp similarity index 96% rename from src/games/supported/SirLancelot.cpp rename to src/ale/games/supported/SirLancelot.cpp index ba87c120c..339cdefca 100644 --- a/src/games/supported/SirLancelot.cpp +++ b/src/ale/games/supported/SirLancelot.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/SirLancelot.hpp" +#include "ale/games/supported/SirLancelot.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/SirLancelot.hpp b/src/ale/games/supported/SirLancelot.hpp similarity index 98% rename from src/games/supported/SirLancelot.hpp rename to src/ale/games/supported/SirLancelot.hpp index 812c3a54b..b33cc2e1f 100644 --- a/src/games/supported/SirLancelot.hpp +++ b/src/ale/games/supported/SirLancelot.hpp @@ -13,7 +13,7 @@ #ifndef __SIRLANCELOT_HPP__ #define __SIRLANCELOT_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Skiing.cpp b/src/ale/games/supported/Skiing.cpp similarity index 97% rename from src/games/supported/Skiing.cpp rename to src/ale/games/supported/Skiing.cpp index 41966d98b..98b860bf3 100644 --- a/src/games/supported/Skiing.cpp +++ b/src/ale/games/supported/Skiing.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Skiing.hpp" +#include "ale/games/supported/Skiing.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Skiing.hpp b/src/ale/games/supported/Skiing.hpp similarity index 98% rename from src/games/supported/Skiing.hpp rename to src/ale/games/supported/Skiing.hpp index 9864cdc0e..4bbebcfd5 100644 --- a/src/games/supported/Skiing.hpp +++ b/src/ale/games/supported/Skiing.hpp @@ -28,7 +28,7 @@ #ifndef __SKIING_HPP__ #define __SKIING_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Solaris.cpp b/src/ale/games/supported/Solaris.cpp similarity index 97% rename from src/games/supported/Solaris.cpp rename to src/ale/games/supported/Solaris.cpp index a312be850..66988dc79 100644 --- a/src/games/supported/Solaris.cpp +++ b/src/ale/games/supported/Solaris.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Solaris.hpp" +#include "ale/games/supported/Solaris.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Solaris.hpp b/src/ale/games/supported/Solaris.hpp similarity index 98% rename from src/games/supported/Solaris.hpp rename to src/ale/games/supported/Solaris.hpp index dc0ade5e5..f96ce4213 100644 --- a/src/games/supported/Solaris.hpp +++ b/src/ale/games/supported/Solaris.hpp @@ -28,7 +28,7 @@ #ifndef __SOLARIS_HPP__ #define __SOLARIS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/SpaceInvaders.cpp b/src/ale/games/supported/SpaceInvaders.cpp similarity index 98% rename from src/games/supported/SpaceInvaders.cpp rename to src/ale/games/supported/SpaceInvaders.cpp index 63fa85b78..946f2bc45 100644 --- a/src/games/supported/SpaceInvaders.cpp +++ b/src/ale/games/supported/SpaceInvaders.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/SpaceInvaders.hpp" +#include "ale/games/supported/SpaceInvaders.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/SpaceInvaders.hpp b/src/ale/games/supported/SpaceInvaders.hpp similarity index 98% rename from src/games/supported/SpaceInvaders.hpp rename to src/ale/games/supported/SpaceInvaders.hpp index 2e289f2aa..14c8bc005 100644 --- a/src/games/supported/SpaceInvaders.hpp +++ b/src/ale/games/supported/SpaceInvaders.hpp @@ -28,7 +28,7 @@ #ifndef __SPACEINVADERS_HPP__ #define __SPACEINVADERS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/SpaceWar.cpp b/src/ale/games/supported/SpaceWar.cpp similarity index 98% rename from src/games/supported/SpaceWar.cpp rename to src/ale/games/supported/SpaceWar.cpp index 63f31c8ea..e3094ec6f 100644 --- a/src/games/supported/SpaceWar.cpp +++ b/src/ale/games/supported/SpaceWar.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/SpaceWar.hpp" +#include "ale/games/supported/SpaceWar.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/SpaceWar.hpp b/src/ale/games/supported/SpaceWar.hpp similarity index 98% rename from src/games/supported/SpaceWar.hpp rename to src/ale/games/supported/SpaceWar.hpp index fe7b0fbfa..27db49af5 100644 --- a/src/games/supported/SpaceWar.hpp +++ b/src/ale/games/supported/SpaceWar.hpp @@ -26,7 +26,7 @@ #ifndef __SPACE_WAR_HPP__ #define __SPACE_WAR_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/StarGunner.cpp b/src/ale/games/supported/StarGunner.cpp similarity index 98% rename from src/games/supported/StarGunner.cpp rename to src/ale/games/supported/StarGunner.cpp index b86041c11..f163d55a6 100644 --- a/src/games/supported/StarGunner.cpp +++ b/src/ale/games/supported/StarGunner.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/StarGunner.hpp" +#include "ale/games/supported/StarGunner.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/StarGunner.hpp b/src/ale/games/supported/StarGunner.hpp similarity index 98% rename from src/games/supported/StarGunner.hpp rename to src/ale/games/supported/StarGunner.hpp index 9ac22b999..c48c18581 100644 --- a/src/games/supported/StarGunner.hpp +++ b/src/ale/games/supported/StarGunner.hpp @@ -28,7 +28,7 @@ #ifndef __STARGUNNER_HPP__ #define __STARGUNNER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Superman.cpp b/src/ale/games/supported/Superman.cpp similarity index 97% rename from src/games/supported/Superman.cpp rename to src/ale/games/supported/Superman.cpp index 6903a0858..d85ef500f 100644 --- a/src/games/supported/Superman.cpp +++ b/src/ale/games/supported/Superman.cpp @@ -23,9 +23,9 @@ * ***************************************************************************** */ -#include "games/supported/Superman.hpp" +#include "ale/games/supported/Superman.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Superman.hpp b/src/ale/games/supported/Superman.hpp similarity index 98% rename from src/games/supported/Superman.hpp rename to src/ale/games/supported/Superman.hpp index 0dc8edf83..ef8d75fa6 100644 --- a/src/games/supported/Superman.hpp +++ b/src/ale/games/supported/Superman.hpp @@ -26,7 +26,7 @@ #ifndef __SUPERMAN_HPP__ #define __SUPERMAN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Surround.cpp b/src/ale/games/supported/Surround.cpp similarity index 98% rename from src/games/supported/Surround.cpp rename to src/ale/games/supported/Surround.cpp index 5ebd9d91f..bf043d42f 100644 --- a/src/games/supported/Surround.cpp +++ b/src/ale/games/supported/Surround.cpp @@ -26,9 +26,9 @@ * * ***************************************************************************** */ -#include "games/supported/Surround.hpp" +#include "ale/games/supported/Surround.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Surround.hpp b/src/ale/games/supported/Surround.hpp similarity index 98% rename from src/games/supported/Surround.hpp rename to src/ale/games/supported/Surround.hpp index 501be203c..d3c22bbcf 100644 --- a/src/games/supported/Surround.hpp +++ b/src/ale/games/supported/Surround.hpp @@ -30,7 +30,7 @@ #ifndef __SURROUND_HPP__ #define __SURROUND_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Tennis.cpp b/src/ale/games/supported/Tennis.cpp similarity index 98% rename from src/games/supported/Tennis.cpp rename to src/ale/games/supported/Tennis.cpp index 8cc5efebc..c6212eb56 100644 --- a/src/games/supported/Tennis.cpp +++ b/src/ale/games/supported/Tennis.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Tennis.hpp" +#include "ale/games/supported/Tennis.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Tennis.hpp b/src/ale/games/supported/Tennis.hpp similarity index 98% rename from src/games/supported/Tennis.hpp rename to src/ale/games/supported/Tennis.hpp index 791faed78..facd4d7d1 100644 --- a/src/games/supported/Tennis.hpp +++ b/src/ale/games/supported/Tennis.hpp @@ -28,7 +28,7 @@ #ifndef __TENNIS_HPP__ #define __TENNIS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Tetris.cpp b/src/ale/games/supported/Tetris.cpp similarity index 97% rename from src/games/supported/Tetris.cpp rename to src/ale/games/supported/Tetris.cpp index 2e83c121a..08aa1e3ca 100644 --- a/src/games/supported/Tetris.cpp +++ b/src/ale/games/supported/Tetris.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Tetris.hpp" +#include "ale/games/supported/Tetris.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Tetris.hpp b/src/ale/games/supported/Tetris.hpp similarity index 98% rename from src/games/supported/Tetris.hpp rename to src/ale/games/supported/Tetris.hpp index 977f99fff..8ddae556c 100644 --- a/src/games/supported/Tetris.hpp +++ b/src/ale/games/supported/Tetris.hpp @@ -26,7 +26,7 @@ #ifndef __TETRIS_HPP__ #define __TETRIS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/TicTacToe3d.cpp b/src/ale/games/supported/TicTacToe3d.cpp similarity index 98% rename from src/games/supported/TicTacToe3d.cpp rename to src/ale/games/supported/TicTacToe3d.cpp index 52d2fabe5..a45d7317a 100644 --- a/src/games/supported/TicTacToe3d.cpp +++ b/src/ale/games/supported/TicTacToe3d.cpp @@ -23,8 +23,8 @@ * ***************************************************************************** */ -#include "games/supported/TicTacToe3d.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/supported/TicTacToe3d.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/TicTacToe3d.hpp b/src/ale/games/supported/TicTacToe3d.hpp similarity index 98% rename from src/games/supported/TicTacToe3d.hpp rename to src/ale/games/supported/TicTacToe3d.hpp index a11fa3b7d..2c08d085e 100644 --- a/src/games/supported/TicTacToe3d.hpp +++ b/src/ale/games/supported/TicTacToe3d.hpp @@ -26,7 +26,7 @@ #ifndef __TIC_TAC_TOE_3D_HPP__ #define __TIC_TAC_TOE_3D_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/TimePilot.cpp b/src/ale/games/supported/TimePilot.cpp similarity index 97% rename from src/games/supported/TimePilot.cpp rename to src/ale/games/supported/TimePilot.cpp index 267173ce8..ef293e4cc 100644 --- a/src/games/supported/TimePilot.cpp +++ b/src/ale/games/supported/TimePilot.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/TimePilot.hpp" +#include "ale/games/supported/TimePilot.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/TimePilot.hpp b/src/ale/games/supported/TimePilot.hpp similarity index 98% rename from src/games/supported/TimePilot.hpp rename to src/ale/games/supported/TimePilot.hpp index 17a49efab..490a113ef 100644 --- a/src/games/supported/TimePilot.hpp +++ b/src/ale/games/supported/TimePilot.hpp @@ -28,7 +28,7 @@ #ifndef __TIMEPILOT_HPP__ #define __TIMEPILOT_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Trondead.cpp b/src/ale/games/supported/Trondead.cpp similarity index 97% rename from src/games/supported/Trondead.cpp rename to src/ale/games/supported/Trondead.cpp index a83371e53..d26c6344b 100644 --- a/src/games/supported/Trondead.cpp +++ b/src/ale/games/supported/Trondead.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Trondead.hpp" +#include "ale/games/supported/Trondead.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Trondead.hpp b/src/ale/games/supported/Trondead.hpp similarity index 98% rename from src/games/supported/Trondead.hpp rename to src/ale/games/supported/Trondead.hpp index 0a68d26a9..a4a5dc4c0 100644 --- a/src/games/supported/Trondead.hpp +++ b/src/ale/games/supported/Trondead.hpp @@ -13,7 +13,7 @@ #ifndef __TRONDEAD_HPP__ #define __TRONDEAD_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Turmoil.cpp b/src/ale/games/supported/Turmoil.cpp similarity index 97% rename from src/games/supported/Turmoil.cpp rename to src/ale/games/supported/Turmoil.cpp index 4c7d4ff34..5c2f97323 100644 --- a/src/games/supported/Turmoil.cpp +++ b/src/ale/games/supported/Turmoil.cpp @@ -10,9 +10,9 @@ * ***************************************************************************** */ -#include "games/supported/Turmoil.hpp" +#include "ale/games/supported/Turmoil.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Turmoil.hpp b/src/ale/games/supported/Turmoil.hpp similarity index 98% rename from src/games/supported/Turmoil.hpp rename to src/ale/games/supported/Turmoil.hpp index 362af926c..8bbbc7e84 100644 --- a/src/games/supported/Turmoil.hpp +++ b/src/ale/games/supported/Turmoil.hpp @@ -13,7 +13,7 @@ #ifndef __TURMOIL_HPP__ #define __TURMOIL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Tutankham.cpp b/src/ale/games/supported/Tutankham.cpp similarity index 98% rename from src/games/supported/Tutankham.cpp rename to src/ale/games/supported/Tutankham.cpp index 2345c529b..1c120fcf6 100644 --- a/src/games/supported/Tutankham.cpp +++ b/src/ale/games/supported/Tutankham.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Tutankham.hpp" +#include "ale/games/supported/Tutankham.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Tutankham.hpp b/src/ale/games/supported/Tutankham.hpp similarity index 98% rename from src/games/supported/Tutankham.hpp rename to src/ale/games/supported/Tutankham.hpp index 2125d39f1..e1a3d7c92 100644 --- a/src/games/supported/Tutankham.hpp +++ b/src/ale/games/supported/Tutankham.hpp @@ -28,7 +28,7 @@ #ifndef __TUTANKHAM_HPP__ #define __TUTANKHAM_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/UpNDown.cpp b/src/ale/games/supported/UpNDown.cpp similarity index 97% rename from src/games/supported/UpNDown.cpp rename to src/ale/games/supported/UpNDown.cpp index 2ec819e48..c9613b257 100644 --- a/src/games/supported/UpNDown.cpp +++ b/src/ale/games/supported/UpNDown.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/UpNDown.hpp" +#include "ale/games/supported/UpNDown.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/UpNDown.hpp b/src/ale/games/supported/UpNDown.hpp similarity index 98% rename from src/games/supported/UpNDown.hpp rename to src/ale/games/supported/UpNDown.hpp index 1f0144819..2b9fb1cdb 100644 --- a/src/games/supported/UpNDown.hpp +++ b/src/ale/games/supported/UpNDown.hpp @@ -28,7 +28,7 @@ #ifndef __UPNDOWN_HPP__ #define __UPNDOWN_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Venture.cpp b/src/ale/games/supported/Venture.cpp similarity index 97% rename from src/games/supported/Venture.cpp rename to src/ale/games/supported/Venture.cpp index 2882f992d..d1b93180e 100644 --- a/src/games/supported/Venture.cpp +++ b/src/ale/games/supported/Venture.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Venture.hpp" +#include "ale/games/supported/Venture.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Venture.hpp b/src/ale/games/supported/Venture.hpp similarity index 98% rename from src/games/supported/Venture.hpp rename to src/ale/games/supported/Venture.hpp index fe3927f4c..7cca66514 100644 --- a/src/games/supported/Venture.hpp +++ b/src/ale/games/supported/Venture.hpp @@ -28,7 +28,7 @@ #ifndef __VENTURE_HPP__ #define __VENTURE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/VideoCheckers.cpp b/src/ale/games/supported/VideoCheckers.cpp similarity index 98% rename from src/games/supported/VideoCheckers.cpp rename to src/ale/games/supported/VideoCheckers.cpp index 2a06d5648..2b98ea1af 100644 --- a/src/games/supported/VideoCheckers.cpp +++ b/src/ale/games/supported/VideoCheckers.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/VideoCheckers.hpp" +#include "ale/games/supported/VideoCheckers.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace { void process_board_state(unsigned char state, unsigned char& num_black_pieces, diff --git a/src/games/supported/VideoCheckers.hpp b/src/ale/games/supported/VideoCheckers.hpp similarity index 98% rename from src/games/supported/VideoCheckers.hpp rename to src/ale/games/supported/VideoCheckers.hpp index 2b98c6e2f..942342adf 100644 --- a/src/games/supported/VideoCheckers.hpp +++ b/src/ale/games/supported/VideoCheckers.hpp @@ -28,7 +28,7 @@ #ifndef __VIDEO_CHECKERS_HPP__ #define __VIDEO_CHECKERS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/VideoChess.cpp b/src/ale/games/supported/VideoChess.cpp similarity index 98% rename from src/games/supported/VideoChess.cpp rename to src/ale/games/supported/VideoChess.cpp index d7e585e44..d276b7a8c 100644 --- a/src/games/supported/VideoChess.cpp +++ b/src/ale/games/supported/VideoChess.cpp @@ -30,9 +30,9 @@ * ***************************************************************************** */ -#include "games/supported/VideoChess.hpp" +#include "ale/games/supported/VideoChess.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/VideoChess.hpp b/src/ale/games/supported/VideoChess.hpp similarity index 98% rename from src/games/supported/VideoChess.hpp rename to src/ale/games/supported/VideoChess.hpp index 4ed3bbc8d..3b7c5ac02 100644 --- a/src/games/supported/VideoChess.hpp +++ b/src/ale/games/supported/VideoChess.hpp @@ -33,7 +33,7 @@ #ifndef __VIDEOCHESS_HPP__ #define __VIDEOCHESS_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/VideoCube.cpp b/src/ale/games/supported/VideoCube.cpp similarity index 99% rename from src/games/supported/VideoCube.cpp rename to src/ale/games/supported/VideoCube.cpp index 7a74c5449..2aee5b3f8 100644 --- a/src/games/supported/VideoCube.cpp +++ b/src/ale/games/supported/VideoCube.cpp @@ -23,12 +23,12 @@ * ***************************************************************************** */ -#include "games/supported/VideoCube.hpp" +#include "ale/games/supported/VideoCube.hpp" #include #include -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/VideoCube.hpp b/src/ale/games/supported/VideoCube.hpp similarity index 98% rename from src/games/supported/VideoCube.hpp rename to src/ale/games/supported/VideoCube.hpp index 687c67bdb..43846aaa2 100644 --- a/src/games/supported/VideoCube.hpp +++ b/src/ale/games/supported/VideoCube.hpp @@ -26,7 +26,7 @@ #ifndef __VIDEO_CUBE_HPP__ #define __VIDEO_CUBE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/VideoPinball.cpp b/src/ale/games/supported/VideoPinball.cpp similarity index 98% rename from src/games/supported/VideoPinball.cpp rename to src/ale/games/supported/VideoPinball.cpp index 706c4edb7..d3f260182 100644 --- a/src/games/supported/VideoPinball.cpp +++ b/src/ale/games/supported/VideoPinball.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/VideoPinball.hpp" +#include "ale/games/supported/VideoPinball.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/VideoPinball.hpp b/src/ale/games/supported/VideoPinball.hpp similarity index 98% rename from src/games/supported/VideoPinball.hpp rename to src/ale/games/supported/VideoPinball.hpp index 3e572a5f4..b768064f5 100644 --- a/src/games/supported/VideoPinball.hpp +++ b/src/ale/games/supported/VideoPinball.hpp @@ -28,7 +28,7 @@ #ifndef __VIDEOPINBALL_HPP__ #define __VIDEOPINBALL_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/WizardOfWor.cpp b/src/ale/games/supported/WizardOfWor.cpp similarity index 97% rename from src/games/supported/WizardOfWor.cpp rename to src/ale/games/supported/WizardOfWor.cpp index 62f474fa0..6d273b269 100644 --- a/src/games/supported/WizardOfWor.cpp +++ b/src/ale/games/supported/WizardOfWor.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/WizardOfWor.hpp" +#include "ale/games/supported/WizardOfWor.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/WizardOfWor.hpp b/src/ale/games/supported/WizardOfWor.hpp similarity index 98% rename from src/games/supported/WizardOfWor.hpp rename to src/ale/games/supported/WizardOfWor.hpp index cbf3cdb75..967c61cc7 100644 --- a/src/games/supported/WizardOfWor.hpp +++ b/src/ale/games/supported/WizardOfWor.hpp @@ -28,7 +28,7 @@ #ifndef __WIZARDOFWOR_HPP__ #define __WIZARDOFWOR_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/WordZapper.cpp b/src/ale/games/supported/WordZapper.cpp similarity index 98% rename from src/games/supported/WordZapper.cpp rename to src/ale/games/supported/WordZapper.cpp index e6f8737ee..97955121d 100644 --- a/src/games/supported/WordZapper.cpp +++ b/src/ale/games/supported/WordZapper.cpp @@ -22,9 +22,9 @@ * * ***************************************************************************** */ -#include "games/supported/WordZapper.hpp" +#include "ale/games/supported/WordZapper.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/WordZapper.hpp b/src/ale/games/supported/WordZapper.hpp similarity index 98% rename from src/games/supported/WordZapper.hpp rename to src/ale/games/supported/WordZapper.hpp index 6b1c8d26a..4e2c6432e 100644 --- a/src/games/supported/WordZapper.hpp +++ b/src/ale/games/supported/WordZapper.hpp @@ -25,7 +25,7 @@ #ifndef __WORD_ZAPPER_HPP__ #define __WORD_ZAPPER_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/YarsRevenge.cpp b/src/ale/games/supported/YarsRevenge.cpp similarity index 98% rename from src/games/supported/YarsRevenge.cpp rename to src/ale/games/supported/YarsRevenge.cpp index e4d19e692..f9371a478 100644 --- a/src/games/supported/YarsRevenge.cpp +++ b/src/ale/games/supported/YarsRevenge.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/YarsRevenge.hpp" +#include "ale/games/supported/YarsRevenge.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/YarsRevenge.hpp b/src/ale/games/supported/YarsRevenge.hpp similarity index 98% rename from src/games/supported/YarsRevenge.hpp rename to src/ale/games/supported/YarsRevenge.hpp index 862bcc996..b9c40d665 100644 --- a/src/games/supported/YarsRevenge.hpp +++ b/src/ale/games/supported/YarsRevenge.hpp @@ -28,7 +28,7 @@ #ifndef __YARS_REVENGE_HPP__ #define __YARS_REVENGE_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/games/supported/Zaxxon.cpp b/src/ale/games/supported/Zaxxon.cpp similarity index 98% rename from src/games/supported/Zaxxon.cpp rename to src/ale/games/supported/Zaxxon.cpp index 06ea2a907..cbc9f1e32 100644 --- a/src/games/supported/Zaxxon.cpp +++ b/src/ale/games/supported/Zaxxon.cpp @@ -25,9 +25,9 @@ * ***************************************************************************** */ -#include "games/supported/Zaxxon.hpp" +#include "ale/games/supported/Zaxxon.hpp" -#include "games/RomUtils.hpp" +#include "ale/games/RomUtils.hpp" namespace ale { using namespace stella; diff --git a/src/games/supported/Zaxxon.hpp b/src/ale/games/supported/Zaxxon.hpp similarity index 98% rename from src/games/supported/Zaxxon.hpp rename to src/ale/games/supported/Zaxxon.hpp index 36e9036dd..c58bdaab1 100644 --- a/src/games/supported/Zaxxon.hpp +++ b/src/ale/games/supported/Zaxxon.hpp @@ -28,7 +28,7 @@ #ifndef __ZAXXON_HPP__ #define __ZAXXON_HPP__ -#include "games/RomSettings.hpp" +#include "ale/games/RomSettings.hpp" namespace ale { diff --git a/src/python/CMakeLists.txt b/src/ale/python/CMakeLists.txt similarity index 100% rename from src/python/CMakeLists.txt rename to src/ale/python/CMakeLists.txt diff --git a/src/python/__init__.py b/src/ale/python/__init__.py similarity index 100% rename from src/python/__init__.py rename to src/ale/python/__init__.py diff --git a/src/python/__init__.pyi b/src/ale/python/__init__.pyi similarity index 100% rename from src/python/__init__.pyi rename to src/ale/python/__init__.pyi diff --git a/src/python/ale_python_interface.cpp b/src/ale/python/ale_python_interface.cpp similarity index 100% rename from src/python/ale_python_interface.cpp rename to src/ale/python/ale_python_interface.cpp diff --git a/src/python/ale_python_interface.hpp b/src/ale/python/ale_python_interface.hpp similarity index 99% rename from src/python/ale_python_interface.hpp rename to src/ale/python/ale_python_interface.hpp index d6cb5920a..ddf0ff026 100644 --- a/src/python/ale_python_interface.hpp +++ b/src/ale/python/ale_python_interface.hpp @@ -24,7 +24,7 @@ #include #include -#include "ale_interface.hpp" +#include "ale/ale_interface.hpp" #include "version.hpp" namespace py = pybind11; diff --git a/src/python/env.py b/src/ale/python/env.py similarity index 100% rename from src/python/env.py rename to src/ale/python/env.py diff --git a/src/python/py.typed b/src/ale/python/py.typed similarity index 100% rename from src/python/py.typed rename to src/ale/python/py.typed diff --git a/src/python/registration.py b/src/ale/python/registration.py similarity index 100% rename from src/python/registration.py rename to src/ale/python/registration.py diff --git a/src/python/roms/__init__.py b/src/ale/python/roms/__init__.py similarity index 100% rename from src/python/roms/__init__.py rename to src/ale/python/roms/__init__.py diff --git a/src/python/roms/md5.json b/src/ale/python/roms/md5.json similarity index 100% rename from src/python/roms/md5.json rename to src/ale/python/roms/md5.json diff --git a/src/python/roms/tetris.bin b/src/ale/python/roms/tetris.bin similarity index 100% rename from src/python/roms/tetris.bin rename to src/ale/python/roms/tetris.bin diff --git a/src/version.hpp.in b/src/ale/version.hpp.in similarity index 100% rename from src/version.hpp.in rename to src/ale/version.hpp.in diff --git a/src/games/Roms.cpp b/src/games/Roms.cpp deleted file mode 100644 index b95dd9a23..000000000 --- a/src/games/Roms.cpp +++ /dev/null @@ -1,249 +0,0 @@ -/* ***************************************************************************** - * A.L.E (Arcade Learning Environment) - * Copyright (c) 2009-2013 by Yavar Naddaf, Joel Veness, Marc G. Bellemare and - * the Reinforcement Learning and Artificial Intelligence Laboratory - * Released under the GNU General Public License; see License.txt for details. - * - * Based on: Stella -- "An Atari 2600 VCS Emulator" - * Copyright (c) 1995-2007 by Bradford W. Mott and the Stella team - * - * ***************************************************************************** - */ - -#include - -#include "games/Roms.hpp" -#include "games/RomUtils.hpp" - -// include the game implementations -#include "games/supported/Adventure.hpp" -#include "games/supported/AirRaid.hpp" -#include "games/supported/Alien.hpp" -#include "games/supported/Amidar.hpp" -#include "games/supported/Assault.hpp" -#include "games/supported/Asterix.hpp" -#include "games/supported/Asteroids.hpp" -#include "games/supported/Atlantis.hpp" -#include "games/supported/Atlantis2.hpp" -#include "games/supported/Backgammon.hpp" -#include "games/supported/BankHeist.hpp" -#include "games/supported/BasicMath.hpp" -#include "games/supported/BattleZone.hpp" -#include "games/supported/BeamRider.hpp" -#include "games/supported/Berzerk.hpp" -#include "games/supported/Blackjack.hpp" -#include "games/supported/Bowling.hpp" -#include "games/supported/Boxing.hpp" -#include "games/supported/Breakout.hpp" -#include "games/supported/Carnival.hpp" -#include "games/supported/Casino.hpp" -#include "games/supported/Centipede.hpp" -#include "games/supported/ChopperCommand.hpp" -#include "games/supported/CrazyClimber.hpp" -#include "games/supported/Crossbow.hpp" -#include "games/supported/DarkChambers.hpp" -#include "games/supported/Defender.hpp" -#include "games/supported/DemonAttack.hpp" -#include "games/supported/DonkeyKong.hpp" -#include "games/supported/DoubleDunk.hpp" -#include "games/supported/Earthworld.hpp" -#include "games/supported/ElevatorAction.hpp" -#include "games/supported/Enduro.hpp" -#include "games/supported/Entombed.hpp" -#include "games/supported/Et.hpp" -#include "games/supported/FishingDerby.hpp" -#include "games/supported/FlagCapture.hpp" -#include "games/supported/Freeway.hpp" -#include "games/supported/Frogger.hpp" -#include "games/supported/Frostbite.hpp" -#include "games/supported/Galaxian.hpp" -#include "games/supported/Gopher.hpp" -#include "games/supported/Gravitar.hpp" -#include "games/supported/Hangman.hpp" -#include "games/supported/HauntedHouse.hpp" -#include "games/supported/Hero.hpp" -#include "games/supported/HumanCannonball.hpp" -#include "games/supported/IceHockey.hpp" -#include "games/supported/JamesBond.hpp" -#include "games/supported/JourneyEscape.hpp" -#include "games/supported/Kaboom.hpp" -#include "games/supported/Kangaroo.hpp" -#include "games/supported/KeystoneKapers.hpp" -#include "games/supported/Kingkong.hpp" -#include "games/supported/Klax.hpp" -#include "games/supported/Koolaid.hpp" -#include "games/supported/Krull.hpp" -#include "games/supported/KungFuMaster.hpp" -#include "games/supported/LaserGates.hpp" -#include "games/supported/LostLuggage.hpp" -#include "games/supported/MarioBros.hpp" -#include "games/supported/MiniatureGolf.hpp" -#include "games/supported/MontezumaRevenge.hpp" -#include "games/supported/MrDo.hpp" -#include "games/supported/MsPacman.hpp" -#include "games/supported/NameThisGame.hpp" -#include "games/supported/Othello.hpp" -#include "games/supported/Pacman.hpp" -#include "games/supported/Phoenix.hpp" -#include "games/supported/Pitfall.hpp" -#include "games/supported/Pitfall2.hpp" -#include "games/supported/Pong.hpp" -#include "games/supported/Pooyan.hpp" -#include "games/supported/PrivateEye.hpp" -#include "games/supported/QBert.hpp" -#include "games/supported/RiverRaid.hpp" -#include "games/supported/RoadRunner.hpp" -#include "games/supported/RoboTank.hpp" -#include "games/supported/Seaquest.hpp" -#include "games/supported/SirLancelot.hpp" -#include "games/supported/Skiing.hpp" -#include "games/supported/Solaris.hpp" -#include "games/supported/SpaceInvaders.hpp" -#include "games/supported/SpaceWar.hpp" -#include "games/supported/StarGunner.hpp" -#include "games/supported/Superman.hpp" -#include "games/supported/Surround.hpp" -#include "games/supported/Tennis.hpp" -#include "games/supported/Tetris.hpp" -#include "games/supported/TicTacToe3d.hpp" -#include "games/supported/TimePilot.hpp" -#include "games/supported/Trondead.hpp" -#include "games/supported/Turmoil.hpp" -#include "games/supported/Tutankham.hpp" -#include "games/supported/UpNDown.hpp" -#include "games/supported/Venture.hpp" -#include "games/supported/VideoCheckers.hpp" -#include "games/supported/VideoChess.hpp" -#include "games/supported/VideoCube.hpp" -#include "games/supported/VideoPinball.hpp" -#include "games/supported/WizardOfWor.hpp" -#include "games/supported/WordZapper.hpp" -#include "games/supported/YarsRevenge.hpp" -#include "games/supported/Zaxxon.hpp" - -namespace fs = std::filesystem; - -namespace ale { - -/* list of supported games */ -static const RomSettings* roms[] = { - new AdventureSettings(), - new AirRaidSettings(), - new AlienSettings(), - new AmidarSettings(), - new AssaultSettings(), - new AsterixSettings(), - new AsteroidsSettings(), - new AtlantisSettings(), - new Atlantis2Settings(), - new BackgammonSettings(), - new BankHeistSettings(), - new BasicMathSettings(), - new BattleZoneSettings(), - new BeamRiderSettings(), - new BerzerkSettings(), - new BlackjackSettings(), - new BowlingSettings(), - new BoxingSettings(), - new BreakoutSettings(), - new CarnivalSettings(), - new CasinoSettings(), - new CentipedeSettings(), - new ChopperCommandSettings(), - new CrazyClimberSettings(), - new CrossbowSettings(), - new DarkChambersSettings(), - new DefenderSettings(), - new DemonAttackSettings(), - new DonkeyKongSettings(), - new DoubleDunkSettings(), - new EarthworldSettings(), - new ElevatorActionSettings(), - new EnduroSettings(), - new EntombedSettings(), - new EtSettings(), - new FishingDerbySettings(), - new FlagCaptureSettings(), - new FreewaySettings(), - new FroggerSettings(), - new FrostbiteSettings(), - new GalaxianSettings(), - new GopherSettings(), - new GravitarSettings(), - new HangmanSettings(), - new HauntedHouseSettings(), - new HeroSettings(), - new HumanCannonballSettings(), - new IceHockeySettings(), - new JamesBondSettings(), - new JourneyEscapeSettings(), - new KaboomSettings(), - new KangarooSettings(), - new KoolaidSettings(), - new KeystoneKapersSettings(), - new KingkongSettings(), - new KlaxSettings(), - new KrullSettings(), - new KungFuMasterSettings(), - new LaserGatesSettings(), - new LostLuggageSettings(), - new MarioBrosSettings(), - new MiniatureGolfSettings(), - new MontezumaRevengeSettings(), - new MrDoSettings(), - new MsPacmanSettings(), - new NameThisGameSettings(), - new OthelloSettings(), - new PacmanSettings(), - new PhoenixSettings(), - new PitfallSettings(), - new Pitfall2Settings(), - new PongSettings(), - new PooyanSettings(), - new PrivateEyeSettings(), - new QBertSettings(), - new RiverRaidSettings(), - new RoadRunnerSettings(), - new RoboTankSettings(), - new SeaquestSettings(), - new SirLancelotSettings(), - new SkiingSettings(), - new SolarisSettings(), - new SpaceInvadersSettings(), - new SpaceWarSettings(), - new StarGunnerSettings(), - new SupermanSettings(), - new SurroundSettings(), - new TennisSettings(), - new TetrisSettings(), - new TicTacToe3dSettings(), - new TimePilotSettings(), - new TurmoilSettings(), - new TrondeadSettings(), - new TutankhamSettings(), - new UpNDownSettings(), - new VentureSettings(), - new VideoCheckersSettings(), - new VideoChessSettings(), - new VideoCubeSettings(), - new VideoPinballSettings(), - new WizardOfWorSettings(), - new WordZapperSettings(), - new YarsRevengeSettings(), - new ZaxxonSettings(), -}; -/* looks for the RL wrapper corresponding to a particular rom filename, - * and optionally md5. returns null if neither match */ -RomSettings* buildRomRLWrapper(const fs::path& rom, const std::string rom_md5 = std::string()){ - // Stem is filename excluding the extension. - std::string rom_str = rom.stem().string(); - std::transform(rom_str.begin(), rom_str.end(), rom_str.begin(), ::tolower); - - for (size_t i = 0; i < sizeof(roms) / sizeof(roms[0]); i++) { - if (rom_md5 == roms[i]->md5() || rom_str == roms[i]->rom()) - return roms[i]->clone(); - } - return NULL; -} - -} // namespace ale