diff --git a/GpApp/Dynamics.cpp b/GpApp/Dynamics.cpp index cb33ae0..ded3fa1 100644 --- a/GpApp/Dynamics.cpp +++ b/GpApp/Dynamics.cpp @@ -400,23 +400,10 @@ void HandleMacPlus (short who) if (!IsMacPlusSoundBanned()) PlayPrioritySound(kMacBeepSound, kMacBeepPriority); - if (IsMacPlusGraphicBanned()) - { - CGraf *oldPort = GetGraphicsPort(); - SetGraphicsPort(backSrcMap); - - ForeColor(whiteColor); - PaintRect(&dinahs[who].dest); - - SetGraphicsPort(oldPort); - } - else - { - CopyBits((BitMap *)*GetGWorldPixMap(applianceSrcMap), - (BitMap *)*GetGWorldPixMap(backSrcMap), - &plusScreen2, &dinahs[who].dest, - srcCopy, nil); - } + CopyBits((BitMap *)*GetGWorldPixMap(applianceSrcMap), + (BitMap *)*GetGWorldPixMap(backSrcMap), + &plusScreen2, &dinahs[who].dest, + srcCopy, nil); AddRectToBackRects(&dinahs[who].dest); } diff --git a/GpApp/ObjectDraw2.cpp b/GpApp/ObjectDraw2.cpp index 53396a5..8bae1e7 100644 --- a/GpApp/ObjectDraw2.cpp +++ b/GpApp/ObjectDraw2.cpp @@ -602,18 +602,6 @@ void DrawMacPlus (Rect *theRect, Boolean isOn, Boolean isLit) { Rect screen; - if (IsMacPlusGraphicBanned()) - { - CGraf *wasGraph = GetGraphicsPort(); - SetGraphicsPort(backSrcMap); - - ForeColor(blackColor); - PaintRect(theRect); - - SetGraphicsPort(wasGraph); - return; - } - if (isLit) { CopyMask((BitMap *)*GetGWorldPixMap(applianceSrcMap), @@ -637,6 +625,30 @@ void DrawMacPlus (Rect *theRect, Boolean isOn, Boolean isLit) (BitMap *)*GetGWorldPixMap(backSrcMap), &plusScreen1, &screen, srcCopy, nil); } + + + if (IsMacPlusGraphicBanned()) + { + CGraf *oldPort = GetGraphicsPort(); + SetGraphicsPort(backSrcMap); + + RGBColor beigeColor; + beigeColor.red = 255 * 0x0101; + beigeColor.green = 255 * 0x0101; + beigeColor.blue = 204 * 0x0101; + + RGBForeColor(&beigeColor); + + Rect paintOverRect = *theRect; + paintOverRect.left += 8; + paintOverRect.top += 35; + paintOverRect.right = paintOverRect.left + 17; + paintOverRect.bottom = paintOverRect.top + 6; + + PaintRect(&paintOverRect); + + SetGraphicsPort(oldPort); + } } //-------------------------------------------------------------- DrawTV