Change identifiers to their new names to match hud.hxx.

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 9d5f5272b64a44ba18be81017bf4208771119248..4fba3ff43657ff4eaef35f6d02cf061e5584bfbf 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -457,7 +457,7 @@ readLabel(const SGPropertyNode * node)
 {
     instr_item *p;
 
-    int font_size = (fgGetInt("/sim/startup/xsize") > 1000) ? LARGE : SMALL;
+    int font_size = (fgGetInt("/sim/startup/xsize") > 1000) ? HUD_FONT_LARGE : HUD_FONT_SMALL;
 
     name               = node->getStringValue("name");
     x                   = node->getIntValue("x");
@@ -813,19 +813,19 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
 }
 //$$$ End - added, Neetha, 28 Nov 2k  
 
-static int global_day_night_switch = DAY;
+static int global_day_night_switch = HUD_DAY;
 
 void HUD_masterswitch( bool incr )
 {
     if ( fgGetBool("/sim/hud/visibility") ) {
-       if ( global_day_night_switch == DAY ) {
-           global_day_night_switch = NIGHT;
+       if ( global_day_night_switch == HUD_DAY ) {
+           global_day_night_switch = HUD_NIGHT;
        } else {
            fgSetBool("/sim/hud/visibility", false);
        }
     } else {
         fgSetBool("/sim/hud/visibility", true);
-       global_day_night_switch = DAY;
+       global_day_night_switch = HUD_DAY;
     }  
 }
 
@@ -838,42 +838,42 @@ void HUD_brightkey( bool incr_bright )
        if( incr_bright ) {
            switch (brightness)
                {
-               case BRT_LIGHT:
-                   brightness = BRT_BLACK;
+               case HUD_BRT_LIGHT:
+                   brightness = HUD_BRT_BLACK;
                    break;
 
-               case BRT_MEDIUM:
-                   brightness = BRT_LIGHT;
+               case HUD_BRT_MEDIUM:
+                   brightness = HUD_BRT_LIGHT;
                    break;
 
-               case BRT_DARK:
-                   brightness = BRT_MEDIUM;
+               case HUD_BRT_DARK:
+                   brightness = HUD_BRT_MEDIUM;
                    break;
 
-               case BRT_BLACK:
-                   brightness = BRT_DARK;
+               case HUD_BRT_BLACK:
+                   brightness = HUD_BRT_DARK;
                    break;
 
                default:
-                   brightness = BRT_BLACK;
+                   brightness = HUD_BRT_BLACK;
                }
        } else {
            switch (brightness)
                {
-               case BRT_LIGHT:
-                   brightness = BRT_MEDIUM;
+               case HUD_BRT_LIGHT:
+                   brightness = HUD_BRT_MEDIUM;
                    break;
 
-               case BRT_MEDIUM:
-                   brightness = BRT_DARK;
+               case HUD_BRT_MEDIUM:
+                   brightness = HUD_BRT_DARK;
                    break;
 
-               case BRT_DARK:
-                   brightness = BRT_BLACK;
+               case HUD_BRT_DARK:
+                   brightness = HUD_BRT_BLACK;
                    break;
 
-               case BRT_BLACK:
-                   brightness = BRT_LIGHT;
+               case HUD_BRT_BLACK:
+                   brightness = HUD_BRT_LIGHT;
                    break;
 
                default:
@@ -1100,22 +1100,22 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
         glLineWidth(1.0);
     }
 
-    if( day_night_sw == DAY) {
+    if( day_night_sw == HUD_DAY) {
         switch (brightness)
             {
-            case BRT_LIGHT:
+            case HUD_BRT_LIGHT:
                 set_hud_color (0.1f, 0.9f, 0.1f);
                 break;
 
-            case BRT_MEDIUM:
+            case HUD_BRT_MEDIUM:
                 set_hud_color (0.1f, 0.7f, 0.0f);
                 break;
 
-            case BRT_DARK:
+            case HUD_BRT_DARK:
                 set_hud_color (0.0f, 0.6f, 0.0f);
                 break;
 
-            case BRT_BLACK:
+            case HUD_BRT_BLACK:
                 set_hud_color( 0.0f, 0.0f, 0.0f);
                 break;
 
@@ -1123,22 +1123,22 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
                 set_hud_color (0.1f, 0.9f, 0.1f);
             }
     } else {
-        if( day_night_sw == NIGHT) {
+        if( day_night_sw == HUD_NIGHT) {
             switch (brightness)
                 {
-                case BRT_LIGHT:
+                case HUD_BRT_LIGHT:
                     set_hud_color (0.9f, 0.1f, 0.1f);
                     break;
 
-                case BRT_MEDIUM:
+                case HUD_BRT_MEDIUM:
                     set_hud_color (0.7f, 0.0f, 0.1f);
                     break;
 
-                case BRT_DARK:
+                case HUD_BRT_DARK:
                     set_hud_color (0.6f, 0.0f, 0.0f);
                     break;
 
-                case BRT_BLACK:
+                case HUD_BRT_BLACK:
                     set_hud_color( 0.0f, 0.0f, 0.0f);
                     break;
 

diff --git a/src/Cockpit/hud_inst.cxx b/src/Cockpit/hud_inst.cxx
index 2eefe1e3344da6b2aa7cfc7b27a8467db3c207e6..53894e257710177def550d027c6d22d0a88c2639 100644 (file)
--- a/src/Cockpit/hud_inst.cxx
+++ b/src/Cockpit/hud_inst.cxx
@@ -3,7 +3,7 @@
 
 
 UINT instr_item :: instances = 0;  // Initial value of zero
-int  instr_item :: brightness = BRT_MEDIUM;
+int  instr_item :: brightness = HUD_BRT_MEDIUM;
 //glRGBTRIPLE instr_item :: color = {0.1, 0.7, 0.0};
 glRGBTRIPLE instr_item :: color = {0.0, 1.0, 0.0};
 

diff --git a/src/Cockpit/hud_labl.cxx b/src/Cockpit/hud_labl.cxx
index 305d6a052d5867ccbe7f84c33a9eb5b855b8791e..2c8c62f67c54c112957e11bb3bedcd1f09889ecd 100644 (file)
--- a/src/Cockpit/hud_labl.cxx
+++ b/src/Cockpit/hud_labl.cxx
@@ -187,12 +187,12 @@ draw( void )       // Required method in base class
       posincr = 0;  // 0;
   }
   
-  if( fontSize == SMALL ) {
+  if( fontSize == HUD_FONT_SMALL ) {
     textString( scrn_rect.left + posincr, scrn_rect.top,
                 label_buffer, GLUT_BITMAP_8_BY_13 ,get_digits()); //suma
     }
   else  {
-    if( fontSize == LARGE ) {
+    if( fontSize == HUD_FONT_LARGE ) {
       textString( scrn_rect.left + posincr, scrn_rect.top,
                   label_buffer, GLUT_BITMAP_9_BY_15 ,get_digits()); //suma
       }

diff --git a/src/Cockpit/hud_lat.cxx b/src/Cockpit/hud_lat.cxx
index e9e6a45203e7d6e8388c8623bbcea2d0c7082d97..035dff65e9d6ae46abf6348161b3a4ac9125be67 100644 (file)
--- a/src/Cockpit/hud_lat.cxx
+++ b/src/Cockpit/hud_lat.cxx
@@ -136,12 +136,12 @@ draw( void )       // Required method in base class
       posincr = 0;  // 0;
   }
   
-  if( fontSize == SMALL ) {
+  if( fontSize == HUD_FONT_SMALL ) {
     textString( scrn_rect.left + posincr, scrn_rect.top,
                 label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma
     }
   else  {
-    if( fontSize == LARGE ) {
+    if( fontSize == HUD_FONT_LARGE ) {
       textString( scrn_rect.left + posincr, scrn_rect.top,
                   label_buffer, GLUT_BITMAP_9_BY_15,get_digits()); //suma
       }

diff --git a/src/Cockpit/hud_lon.cxx b/src/Cockpit/hud_lon.cxx
index 74cae204afe04d73a3059101f709d65c41784572..f68b6928facc7817e9e0c8cd470865e4d63f53e1 100644 (file)
--- a/src/Cockpit/hud_lon.cxx
+++ b/src/Cockpit/hud_lon.cxx
@@ -139,12 +139,12 @@ draw( void )       // Required method in base class
       posincr = 0;
   }
   
-  if( fontSize == SMALL ) {
+  if( fontSize == HUD_FONT_SMALL ) {
     textString( scrn_rect.left + posincr, scrn_rect.top,
                 label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma
     }
   else  {
-    if( fontSize == LARGE ) {
+    if( fontSize == HUD_FONT_LARGE ) {
       textString( scrn_rect.left + posincr, scrn_rect.top,
                   label_buffer, GLUT_BITMAP_9_BY_15, get_digits()); //suma
       }