Converted to new logstream debugging facility. This allows release

[flightgear.git] / Cockpit / hud_scal.cxx

diff --git a/Cockpit/hud_scal.cxx b/Cockpit/hud_scal.cxx
index 57fc3ebd979db05f27c64e517f7997fe2b9269b2..0b582d0580994a0b62337410090a6f0b9ce8e5bb 100644 (file)
--- a/Cockpit/hud_scal.cxx
+++ b/Cockpit/hud_scal.cxx
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H\r
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -7,19 +7,17 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-#include <Aircraft/aircraft.h>
-#include <Debug/fg_debug.h>
+#include <Aircraft/aircraft.hxx>
 #include <Include/fg_constants.h>
 #include <Math/fg_random.h>
 #include <Math/mat3.h>
 #include <Math/polar3d.hxx>
 #include <Scenery/scenery.hxx>
 #include <Time/fg_timer.hxx>
-#include <Weather/weather.h>
 
 
 #include "hud.hxx"
-//============== Top of instr_scale class memeber definitions ===============\r
+//============== Top of instr_scale class memeber definitions ===============
 //
 // Notes:
 // 1. instr_scales divide the specified location into half and then
@@ -47,11 +45,11 @@ instr_scale ( int       x,
               UINT      rollover,
               int       dp_showing,
               bool      working ) :
-                instr_item( x, y, width, height, load_fn, options, working),
+                instr_item( x, y, width, height,
+                            load_fn, disp_scale, options, working),
                 range_shown  ( show_range ),
                 Maximum_value( maxValue   ),
                 Minimum_value( minValue   ),
-                scale_factor ( disp_scale ),
                 Maj_div      ( major_divs ),
                 Min_div      ( minor_divs ),
                 Modulo       ( rollover   ),