Read quirks setting from cfg file

leonmavr · Aug 19, 2024 · 1036c10 · 1036c10
1 parent b04682c
commit 1036c10
Show file tree

Hide file tree

Showing 80 changed files with 96 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -78,8 +78,7 @@ found at `roms/README.md`.
 
 - [x] CPU and renderer.
 - [x] UI including controls and debugger view including pause, exit, and stepping key.
-- [x] .cfg file each ROM; lists the controls and sets the emulation frequency.
-      Found at `roms/*.cfg`.
+- [x] .cfg file for each ROM with editable presets (such as emulation frequency) and key descriptions for each rom.  Found at `roms/*.cfg`.
 - [x] Configurable keys.
 - [x] CI.
 - [ ] Sound; probably never going to implement this.

diff --git a/include/cfg_parser.hpp b/include/cfg_parser.hpp
@@ -27,6 +27,7 @@ class CfgParser {
     const std::vector<std::pair<std::string, std::string>>& key_descrs() const {
         return key_descrs_;
     }
+    bool quirks() const { return quirks_; }
 
 private:
     void ParseConfigFile(const std::string& filename);
@@ -39,6 +40,7 @@ class CfgParser {
         return ret;
     }();
     std::vector<std::pair<std::string, std::string>> key_descrs_;
+    bool quirks_;
     bool cfg_file_found_;
 };
 

diff --git a/roms/15_Puzzle.cfg b/roms/15_Puzzle.cfg
@@ -61,3 +61,4 @@
 0xf: shuffle 16th tile
 
 500
+on
diff --git a/roms/15_Puzzle_alt.cfg b/roms/15_Puzzle_alt.cfg
@@ -18,3 +18,4 @@
 0xb: shuffle 15th tile
 0xf: shuffle 16th tile
 500
+on
diff --git a/roms/Addition_Problems.cfg b/roms/Addition_Problems.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/Airplane.cfg b/roms/Airplane.cfg
@@ -1,3 +1,4 @@
 # Author: Unknown
 # Controls:
 0x8: Shoot
+on
diff --git a/roms/Animal_Race.cfg b/roms/Animal_Race.cfg
@@ -47,3 +47,4 @@
 0x6: Bet $8
 0x9: Bet $9
 1500
+on
diff --git a/roms/Astro_Dodge.cfg b/roms/Astro_Dodge.cfg
@@ -58,3 +58,4 @@
 0x6: Right
 0x8: Down
 1500
+on
diff --git a/roms/Biorhythm.cfg b/roms/Biorhythm.cfg
@@ -72,3 +72,4 @@
 0xf: advance start date
 0xb: decrement start date
 2000
+on
diff --git a/roms/Blinky.cfg b/roms/Blinky.cfg
@@ -1,2 +1,3 @@
 # Author: Unknown
 2000
+on
diff --git a/roms/Blinky_alt.cfg b/roms/Blinky_alt.cfg
@@ -1,2 +1,3 @@
 # Author: Unknown
 2000
+on
diff --git a/roms/Blitz.cfg b/roms/Blitz.cfg
@@ -8,3 +8,4 @@
 # Status: Not working
 # Controls:
 0x5: drop bomb
+on
diff --git a/roms/Bowling.cfg b/roms/Bowling.cfg
@@ -51,3 +51,4 @@
 # 
 # 
 # Author: Gooitzen van der Wal
+on
diff --git a/roms/Breakout.cfg b/roms/Breakout.cfg
@@ -5,3 +5,4 @@
 # Controls:
 0x4: Left
 0x6: Right
+on
diff --git a/roms/Breakout_Brix_hack.cfg b/roms/Breakout_Brix_hack.cfg
@@ -7,3 +7,4 @@
 # Author: David Winter, 1997
 0x4: Left
 0x6: Right
+on
diff --git a/roms/Brick.cfg b/roms/Brick.cfg
@@ -2,4 +2,5 @@
 # Original BRIX by Andreas Gustafsson.
 0x4: left
 0x6: right
-300
+350
+on
diff --git a/roms/Brix.cfg b/roms/Brix.cfg
@@ -3,3 +3,4 @@
 0x4: left
 # frequency
 350
+on
diff --git a/roms/Cave.cfg b/roms/Cave.cfg
@@ -4,3 +4,4 @@
 0x4: Left
 0x6: Right
 150
+on
diff --git a/roms/Coin_Flipping.cfg b/roms/Coin_Flipping.cfg
@@ -5,3 +5,4 @@
 # and tails on the screen, stopping at the value set in VC.
 # Author: Carmelo Cortez, 1978
 1500
+on
diff --git a/roms/Connect_4.cfg b/roms/Connect_4.cfg
@@ -12,3 +12,4 @@
 0x4: Select left column
 0x6: Select right column
 0x5: Drop coin
+on
diff --git a/roms/Craps.cfg b/roms/Craps.cfg
@@ -4,3 +4,4 @@
 # 7 or 11 wins, 12, 2 or 3 loses on first roll. The second roll must match the first to win, but if you roll a seven you lose. This program could be expanded to include on-the-screen scoring of bets.
 # Author: Camerlo Cortez, 1978
 # Status: Not working
+on
diff --git a/roms/Deflection.cfg b/roms/Deflection.cfg
@@ -63,3 +63,4 @@
 0x7:  down and to the left
 0x8:  down
 0x9:  down and to the right
+on
diff --git a/roms/Figures.cfg b/roms/Figures.cfg
@@ -3,3 +3,4 @@
 0x6: move right
 0x1: drop
 600
+on
diff --git a/roms/Filter.cfg b/roms/Filter.cfg
@@ -4,3 +4,4 @@
 0x4: Left
 0x6: Right
 250
+on
diff --git a/roms/Guess.cfg b/roms/Guess.cfg
@@ -5,3 +5,4 @@
 0x5: See the number you thought
 0x0: Or other keys; don't see it
 1500
+on
diff --git a/roms/Guess_alt.cfg b/roms/Guess_alt.cfg
@@ -4,3 +4,4 @@
 0x5: See the number you thought
 0x0: Or other keys; don't see it
 1500
+on
diff --git a/roms/Hi-Lo.cfg b/roms/Hi-Lo.cfg
@@ -2,3 +2,4 @@
 # 
 # You have 10 chances to guess the value of a random number between 00 and 99 selected by the program. The number at the right of the screen shows the number of the guess you are using. Enter a two digit number and the computer tells you if you are high or low. Press any key to erase this number and then, try again. If you have failed after ten guesses, press any key and the number will be shown. If you are good you will never need more than seven guesses. 
 # Author: Jef Winsor, 1978
+on
diff --git a/roms/Hidden.cfg b/roms/Hidden.cfg
@@ -27,3 +27,4 @@
 # 
 # Enjoy !!!
 # Author: David Winter, 1996
+on
diff --git a/roms/Kaleidoscope.cfg b/roms/Kaleidoscope.cfg
@@ -16,3 +16,4 @@
 0x6: create a pattern
 0x8: create a pattern
 1000
+on
diff --git a/roms/Landing.cfg b/roms/Landing.cfg
@@ -1,2 +1,3 @@
 # Author: Unknown
 0x8: Shoot
+on
diff --git a/roms/Lunar_Lander.cfg b/roms/Lunar_Lander.cfg
@@ -108,3 +108,4 @@
 0x2: thrust
 0x4: left 
 0x6: right
+on
diff --git a/roms/Mastermind_FourRow_Robert_Lindley,_1978.cfg b/roms/Mastermind_FourRow_Robert_Lindley,_1978.cfg
@@ -29,3 +29,4 @@
 # used, the hidden number will be revealed. 
 # Controls:
 0xf: change your mind and input
+on
diff --git a/roms/Merlin.cfg b/roms/Merlin.cfg
@@ -11,3 +11,4 @@
 0x5: Toggle upper right
 0x1: Toggle lower left
 0x2: Toggle lower right
+on
diff --git a/roms/Missile.cfg b/roms/Missile.cfg
@@ -1,3 +1,4 @@
 # Author: Unknown
 # Controls:
 0x8: Shoot
+on
diff --git a/roms/Most_Dangerous_Game.cfg b/roms/Most_Dangerous_Game.cfg
@@ -47,3 +47,4 @@
 # 04E3	 70	 Probability (out of 100Hex) of a wall appearing.
 # 04EB	 FE	 If FF, a wall may appear at previously tested boundaries.
 # Author: Peter Maruhnic
+on
diff --git a/roms/Nim.cfg b/roms/Nim.cfg
@@ -4,3 +4,4 @@
 # Author: Carmelo Cortez, 1978
 # Controls:
 0xf: action
+on
diff --git a/roms/Paddles.cfg b/roms/Paddles.cfg
@@ -5,3 +5,4 @@
 0x7: left (bottom player) 
 0x9: right (bottom player)
 500
+on
diff --git a/roms/Pong.cfg b/roms/Pong.cfg
@@ -13,3 +13,4 @@
 0x4: Left player down
 0xc: Right player up
 0xd: Right player down
+on
diff --git a/roms/Pong_1_player.cfg b/roms/Pong_1_player.cfg
@@ -3,3 +3,4 @@
 0x1: up 
 0x4: down
 400
+on
diff --git a/roms/Pong_2_Pong_hack.cfg b/roms/Pong_2_Pong_hack.cfg
@@ -4,3 +4,4 @@
 0x4: Left player down
 0xc: Right player up
 0xd: Right player down
+on
diff --git a/roms/Pong_alt.cfg b/roms/Pong_alt.cfg
@@ -4,3 +4,4 @@
 0x4: Left player down
 0xc: Right player up
 0xd: Right player down
+on
diff --git a/roms/Programmable_Spacefighters.cfg b/roms/Programmable_Spacefighters.cfg
@@ -134,3 +134,4 @@
 #    of fire power can have long range effects if there is low fire power and a large
 #    number of moves per round.
 # Author: Jef Winsor
+on
diff --git a/roms/Puzzle.cfg b/roms/Puzzle.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/README.md b/roms/README.md
@@ -12,6 +12,8 @@ Here's an example config:
 0x5: Shoot
 # Frequency (optional)
 1000
+# Quirks ("on" or "off")
+on
 ```
 
 ### Credits

diff --git a/roms/Reversi.cfg b/roms/Reversi.cfg
@@ -51,3 +51,4 @@
 0x6: right (P1/P2)
 0x8: down (P1/P2)
 1000
+on
diff --git a/roms/Rocket.cfg b/roms/Rocket.cfg
@@ -1,3 +1,4 @@
 # Author: Unknown
 # Controls:
 0xf: Launch
+on
diff --git a/roms/Rocket_Launch.cfg b/roms/Rocket_Launch.cfg
@@ -2,3 +2,4 @@
 0x4: left
 0x6: right
 2000
+on
diff --git a/roms/Rocket_Launcher.cfg b/roms/Rocket_Launcher.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/Rush_Hour.cfg b/roms/Rush_Hour.cfg
@@ -35,3 +35,4 @@
 0xa: OK/hold to slide
 0x1: Options/back
 1000
+on
diff --git a/roms/Rush_Hour_alt.cfg b/roms/Rush_Hour_alt.cfg
@@ -7,3 +7,4 @@
 0xa: OK/hold to slide
 0x1: Options/back
 1000
+on
diff --git a/roms/Russian_Roulette.cfg b/roms/Russian_Roulette.cfg
@@ -5,3 +5,4 @@
 # Controls:
 0x0: (or any other key) spin
 1000
+on
diff --git a/roms/Sequence_Shoot.cfg b/roms/Sequence_Shoot.cfg
@@ -28,3 +28,4 @@
 0xe: Shoot 3rd target
 0xf: Shoot 4th target (bottom)
 1000
+on
diff --git a/roms/Shooting_Stars.cfg b/roms/Shooting_Stars.cfg
@@ -10,3 +10,4 @@
 0x6: right
 0x8: down
 1000
+on
diff --git a/roms/Slide.cfg b/roms/Slide.cfg
@@ -26,3 +26,4 @@
 # Controls:
 0x0: stop and hold the puck
 1000
+on
diff --git a/roms/Soccer.cfg b/roms/Soccer.cfg
@@ -4,3 +4,4 @@
 0x4: Down (P1)
 0xc: Up (P2)
 0xd: Down (P2)
+on
diff --git a/roms/Space_Flight.cfg b/roms/Space_Flight.cfg
@@ -5,3 +5,4 @@
 0xf: start game
 0xe: launch 
 500
+on
diff --git a/roms/Space_Intercept.cfg b/roms/Space_Intercept.cfg
@@ -13,3 +13,4 @@
 0x5: Launch
 0x6: Launch
 1000
+on
diff --git a/roms/Space_Invaders.cfg b/roms/Space_Invaders.cfg
@@ -10,3 +10,4 @@
 0x6: Right
 
 400
+on
diff --git a/roms/Space_Invaders_alt.cfg b/roms/Space_Invaders_alt.cfg
@@ -8,3 +8,4 @@
 0x6: Right
 
 400
+on
diff --git a/roms/Spooky_Spot.cfg b/roms/Spooky_Spot.cfg
@@ -10,3 +10,4 @@
 # Author: Joseph Weisbecker, 1978
 0x0: Show answer
 1000
+on
diff --git a/roms/Squash.cfg b/roms/Squash.cfg
@@ -3,3 +3,4 @@
 0x1: up
 0x4: down
 250
+on
diff --git a/roms/Submarine.cfg b/roms/Submarine.cfg
@@ -9,3 +9,4 @@
 
 0x5: shoot
 500
+on
diff --git a/roms/Sum_Fun.cfg b/roms/Sum_Fun.cfg
@@ -38,3 +38,4 @@
 0x8: Enter 8
 0x9: Enter 9
 500
+on
diff --git a/roms/Syzygy.cfg b/roms/Syzygy.cfg
@@ -66,3 +66,4 @@
 0x1: left
 0x2: down
 250
+on
diff --git a/roms/Tank.cfg b/roms/Tank.cfg
@@ -7,3 +7,4 @@
 # Controls:
 0x5: shoot
 500
+on
diff --git a/roms/Tapeworm.cfg b/roms/Tapeworm.cfg
@@ -5,3 +5,4 @@
 0x8: down
 0xf: start
 1000
+on
diff --git a/roms/Tetris.cfg b/roms/Tetris.cfg
@@ -36,3 +36,4 @@
 0x7: drop
 2000
 
+on
diff --git a/roms/Tic-Tac-Toe.cfg b/roms/Tic-Tac-Toe.cfg
@@ -10,3 +10,4 @@
 0x8: tile 8
 0x9: tile 9
 500
+on
diff --git a/roms/Timebomb.cfg b/roms/Timebomb.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/Tron.cfg b/roms/Tron.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/UFO.cfg b/roms/UFO.cfg
@@ -27,3 +27,4 @@
 0x4: Shoot top left
 0x5: Shoot straight
 0x6: Shoot top right
+on
diff --git a/roms/Vers.cfg b/roms/Vers.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/Vertical_Brix.cfg b/roms/Vertical_Brix.cfg
@@ -3,3 +3,4 @@
 0x1: Up
 0x4: Down
 1000
+on
diff --git a/roms/Wall.cfg b/roms/Wall.cfg
@@ -2,3 +2,4 @@
 # Controls:
 0x4: Left
 0x6: Right
+on
diff --git a/roms/Wipe_Off.cfg b/roms/Wipe_Off.cfg
@@ -3,3 +3,4 @@
 0x4: left
 0x6: right
 500
+on
diff --git a/roms/Worm_V4.cfg b/roms/Worm_V4.cfg
@@ -59,3 +59,4 @@
 0x8: Down
 0x4: Left
 350
+on
diff --git a/roms/X-Mirror.cfg b/roms/X-Mirror.cfg
@@ -1 +1,2 @@
 # Author: Unknown
+on
diff --git a/roms/ZeroPong.cfg b/roms/ZeroPong.cfg
@@ -2,3 +2,4 @@
 # Controls:
 0x2: up
 0x8: down
+on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@
		0xb: shuffle 15th tile
		0xf: shuffle 16th tile
		500
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,3 +72,4 @@
		0xf: advance start date
		0xb: decrement start date
		2000
		on
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,3 +51,4 @@ @@
     #
     #
     # Author: Gooitzen van der Wal
+    on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		# and tails on the screen, stopping at the value set in VC.
		# Author: Carmelo Cortez, 1978
		1500
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		0x5: See the number you thought
		0x0: Or other keys; don't see it
		1500
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@
		0x5: See the number you thought
		0x0: Or other keys; don't see it
		1500
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@
		0x6: create a pattern
		0x8: create a pattern
		1000
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		0x7: left (bottom player)
		0x9: right (bottom player)
		500
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,4 @@
		0x6: right (P1/P2)
		0x8: down (P1/P2)
		1000
		on
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,4 @@
		0xa: OK/hold to slide
		0x1: Options/back
		1000
		on