From 4b77cef395c4ac0573fe0426d6233bb9de6689d8 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Tue, 6 Sep 2005 17:30:35 +0000 Subject: [PATCH] Fix an OO issue that only a later compiler picked up --- voptions.cc | 6 ++++-- wsymbol.cc | 5 +++-- wsymbol.h | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/voptions.cc b/voptions.cc index 7c5d79c..78520c4 100644 --- a/voptions.cc +++ b/voptions.cc @@ -141,11 +141,13 @@ void VOptions::draw() else cl = Colour::BUTTONBACKGROUND; ws.nextSymbol = WSymbol::LEFTARROW; + ws.nextColour = cl; + ws.setScreenPos(screenX + 272, screenY + 47 + (i * 30)); - ws.draw(cl); + ws.draw(); ws.nextSymbol = WSymbol::RIGHTARROW; ws.setScreenPos(screenX + 442, screenY + 47 + (i * 30)); - ws.draw(cl); + ws.draw(); optionBox[i].draw(); optionBox[i].show(); } diff --git a/wsymbol.cc b/wsymbol.cc index a12d033..efc9ea1 100644 --- a/wsymbol.cc +++ b/wsymbol.cc @@ -602,9 +602,10 @@ UCHAR WSymbol::symbols[] = { WSymbol::WSymbol() { nextSymbol = 0; + nextColour = Colour::LIGHTTEXT; } -void WSymbol::draw(Colour& colour) +void WSymbol::draw() { int offset = 0; for(int i = 0; i < nextSymbol; i++) @@ -628,7 +629,7 @@ void WSymbol::draw(Colour& colour) if ((base[bytesIn] >> (7 - bitsIn)) & 0x01) { - drawPixel(x, y, colour); + drawPixel(x, y, nextColour); } } } diff --git a/wsymbol.h b/wsymbol.h index 8e02bae..6eb672b 100644 --- a/wsymbol.h +++ b/wsymbol.h @@ -30,8 +30,9 @@ class WSymbol : public Box public: WSymbol(); - void draw(Colour& colour = Colour::LIGHTTEXT); + void draw(); UCHAR nextSymbol; + Colour nextColour; const static UCHAR VOLUME = 0; const static UCHAR TEST = 1; -- 2.39.5