From 2da201c4a22b42ca3544562d2c48f28d31363a4d Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 6 May 2011 19:58:56 +0000 Subject: [PATCH] Added controller types 'Paddles_IAxis', 'Paddles_IDir' and 'Paddles_IAxDr', which are specialized paddles classes that invert the axis, direction, and axis+direction, respectively. Updated all applicable ROMs in the properties database. Cleaned up the menus in the OSX port; some of them weren't even tied to anything. I'm seriously considering removing them all, except for the Help and Quit items. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2230 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Changes.txt | 8 + docs/index.html | 4 +- src/emucore/Console.cxx | 24 +- src/emucore/Console.hxx | 2 +- src/emucore/DefProps.hxx | 58 +- src/emucore/EventHandler.cxx | 13 - src/emucore/stella.pro | 72 +-- src/gui/GameInfoDialog.cxx | 25 +- src/macosx/Menus.h | 6 - src/macosx/Menus.m | 82 --- src/macosx/SDLMain.nib/designable.nib | 745 +----------------------- src/macosx/SDLMain.nib/keyedobjects.nib | Bin 14485 -> 8014 bytes 12 files changed, 129 insertions(+), 910 deletions(-) diff --git a/Changes.txt b/Changes.txt index 3061022c7..b42b28314 100644 --- a/Changes.txt +++ b/Changes.txt @@ -30,6 +30,14 @@ Stelladaptor but improves handling of paddles. Thanks go to XXX for a complimentary test sample of this device. + * Added new controller types 'Paddles_IAxis', 'Paddles_IDir', and + 'Paddles_IAxDr', which invert the paddle axis, direction, and + axis+direction, respectively. These are used for certain ROMs + that have the axis or direction inverted from normal (for example, + using the paddles causes on onscreen object to move up and down vs. + left and right). All applicable ROMs in the internal database + have been updated. + * Added preliminary support for emulating ARM code to the DPC+ bankswitching scheme (thanks to Batari). diff --git a/docs/index.html b/docs/index.html index 5b76375d7..c06165cd0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2986,7 +2986,7 @@ Ms Pac-Man (Stella extended codes): Controller.Left: Indicates what type of controller the left player uses. The value must be BoosterGrip, Driving, - Keyboard, Paddles, Trackball22, + Keyboard, Paddles, Paddles_IAxis, Paddles_IDir, Paddles_IAxDr, Trackball22, Trackball80, AmigaMouse, Genesis or Joystick. @@ -2994,7 +2994,7 @@ Ms Pac-Man (Stella extended codes): Controller.Right: Indicates what type of controller the right player uses. The value must be BoosterGrip, Driving, - Keyboard, Paddles, Trackball22, + Keyboard, Paddles,Paddles_IAxis, Paddles_IDir, Paddles_IAxDr, Trackball22, Trackball80, AmigaMouse, AtariVox, SaveKey, Genesis or Joystick. diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 58704fe32..cda602591 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -635,12 +635,19 @@ void Console::setControllers(const string& rommd5) { myControllers[leftPort] = new Keyboard(Controller::Left, *myEvent, *mySystem); } - else if(left == "PADDLES") + else if(BSPF_startsWithIgnoreCase(left, "PADDLES")) { Controller::setMouseIsController(swapPaddles ? 1 : 0); + bool swapAxis = false, swapDir = false; + if(left == "PADDLES_IAXIS") + swapAxis = true; + else if(left == "PADDLES_IDIR") + swapDir = true; + else if(left == "PADDLES_IAXDR") + swapAxis = swapDir = true; myControllers[leftPort] = new Paddles(Controller::Left, *myEvent, *mySystem, - swapPaddles, false, false); + swapPaddles, swapAxis, swapDir); } else if(left == "TRACKBALL22") { @@ -679,13 +686,18 @@ void Console::setControllers(const string& rommd5) { myControllers[rightPort] = new Keyboard(Controller::Right, *myEvent, *mySystem); } - else if(right == "PADDLES") + else if(BSPF_startsWithIgnoreCase(right, "PADDLES")) { - if(left != "PADDLES") - Controller::setMouseIsController(swapPaddles ? 3 : 2); + bool swapAxis = false, swapDir = false; + if(right == "PADDLES_IAXIS") + swapAxis = true; + else if(right == "PADDLES_IDIR") + swapDir = true; + else if(right == "PADDLES_IAXDR") + swapAxis = swapDir = true; myControllers[rightPort] = new Paddles(Controller::Right, *myEvent, *mySystem, - swapPaddles, false, false); + swapPaddles, swapAxis, swapDir); } else if(right == "TRACKBALL22") { diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx index 20ef2bb95..f8e32a4d0 100644 --- a/src/emucore/Console.hxx +++ b/src/emucore/Console.hxx @@ -283,7 +283,7 @@ class Console : public Serializable private: /** - Adds the left and right controllers to the console + Adds the left and right controllers to the console. */ void setControllers(const string& rommd5); diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx index 6d30a826f..eb2df4435 100644 --- a/src/emucore/DefProps.hxx +++ b/src/emucore/DefProps.hxx @@ -164,7 +164,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "09e1ecf9bd2a3030d5670dba7a65e78d", "Atari, James Andreasen", "CX2654", "Haunted House (1982) (Atari) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "09f89bbfa2ab00f1964d200e12d7ced0", "Atari", "MA017600", "Diagnostic Test Cartridge 2.6 (1982) (Atari) (Prototype) (4K)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0a1b98937911d621b004b1617446d124", "", "", "Hangman Pac-Man Biglist1 (Hack)", "Hack of Hangman", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "0a981c03204ac2b278ba392674682560", "Atari, Bob Whitehead - Sears", "CX2651 - 99805, 49-75602", "Blackjack (1977) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "0a981c03204ac2b278ba392674682560", "Atari, Bob Whitehead - Sears", "CX2651 - 99805, 49-75602", "Blackjack (1977) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "", "", "", "" }, { "0aa208060d7c140f20571e3341f5a3f8", "U.S. Games Corporation, Jeff Corsiglia, Paul Allen Newell", "VC1009", "Towering Inferno (1982) (U.S. Games)", "Uses the Joystick Controllers (swapped)", "", "", "", "", "", "", "YES", "", "", "", "", "30", "220", "YES", "" }, { "0abf64ca504a116adca80f77f85e00fb", "", "", "Cube Conquest (Billy Eno) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0ac0d491763153fac75f5337ce32a9d6", "", "", "SPAM Image Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -218,7 +218,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "0e4b2b6e014a93ef8be896823da0d4ec", "", "", "Skiing (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0e713d4e272ea7322c5b27d645f56dd0", "Home Vision - Gem International Corp.", "VCS83105", "Panda Chase (1983) (Home Vision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0e7e73421606873b544e858c59dc283e", "Digivision", "", "Super Soccer (Digivision)", "AKA RealSports Soccer", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, - { "0e86470791b26292abe1c64545c47985", "Arcadia Corporation, Dennis Caswell", "AR-4302", "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia) (PAL)", "Uses Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "0e86470791b26292abe1c64545c47985", "Arcadia Corporation, Dennis Caswell", "AR-4302", "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia) (PAL)", "Uses Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "", "", "", "" }, { "0ec93f519bb769e0d9f80e61f6cc8023", "Atari - GCC, Mike Feinstein, John Allred", "CX2688", "Jungle Hunt (02-25-1983) (Atari) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0eebfb60d437796d536039701ec43845", "Fabrizio Zavagli", "", "Cakewalk (Fabrizio Zavagli)", "NTSC Conversion", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0eecb5f58f55de9db4eedb3a0f6b74a8", "Xonox - Beck-Tech", "6210, 06002, 06004, 99002", "Ghost Manor (1983) (Xonox) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "", "" }, @@ -366,7 +366,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "19829cfe884e30219c868b2d9a5b3540", "", "", "Death Derby (v0003) (2001) (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "199985cae1c0123ab1aef921daace8be", "", "", "Euchre (Release Candidate 2) (PAL) (01-10-2002) (Erik Eid)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "199eb0b8dce1408f3f7d46411b715ca9", "Parker Brothers, David Lamkins, Laura Nikolich", "PB5900", "Spider-Man (1982) (Parker Bros)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "", "" }, - { "19a9d3f9fa1b1358fb53009444247aaf", "", "", "Blackjack (Unknown) (PAL) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "56", "", "", "" }, + { "19a9d3f9fa1b1358fb53009444247aaf", "", "", "Blackjack (Unknown) (PAL) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "56", "", "", "" }, { "19abaf2144b6a7b281c4112cff154904", "Atari, Brad Stewart", "CX2649, CX2649P", "Asteroids (1981) (Atari) (PAL) [a2]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "19d6956ff17a959c48fcd8f4706a848d", "PlayAround - J.H.M.", "202", "Burning Desire (1982) (PlayAround)", "", "", "", "", "", "", "", "", "", "", "", "", "25", "", "YES", "" }, { "19d9b5f8428947eae6f8e97c7f33bf44", "", "", "Fortress (Dual Version) (20-04-2003) (CT)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -428,7 +428,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "1f40eefc7447336ae6cd8ffa5eb325be", "Atari, Chris Crawford", "", "Wizard (1980) (Atari) (Prototype) (4K) [a]", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "1f562b89d081e36d58e6fc943512ec05", "", "", "Hangman Man Biglist2 (Hack)", "Hack of Hangman", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "1f5a2927a0b2faf87540b01d9d7d7fd1", "Pet Boat", "", "Tennis (Pet Boat) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "1f60e48ad98b659a05ce0c1a8e999ad9", "", "", "Mondo Pong V2 (Piero Cavina) (PD)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "1f60e48ad98b659a05ce0c1a8e999ad9", "", "", "Mondo Pong V2 (Piero Cavina) (PD)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "1f773a94d919b2a3c647172bbb97f6b4", "Atari, Jerome Domurat, Peter C. Niday", "CX26115", "Dumbo's Flying Circus (07-11-1983) (Atari) (Prototype) (PAL)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "1fa58679d4a39052bd9db059e8cda4ad", "Imagic, Dan Oliver", "720118-1A, 03208", "Laser Gates (1983) (Imagic)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "1fa7a42c2c7d6b7a0c6a05d38c7508f4", "Coleco, Ed Temple", "", "Cabbage Patch Kids (09-04-1984) (Coleco) (Prototype)", "Adventures in the Park", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -525,7 +525,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "270229c6d5578446e6a588492e4e5910", "", "", "Space Invaders 2 (Hack)", "Hack of Space Invaders", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "271bfd5dc2673d382019f1fb6cab9332", "Arcadia Corporation, Dennis Caswell", "AR-4200", "Escape from the Mindmaster (Preview) (1982) (Arcadia) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "273ce50db5a0d6da7ea827a54f44dee9", "", "", "Island Flyer Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "274d17ccd825ef9c728d68394b4569d2", "Playaround - J.H.M.", "202", "Bachelorette Party (1982) (Playaround)", "AKA Bachelor Party, Uses the paddle controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "22", "222", "YES", "" }, + { "274d17ccd825ef9c728d68394b4569d2", "Playaround - J.H.M.", "202", "Bachelorette Party (1982) (Playaround)", "AKA Bachelor Party, Uses the paddle controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "22", "222", "YES", "" }, { "277c7281ac945b8331e2e6fcad560c11", "Arcadia Corporation, Steve Mundry, Scott Nelson", "AR-4401", "Survival Island (2 of 3) (1983) (Arcadia) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "277cca62014fceebb46c549bac25a2e3", "Activision, Bob Whitehead", "AG-002, CAG-002, AG-002-04", "Boxing (1980) (Activision) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "277fa4b9a6bb7a8dcea2c5f38a4c25f0", "Atari, Alan J. Murphy, Robert Zdybel", "CX2668", "RealSports Football (1982) (Atari) (Prototype)", "AKA Football II", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, @@ -587,7 +587,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "2ba02f509a4991aa176ba8d9e540df3d", "Atari, Mark R. Hahn", "CX2678", "Dukes of Hazzard (1983) (Atari) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "2bb0a1f1dee5226de648eb5f1c97f067", "Robby", "", "Enduro (Robby)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "2bb9f4686f7e08c5fcc69ec1a1c66fe7", "Atari - GCC, Mike Feinstein, John Allred", "CX2688", "Jungle Hunt (1983) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "2bc26619e31710a9884c110d8430c1da", "Atari, Bob Whitehead", "CX2652, CX2652P", "Casino (1979) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "", "", "", "60", "", "", "" }, + { "2bc26619e31710a9884c110d8430c1da", "Atari, Bob Whitehead", "CX2652, CX2652P", "Casino (1979) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "60", "", "", "" }, { "2bc6c53b19e0097a242f22375a6a60ff", "", "", "Droid Demo 2 (David Conrad Schweinsberg) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "2bee7f226d506c217163bad4ab1768c0", "Xonox - K-Tel Software - Beck-Tech", "6210, 06002, 06004, 99002", "Ghost Manor (1983) (Xonox)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "", "", "" }, { "2bf34b6ad7d2317a2d0808b3fb93571b", "", "", "Easy Playfield Graphics (1997) (Chris Cracknell)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -650,7 +650,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "304512528a5530a9361e8a231ed9a6de", "Thomas Jentzsch", "", "River Raid Plus (Thomas Jentzsch) (Hack)", "Hack of River Raid", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "30512e0e83903fc05541d2f6a6a62654", "Atari, Jim Huether - Sears", "CX2644 - 6-99824", "Flag Capture (1978) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "30516cfbaa1bc3b5335ee53ad811f17a", "Wizard Video Games, Robert Barber, Tim Martin", "007", "Halloween (1983) (Wizard Video Games)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "3051b6071cb26377cd428af155e1bfc4", "Atari, David Crane - Sears", "CX2607 - 6-99828, 49-75115", "Canyon Bomber (1979) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "42", "", "", "" }, + { "3051b6071cb26377cd428af155e1bfc4", "Atari, David Crane - Sears", "CX2607 - 6-99828, 49-75115", "Canyon Bomber (1979) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "YES", "", "42", "", "", "" }, { "30685b9b6ebd9ba71536dd7632a1e3b6", "Dactari - Milmar", "", "Tennis (Dactari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "3091af0ef1a61e801f4867783c21d45c", "CCE", "C-862", "Crackpots (1983) (CCE) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "30997031b668e37168d4d0e299ccc46f", "", "", "John K Harvey's Equalizer (PAL) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, @@ -1079,7 +1079,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "521f4dd1eb84a09b2b19959a41839aad", "Bit Corporation", "PG206", "Bobby Is Going Home (1983) (BitCorp)", "AKA Bobby geht Heim", "", "", "", "", "", "", "", "", "", "", "", "31", "", "", "" }, { "522c9cf684ecd72db2f85053e6f6f720", "Rainbow Vision - Suntek", "SS-008", "Year 1999, The (Rainbow Vision) (PAL)", "AKA Condor Attack", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "52385334ac9e9b713e13ffa4cc5cb940", "CCE", "C-804", "Open, Sesame! (1983) (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, - { "523f5cbb992f121e2d100f0f9965e33f", "Joe Grand", "", "SCSIcide (1.30) (CGE 2001 Release) (Joe Grand)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "523f5cbb992f121e2d100f0f9965e33f", "Joe Grand", "", "SCSIcide (1.30) (CGE 2001 Release) (Joe Grand)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "524693b337f7ecc9e8b9126e04a232af", "", "", "Euchre (19-08-2001) (Eric Eid) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5256f68d1491986aae5cfdff539bfeb5", "Atari - GCC, Mark Ackerman, Noellie Alito", "CX2692", "Moon Patrol (07-26-1983) (Atari) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "525ea747d746f3e80e3027720e1fa7ac", "Activision, Garry Kitchen - Ariola", "EAZ-032 - 771 032-712", "Pressure Cooker (1983) (Activision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1133,7 +1133,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "568371fbae6f5e5b936af80031cd8888", "", "", "Robotfindskitten2600 (26-04-2003) (Jeremy Penner)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "571c6d9bc71cb97617422851f787f8fe", "Activision, David Crane - Ariola", "EAG-004, PAG-004 - 711 004-715", "Fishing Derby (1980) (Activision) (PAL)", "AKA Schneller als der Hai", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "572d0a4633d6a9407d3ba83083536e0f", "Funvision - Fund. International Co.", "", "Busy Police (Funvision)", "AKA Keystone Kapers", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "575c0fb61e66a31d982c95c9dea6865c", "", "", "Blackjack (Unknown) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "56", "", "", "" }, + { "575c0fb61e66a31d982c95c9dea6865c", "", "", "Blackjack (Unknown) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "56", "", "", "" }, { "57939b326df86b74ca6404f64f89fce9", "Atari, Richard Dobbis, Nick 'Sandy Maiwald' Turner", "CX26111", "Snoopy and the Red Baron (1983) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "579baa6a4aa44f035d245908ea7a044d", "Jess Ragan", "", "Galaxian Enhanced Graphics (Jess Ragan) (Hack)", "Hack of Galaxian", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "57a66b6db7efc5df17b0b0f2f2c2f078", "Retroactive", "", "Qb (V2.08) (NTSC) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, @@ -1177,7 +1177,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "5ae73916fa1da8d38ceff674fa25a78a", "CCE", "", "Barnstorming (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5aea9974b975a6a844e6df10d2b861c4", "Atari, Dan Hitchens", "CX2656", "SwordQuest - EarthWorld (1982) (Atari)", "AKA Adventure I, SwordQuest I - EarthWorld", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5af9cd346266a1f2515e1fbc86f5186a", "Sega", "002-01", "Sub-Scan (1982) (Sega)", "AKA Subterfuge", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "5b124850de9eea66781a50b2e9837000", "PlayAround - J.H.M.", "205", "Bachelor Party (1982) (PlayAround)", "Uses the paddle controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "22", "222", "YES", "" }, + { "5b124850de9eea66781a50b2e9837000", "PlayAround - J.H.M.", "205", "Bachelor Party (1982) (PlayAround)", "Uses the paddle controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "22", "222", "YES", "" }, { "5b574faa56836da0866ba32ae32547f2", "", "", "Tomb Raider 2600 [REV 03] (Montezuma's Revenge Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5b6f5bcbbde42fc77d0bdb3146693565", "", "", "Seaquest (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5b7ea6aa6b35dc947c65ce665fde624b", "Arcadia Corporation, Stephen Harland Landrum", "AR-4400", "Dragonstomper (2 of 3) (1982) (Arcadia)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1255,7 +1255,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "60a61da9b2f43dd7e13a5093ec41a53d", "VentureVision, Dan Oliver", "VV2001", "Rescue Terra I (1982) (VentureVision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "60bbd425cb7214ddb9f9a31948e91ecb", "Activision, Bob Whitehead", "AG-005, CAG-005, AG-005-04", "Skiing (1980) (Activision) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "60d304582d33e2957b73eb300a7495bb", "", "", "Jam Demo 2 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "60e0ea3cbe0913d39803477945e9e5ec", "Atari, Joe Decuir - Sears", "CX2621 - 99806, 6-99806, 49-75104", "Video Olympics (1977) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "", "", "", "" }, + { "60e0ea3cbe0913d39803477945e9e5ec", "Atari, Joe Decuir - Sears", "CX2621 - 99806, 6-99806, 49-75104", "Video Olympics (1977) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "YES", "", "", "", "", "" }, { "613abf596c304ef6dbd8f3351920c37a", "", "", "Boring Pac-Man (Hack)", "Hack of Pac-Man", "Hack", "", "", "", "", "", "", "", "", "", "", "33", "", "", "" }, { "6141c095d0aee4e734bebfaac939030a", "Rainbow Vision - Suntek", "SS-017", "Mariana (Rainbow Vision) (PAL)", "AKA Seaquest", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "61426cee013306e7f7367534ab124747", "", "", "One Blue Bar Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1272,7 +1272,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "624e0a77f9ec67d628211aaf24d8aea6", "Panda", "108", "Sea Hawk (1983) (Panda)", "AKA Seahawk", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "626d67918f4b5e3f961e4b2af2f41f1d", "Atari", "50008", "Diagnostic Test Cartridge 2.0 (1980) (Atari) (Prototype)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6272f348a9a7f2d500a4006aa93e0d08", "Atari, Jerome Domurat, Michael Sierchio", "CX2667, CX2667P", "RealSports Soccer (1983) (Atari) (PAL) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, - { "62921652f6634eb1a0940ed5489c7e18", "", "", "SCSIcide (V1.09) (2001) (Joe Grand)", "", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "62921652f6634eb1a0940ed5489c7e18", "", "", "SCSIcide (V1.09) (2001) (Joe Grand)", "", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "62992392ea651a16aa724a92e4596ed6", "Eric Mooney", "", "Invaders by Erik Mooney (Beta) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "62f74a2736841191135514422b20382d", "", "", "Pharaoh's Curse (Unknown)", "", "", "", "", "", "", "", "", "", "", "", "PAL60", "20", "225", "YES", "" }, { "62ffd175cac3f781ef6e4870136a2520", "", "", "2600 Digital Clock (V x.xx) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1307,11 +1307,11 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "64fab9d15df937915b1c392fc119b83b", "Atari, Jerome Domurat, Howard Scott Warshaw", "CX26119", "Saboteur (05-20-1983) (Atari) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "651d2b6743a3a18b426bce2c881af212", "CCE", "C-812", "Pac Man (1983) (CCE) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "33", "", "", "" }, { "6522717cfd75d1dba252cbde76992090", "Home Vision - Gem International Corp.", "VCS83102", "War 2000 (1983) (Home Vision) (PAL)", "AKA Astrowar", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "6538e454b0498ad2befe1ef0f87815c0", "Joe Grand", "", "SCSIcide (v1.2) (2001) (Joe Grand)", "", "New Release", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "6538e454b0498ad2befe1ef0f87815c0", "Joe Grand", "", "SCSIcide (v1.2) (2001) (Joe Grand)", "", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "65490d61922f3e3883ee1d583ce10855", "Atari - GCC, Mark Ackerman, Noellie Alito", "CX2692, CX2692P", "Moon Patrol (1983) (Atari) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "65562f686b267b21b81c4dddc129d724", "", "", "Euchre (28-07-2001) (Eric Eid) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "655c84e5b951258c9d20f0bf2b9d496d", "", "", "2600_2003 Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "656dc247db2871766dffd978c71da80c", "Sears Tele-Games, Jim Huether", "CX2614 - 49-75126", "Steeplechase (1980) (Sears)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "656dc247db2871766dffd978c71da80c", "Sears Tele-Games, Jim Huether", "CX2614 - 49-75126", "Steeplechase (1980) (Sears)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "PADDLES", "", "", "", "", "", "" }, { "65917ae29a8c9785bb1f2acb0d6aafd0", "", "", "Junkosoft One Year Demo (1999) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6596b3737ae4b976e4aadb68d836c5c7", "Digivision", "", "Defender (Digivision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "659a20019de4a23c748ec2292ea5f221", "Retroactive", "", "Qb (V2.05) (NTSC) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, @@ -1405,7 +1405,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "6b8fb021bb2e1f1e9bd7ee57f2a8e709", "Paul Slocum", "", "3-D Corridor (29-03-2003) (Paul Slocum) (PD) [a]", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6bb09bc915a7411fe160d0b2e4d66047", "Atari", "CX26163P", "UFO (32 in 1) (1988) (Atari) (PAL)", "AKA Space Jockey", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6bb22efa892b89b69b9bf5ea547e62b8", "Dynacom", "", "Megamania (1982) (Dynacom)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "6bde3f6ac31aceef447ce57d4d2c2ec0", "Piero Cavina", "", "Mondo Pong V1 (Piero Cavina) (PD)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "6bde3f6ac31aceef447ce57d4d2c2ec0", "Piero Cavina", "", "Mondo Pong V1 (Piero Cavina) (PD)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "6c128bc950fcbdbcaf0d99935da70156", "Digitel", "", "Volleyball (1983) (Digitel)", "AKA RealSports Volleyball", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6c1553ca90b413bf762dfc65f2b881c7", "Quelle", "343.073 3", "Winterjagd (1983) (Quelle) (PAL)", "AKA Ski Hunt", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6c1f3f2e359dbf55df462ccbcdd2f6bf", "Activision, Garry Kitchen - Ariola", "EAX-025, EAX-025-04I - 711 025-725", "Keystone Kapers (1983) (Activision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1438,7 +1438,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "6e59dd52f88c00d5060eac56c1a0b0d3", "Atari, Bob Smith", "CX2648", "Video Pinball (1981) (Atari) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6e5d5ba193d2540aec2e847aafb2a5fb", "Retroactive", "", "Qb (2.14) (Retroactive) (NTSC)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "6e7ed74082f39ad4166c823765a59909", "", "", "Poker Squares (V0.14) (2001) (B. Watson)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "6ed5012793f5ddf4353a48c11ea9b8d3", "Arcadia Corporation, Dennis Caswell", "AR-4302", "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia)", "Uses Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "30", "", "", "" }, + { "6ed5012793f5ddf4353a48c11ea9b8d3", "Arcadia Corporation, Dennis Caswell", "AR-4302", "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia)", "Uses Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "PADDLES", "", "", "30", "", "", "" }, { "6efe876168e2d45d4719b6a61355e5fe", "Bit Corporation", "PG207", "Mission 3,000 A.D. (1983) (BitCorp) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "6f084daf265599f65422ef4173b69bc7", "", "", "Music Kit (V2.0) - Song Player (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "6f2aaffaaf53d23a28bf6677b86ac0e3", "U.S. Games Corporation, Garry Kitchen - Vidtec", "VC1001", "Space Jockey (1982) (U.S. Games)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1555,7 +1555,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "77887e4192a6b0a781530e6cf9be7199", "Atari", "CX2604", "Space War (1978) (Atari) [b1]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "77be57d872e3f5b7ecf8d19d97f73281", "", "", "Basketball (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "77cd9a9dd810ce8042bdb9d40e256dfe", "Kyle Pittman", "", "Evil Dead (2003) (Kyle Pittman) (Hack)", "Hack of Haunted House", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "77d0a577636e1c9212aeccde9d0baa4b", "Atari, Joe Decuir", "CX2621, CX2621P", "Video Olympics (1977) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "", "", "", "" }, + { "77d0a577636e1c9212aeccde9d0baa4b", "Atari, Joe Decuir", "CX2621, CX2621P", "Video Olympics (1977) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "YES", "", "", "", "", "" }, { "78297db7f416af3052dd793b53ff014e", "", "", "Poker Squares (V0.17) (2001) (B. Watson)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "7836794b79e8060c2b8326a2db74eef0", "", "", "RIOT RAM Test (26-11-2002) (Dennis Debro)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "784176346e9422733d55c427230e5bad", "Activision, Alex DeMeo", "", "Title Match Pro Wrestling (1989) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1573,7 +1573,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "7972e5101fa548b952d852db24ad6060", "Atari - Sears", "CX2627 - 6-99841", "Human Cannonball (1979) (Atari)", "AKA Cannon Man", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "798b8921276eec9e332dfcb47a2dbb17", "Atari, Gary Stark", "CX26102", "Cookie Monster Munch (1983) (Atari) (PAL) [a]", "Uses Kids/Keypad Controllers", "", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "", "" }, { "798cc114f1623c14085868cd3494fe8e", "", "", "Pins Revenge (Atari Freak 1)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "7991e1797e5e9f311fd957e62d889dff", "Joe Grand", "", "SCSIcide (v1.1) (2001) (Joe Grand)", "", "New Release", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "7991e1797e5e9f311fd957e62d889dff", "Joe Grand", "", "SCSIcide (v1.1) (2001) (Joe Grand)", "", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "7996b8d07462a19259baa4c811c2b4b4", "", "", "Math Gran Prix (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "79ab4123a83dc11d468fb2108ea09e2e", "Activision, David Rolfe - Cheshire Engineering", "AZ-037-04", "Beamrider (1984) (Activision)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "79b649fb812c50b4347d12e7ddbb8400", "", "", "Red Pong Number 2 Demo 2 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, @@ -1720,7 +1720,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "840a5a2eaea24d95d289f514fd12f9bb", "", "", "GBImprov (Hack)", "Hack of Ghostbusters", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "841b7bc1cad05f5408302308777d49dc", "Activision", "", "Unknown Activision Game #1 (10-22-1982) (Activision) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "84290e333ff7567c2380f179430083b8", "Imagic, Dave Johnson", "13211, EIX-004-04I", "Quick Step! (1983) (Imagic) (PAL) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "843435eb360ed72085f7ab9374f9749a", "Joe Grand", "", "SCSIcide (1.31) (Joe Grand)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "843435eb360ed72085f7ab9374f9749a", "Joe Grand", "", "SCSIcide (1.31) (Joe Grand)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "84535afb9a69712ec0af4947329e08b8", "CCE", "C-868", "Bingo (1983) (CCE) (PAL)", "AKA Dice Puzzle", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8454ed9787c9d8211748ccddb673e920", "Froggo", "FG1002", "Spiderdroid (1987) (Froggo)", "AKA Amidar", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8490e1014c2baa0d3a3a08854e5d68b3", "Xonox, Anthony R. Henderson", "99006, 6220", "Sir Lancelot (1983) (Xonox) [a2]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1738,10 +1738,10 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "854b68b93e7123a3be42b5a2a41f75d7", "Atari, Carol Shaw", "CX2618, CX2618P", "3-D Tic-Tac-Toe (1980) (Atari) (PAL) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "44", "", "", "" }, { "85502d69fe46b7f54ef2598225678b47", "Jone Yuan Telephonic Enterprise Co", "", "Super-Ferrari (Jone Yuan)", "AKA Enduro", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "85564dd0665aa0a1359037aef1a48d58", "ITT Family Games", "554-33 367", "Laser Base (1983) (ITT Family Games) (PAL) [a]", "AKA World End (Perry Rhodan-Serie)", "", "", "", "", "", "", "", "", "", "", "", "30", "", "YES", "" }, - { "8556b42aa05f94bc29ff39c39b11bff4", "Atari, Craig Nelson - Sears", "CX2617 - 49-75183", "Backgammon (1979) (Atari)", "Uses the Paddle Controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "8556b42aa05f94bc29ff39c39b11bff4", "Atari, Craig Nelson - Sears", "CX2617 - 49-75183", "Backgammon (1979) (Atari)", "Uses the Paddle Controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "855a42078b14714bcfd490d2cf57e68d", "Atari, Suki Lee", "CX26113", "Miss Piggy's Wedding (1983) (Atari) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "24", "", "", "" }, { "85a4133f6dcf4180e36e70ad0fca0921", "CCE", "C-827", "Chopper Command (1983) (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "85b1bca93e69f13905107cc802a02470", "Atari, Craig Nelson", "CX2617, CX2617P", "Backgammon (1979) (Atari) (PAL)", "Uses the Paddle Controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "85b1bca93e69f13905107cc802a02470", "Atari, Craig Nelson", "CX2617, CX2617P", "Backgammon (1979) (Atari) (PAL)", "Uses the Paddle Controllers", "Extremely Rare", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "85bbefb90e16bf386b304c1e9a1f6084", "Champ Games", "", "Conquest Of Mars (PAL60)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "" }, { "85dcc70a0adeb2e001e5df387612de24", "", "", "Greeting Cart Gene (SnailSoft)(PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "85e48d68c8d802e3ba9d494a47d6e016", "", "", "Ship Demo (V 15) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -2027,7 +2027,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "9eca521db1959156a115dee85a405194", "", "", "Fu Kung! (V0.08) (2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "9ed0f2aa226c34d4f55f661442e8f22a", "", "", "Nuts (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "9eeb40f04a27efb1c68ba1d25e606607", "Kyle Pittman", "", "Rambo II (2003) (Kyle Pittman) (Hack)", "Hack of Double Dragon", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "9efa877a98dd5a075e058214da428abb", "Hozer Video Games", "", "SCSIcide (1.32) (Hozer Video Games)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "9efa877a98dd5a075e058214da428abb", "Hozer Video Games", "", "SCSIcide (1.32) (Hozer Video Games)", "Uses the Paddle Controllers", "New Release", "", "", "", "", "", "", "PADDLES_IAXDR", "", "", "", "", "", "", "" }, { "9efb4e1a15a6cdd286e4bcd7cd94b7b8", "20th Century Fox Video Games, John W.S. Marvin", "", "Planet of the Apes (1983) (20th Century Fox) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "9f2d58dce1b81c6ba201ed103507c025", "", "", "Fu Kung! (V0.02) (2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "9f48eeb47836cf145a15771775f0767a", "Atari, Warren Robinett", "CX2620", "Basic Programming (1979) (Atari)", "Uses Keypad Controllers", "Rare", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "YES", "" }, @@ -2054,7 +2054,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "a1403fef01641dcd3980cac9f24d63f9", "Dactari - Milmar", "", "Atlantis (Dactari - Milmar)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "a14d8a388083c60283e00592b18d4c6c", "", "", "Tunnel Demo (28-03-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "a15b5831a1fab52e4c416068c85ec011", "Hozer Video Games", "", "Gunfight 2600 - The Good, The Bad, The Ugly (2001) (MP)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "a174cece06b3abc0aec3516913cdf9cc", "Sears Tele-Games, Jim Huether", "CX2614 - 49-75126", "Steeplechase (1980) (Sears) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, + { "a174cece06b3abc0aec3516913cdf9cc", "Sears Tele-Games, Jim Huether", "CX2614 - 49-75126", "Steeplechase (1980) (Sears) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "PADDLES", "", "", "", "", "", "" }, { "a1770ef47146ab7b12e2c4beccd68806", "Digitel", "", "Kaystone Kapers (1983) (Digitel)", "AKA Keystone Kapers", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "a184846d8904396830951217b47d13d9", "Activision, Dan Kitchen", "AX-029", "Crackpots (1983) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "a189f280521f4e5224d345efb4e75506", "Atari - Thomas Jentzsch", "", "Obelix (1983) (Thomas Jentzsch)", "NTSC Conversion", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -2264,7 +2264,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "b24f6a5820a4b7763a3d547e3e07441d", "CCE", "C-823", "Demon Attack (1983) (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b26506fbf411009e5e3f7365f442960e", "Atari, Alan Miller", "CX2642", "Hunt & Score (1978) (Atari) (PAL) (4K)", "Uses the Keypad Controllers", "", "", "", "", "", "", "", "KEYBOARD", "KEYBOARD", "", "", "", "", "", "" }, { "b2737034f974535f5c0c6431ab8caf73", "CBS Electronics, Richard K. Balaska Jr., Andy Frank, Stuart Ross", "4L 2520 5000", "Tunnel Runner (1983) (CBS Electronics)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "b2761efb8a11fc59b00a3b9d78022ad6", "Atari, Bob Whitehead - Sears", "CX2651 - 99805, 49-75602", "Blackjack (1977) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "b2761efb8a11fc59b00a3b9d78022ad6", "Atari, Bob Whitehead - Sears", "CX2651 - 99805, 49-75602", "Blackjack (1977) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "", "", "", "" }, { "b28b3d07ffd5f56938a922b7448730b9", "", "", "Greeting Cart Autobots(PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b290c2b139344fcff5b312c71b9ac3b2", "Atari", "CX26163P", "UFO (32 in 1) (1988) (Atari) (PAL) (4K)", "AKA Space Jockey", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b29359f7de62fed6e6ad4c948f699df8", "Puzzy - Bit Corporation", "PG203", "Phantom Tank (1982) (Puzzy) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -2324,7 +2324,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "b7e459d5416eeb196aaa8e092db14463", "", "", "Push (V0.02) (1998) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b7f184013991823fc02a6557341d2a7a", "", "", "Blue Rod Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b80d50ecee73919a507498d0a4d922ae", "20th Century Fox Video Games, David Lubar", "11008", "Fantastic Voyage (1982) (20th Century Fox)", "", "", "", "", "", "", "", "", "", "", "", "", "28", "", "", "" }, - { "b816296311019ab69a21cb9e9e235d12", "Atari, Bob Whitehead - Sears", "CX2652 - 6-99816, 49-75151", "Casino (1979) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "" }, + { "b816296311019ab69a21cb9e9e235d12", "Atari, Bob Whitehead - Sears", "CX2652 - 6-99816, 49-75151", "Casino (1979) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "", "", "", "" }, { "b822fba8b7c8a97ea4e92aeb2c455ef9", "Dactari", "", "Freeway (Dactari) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "b83579c4450fcbdf2b108903731fa734", "", "", "Mission 3,000 A.D. (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "b83df1f32b4539c324bdf94851b4db55", "Angelino", "", "One On One by Angelino (Basketball Hack)", "Hack of Basketball (1978) (Atari)", "New Release (Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -2406,7 +2406,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "bff8f8f53a8aeb1ee804004ccbb08313", "", "", "Droid Demo 22 (David Conrad Schweinsberg) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "bffe34516aaa3cbf5d307eab382a7e95", "", "", "Euchre (Release Candidate) (PAL) (28-09-2002) (Erik Eid)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "c00734a2233ef683d9b6e622ac97a5c8", "Atari, Jerome Domurat, Howard Scott Warshaw", "CX26133", "A-Team, The (03-30-1984) (Atari) (Prototype)", "AKA Saboteur", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "c00b65d1bae0aef6a1b5652c9c2156a1", "Atari, Joe Decuir - Sears", "CX2621 - 99806, 6-99806, 49-75104", "Video Olympics (1977) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "", "", "", "" }, + { "c00b65d1bae0aef6a1b5652c9c2156a1", "Atari, Joe Decuir - Sears", "CX2621 - 99806, 6-99806, 49-75104", "Video Olympics (1977) (Atari) (4K)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "YES", "", "", "", "", "" }, { "c02e1afa0671e438fd526055c556d231", "Atari", "", "A-Team (Atari) (Prototype) (PAL60)", "", "Prototype", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "" }, { "c032c2bd7017fdfbba9a105ec50f800e", "Activision, Charlie Heath", "", "Thwocker (04-09-1984) (Activision) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "c033dc1d7b6fde41b9cadce9638909bb", "", "", "Skeleton (V1.1) (06-09-2002) (Eric Ball)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -3262,11 +3262,11 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = { { "fece458a8023a809a5006867feca40e8", "", "", "SCSIcide (24-02-2001) (Joe Grand) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "feeae23f2eeac44b81a43e8292d0c574", "", "", "Greeting Cart Halle Berry (SnailSoft)(PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "feec54aac911887940b47fe8c9f80b11", "Atari, Rob Fulop", "CX2633, CX2633P", "Night Driver (1980) (Atari) (PAL)", "Uses the Paddle Controllers (left only)", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "YES", "" }, - { "feedcc20bc3ca34851cd5d9e38aa2ca6", "Atari, David Crane - Sears", "CX2607 - 6-99828, 49-75115", "Canyon Bomber (1979) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "YES", "", "42", "", "", "" }, - { "ff3bd0c684f7144aeaa18758d8281a78", "Atari, Bob Whitehead", "CX2651", "Blackjack (1977) (Atari) (PAL)", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "PADDLES", "", "", "", "48", "", "", "" }, + { "feedcc20bc3ca34851cd5d9e38aa2ca6", "Atari, David Crane - Sears", "CX2607 - 6-99828, 49-75115", "Canyon Bomber (1979) (Atari)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXDR", "", "YES", "", "42", "", "", "" }, + { "ff3bd0c684f7144aeaa18758d8281a78", "Atari, Bob Whitehead", "CX2651", "Blackjack (1977) (Atari) (PAL)", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "48", "", "", "" }, { "ff4ed162386c795b4fb434903295b571", "", "", "Death Derby (v0002) (2001) (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "ff5a9e340d96df6f5a5b6eb038e923bd", "", "", "Space Shuttle (1983) (Activision) [t1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "ff7627207e8aa03730c35c735a82c26c", "Atari, Bob Whitehead", "CX26163P", "Blackjack (32 in 1) (1988) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "", "", "", "63", "", "", "" }, + { "ff7627207e8aa03730c35c735a82c26c", "Atari, Bob Whitehead", "CX26163P", "Blackjack (32 in 1) (1988) (Atari) (PAL)", "Uses the Paddle Controllers", "", "", "", "", "", "", "", "PADDLES_IAXIS", "", "", "", "63", "", "", "" }, { "ff86fc8ffa717bb095e8471638c1c31c", "Arcadia Corporation, Dennis Caswell", "AR-4302", "Party Mix - Bop a Buggy (1 of 3) (1983) (Arcadia) (PAL)", "Uses Paddle Controllers", "", "", "", "", "", "", "", "PADDLES", "PADDLES", "", "", "", "", "", "" }, { "ff87d58125ae517eb7b09a0475a1ccdc", "", "", "SCSIcide (Score Hack 1) (24-02-2001) (Joe Grand) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "ffb1cd548563158ce33f9d10268187e7", "Erik Eid", "", "Euchre (Beta) (NTSC) (12-09-2002) (Erik Eid)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 9a3be40b4..10e89592f 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -52,12 +52,6 @@ #include "Debugger.hxx" #endif -#ifdef MAC_OSX - extern "C" { - void handleMacOSXKeypress(int key); - } -#endif - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EventHandler::EventHandler(OSystem* osystem) : myOSystem(osystem), @@ -551,13 +545,6 @@ void EventHandler::poll(uInt64 time) { switch(int(key)) { - #ifdef MAC_OSX - case SDLK_h: - case SDLK_m: - case SDLK_SLASH: - handleMacOSXKeypress(int(key)); - break; - #endif case SDLK_0: // Ctrl-0 sets the mouse to controller 0 setMouseControllerMode(0, true); break; diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro index 15571a201..34674ed32 100644 --- a/src/emucore/stella.pro +++ b/src/emucore/stella.pro @@ -763,7 +763,7 @@ "Cartridge.ModelNo" "CX2651 - 99805, 49-75602" "Cartridge.Name" "Blackjack (1977) (Atari)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "" "Cartridge.MD5" "0a1b98937911d621b004b1617446d124" @@ -1191,8 +1191,7 @@ "Cartridge.ModelNo" "AR-4302" "Cartridge.Name" "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia) (PAL)" "Cartridge.Note" "Uses Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "" "Cartridge.MD5" "0ef64cdbecccb7049752a3de0b7ade14" @@ -1950,8 +1949,7 @@ "Cartridge.MD5" "19a9d3f9fa1b1358fb53009444247aaf" "Cartridge.Name" "Blackjack (Unknown) (PAL) (4K)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "56" "" @@ -2407,7 +2405,7 @@ "Cartridge.Name" "Mondo Pong V2 (Piero Cavina) (PD)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "1f5a2927a0b2faf87540b01d9d7d7fd1" @@ -2957,7 +2955,7 @@ "Cartridge.Name" "Bachelorette Party (1982) (Playaround)" "Cartridge.Note" "AKA Bachelor Party, Uses the paddle controllers" "Cartridge.Rarity" "Extremely Rare" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "22" "Display.Height" "222" "Display.Phosphor" "YES" @@ -3278,7 +3276,7 @@ "Cartridge.ModelNo" "CX2652, CX2652P" "Cartridge.Name" "Casino (1979) (Atari) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "60" "" @@ -3679,8 +3677,7 @@ "Cartridge.ModelNo" "CX2607 - 6-99828, 49-75115" "Cartridge.Name" "Canyon Bomber (1979) (Atari) (4K)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "Controller.SwapPaddles" "YES" "Display.YStart" "42" "" @@ -6247,8 +6244,7 @@ "Cartridge.Name" "SCSIcide (1.30) (CGE 2001 Release) (Joe Grand)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "522c9cf684ecd72db2f85053e6f6f720" @@ -6439,8 +6435,7 @@ "Cartridge.MD5" "575c0fb61e66a31d982c95c9dea6865c" "Cartridge.Name" "Blackjack (Unknown) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "56" "" @@ -6651,7 +6646,7 @@ "Cartridge.Name" "Bachelor Party (1982) (PlayAround)" "Cartridge.Note" "Uses the paddle controllers" "Cartridge.Rarity" "Extremely Rare" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "22" "Display.Height" "222" "Display.Phosphor" "YES" @@ -7312,8 +7307,7 @@ "Cartridge.ModelNo" "CX2621 - 99806, 6-99806, 49-75104" "Cartridge.Name" "Video Olympics (1977) (Atari)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "Controller.SwapPaddles" "YES" "" @@ -7405,8 +7399,7 @@ "Cartridge.MD5" "62921652f6634eb1a0940ed5489c7e18" "Cartridge.Name" "SCSIcide (V1.09) (2001) (Joe Grand)" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "62f74a2736841191135514422b20382d" @@ -7626,8 +7619,7 @@ "Cartridge.Manufacturer" "Joe Grand" "Cartridge.Name" "SCSIcide (v1.2) (2001) (Joe Grand)" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "6b8fb021bb2e1f1e9bd7ee57f2a8e709" @@ -7662,7 +7654,7 @@ "Cartridge.ModelNo" "CX2614 - 49-75126" "Cartridge.Name" "Steeplechase (1980) (Sears)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Controller.Right" "PADDLES" "" @@ -8206,7 +8198,7 @@ "Cartridge.Name" "Mondo Pong V1 (Piero Cavina) (PD)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "6bb09bc915a7411fe160d0b2e4d66047" @@ -8426,7 +8418,7 @@ "Cartridge.ModelNo" "AR-4302" "Cartridge.Name" "Party Mix - Down on the Line (3 of 3) (1983) (Arcadia)" "Cartridge.Note" "Uses Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Controller.Right" "PADDLES" "Display.YStart" "30" "" @@ -9094,8 +9086,7 @@ "Cartridge.ModelNo" "CX2621, CX2621P" "Cartridge.Name" "Video Olympics (1977) (Atari) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "Controller.SwapPaddles" "YES" "" @@ -9205,8 +9196,7 @@ "Cartridge.Manufacturer" "Joe Grand" "Cartridge.Name" "SCSIcide (v1.1) (2001) (Joe Grand)" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "7996b8d07462a19259baa4c811c2b4b4" @@ -9955,7 +9945,7 @@ "Cartridge.Name" "Backgammon (1979) (Atari)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "Extremely Rare" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "85478bb289dfa5c63726b9153992a920" @@ -10092,8 +10082,7 @@ "Cartridge.Name" "SCSIcide (1.31) (Joe Grand)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "8454ed9787c9d8211748ccddb673e920" @@ -10197,7 +10186,7 @@ "Cartridge.Name" "Backgammon (1979) (Atari) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "Extremely Rare" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "85a4133f6dcf4180e36e70ad0fca0921" @@ -11894,8 +11883,7 @@ "Cartridge.Name" "SCSIcide (1.32) (Hozer Video Games)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "New Release" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "" "Cartridge.MD5" "9f59eddf9ba91a7d93bce7ee4b7693bc" @@ -12055,7 +12043,7 @@ "Cartridge.ModelNo" "CX2614 - 49-75126" "Cartridge.Name" "Steeplechase (1980) (Sears) (4K)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Controller.Right" "PADDLES" "" @@ -13294,7 +13282,7 @@ "Cartridge.ModelNo" "CX2651 - 99805, 49-75602" "Cartridge.Name" "Blackjack (1977) (Atari) (4K)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "" "Cartridge.MD5" "b2737034f974535f5c0c6431ab8caf73" @@ -13685,7 +13673,7 @@ "Cartridge.ModelNo" "CX2652 - 6-99816, 49-75151" "Cartridge.Name" "Casino (1979) (Atari)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "" "Cartridge.MD5" "b822fba8b7c8a97ea4e92aeb2c455ef9" @@ -14112,8 +14100,7 @@ "Cartridge.ModelNo" "CX2621 - 99806, 6-99806, 49-75104" "Cartridge.Name" "Video Olympics (1977) (Atari) (4K)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "Controller.SwapPaddles" "YES" "" @@ -19162,7 +19149,7 @@ "Cartridge.Name" "Blackjack (1977) (Atari) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" "Cartridge.Rarity" "Rare" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "48" "" @@ -19171,8 +19158,7 @@ "Cartridge.ModelNo" "CX2607 - 6-99828, 49-75115" "Cartridge.Name" "Canyon Bomber (1979) (Atari)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" -"Controller.Right" "PADDLES" +"Controller.Left" "PADDLES_IAXDR" "Controller.SwapPaddles" "YES" "Display.YStart" "42" "" @@ -19199,7 +19185,7 @@ "Cartridge.ModelNo" "CX26163P" "Cartridge.Name" "Blackjack (32 in 1) (1988) (Atari) (PAL)" "Cartridge.Note" "Uses the Paddle Controllers" -"Controller.Left" "PADDLES" +"Controller.Left" "PADDLES_IAXIS" "Display.YStart" "63" "" diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 8dcc25b92..03dd4637f 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -224,17 +224,20 @@ GameInfoDialog::GameInfoDialog( new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "P0 Controller:", kTextAlignLeft); ctrls.clear(); - ctrls.push_back("Joystick", "JOYSTICK" ); - ctrls.push_back("Paddles", "PADDLES" ); - ctrls.push_back("BoosterGrip", "BOOSTERGRIP" ); - ctrls.push_back("Driving", "DRIVING" ); - ctrls.push_back("Keyboard", "KEYBOARD" ); - ctrls.push_back("CX-22 Trakball", "TRACKBALL22" ); - ctrls.push_back("CX-80 Mouse", "TRACKBALL80" ); - ctrls.push_back("AmigaMouse", "AMIGAMOUSE" ); - ctrls.push_back("AtariVox", "ATARIVOX" ); - ctrls.push_back("SaveKey", "SAVEKEY" ); - ctrls.push_back("Sega Genesis", "GENESIS" ); + ctrls.push_back("Joystick", "JOYSTICK" ); + ctrls.push_back("Paddles", "PADDLES" ); + ctrls.push_back("Paddles_IAxis", "PADDLES_IAXIS"); + ctrls.push_back("Paddles_IDir", "PADDLES_IDIR" ); + ctrls.push_back("Paddles_IAxDr", "PADDLES_IAXDR"); + ctrls.push_back("BoosterGrip", "BOOSTERGRIP" ); + ctrls.push_back("Driving", "DRIVING" ); + ctrls.push_back("Keyboard", "KEYBOARD" ); + ctrls.push_back("CX-22 Trakball", "TRACKBALL22" ); + ctrls.push_back("CX-80 Mouse", "TRACKBALL80" ); + ctrls.push_back("AmigaMouse", "AMIGAMOUSE" ); + ctrls.push_back("AtariVox", "ATARIVOX" ); + ctrls.push_back("SaveKey", "SAVEKEY" ); + ctrls.push_back("Sega Genesis", "GENESIS" ); // TODO ctrls.push_back("KidVid", "KIDVID" ); myP0Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, ctrls, "", 0, 0); diff --git a/src/macosx/Menus.h b/src/macosx/Menus.h index abfe7a0e8..5f0dd281a 100644 --- a/src/macosx/Menus.h +++ b/src/macosx/Menus.h @@ -33,21 +33,15 @@ IBOutlet id screenBiggerMenuItem; IBOutlet id screenSmallerMenuItem; IBOutlet id fullScreenMenuItem; - IBOutlet id mousePaddle0MenuItem; - IBOutlet id mousePaddle1MenuItem; - IBOutlet id mousePaddle2MenuItem; - IBOutlet id mousePaddle3MenuItem; IBOutlet id increaseVolumeMenuItem; IBOutlet id decreaseVolumeMenuItem; } + (Menus *)sharedInstance; - (void)pushKeyEvent:(int)key:(bool)shift:(bool)cmd:(bool)control; -- (IBAction)paddleChange:(id) sender; - (IBAction)biggerScreen:(id)sender; - (IBAction)smallerScreen:(id)sender; - (IBAction)fullScreen:(id)sender; -- (IBAction)openCart:(id)sender; - (IBAction)restartGame:(id)sender; - (IBAction)doPrefs:(id)sender; - (IBAction)volumePlus:(id)sender; diff --git a/src/macosx/Menus.m b/src/macosx/Menus.m index 11715288b..b0ed9e6b5 100644 --- a/src/macosx/Menus.m +++ b/src/macosx/Menus.m @@ -55,40 +55,6 @@ void releaseCmdKeys(NSString *character, int keyCode) [NSApp postEvent:event2 atStart:NO]; } -void hideApp(void) -{ - [NSApp hide:nil]; - releaseCmdKeys(@"h",QZ_h); -} - -void showHelp(void) -{ - [NSApp showHelp:nil]; - releaseCmdKeys(@"?",QZ_SLASH); -} - -void miniturizeWindow(void) -{ - [[NSApp keyWindow] performMiniaturize:nil]; - releaseCmdKeys(@"m",QZ_m); -} - -void handleMacOSXKeypress(int key) -{ - switch(key) - { - case SDLK_h: - hideApp(); - break; - case SDLK_m: - miniturizeWindow(); - break; - case SDLK_SLASH: - showHelp(); - break; - } -} - void setEmulationMenus(void) { [[Menus sharedInstance] setEmulationMenus]; @@ -149,25 +115,6 @@ static Menus *sharedInstance = nil; SDL_PushEvent(&theEvent); } -- (IBAction) paddleChange:(id) sender -{ - switch([sender tag]) - { - case 0: - [self pushKeyEvent:SDLK_0:NO:NO:YES]; - break; - case 1: - [self pushKeyEvent:SDLK_1:NO:NO:YES]; - break; - case 2: - [self pushKeyEvent:SDLK_2:NO:NO:YES]; - break; - case 3: - [self pushKeyEvent:SDLK_3:NO:NO:YES]; - break; - } -} - - (IBAction)biggerScreen:(id)sender { [self pushKeyEvent:SDLK_EQUALS:NO:YES:NO]; @@ -183,15 +130,6 @@ static Menus *sharedInstance = nil; [self pushKeyEvent:SDLK_RETURN:NO:YES:NO]; } -- (IBAction)openCart:(id)sender -{ - [self pushKeyEvent:SDLK_ESCAPE:NO:NO:NO]; -// Fixme - This should work like the other keys, but instead -// if you send the LauncherOpen event, it crashes SDL in -// the poll loop. -// macOSXSendMenuEvent(MENU_OPEN); -} - - (IBAction)restartGame:(id)sender { [self pushKeyEvent:SDLK_r:NO:NO:YES]; @@ -220,10 +158,6 @@ static Menus *sharedInstance = nil; [screenBiggerMenuItem setTarget:self]; [screenSmallerMenuItem setTarget:self]; [fullScreenMenuItem setTarget:self]; - [mousePaddle0MenuItem setTarget:self]; - [mousePaddle1MenuItem setTarget:self]; - [mousePaddle2MenuItem setTarget:self]; - [mousePaddle3MenuItem setTarget:self]; [increaseVolumeMenuItem setTarget:self]; [decreaseVolumeMenuItem setTarget:self]; } @@ -236,10 +170,6 @@ static Menus *sharedInstance = nil; [screenBiggerMenuItem setTarget:nil]; [screenSmallerMenuItem setTarget:nil]; [fullScreenMenuItem setTarget:self]; - [mousePaddle0MenuItem setTarget:nil]; - [mousePaddle1MenuItem setTarget:nil]; - [mousePaddle2MenuItem setTarget:nil]; - [mousePaddle3MenuItem setTarget:nil]; [increaseVolumeMenuItem setTarget:nil]; [decreaseVolumeMenuItem setTarget:nil]; } @@ -252,10 +182,6 @@ static Menus *sharedInstance = nil; [screenBiggerMenuItem setTarget:self]; [screenSmallerMenuItem setTarget:self]; [fullScreenMenuItem setTarget:self]; - [mousePaddle0MenuItem setTarget:nil]; - [mousePaddle1MenuItem setTarget:nil]; - [mousePaddle2MenuItem setTarget:nil]; - [mousePaddle3MenuItem setTarget:nil]; [increaseVolumeMenuItem setTarget:nil]; [decreaseVolumeMenuItem setTarget:nil]; } @@ -268,10 +194,6 @@ static Menus *sharedInstance = nil; [screenBiggerMenuItem setTarget:self]; [screenSmallerMenuItem setTarget:self]; [fullScreenMenuItem setTarget:self]; - [mousePaddle0MenuItem setTarget:nil]; - [mousePaddle1MenuItem setTarget:nil]; - [mousePaddle2MenuItem setTarget:nil]; - [mousePaddle3MenuItem setTarget:nil]; [increaseVolumeMenuItem setTarget:nil]; [decreaseVolumeMenuItem setTarget:nil]; } @@ -284,10 +206,6 @@ static Menus *sharedInstance = nil; [screenBiggerMenuItem setTarget:self]; [screenSmallerMenuItem setTarget:self]; [fullScreenMenuItem setTarget:self]; - [mousePaddle0MenuItem setTarget:nil]; - [mousePaddle1MenuItem setTarget:nil]; - [mousePaddle2MenuItem setTarget:nil]; - [mousePaddle3MenuItem setTarget:nil]; [increaseVolumeMenuItem setTarget:nil]; [decreaseVolumeMenuItem setTarget:nil]; } diff --git a/src/macosx/SDLMain.nib/designable.nib b/src/macosx/SDLMain.nib/designable.nib index b5b0a2770..00758450b 100644 --- a/src/macosx/SDLMain.nib/designable.nib +++ b/src/macosx/SDLMain.nib/designable.nib @@ -12,7 +12,6 @@ YES - YES @@ -85,44 +84,6 @@ - - - Hide SDL App - h - 1048576 - 2147483647 - - - - - - Hide Others - - 1048576 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - Quit SDL App @@ -168,26 +129,6 @@ - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Save Properties - s - 1048576 - 2147483647 - - - @@ -242,137 +183,6 @@ - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Toggle Palette - p - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Developer - - 1048576 - 2147483647 - - - submenuAction: - - Developer - - YES - - - Toggle NTSC/PAL Format - f - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Increase XStart - - 2147483647 - - - - - - Decrease XStart - - 2147483647 - - - - - - Increase YStart - - 2147483647 - - - - - - Decrease YStart - - 2147483647 - - - - - - Increase Width - - 2147483647 - - - - - - Decrease Width - - 2147483647 - - - - - - Increase Height - - 2147483647 - - - - - - Decrease Height - - 2147483647 - - - - - - @@ -410,34 +220,6 @@ - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - - Window - - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - Help @@ -455,7 +237,7 @@ YES - Stella OSX Help + Stella Help ? 1048576 2147483647 @@ -484,30 +266,6 @@ YES - - - hideOtherApplications: - - - - 146 - - - - hide: - - - - 152 - - - - unhideAllApplications: - - - - 153 - delegate @@ -532,14 +290,6 @@ 469 - - - performMiniaturize: - - - - 476 - openCart: @@ -572,86 +322,6 @@ 610 - - - togglePallette: - - - - 614 - - - - xStartPlus: - - - - 657 - - - - xStartMinus: - - - - 658 - - - - yStartPlus: - - - - 659 - - - - yStartMinus: - - - - 660 - - - - ntscPalMode: - - - - 661 - - - - widthPlus: - - - - 673 - - - - widthMinus: - - - - 675 - - - - heightPlus: - - - - 676 - - - - heightMinus: - - - - 677 - restartGame: @@ -684,14 +354,6 @@ 692 - - - saveProps: - - - - 697 - showPanel: @@ -724,86 +386,6 @@ 723 - - - togglePalletteMenuItem - - - - 725 - - - - ntscPalMenuItem - - - - 726 - - - - increaseXStartMenuItem - - - - 727 - - - - decreaseXStartMenuItem - - - - 728 - - - - increaseYStartMenuItem - - - - 729 - - - - decreaseYStartMenuItem - - - - 730 - - - - increaseWidthMenuItem - - - - 731 - - - - decreaseWidthMenuItem - - - - 732 - - - - increaseHeightMenuItem - - - - 733 - - - - decreaseHeightMenuItem - - - - 734 - increaseVolumeMenuItem @@ -836,14 +418,6 @@ 743 - - - savePropsMenuItem - - - - 744 - preferencesMenuItem @@ -885,7 +459,6 @@ - @@ -905,42 +478,18 @@ YES - - - - - - 134 - - - 136 - - 145 - - - - - 149 - - - - - 150 - - - 196 @@ -997,10 +546,6 @@ - - - - @@ -1024,98 +569,6 @@ - - 427 - - - - - 445 - - - - - 649 - - - - - 655 - - - YES - - - - - - 652 - - - YES - - - - - - - - - - - - - - - 650 - - - - - 651 - - - - - 653 - - - - - 654 - - - - - 656 - - - - - 669 - - - - - 670 - - - - - 671 - - - - - 672 - - - - - 693 - - - 357 @@ -1132,8 +585,6 @@ YES - - @@ -1147,39 +598,6 @@ - - 694 - - - - - 695 - - - - - 471 - - - YES - - - - - - 470 - - - YES - - - - - - 475 - - - 686 @@ -1247,20 +665,13 @@ YES 103.IBPluginDependency 103.ImportedFromIB2 + 106.IBEditorWindowLastContentRect 106.IBPluginDependency 106.ImportedFromIB2 111.IBPluginDependency 111.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 136.IBPluginDependency 136.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 194.ImportedFromIB2 196.IBPluginDependency 196.ImportedFromIB2 @@ -1270,6 +681,7 @@ 29.ImportedFromIB2 293.IBPluginDependency 293.ImportedFromIB2 + 328.IBEditorWindowLastContentRect 328.IBPluginDependency 328.ImportedFromIB2 332.IBPluginDependency @@ -1284,65 +696,28 @@ 347.ImportedFromIB2 357.IBPluginDependency 357.ImportedFromIB2 + 358.IBEditorWindowLastContentRect 358.IBPluginDependency 358.ImportedFromIB2 368.IBPluginDependency 368.ImportedFromIB2 - 427.IBPluginDependency - 427.ImportedFromIB2 - 445.IBPluginDependency - 445.ImportedFromIB2 - 470.IBPluginDependency - 470.ImportedFromIB2 - 471.IBPluginDependency - 471.ImportedFromIB2 - 475.IBPluginDependency - 475.ImportedFromIB2 56.IBPluginDependency 56.ImportedFromIB2 + 57.IBEditorWindowLastContentRect 57.IBPluginDependency 57.ImportedFromIB2 596.ImportedFromIB2 - 649.IBPluginDependency - 649.ImportedFromIB2 - 650.IBPluginDependency - 650.ImportedFromIB2 - 651.IBPluginDependency - 651.ImportedFromIB2 - 652.IBPluginDependency - 652.ImportedFromIB2 - 653.IBPluginDependency - 653.ImportedFromIB2 - 654.IBPluginDependency - 654.ImportedFromIB2 - 655.IBPluginDependency - 655.ImportedFromIB2 - 656.IBPluginDependency - 656.ImportedFromIB2 - 669.IBPluginDependency - 669.ImportedFromIB2 - 670.IBPluginDependency - 670.ImportedFromIB2 - 671.IBPluginDependency - 671.ImportedFromIB2 - 672.IBPluginDependency - 672.ImportedFromIB2 684.IBPluginDependency 684.ImportedFromIB2 686.IBPluginDependency 686.ImportedFromIB2 + 687.IBEditorWindowLastContentRect 687.IBPluginDependency 687.ImportedFromIB2 688.IBPluginDependency 688.ImportedFromIB2 689.IBPluginDependency 689.ImportedFromIB2 - 693.IBPluginDependency - 693.ImportedFromIB2 - 694.IBPluginDependency - 694.ImportedFromIB2 - 695.IBPluginDependency - 695.ImportedFromIB2 717.IBPluginDependency 717.ImportedFromIB2 719.ImportedFromIB2 @@ -1351,6 +726,23 @@ YES com.apple.InterfaceBuilder.CocoaPlugin + {{580, 691}, {143, 23}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + {{329, 714}, {312, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{462, 641}, {179, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1365,45 +757,14 @@ com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - {{329, 714}, {383, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - + {{420, 671}, {232, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{341, 641}, {183, 73}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1411,36 +772,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - + {{519, 671}, {188, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1562,6 +894,7 @@ FirstResponder + NSObject IBUserSource @@ -2373,28 +1706,6 @@ NSResponder - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - 0 @@ -2408,7 +1719,7 @@ YES - + stella_intel.xcodeproj 3 YES diff --git a/src/macosx/SDLMain.nib/keyedobjects.nib b/src/macosx/SDLMain.nib/keyedobjects.nib index ab43dab8b9f67525fd4035210feba7c68f6cbe49..1bc66f665859b616ad5a8f0d903638d38cd97b6f 100644 GIT binary patch literal 8014 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 literal 14485 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 B9dQ5v