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

Fixed issue with GP2X port not defaulting to GP2X UI palette. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1264 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-01-01 19:55:56 +00:00
parent 74eb56f148
commit 6f6f27160e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stella/src/emucore/DefProps.hxx
View File

@ -26,7 +26,7 @@ static const char* DefProps[][23] = {
{ "0805366f1b165a64b6d4df20d2c39d25", "Atari", "CX2650 / 4975168", "Berzerk (1982) (Atari) (PAL) [!]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "0805366f1b165a64b6d4df20d2c39d25", "Atari", "CX2650 / 4975168", "Berzerk (1982) (Atari) (PAL) [!]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "16cb43492987d2f32b423817cdaaf7c4", "Atari", "CX2602", "Air-Sea Battle (1977) (Atari) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "16cb43492987d2f32b423817cdaaf7c4", "Atari", "CX2602", "Air-Sea Battle (1977) (Atari) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "26bc2bdf447a17376aea7ef187ff6e44", "", "", "Amanda Invaders (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "26bc2bdf447a17376aea7ef187ff6e44", "", "", "Amanda Invaders (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "35be55426c1fec32dfb503b4f0651572", "", "C-817", "Air Raid (Men-A-Vision)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "35be55426c1fec32dfb503b4f0651572", "", "C-817", "Air Raid (Men-A-Vision)", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Yes", "", "" },
{ "456453a54ca65191781aef316343ae00", "", "", "Full Screen Bitmap (3-D Green) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "456453a54ca65191781aef316343ae00", "", "", "Full Screen Bitmap (3-D Green) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "575c0fb61e66a31d982c95c9dea6865c", "Atari", "", "Blackjack (1977) (Atari) (PAL) [p1][!]", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "Paddles", "Paddles", "", "", "", "", "", "", "", "", "" }, { "575c0fb61e66a31d982c95c9dea6865c", "Atari", "", "Blackjack (1977) (Atari) (PAL) [p1][!]", "Uses the Paddle Controllers", "Rare", "", "", "", "", "", "", "Paddles", "Paddles", "", "", "", "", "", "", "", "", "" },
{ "6672de8f82c4f7b8f7f1ef8b6b4f614d", "Ariola", "", "Angling (Ariola) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "6672de8f82c4f7b8f7f1ef8b6b4f614d", "Ariola", "", "Angling (Ariola) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

1
stella/src/emucore/stella.pro
View File

@ -3145,6 +3145,7 @@
"Cartridge.ModelNo" "C-817" "Cartridge.ModelNo" "C-817"
"Cartridge.Name" "Air Raid (Men-A-Vision)" "Cartridge.Name" "Air Raid (Men-A-Vision)"
"Cartridge.Rarity" "Extremely Rare" "Cartridge.Rarity" "Extremely Rare"
"Display.Phosphor" "Yes"
"" ""
"Cartridge.MD5" "335793736cbf6fc99c9359ed2a32a49d" "Cartridge.MD5" "335793736cbf6fc99c9359ed2a32a49d"

4
stella/src/gp2x/SettingsGP2X.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SettingsGP2X.cxx,v 1.25 2007-01-01 18:04:51 stephena Exp $ // $Id: SettingsGP2X.cxx,v 1.26 2007-01-01 19:55:55 stephena Exp $
// Modified on 2006/02/05 by Alex Zaballa for use on GP2X // Modified on 2006/02/05 by Alex Zaballa for use on GP2X
//============================================================================ //============================================================================
@ -43,7 +43,7 @@ SettingsGP2X::SettingsGP2X(OSystem* osystem)
setInternal("p2speed", "15"); setInternal("p2speed", "15");
setInternal("p3speed", "15"); setInternal("p3speed", "15");
setInternal("launchersize", "1"); setInternal("launchersize", "1");
setInternal("uipalette", "1"); setInternal("uipalette", "2");
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

7
stella/src/gui/CommandDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: CommandDialog.cxx,v 1.13 2007-01-01 18:04:52 stephena Exp $ // $Id: CommandDialog.cxx,v 1.14 2007-01-01 19:55:56 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -32,9 +32,8 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent)
mySelectedItem(0) mySelectedItem(0)
{ {
const GUI::Font& font = osystem->font(); const GUI::Font& font = osystem->font();
int lineHeight = font.getLineHeight(), int buttonWidth = 65,
buttonWidth = 65, buttonHeight = 18,
buttonHeight = 18,//lineHeight + 2,
xoffset = 5, xoffset = 5,
yoffset = 5, yoffset = 5,
lwidth = buttonWidth + 5; lwidth = buttonWidth + 5;