From a0df5ec2bcc11215e34e3aba561a8b608ca0d1ba Mon Sep 17 00:00:00 2001 From: stephena Date: Tue, 19 Dec 2006 12:40:31 +0000 Subject: [PATCH] Completely removed FrameBuffer::cls() functionality, since it was causing problems in the OpenGL code, and wasn't needed in the software code. The only port that needs it is the GP2X, so it makes sense to take care of that functionality directly in FrameBufferGP2X (which it now does). Added ROM properties for a few homebrew ROMs from AtariAge. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1225 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/common/FrameBufferGL.cxx | 7 +----- stella/src/common/FrameBufferGL.hxx | 9 ++----- stella/src/common/FrameBufferSoft.cxx | 35 ++------------------------- stella/src/common/FrameBufferSoft.hxx | 9 ++----- stella/src/emucore/DefProps.hxx | 32 ++++++++++++------------ stella/src/emucore/FrameBuffer.cxx | 5 +--- stella/src/emucore/FrameBuffer.hxx | 9 ++----- stella/src/emucore/stella.pro | 31 ++++++++++++++++++++++++ stella/src/gp2x/FrameBufferGP2X.cxx | 21 +++++++--------- stella/src/gp2x/FrameBufferGP2X.hxx | 9 ++----- stella/src/wince/FrameBufferWinCE.hxx | 1 - 11 files changed, 68 insertions(+), 100 deletions(-) diff --git a/stella/src/common/FrameBufferGL.cxx b/stella/src/common/FrameBufferGL.cxx index cccd2e7cf..8fc0bb310 100644 --- a/stella/src/common/FrameBufferGL.cxx +++ b/stella/src/common/FrameBufferGL.cxx @@ -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: FrameBufferGL.cxx,v 1.77 2006-12-18 18:35:26 stephena Exp $ +// $Id: FrameBufferGL.cxx,v 1.78 2006-12-19 12:40:29 stephena Exp $ //============================================================================ #ifdef DISPLAY_OPENGL @@ -572,11 +572,6 @@ void FrameBufferGL::enablePhosphor(bool enable, int blend) myPhosphorBlend = blend; } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void FrameBufferGL::cls() -{ -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool FrameBufferGL::createTextures() { diff --git a/stella/src/common/FrameBufferGL.hxx b/stella/src/common/FrameBufferGL.hxx index 3f77aef76..b9710bb75 100644 --- a/stella/src/common/FrameBufferGL.hxx +++ b/stella/src/common/FrameBufferGL.hxx @@ -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: FrameBufferGL.hxx,v 1.40 2006-12-13 22:46:28 stephena Exp $ +// $Id: FrameBufferGL.hxx,v 1.41 2006-12-19 12:40:29 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_GL_HXX @@ -36,7 +36,7 @@ class GUI::Font; This class implements an SDL OpenGL framebuffer. @author Stephen Anthony - @version $Id: FrameBufferGL.hxx,v 1.40 2006-12-13 22:46:28 stephena Exp $ + @version $Id: FrameBufferGL.hxx,v 1.41 2006-12-19 12:40:29 stephena Exp $ */ class FrameBufferGL : public FrameBuffer { @@ -218,11 +218,6 @@ class FrameBufferGL : public FrameBuffer */ virtual void enablePhosphor(bool enable, int blend); - /** - Completely erase contents of the screen. - */ - virtual void cls(); - private: bool createTextures(); diff --git a/stella/src/common/FrameBufferSoft.cxx b/stella/src/common/FrameBufferSoft.cxx index 9efb88aef..d2bc53a9a 100644 --- a/stella/src/common/FrameBufferSoft.cxx +++ b/stella/src/common/FrameBufferSoft.cxx @@ -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: FrameBufferSoft.cxx,v 1.65 2006-12-12 19:41:51 stephena Exp $ +// $Id: FrameBufferSoft.cxx,v 1.66 2006-12-19 12:40:29 stephena Exp $ //============================================================================ #include @@ -661,7 +661,6 @@ void FrameBufferSoft::drawChar(const GUI::Font* font, uInt8 chr, chr -= desc.firstchar; const uInt16* tmp = desc.bits + (desc.offset ? desc.offset[chr] : (chr * h)); -#if 1 // Scale the origins to the current zoom xorig *= myZoomLevel; yorig *= myZoomLevel; @@ -729,25 +728,6 @@ void FrameBufferSoft::drawChar(const GUI::Font* font, uInt8 chr, default: break; } -#else - SDL_Rect rect; - for(int y = 0; y < h; y++) - { - const uInt16 buffer = *tmp++; - uInt16 mask = 0x8000; - - for(int x = 0; x < w; x++, mask >>= 1) - { - if ((buffer & mask) != 0) - { - rect.x = (x + xorig) * myZoomLevel; - rect.y = (y + yorig) * myZoomLevel; - rect.w = rect.h = myZoomLevel; - SDL_FillRect(myScreen, &rect, myDefPalette[color]); - } - } - } -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -808,16 +788,6 @@ void FrameBufferSoft::enablePhosphor(bool enable, int blend) stateChanged(myOSystem->eventHandler().state()); } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void FrameBufferSoft::cls() -{ - if(myScreen) - { - SDL_FillRect(myScreen, NULL, 0); - SDL_UpdateRect(myScreen, 0, 0, 0, 0); - } -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FrameBufferSoft::stateChanged(EventHandler::State state) { @@ -826,7 +796,7 @@ void FrameBufferSoft::stateChanged(EventHandler::State state) // When in a UI mode, always use dirty rects // Otherwise, check the 'dirtyrects' setting - // Phosphor mode implies a full update, so turn on dirty rects + // Phosphor mode implies a full update, so turn off dirty rects bool emulation = state == EventHandler::S_EMULATE; if(emulation) { @@ -877,7 +847,6 @@ void FrameBufferSoft::stateChanged(EventHandler::State state) } // Have the changes take effect - cls(); myOSystem->eventHandler().refreshDisplay(); //cerr << "Render type = " << myRenderType << ", dirty rects = " << myUseDirtyRects << endl; diff --git a/stella/src/common/FrameBufferSoft.hxx b/stella/src/common/FrameBufferSoft.hxx index 9f640627e..3dee3c5bc 100644 --- a/stella/src/common/FrameBufferSoft.hxx +++ b/stella/src/common/FrameBufferSoft.hxx @@ -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: FrameBufferSoft.hxx,v 1.42 2006-12-12 19:41:52 stephena Exp $ +// $Id: FrameBufferSoft.hxx,v 1.43 2006-12-19 12:40:29 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_SOFT_HXX @@ -33,7 +33,7 @@ class RectList; This class implements an SDL software framebuffer. @author Stephen Anthony - @version $Id: FrameBufferSoft.hxx,v 1.42 2006-12-12 19:41:52 stephena Exp $ + @version $Id: FrameBufferSoft.hxx,v 1.43 2006-12-19 12:40:29 stephena Exp $ */ class FrameBufferSoft : public FrameBuffer { @@ -206,11 +206,6 @@ class FrameBufferSoft : public FrameBuffer */ virtual void enablePhosphor(bool enable, int blend); - /** - Completely erase contents of the screen. - */ - virtual void cls(); - /** Informs the Framebuffer of a change in EventHandler state. */ diff --git a/stella/src/emucore/DefProps.hxx b/stella/src/emucore/DefProps.hxx index 21a250d72..d2bcf4e4a 100644 --- a/stella/src/emucore/DefProps.hxx +++ b/stella/src/emucore/DefProps.hxx @@ -914,7 +914,7 @@ static const char* DefProps[][23] = { { "cb0b5b8458a13a074e1fe82d3c4e8f3c", "Activision", "AZ-028", "Robot Tank (1983) (Activision) (PAL) [b1]", "", "Rare", "", "FE", "", "", "", "", "", "", "", "PAL", "8", "152", "64", "200", "", "", "" }, { "cb9626517b440f099c0b6b27ca65142c", "Atari", "CX2664 / 6699818", "Brain Games (1982) (Atari) [o1]", "Uses Keypad Controllers", "Uncommon", "", "", "", "", "", "", "Keyboard", "Keyboard", "", "", "", "", "38", "", "", "", "" }, { "cbced209dd0575a27212d3eee6aee3bc", "Apollo", "AP 2003", "Racquetball (1981) (Apollo) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "8", "152", "40", "187", "Yes", "", "" }, - { "cc3d942c6958bd16b1c602623f59e6e1", "", "", "Pigs in Space starring Miss Piggy (1986) (Atari) (PAL) [a1][!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "", "240", "", "", "" }, + { "cc1727dadf82e8fbf152e47d7e88d6c9", "", "", "Death Derby (v0004) (2001) (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "ccb5fa954fb76f09caae9a8c66462190", "", "ASC1001", "Malagai (1983) (Answer Software)", "", "Unbelievably Rare", "", "", "", "", "", "", "", "", "", "", "", "", "32", "", "Yes", "", "" }, { "ccd6ce508eee4b3fca67212833edcd85", "", "", "Hot Wave (Starsoft) (w-Black Label) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "60", "", "", "", "" }, { "cd568d6acb2f14477ebf7e59fb382292", "Ariola", "MT5687", "Football (AKA Fussball) (Ariola) (PAL) [!]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "PAL", "8", "152", "64", "194", "", "", "" }, @@ -980,7 +980,7 @@ static const char* DefProps[][23] = { { "e7dd8c2e6c100044002c1086d02b366e", "", "", "Barnstorming (1982) (Activision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "8", "152", "64", "220", "", "", "" }, { "e847e1b57a704ad9f029cc2d564bde11", "", "", "Death Derby (v0007) (2001) (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e8e7b9bdf4bf04930c2bcaa0278ee637", "", "", "Boring Taz (Taz Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "e932f44fad2a66b6d5faec9addec208e", "", "", "Atari Logo Demo 1 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "e957eb4612d6bd5940d3492dfa749668", "", "", "Tunnel Demo (27-03-2003) (CT)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "ea832e2cb6aae6f525f07452c381fa48", "", "", "Polar to Cartesian and VV (2001) (Roger Williams)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "eaf744185d5e8def899950ba7c6e7bb5", "Atari", "CX26172", "Xenophobe (1990) (Atari) [a1]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "eb46e99ec15858f8cd8c91cef384ce09", "Rainbow Vision", "", "Ground Zero (Rainbow Vision) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "8", "152", "54", "199", "", "", "" }, @@ -1055,7 +1055,7 @@ static const char* DefProps[][23] = { { "05ccf96247af12eef59698f1a060a54f", "Starsoft", "", "King Arthur (Starsoft) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "41", "", "", "", "" }, { "05eb4347f0ec8f4783983ca35ffd8d1b", "", "", "Qb (2.06) (Retroactive) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "60", "250", "Yes", "", "" }, { "0614ed51acd027d531e7c85c4f435292", "", "", "Narnia (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "35", "195", "", "", "" }, - { "06b6c5031b8353f3a424a5b86b8fe409", "Activision", "AX-023", "Oink! (1983) (Activision) (PAL) [!]", "", "Rare", "", "4K", "", "", "", "", "", "", "", "PAL", "8", "152", "64", "200", "", "", "" }, + { "069c17beb1e8e0557adb8539fdcf6cba", "", "", "Phantom II / Pirate (PAL60)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "", "", "", "" }, { "06db908011065e5ebb37f4e253c2a0b0", "US Games", "", "Gopher (1982) (US Games) (PAL) [p1][!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "64", "197", "", "", "" }, { "072a6ea2181ca0df88ac0dedc67b239d", "", "", "Multiple Missiles Demo (19-12-2002) (CT)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1818,11 +1818,11 @@ static const char* DefProps[][23] = { { "cad982c9b45bc5eff34e4ea982d5f1ca", "", "", "Song (17-02-2003) (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "cb24210dc86d92df97b38cf2a51782da", "Ariola", "VG-01", "Missile Control (AKA Raketen-Angriff) (Ariola) (PAL) [!]", "", "Extremely Rare", "", "", "", "", "", "", "", "", "", "PAL", "", "", "55", "", "", "", "" }, { "cb8afcbc4a779b588b0428ea7af211d5", "Activision", "", "Atlantis (1982) (Activision) [!]", "", "", "", "4K", "", "", "", "", "", "", "", "", "", "", "49", "185", "", "", "" }, - { "cba56e939252b05df7b7de87307d12ca", "", "", "Playfield Text Demo (2001) (Roger Williams)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cb9b2e9806a7fbab3d819cfe15f0f05a", "Parker Bros", "PB5060", "Star Wars - Death Star Battle (1983) (Parker Bros) (PAL) [!]", "", "Rare", "", "E0", "", "", "", "", "", "", "", "PAL", "8", "144", "55", "200", "", "", "" }, { "cbb0ee17c1308148823cc6da85bff25c", "", "", "Rotating Colors Demo 1 (Junkosoft) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "cbd981a23c592fb9ab979223bb368cd5", "Atari", "CX2660 / 4975187", "Star Raiders (1982) (Atari)", "Uses Joystick (left) and Keypad (right) Controllers", "Uncommon", "", "", "", "", "", "", "", "Keyboard", "", "", "", "", "", "", "", "", "" }, - { "cc1727dadf82e8fbf152e47d7e88d6c9", "", "", "Death Derby (v0004) (2001) (Glenn Saunders) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "cc74ddb45d7bc4d04c2e6f1907416699", "", "", "Colour Display Programme (1997) (Chris Cracknell)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cbeafd37f15e0dddb0540dbe15c545a4", "", "", "Black and White Fast Scolling Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "37", "193", "", "", "" }, + { "cc3d942c6958bd16b1c602623f59e6e1", "", "", "Pigs in Space starring Miss Piggy (1986) (Atari) (PAL) [a1][!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "", "240", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "ccb807eb79b0ed0f5fdc460445ef703a", "", "", "Superman (Stunt_Cycle_Rules!) (Superman Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "cccfe9e9a11b1dad04beba46eefb7351", "", "", "Poker Squares (V0.25) (PAL) (2001) (B. Watson)", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "45", "", "", "", "" }, @@ -1953,7 +1953,7 @@ static const char* DefProps[][23] = { { "e879b7093ac4cfad74c88d636ca97d00", "", "", "Poker Squares (V0.0f) (2001) (B. Watson)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e8aa36e3d49e9bfa654c25dcc19c74e6", "Atari", "CX2601", "Combat (Atari) (PAL) [!]", "", "Common", "", "2K", "", "", "", "", "", "", "", "PAL", "", "", "39", "256", "", "", "" }, { "e908611d99890733be31733a979c62d8", "", "CX2697", "Mario Bros (1983) (Atari)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "195", "", "", "" }, - { "e927ecf80f3784d745abd8368d78f2f3", "", "", "Space Instigators (V1.8) (19-10-2002) (CT) [a1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "e932f44fad2a66b6d5faec9addec208e", "", "", "Atari Logo Demo 1 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e9be3e8e4a7e73dd63ed4235a3a1a25f", "", "", "MMetall (Miniature Golf Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "41", "218", "", "", "" }, { "ea38fcfc06ad87a0aed1a3d1588744e4", "Atari", "CX26122", "Sinistar (Atari)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "37", "219", "", "", "" }, { "ea86176b27ab0da8cce8f0179884bfaa", "", "", "Demo Image Series #10 - It's Art (28-02-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -2104,7 +2104,7 @@ static const char* DefProps[][23] = { { "05f11fb2e45c4e47424d3cb25414d278", "", "", "Boring (NTSC) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "06742cf522f23797157f215a1dc8a1a9", "", "", "Healthbars (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "06953ed762220dba63d63930d4ad0cc3", "", "", "Star Fire - Eckhard WIP (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "06b6c5031b8353f3a424a5b86b8fe409", "Activision", "AX-023", "Oink! (1983) (Activision) (PAL) [!]", "", "Rare", "", "4K", "", "", "", "", "", "", "", "PAL", "8", "152", "64", "200", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "06e5dc181a8eda1c31cc7c581c68b6ef", "Sega", "", "Tac Scan (1982) (Sega) (PAL) [p1][!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "64", "250", "Yes", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -3629,16 +3629,16 @@ static const char* DefProps[][23] = { { "cb4a7b507372c24f8b9390d22d54a918", "ITT", "", "Peter Penguin (Jagt auf Diamanten-Frisco) (ITT) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "64", "200", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "cb8bf5a0df683cbf6ce50d614b12dd20", "Activision", "", "Fast Eddie (1983) (Activision)", "", "", "", "4K", "", "", "", "", "", "", "", "", "", "", "38", "198", "", "", "" }, - { "cb9b2e9806a7fbab3d819cfe15f0f05a", "Parker Bros", "PB5060", "Star Wars - Death Star Battle (1983) (Parker Bros) (PAL) [!]", "", "Rare", "", "E0", "", "", "", "", "", "", "", "PAL", "8", "144", "55", "200", "", "", "" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cb96b0cf90ab7777a2f6f05e8ad3f694", "Silvio Mogno", "", "Rainbow Invaders", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cba56e939252b05df7b7de87307d12ca", "", "", "Playfield Text Demo (2001) (Roger Williams)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "cbc373fbcb1653b4c56bfabba33ea50d", "CCE", "", "Super VoleyBall (CCE)", "", "", "", "4K", "", "", "", "", "", "", "", "", "8", "152", "41", "192", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "cbeafd37f15e0dddb0540dbe15c545a4", "", "", "Black and White Fast Scolling Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "37", "193", "", "", "" }, + { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cc12581e079cd18330a89902625b8347", "Dave Neuman", "", "Space Battle (PAL)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "PAL", "", "", "", "", "", "", "" }, { "cc1939e4769d0c157ace326efcfdcf80", "Starpath", "AR-4200", "Escape from the Mindmaster (3 of 4) (1982) (Starpath) (PAL)", "", "Extremely Rare", "", "AR", "", "", "", "", "", "", "", "PAL", "8", "144", "36", "192", "", "", "No" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "cc74ddb45d7bc4d04c2e6f1907416699", "", "", "Colour Display Programme (1997) (Chris Cracknell)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -3899,9 +3899,9 @@ static const char* DefProps[][23] = { { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e8f7679359c4f532f5d5e93af7d8a985", "", "", "Hangman Invader Original Words (Hangman Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e91d2ecf8803ae52b55bbf105af04d4b", "Atari", "CX2655 / 4975167", "Yar's Revenge (1981) (Atari) (PAL) [!]", "", "Common", "", "", "", "", "", "", "", "", "", "PAL", "", "", "45", "230", "Yes", "", "" }, + { "e927ecf80f3784d745abd8368d78f2f3", "", "", "Space Instigators (V1.8) (19-10-2002) (CT) [a1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "e957eb4612d6bd5940d3492dfa749668", "", "", "Tunnel Demo (27-03-2003) (CT)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "e959b5a2c882ccaacb43c32790957c2d", "", "", "Phantom II / Pirate (NTSC)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e9c5d04643855949a23ff29349af74ea", "", "", "SCSIcide (Score Hack 2) (24-02-2001) (Joe Grand) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "e9cb18770a41a16de63b124c1e8bd493", "Parker Bros", "PB5370", "Popeye (1983) (Parker Bros) (PAL) [!]", "", "Common", "", "", "", "", "", "", "", "", "", "PAL", "", "", "", "", "Yes", "", "" }, { "ea6d40db5498d6386571a76df448aa4c", "", "", "Vertical Playfield Demo 2 (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -3950,7 +3950,7 @@ static const char* DefProps[][23] = { { "efb47d70b2965ce689e2c5757616b286", "", "", "Time Test Demo (Eckhard Stolberg) (PAL) (PD)", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "36", "192", "", "", "" }, { "efefc02bbc5258815457f7a5b8d8750a", "CBS Electronics", "4L-2520", "Tunnel Runner (1983) (CBS Electronics) [a1][!]", "", "Rare", "", "FASC", "", "", "", "", "", "", "", "", "", "", "67", "153", "", "", "" }, { "f02ba8b5292bf3017d10553c9b7b2861", "Atari", "", "Xenophobe (1990) (Atari) (PAL) [!]", "", "", "", "", "", "", "", "", "", "", "", "PAL", "", "", "60", "", "", "", "" }, - { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "f047df70d3d08e331122cd2de61d6af8", "Dave Neuman", "", "Space Battle (NTSC)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "f0541d2f7cda5ec7bab6d62b6128b823", "Atari", "", "Bionic Breakthrough (1984) (Atari) (Prototype)", "Uses Mindlink Controller (left only)", "Prototype", "", "", "", "", "", "", "Mindlink", "None", "", "", "", "", "36", "196", "", "", "" }, { "f0631c6675033428238408885d7e4fde", "Paul Slocum", "", "Test Cart (2002) (Paul Slocum)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Yes", "", "" }, { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx index ca065171b..054b26260 100644 --- a/stella/src/emucore/FrameBuffer.cxx +++ b/stella/src/emucore/FrameBuffer.cxx @@ -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: FrameBuffer.cxx,v 1.111 2006-12-18 12:53:32 stephena Exp $ +// $Id: FrameBuffer.cxx,v 1.112 2006-12-19 12:40:30 stephena Exp $ //============================================================================ #include @@ -75,9 +75,6 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height, } myInitializedCount++; - // Erase old contents - cls(); - // Query the desktop size // This is really the job of SDL int dwidth = 0, dheight = 0; diff --git a/stella/src/emucore/FrameBuffer.hxx b/stella/src/emucore/FrameBuffer.hxx index 7ea4984d9..fc4380c16 100644 --- a/stella/src/emucore/FrameBuffer.hxx +++ b/stella/src/emucore/FrameBuffer.hxx @@ -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: FrameBuffer.hxx,v 1.81 2006-12-13 22:46:28 stephena Exp $ +// $Id: FrameBuffer.hxx,v 1.82 2006-12-19 12:40:30 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_HXX @@ -93,7 +93,7 @@ struct Scaler { All GUI elements (ala ScummVM) are drawn here as well. @author Stephen Anthony - @version $Id: FrameBuffer.hxx,v 1.81 2006-12-13 22:46:28 stephena Exp $ + @version $Id: FrameBuffer.hxx,v 1.82 2006-12-19 12:40:30 stephena Exp $ */ class FrameBuffer { @@ -452,11 +452,6 @@ class FrameBuffer */ virtual void enablePhosphor(bool enable, int blend) = 0; - /** - Completely erase contents of the screen. - */ - virtual void cls() = 0; - protected: // The parent system for the framebuffer OSystem* myOSystem; diff --git a/stella/src/emucore/stella.pro b/stella/src/emucore/stella.pro index 67614a058..d117cd586 100644 --- a/stella/src/emucore/stella.pro +++ b/stella/src/emucore/stella.pro @@ -20987,3 +20987,34 @@ "Controller.Left" "PADDLES" "Controller.Right" "PADDLES" "" + + +"Cartridge.MD5" "069c17beb1e8e0557adb8539fdcf6cba" +"Cartridge.Name" "Phantom II / Pirate (PAL60)" +"Cartridge.Rarity" "Homebrew" +"Display.Format" "PAL60" +"" + +"Cartridge.MD5" "cb96b0cf90ab7777a2f6f05e8ad3f694" +"Cartridge.Manufacturer" "Silvio Mogno" +"Cartridge.Name" "Rainbow Invaders" +"Cartridge.Rarity" "Homebrew" +"" + +"Cartridge.MD5" "f047df70d3d08e331122cd2de61d6af8" +"Cartridge.Manufacturer" "Dave Neuman" +"Cartridge.Name" "Space Battle (NTSC)" +"Cartridge.Rarity" "Homebrew" +"" + +"Cartridge.MD5" "cc12581e079cd18330a89902625b8347" +"Cartridge.Manufacturer" "Dave Neuman" +"Cartridge.Name" "Space Battle (PAL)" +"Cartridge.Rarity" "Homebrew" +"Display.Format" "PAL" +"" + +"Cartridge.MD5" "e959b5a2c882ccaacb43c32790957c2d" +"Cartridge.Name" "Phantom II / Pirate (NTSC)" +"Cartridge.Rarity" "Homebrew" +"" diff --git a/stella/src/gp2x/FrameBufferGP2X.cxx b/stella/src/gp2x/FrameBufferGP2X.cxx index eef448765..2bfb27829 100644 --- a/stella/src/gp2x/FrameBufferGP2X.cxx +++ b/stella/src/gp2x/FrameBufferGP2X.cxx @@ -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: FrameBufferGP2X.cxx,v 1.12 2006-12-11 00:15:33 stephena Exp $ +// $Id: FrameBufferGP2X.cxx,v 1.13 2006-12-19 12:40:30 stephena Exp $ //============================================================================ #include @@ -68,8 +68,15 @@ void FrameBufferGP2X::setScaler(Scaler scaler) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool FrameBufferGP2X::createScreen() { - myScreenDim.x = myScreenDim.y = 0; + // Make sure to clear the screen, since we're using different resolutions, + // and there tends to be lingering artifacts in hardware mode + if(myScreen) + { + SDL_FillRect(myScreen, NULL, 0); + SDL_UpdateRect(myScreen, 0, 0, 0, 0); + } + myScreenDim.x = myScreenDim.y = 0; myScreenDim.w = myBaseDim.w; myScreenDim.h = myBaseDim.h; @@ -310,16 +317,6 @@ void FrameBufferGP2X::enablePhosphor(bool enable, int blend) myPhosphorBlend = blend; } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void FrameBufferGP2X::cls() -{ - if(myScreen) - { - SDL_FillRect(myScreen, NULL, 0); - SDL_UpdateRect(myScreen, 0, 0, 0, 0); - } -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FrameBufferGP2X::showCursor(bool show) { diff --git a/stella/src/gp2x/FrameBufferGP2X.hxx b/stella/src/gp2x/FrameBufferGP2X.hxx index 01bc7fb7b..f82275ac2 100644 --- a/stella/src/gp2x/FrameBufferGP2X.hxx +++ b/stella/src/gp2x/FrameBufferGP2X.hxx @@ -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: FrameBufferGP2X.hxx,v 1.7 2006-12-11 00:15:33 stephena Exp $ +// $Id: FrameBufferGP2X.hxx,v 1.8 2006-12-19 12:40:30 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_GP2X_HXX @@ -32,7 +32,7 @@ class GUI::Font; This class implements an SDL hardware framebuffer for the GP2X device. @author Stephen Anthony - @version $Id: FrameBufferGP2X.hxx,v 1.7 2006-12-11 00:15:33 stephena Exp $ + @version $Id: FrameBufferGP2X.hxx,v 1.8 2006-12-19 12:40:30 stephena Exp $ */ class FrameBufferGP2X : public FrameBuffer { @@ -205,11 +205,6 @@ class FrameBufferGP2X : public FrameBuffer */ virtual void enablePhosphor(bool enable, int blend); - /** - Completely erase contents of the screen. - */ - virtual void cls(); - /** Shows or hides the cursor based on the given boolean value. */ diff --git a/stella/src/wince/FrameBufferWinCE.hxx b/stella/src/wince/FrameBufferWinCE.hxx index 046c40e07..7e548fea0 100644 --- a/stella/src/wince/FrameBufferWinCE.hxx +++ b/stella/src/wince/FrameBufferWinCE.hxx @@ -71,7 +71,6 @@ class FrameBufferWinCE : public FrameBuffer virtual void enablePhosphor(bool enable, int blend) { return; }; virtual uInt32 lineDim(); void wipescreen(void); - virtual void cls() { return; }; void setmode(uInt8 mode); uInt8 rotatedisplay(void);