ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove all references to CX22/CX80 for trakball-like controllers. 

Applicable controllers are now (consistently) named either
Amigamouse, Atarimouse or Trakball.
This commit is contained in:
Stephen Anthony 2017-03-24 20:27:37 -02:30
parent 6c41bf6405
commit 7a0f322224
4 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/DefProps.hxx
View File

@ -1845,7 +1845,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "8bbfd951c89cc09c148bfabdefa08bec", "UA Limited", "", "Pleiades (1983) (UA Limited) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
{ "8bc0d2052b4f259e7a50a7c771b45241", "Xonox - K-Tel Software, Anthony R. Henderson", "99007, 6240", "Tomarc the Barbarian (1983) (Xonox) [a]", "AKA Thundarr the Barbarian", "", "", "", "", "", "", "", "", "", "", "", "", "24", "", "", "" },
{ "8bd8f65377023bdb7c5fcf46ddda5d31", "Activision, Bob Whitehead", "AG-019", "Sky Jinks (1982) (Activision) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8bebac614571135933116045204f0f00", "Thomas Jentzsch", "", "Missile Command (CX22 Trakball) (2002) (TJ) (PAL)", "Uses CX22 Trakball Controller", "Homebrew", "", "", "", "", "", "", "TRAKBALL", "", "", "", "", "", "", "YES", "" },
{ "8bebac614571135933116045204f0f00", "Thomas Jentzsch", "", "Missile Command (Trakball) (2002) (TJ) (PAL)", "Uses the Trakball Controller", "Homebrew", "", "", "", "", "", "", "TRAKBALL", "", "", "", "", "", "", "YES", "" },
{ "8c103a79b007a2fd5af602334937b4e1", "Thomas Jentzsch", "", "Laser Base (Thomas Jentzsch)", "NTSC Conversion", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "240", "", "" },
{ "8c136e97c0a4af66da4a249561ed17db", "", "", "Poker Squares (V0.27) (2001) (B. Watson)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8c2fa33048f055f38358d51eefe417db", "Home Vision - Gem International Corp.", "VCS83137", "Teddy Apple (1983) (Home Vision) (PAL)", "AKA Open Sesame", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
@ -1856,7 +1856,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "8c941fa32c7718a10061d8c328909577", "Digivision", "", "River Raid (Digivision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8ccaa442d26b09139685f5b22bf189c4", "Retroactive", "", "Qb (V1.01) (NTSC) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
{ "8cd26dcf249456fe4aeb8db42d49df74", "Atari", "CX26139", "Crossbow (1987) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8ce9126066f2ddd5173e9f1f9ce1494e", "Thomas Jentzsch", "", "Missile Command (CX22 Trakball) (2002) (TJ)", "Uses CX22 Trakball Controller", "Homebrew", "", "", "", "", "", "", "TRAKBALL", "", "", "", "", "", "", "YES", "" },
{ "8ce9126066f2ddd5173e9f1f9ce1494e", "Thomas Jentzsch", "", "Missile Command (Trakball) (2002) (TJ)", "Uses the Trakball Controller", "Homebrew", "", "", "", "", "", "", "TRAKBALL", "", "", "", "", "", "", "YES", "" },
{ "8cf0d333bbe85b9549b1e6b1e2390b8d", "Atari, Brad Stewart", "CX2649, CX2649P", "Asteroids (1981) (Atari) (PAL)", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
{ "8d00a38f4c8f8800f1c237215ac243fc", "", "", "3-D Corridor (Green) (30-03-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8d1e2a6d2885966e6d86717180938f87", "Thomas Jentzsch", "", "Missile Command (Amiga Mouse) (2002) (TJ)", "Uses Amiga Mouse Controller", "Homebrew", "", "", "", "", "", "", "AMIGAMOUSE", "", "", "", "", "", "", "YES", "" },

7
src/emucore/TrakBall.hxx
View File

@ -15,15 +15,16 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef CX_TRAKBALL_HXX
#define CX_TRAKBALL_HXX
#ifndef TRAKBALL_HXX
#define TRAKBALL_HXX
#include "bspf.hxx"
#include "Control.hxx"
#include "Event.hxx"
/**
CX22/CX80 trakball controller. This code was heavily borrowed from z26.
Emulates the standard trakball controller, sometimes known as the 'CX22'
controller. This code was heavily borrowed from z26.
@author Stephen Anthony & z26 team
*/

8
src/emucore/stella.pro
View File

@ -11171,8 +11171,8 @@
"Cartridge.MD5" "8bebac614571135933116045204f0f00"
"Cartridge.Manufacturer" "Thomas Jentzsch"
"Cartridge.Name" "Missile Command (CX22 Trakball) (2002) (TJ) (PAL)"
"Cartridge.Note" "Uses CX22 Trakball Controller"
"Cartridge.Name" "Missile Command (Trakball) (2002) (TJ) (PAL)"
"Cartridge.Note" "Uses the Trakball Controller"
"Cartridge.Rarity" "Homebrew"
"Controller.Left" "TRAKBALL"
"Display.Phosphor" "YES"
@ -11241,8 +11241,8 @@
"Cartridge.MD5" "8ce9126066f2ddd5173e9f1f9ce1494e"
"Cartridge.Manufacturer" "Thomas Jentzsch"
"Cartridge.Name" "Missile Command (CX22 Trakball) (2002) (TJ)"
"Cartridge.Note" "Uses CX22 Trakball Controller"
"Cartridge.Name" "Missile Command (Trakball) (2002) (TJ)"
"Cartridge.Note" "Uses the Trakball Controller"
"Cartridge.Rarity" "Homebrew"
"Controller.Left" "TRAKBALL"
"Display.Phosphor" "YES"

38
src/gui/GameInfoDialog.cxx
View File

@ -178,27 +178,27 @@ GameInfoDialog::GameInfoDialog(
xpos = 10; ypos = vBorder;
lwidth = font.getStringWidth("P0 Controller: ");
pwidth = font.getStringWidth("CX22 Trakball");
pwidth = font.getStringWidth("Paddles_IAxis");
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"P0 Controller:", kTextAlignLeft);
ctrls.clear();
VarList::push_back(ctrls, "Joystick", "JOYSTICK" );
VarList::push_back(ctrls, "Paddles", "PADDLES" );
VarList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS");
VarList::push_back(ctrls, "Paddles_IDir", "PADDLES_IDIR" );
VarList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR");
VarList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP" );
VarList::push_back(ctrls, "Driving", "DRIVING" );
VarList::push_back(ctrls, "Keyboard", "KEYBOARD" );
VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE" );
VarList::push_back(ctrls, "AtariMouse", "ATARIMOUSE" );
VarList::push_back(ctrls, "CX22 Trakball", "TRAKBALL" );
VarList::push_back(ctrls, "AtariVox", "ATARIVOX" );
VarList::push_back(ctrls, "SaveKey", "SAVEKEY" );
VarList::push_back(ctrls, "Sega Genesis", "GENESIS" );
VarList::push_back(ctrls, "CompuMate", "COMPUMATE" );
// VarList::push_back(ctrls, "KidVid", "KIDVID" );
VarList::push_back(ctrls, "MindLink", "MINDLINK" );
VarList::push_back(ctrls, "Joystick", "JOYSTICK" );
VarList::push_back(ctrls, "Paddles", "PADDLES" );
VarList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS");
VarList::push_back(ctrls, "Paddles_IDir", "PADDLES_IDIR" );
VarList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR");
VarList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP" );
VarList::push_back(ctrls, "Driving", "DRIVING" );
VarList::push_back(ctrls, "Keyboard", "KEYBOARD" );
VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE" );
VarList::push_back(ctrls, "AtariMouse", "ATARIMOUSE" );
VarList::push_back(ctrls, "Trakball", "TRAKBALL" );
VarList::push_back(ctrls, "AtariVox", "ATARIVOX" );
VarList::push_back(ctrls, "SaveKey", "SAVEKEY" );
VarList::push_back(ctrls, "Sega Genesis", "GENESIS" );
VarList::push_back(ctrls, "CompuMate", "COMPUMATE" );
// VarList::push_back(ctrls, "KidVid", "KIDVID" );
VarList::push_back(ctrls, "MindLink", "MINDLINK" );
myP0Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
pwidth, lineHeight, ctrls, "", 0, 0);
wid.push_back(myP0Controller);
@ -216,7 +216,7 @@ GameInfoDialog::GameInfoDialog(
wid.push_back(myLeftPort);
xpos = 10; ypos += lineHeight + 5;
pwidth = font.getStringWidth("CX22 Trakball");
pwidth = font.getStringWidth("Paddles_IAxis");
new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight,
"P1 Controller:", kTextAlignLeft);
myP1Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos,