Remove some calls to TXT_FGColor by using the new TXT_SaveColors system

instead. Remove the unused "embedded color code" system from TXT_Puts.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2508

1 files changed, 5 insertions, 5 deletions

diff --git a/textscreen/txt_spinctrl.c b/textscreen/txt_spinctrl.c
index 0b77805f..1015ece5 100644
--- a/textscreen/txt_spinctrl.c
+++ b/textscreen/txt_spinctrl.c
@@ -152,13 +152,12 @@ static void TXT_SpinControlDrawer(TXT_UNCAST_ARG(spincontrol))
 
     focused = spincontrol->widget.focused;
 
-    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
+    TXT_SaveColors(&colors);
 
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
     TXT_DrawString("\x1b ");
 
-    TXT_SaveColors(&colors);
-
-    TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
+    TXT_RestoreColors(&colors);
 
     // Choose background color
 
@@ -175,7 +174,7 @@ static void TXT_SpinControlDrawer(TXT_UNCAST_ARG(spincontrol))
     {
         SetBuffer(spincontrol);
     }
-    
+
     i = 0;
 
     padding = spincontrol->widget.w - strlen(spincontrol->buffer) - 4;
@@ -196,6 +195,7 @@ static void TXT_SpinControlDrawer(TXT_UNCAST_ARG(spincontrol))
     }
 
     TXT_RestoreColors(&colors);
+    TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
     TXT_DrawString(" \x1a");
 }