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

Fixed crash when exiting from the debugger while in OpenGL mode. 

Temporarily changed colour of hightlighted text from pure green to
pure blue for the GP2X port.  The next major release (2.2) will have
a GUI palette selector for this.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1049 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-03-16 16:10:47 +00:00
parent a8f5530162
commit dfd7faf454
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/src/common/FrameBufferGL.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: FrameBufferGL.cxx,v 1.55 2006-01-16 01:23:55 stephena Exp $ // $Id: FrameBufferGL.cxx,v 1.56 2006-03-16 16:10:47 stephena Exp $
//============================================================================ //============================================================================
#ifdef DISPLAY_OPENGL #ifdef DISPLAY_OPENGL
@ -305,7 +305,7 @@ bool FrameBufferGL::createScreen()
SDL_GL_SwapBuffers(); SDL_GL_SwapBuffers();
p_glClear(GL_COLOR_BUFFER_BIT); p_glClear(GL_COLOR_BUFFER_BIT);
myOSystem->eventHandler().refreshDisplay(); cls();
return true; return true;
} }

5
stella/src/common/FrameBufferSoft.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: FrameBufferSoft.cxx,v 1.47 2006-02-15 03:22:34 azaballa Exp $ // $Id: FrameBufferSoft.cxx,v 1.48 2006-03-16 16:10:47 stephena Exp $
//============================================================================ //============================================================================
#include <SDL.h> #include <SDL.h>
@ -107,7 +107,8 @@ bool FrameBufferSoft::createScreen()
myPitch = myScreen->pitch/4; myPitch = myScreen->pitch/4;
break; break;
} }
myOSystem->eventHandler().refreshDisplay();
cls();
return true; return true;
} }

4
stella/src/emucore/Console.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: Console.cxx,v 1.85 2006-03-15 23:14:01 stephena Exp $ // $Id: Console.cxx,v 1.86 2006-03-16 16:10:47 stephena Exp $
//============================================================================ //============================================================================
#include <assert.h> #include <assert.h>
@ -94,7 +94,7 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
iHeight = atoi(myProperties.get(Display_Height).c_str()); iHeight = atoi(myProperties.get(Display_Height).c_str());
if(iWidth > sWidth || iHeight > sHeight) if(iWidth > sWidth || iHeight > sHeight)
{ {
myOSystem->frameBuffer().showMessage("ROM image dimensions larger than screen"); myOSystem->frameBuffer().showMessage("PAL ROMS not supported, screen too small");
return; return;
} }

6
stella/src/emucore/FrameBuffer.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: FrameBuffer.cxx,v 1.80 2006-03-15 23:14:01 stephena Exp $ // $Id: FrameBuffer.cxx,v 1.81 2006-03-16 16:10:47 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -686,6 +686,10 @@ const uInt8 FrameBuffer::ourGUIColors[kNumColors-256][3] = {
{ 64, 64, 64 }, // kShadowColor { 64, 64, 64 }, // kShadowColor
{ 200, 200, 255 }, // kHiliteColor { 200, 200, 255 }, // kHiliteColor
{ 32, 160, 32 }, // kTextColor { 32, 160, 32 }, // kTextColor
#if !defined(GP2X) // Quick GP2X hack to change colours, until an in-game GUI is added
{ 0, 255, 0 }, // kTextColorHi { 0, 255, 0 }, // kTextColorHi
#else
{ 0, 0, 255 }, // kTextColorHi
#endif
{ 200, 0, 0 } // kTextColorEm { 200, 0, 0 } // kTextColorEm
}; };