fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
david 2002-07-06 17:50:38 +00:00
parent fb40950e78
commit 30d239eeda
5 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/Cockpit/hud.cxx
View file

@ -457,7 +457,7 @@ readLabel(const SGPropertyNode * node)
{ {
instr_item *p; 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"); name = node->getStringValue("name");
x = node->getIntValue("x"); x = node->getIntValue("x");
@ -813,19 +813,19 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
} }
//$$$ End - added, Neetha, 28 Nov 2k //$$$ 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 ) void HUD_masterswitch( bool incr )
{ {
if ( fgGetBool("/sim/hud/visibility") ) { if ( fgGetBool("/sim/hud/visibility") ) {
if ( global_day_night_switch == DAY ) { if ( global_day_night_switch == HUD_DAY ) {
global_day_night_switch = NIGHT; global_day_night_switch = HUD_NIGHT;
} else { } else {
fgSetBool("/sim/hud/visibility", false); fgSetBool("/sim/hud/visibility", false);
} }
} else { } else {
fgSetBool("/sim/hud/visibility", true); 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 ) { if( incr_bright ) {
switch (brightness) switch (brightness)
{ {
case BRT_LIGHT: case HUD_BRT_LIGHT:
brightness = BRT_BLACK; brightness = HUD_BRT_BLACK;
break; break;
case BRT_MEDIUM: case HUD_BRT_MEDIUM:
brightness = BRT_LIGHT; brightness = HUD_BRT_LIGHT;
break; break;
case BRT_DARK: case HUD_BRT_DARK:
brightness = BRT_MEDIUM; brightness = HUD_BRT_MEDIUM;
break; break;
case BRT_BLACK: case HUD_BRT_BLACK:
brightness = BRT_DARK; brightness = HUD_BRT_DARK;
break; break;
default: default:
brightness = BRT_BLACK; brightness = HUD_BRT_BLACK;
} }
} else { } else {
switch (brightness) switch (brightness)
{ {
case BRT_LIGHT: case HUD_BRT_LIGHT:
brightness = BRT_MEDIUM; brightness = HUD_BRT_MEDIUM;
break; break;
case BRT_MEDIUM: case HUD_BRT_MEDIUM:
brightness = BRT_DARK; brightness = HUD_BRT_DARK;
break; break;
case BRT_DARK: case HUD_BRT_DARK:
brightness = BRT_BLACK; brightness = HUD_BRT_BLACK;
break; break;
case BRT_BLACK: case HUD_BRT_BLACK:
brightness = BRT_LIGHT; brightness = HUD_BRT_LIGHT;
break; break;
default: default:
@ -1100,22 +1100,22 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
glLineWidth(1.0); glLineWidth(1.0);
} }
if( day_night_sw == DAY) { if( day_night_sw == HUD_DAY) {
switch (brightness) switch (brightness)
{ {
case BRT_LIGHT: case HUD_BRT_LIGHT:
set_hud_color (0.1f, 0.9f, 0.1f); set_hud_color (0.1f, 0.9f, 0.1f);
break; break;
case BRT_MEDIUM: case HUD_BRT_MEDIUM:
set_hud_color (0.1f, 0.7f, 0.0f); set_hud_color (0.1f, 0.7f, 0.0f);
break; break;
case BRT_DARK: case HUD_BRT_DARK:
set_hud_color (0.0f, 0.6f, 0.0f); set_hud_color (0.0f, 0.6f, 0.0f);
break; break;
case BRT_BLACK: case HUD_BRT_BLACK:
set_hud_color( 0.0f, 0.0f, 0.0f); set_hud_color( 0.0f, 0.0f, 0.0f);
break; break;
@ -1123,22 +1123,22 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
set_hud_color (0.1f, 0.9f, 0.1f); set_hud_color (0.1f, 0.9f, 0.1f);
} }
} else { } else {
if( day_night_sw == NIGHT) { if( day_night_sw == HUD_NIGHT) {
switch (brightness) switch (brightness)
{ {
case BRT_LIGHT: case HUD_BRT_LIGHT:
set_hud_color (0.9f, 0.1f, 0.1f); set_hud_color (0.9f, 0.1f, 0.1f);
break; break;
case BRT_MEDIUM: case HUD_BRT_MEDIUM:
set_hud_color (0.7f, 0.0f, 0.1f); set_hud_color (0.7f, 0.0f, 0.1f);
break; break;
case BRT_DARK: case HUD_BRT_DARK:
set_hud_color (0.6f, 0.0f, 0.0f); set_hud_color (0.6f, 0.0f, 0.0f);
break; break;
case BRT_BLACK: case HUD_BRT_BLACK:
set_hud_color( 0.0f, 0.0f, 0.0f); set_hud_color( 0.0f, 0.0f, 0.0f);
break; break;

2
src/Cockpit/hud_inst.cxx
View file

@ -3,7 +3,7 @@
UINT instr_item :: instances = 0; // Initial value of zero 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.1, 0.7, 0.0};
glRGBTRIPLE instr_item :: color = {0.0, 1.0, 0.0}; glRGBTRIPLE instr_item :: color = {0.0, 1.0, 0.0};

4
src/Cockpit/hud_labl.cxx
View file

@ -187,12 +187,12 @@ draw( void ) // Required method in base class
posincr = 0; // 0; posincr = 0; // 0;
} }
if( fontSize == SMALL ) { if( fontSize == HUD_FONT_SMALL ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_8_BY_13 ,get_digits()); //suma label_buffer, GLUT_BITMAP_8_BY_13 ,get_digits()); //suma
} }
else { else {
if( fontSize == LARGE ) { if( fontSize == HUD_FONT_LARGE ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_9_BY_15 ,get_digits()); //suma label_buffer, GLUT_BITMAP_9_BY_15 ,get_digits()); //suma
} }

4
src/Cockpit/hud_lat.cxx
View file

@ -136,12 +136,12 @@ draw( void ) // Required method in base class
posincr = 0; // 0; posincr = 0; // 0;
} }
if( fontSize == SMALL ) { if( fontSize == HUD_FONT_SMALL ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma
} }
else { else {
if( fontSize == LARGE ) { if( fontSize == HUD_FONT_LARGE ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_9_BY_15,get_digits()); //suma label_buffer, GLUT_BITMAP_9_BY_15,get_digits()); //suma
} }

4
src/Cockpit/hud_lon.cxx
View file

@ -139,12 +139,12 @@ draw( void ) // Required method in base class
posincr = 0; posincr = 0;
} }
if( fontSize == SMALL ) { if( fontSize == HUD_FONT_SMALL ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma label_buffer, GLUT_BITMAP_8_BY_13, get_digits()); //suma
} }
else { else {
if( fontSize == LARGE ) { if( fontSize == HUD_FONT_LARGE ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, GLUT_BITMAP_9_BY_15, get_digits()); //suma label_buffer, GLUT_BITMAP_9_BY_15, get_digits()); //suma
} }