Fix an OO issue that only a later compiler picked up

diff --git a/voptions.cc b/voptions.cc
index 7c5d79ce1e62c9b2ac261f7457ce5b17d130a9e8..78520c45add00b3e3b32ce81daa6b4293ecd38fe 100644 (file)
--- 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 a12d0339f7b237ab05957b3126febfa1c38758cc..efc9ea16652b10cce7c7ad164e972ac766226874 100644 (file)
--- 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 8e02bae5ea69f5c616816fd9a348b908522a4ff6..6eb672badb7e1bf2fe52ecbddfeeb09bfbae82e6 100644 (file)
--- 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;