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

Some tweaks to the RomInfoWidget snapshot size, and upped maximum size of 

the launcher to 1920x1200.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1432 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2008-03-15 19:11:02 +00:00
parent 7e0314a9c2
commit 7f3a2781d7
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,7 +602,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "318046ae3711c05fd16e479b298e5fcc", "Retroactive", "", "Qb (V2.08) (Stella) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" },
{ "318a9d6dda791268df92d72679914ac3", "Activision, Steve Cartwright", "AX-017, AX-017-04", "MegaMania (1982) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "319a142aab6260842ab616382848c204", "", "", "Marble Craze (05-02-2002) (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "31bb9b8ceed46cb3e506777a9e65f3ce", "Bit Corporation", "", "4 Game in One Light Green) (1983) (BitCorp) (PAL)", "Ice Hockey, Phantom UFO, Spy Vs. Spy, Cosmic Avenger", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "31bb9b8ceed46cb3e506777a9e65f3ce", "Bit Corporation", "", "4 Game in One Light Green (1983) (BitCorp) (PAL)", "Ice Hockey, Phantom UFO, Spy Vs. Spy, Cosmic Avenger", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "31d08cb465965f80d3541a57ec82c625", "Atari, Alan Miller - Sears", "CX2641 - 99807, 49-75105", "Surround (1977) (Atari) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "31df1c50c4351e144c9a378adb8c10ba", "Quelle", "687.463 0", "Die Ratte und die Karotten (1983) (Quelle) (PAL)", "AKA Gopher", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "31e518debba46df6226b535fa8bd2543", "Atari, Douglas 'Solaris' Neubauer", "CX26134", "Last Starfighter (1984) (Atari) (Prototype)", "Solaris Beta", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
@ -2745,7 +2745,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "ec407a206b718a0a9f69b03e920a0185", "Quelle", "876.482 1", "Landung in der Normandie (1983) (Quelle) (PAL)", "AKA Commando Raid", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ec5c861b487a5075876ab01155e74c6c", "Apollo, Ed Salvo, Bryson Park", "AP-2001", "Spacechase (1981) (Apollo)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ec5d04b7e6cc6641d74d3ba7bb41ebc9", "Absolute Entertainment, Alex DeMeo", "EAZ-041-04I", "Title Match Pro Wrestling (1987) (Absolute) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ece908d77ab944f7bac84322b9973549", "", "", "Tom Boy (Unknown)", "AKA Pitfall!", "", "", "", "", "", "", "", "", "", "", "", "24", "", "", "", "" },
{ "ece908d77ab944f7bac84322b9973549", "", "", "Tom Boy (Unknown) (PAL60)", "AKA Pitfall!", "", "", "", "", "", "", "", "", "", "", "PAL60", "24", "", "", "", "" },
{ "ecf51385384b468834611d44a8429c03", "20th Century Fox Video Games, Douglas 'Dallas North' Neubauer", "11105", "Mega Force (1982) (20th Century Fox) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ecfa04523dde82fe42cdc7315a8f61b6", "Activision, David Crane - Ariola", "EAG-004, PAG-004 - 711 004-715", "Fishing Derby (1980) (Activision) (PAL) (4K)", "AKA Schneller als der Hai", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ed014beeeb77dbb2bbcf9b5f6850b2f4", "", "", "Green Bar Text Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

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

@ -3338,7 +3338,7 @@
"Cartridge.MD5" "31bb9b8ceed46cb3e506777a9e65f3ce"
"Cartridge.Manufacturer" "Bit Corporation"
"Cartridge.Name" "4 Game in One Light Green) (1983) (BitCorp) (PAL)"
"Cartridge.Name" "4 Game in One Light Green (1983) (BitCorp) (PAL)"
"Cartridge.Note" "Ice Hockey, Phantom UFO, Spy Vs. Spy, Cosmic Avenger"
""
@ -16327,8 +16327,9 @@
""
"Cartridge.MD5" "ece908d77ab944f7bac84322b9973549"
"Cartridge.Name" "Tom Boy (Unknown)"
"Cartridge.Name" "Tom Boy (Unknown) (PAL60)"
"Cartridge.Note" "AKA Pitfall!"
"Display.Format" "PAL60"
"Display.YStart" "24"
""

4
stella/src/gui/LauncherDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: LauncherDialog.cxx,v 1.81 2008-03-14 23:52:17 stephena Exp $
// $Id: LauncherDialog.cxx,v 1.82 2008-03-15 19:10:57 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -67,7 +67,7 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
// Check if we want the ROM info viewer
// Make sure it will fit within the current bounds
myRomInfoFlag = instance()->settings().getBool("romviewer");
if((w < 600 || h < 400) && myRomInfoFlag)
if((w < 640 || h < 480) && myRomInfoFlag)
{
cerr << "Error: ROM launcher too small, deactivating ROM info viewer" << endl;
myRomInfoFlag = false;

12
stella/src/gui/RomInfoWidget.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: RomInfoWidget.cxx,v 1.6 2008-03-14 23:52:17 stephena Exp $
// $Id: RomInfoWidget.cxx,v 1.7 2008-03-15 19:11:00 stephena Exp $
//============================================================================
#include <cstring>
@ -109,7 +109,7 @@ void RomInfoWidget::parseProperties()
// The surface will always be the maximum size, but sometimes we'll
// only draw certain parts of it
if(mySurface == NULL)
mySurface = instance()->frameBuffer().createSurface(320, 250);
mySurface = instance()->frameBuffer().createSurface(320, 260);
// The input stream for the PNG file
ifstream in;
@ -199,14 +199,14 @@ void RomInfoWidget::drawWidget(bool hilite)
fb.fillRect(_x+2, _y+2, _w-4, _h-4, kWidColor);
fb.box(_x, _y, _w, _h, kColor, kShadowColor);
fb.box(_x, _y+254, _w, _h-254, kColor, kShadowColor);
fb.box(_x, _y+264, _w, _h-264, kColor, kShadowColor);
if(!myHaveProperties) return;
if(myDrawSurface && mySurface)
{
int x = (_w - mySurface->getClipWidth()) >> 1;
int y = (256 - mySurface->getClipHeight()) >> 1;
int y = (266 - mySurface->getClipHeight()) >> 1;
fb.drawSurface(mySurface, x + getAbsX(), y + getAbsY());
}
else if(mySurfaceErrorMsg != "")
@ -214,7 +214,7 @@ void RomInfoWidget::drawWidget(bool hilite)
int x = _x + ((_w - _font->getStringWidth(mySurfaceErrorMsg)) >> 1);
fb.drawString(_font, mySurfaceErrorMsg, x, 120, _w - 10, _textcolor);
}
int xpos = _x + 5, ypos = _y + 256 + 5;
int xpos = _x + 5, ypos = _y + 266 + 5;
for(unsigned int i = 0; i < myRomInfo.size(); ++i)
{
fb.drawString(_font, myRomInfo[i], xpos, ypos, _w - 10, _textcolor);
@ -268,7 +268,7 @@ bool RomInfoWidget::parseIHDR(int& width, int& height, uInt8* data, int size)
// Make sure image can fit in widget bounds
width = BSPF_min(320, width);
height = BSPF_min(250, height);
height = BSPF_min(260, height);
uInt8 trailer[5] = { 8, 2, 0, 0, 0 }; // 24-bit RGB
return memcmp(trailer, data + 8, 5) == 0;

8
stella/src/gui/UIDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: UIDialog.cxx,v 1.10 2008-03-13 22:58:07 stephena Exp $
// $Id: UIDialog.cxx,v 1.11 2008-03-15 19:11:02 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -51,7 +51,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
lineHeight, "Launcher Width (*): ",
lwidth, kLWidthChanged);
myLauncherWidthSlider->setMinValue(320);
myLauncherWidthSlider->setMaxValue(800);
myLauncherWidthSlider->setMaxValue(1920);
myLauncherWidthSlider->setStepValue(10);
wid.push_back(myLauncherWidthSlider);
myLauncherWidthLabel =
@ -65,7 +65,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
lineHeight, "Launcher Height (*): ",
lwidth, kLHeightChanged);
myLauncherHeightSlider->setMinValue(240);
myLauncherHeightSlider->setMaxValue(600);
myLauncherHeightSlider->setMaxValue(1200);
myLauncherHeightSlider->setStepValue(10);
wid.push_back(myLauncherHeightSlider);
myLauncherHeightLabel =
@ -80,7 +80,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
lineHeight, "Debugger Width (*): ",
lwidth, kDWidthChanged);
myDebuggerWidthSlider->setMinValue(1030);
myDebuggerWidthSlider->setMaxValue(1600);
myDebuggerWidthSlider->setMaxValue(1920);
myDebuggerWidthSlider->setStepValue(10);
wid.push_back(myDebuggerWidthSlider);
myDebuggerWidthLabel =