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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
Thomas Jentzsch 2019-12-25 17:49:46 +01:00
parent 0c0c311e84 5d59be800e
commit 173560f788
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emucore/FrameBuffer.cxx
View File

@ -309,7 +309,7 @@ void FrameBuffer::update(bool force)
// last, since they are always drawn on top of everything else). // last, since they are always drawn on top of everything else).
// Full rendering is required when messages are enabled // Full rendering is required when messages are enabled
force |= myMsg.counter >= 0; force = force || myMsg.counter >= 0;
// Detect when a message has been turned off; one last redraw is required // Detect when a message has been turned off; one last redraw is required
// in this case, to draw over the area that the message occupied // in this case, to draw over the area that the message occupied
@ -340,7 +340,7 @@ void FrameBuffer::update(bool force)
#ifdef GUI_SUPPORT #ifdef GUI_SUPPORT
case EventHandlerState::OPTIONSMENU: case EventHandlerState::OPTIONSMENU:
{ {
force |= myOSystem.menu().needsRedraw(); force = force || myOSystem.menu().needsRedraw();
if(force) if(force)
{ {
clear(); clear();
@ -352,7 +352,7 @@ void FrameBuffer::update(bool force)
case EventHandlerState::CMDMENU: case EventHandlerState::CMDMENU:
{ {
force |= myOSystem.commandMenu().needsRedraw(); force = force || myOSystem.commandMenu().needsRedraw();
if(force) if(force)
{ {
clear(); clear();
@ -364,7 +364,7 @@ void FrameBuffer::update(bool force)
case EventHandlerState::TIMEMACHINE: case EventHandlerState::TIMEMACHINE:
{ {
force |= myOSystem.timeMachine().needsRedraw(); force = force || myOSystem.timeMachine().needsRedraw();
if(force) if(force)
{ {
clear(); clear();
@ -376,7 +376,7 @@ void FrameBuffer::update(bool force)
case EventHandlerState::LAUNCHER: case EventHandlerState::LAUNCHER:
{ {
force |= myOSystem.launcher().needsRedraw(); force = force || myOSystem.launcher().needsRedraw();
if(force) if(force)
{ {
clear(); clear();
@ -389,7 +389,7 @@ void FrameBuffer::update(bool force)
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
case EventHandlerState::DEBUGGER: case EventHandlerState::DEBUGGER:
{ {
force |= myOSystem.debugger().needsRedraw(); force = force || myOSystem.debugger().needsRedraw();
if(force) if(force)
{ {
clear(); clear();
@ -408,7 +408,7 @@ void FrameBuffer::update(bool force)
// indicates that, and then the code at the top of this method sees // indicates that, and then the code at the top of this method sees
// the change and redraws everything // the change and redraws everything
if(myMsg.enabled) if(myMsg.enabled)
force |= drawMessage(); force = force || drawMessage();
// Push buffers to screen only when necessary // Push buffers to screen only when necessary
if(force) if(force)