1
0
Fork 0

Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in

ImageGetRawData() to match usage.
This commit is contained in:
curt 1998-07-24 21:36:55 +00:00
parent ffa2a0feb3
commit 9e301558c9
10 changed files with 39 additions and 31 deletions

View file

@ -53,8 +53,8 @@
#include <Flight/flight.h> #include <Flight/flight.h>
#include <Controls/controls.h> #include <Controls/controls.h>
#include <deque> // STL double ended queue
#include <deque> // STL
#ifdef NEEDNAMESPACESTD #ifdef NEEDNAMESPACESTD
using namespace std; using namespace std;
#endif #endif
@ -116,17 +116,17 @@ enum fgLabelJust{ LEFT_JUST, CENTER_JUST, RIGHT_JUST } ;
#define LABEL_WARNING 2 #define LABEL_WARNING 2
#define HUDS_AUTOTICKS 0x0001 #define HUDS_AUTOTICKS 0x0001
#define HUDS_VERT 0x0002 #define HUDS_VERT 0x0002
#define HUDS_HORZ 0x0000 #define HUDS_HORZ 0x0000
#define HUDS_TOP 0x0004 #define HUDS_TOP 0x0004
#define HUDS_BOTTOM 0x0008 #define HUDS_BOTTOM 0x0008
#define HUDS_LEFT HUDS_TOP #define HUDS_LEFT HUDS_TOP
#define HUDS_RIGHT HUDS_BOTTOM #define HUDS_RIGHT HUDS_BOTTOM
#define HUDS_BOTH (HUDS_LEFT | HUDS_RIGHT) #define HUDS_BOTH (HUDS_LEFT | HUDS_RIGHT)
#define HUDS_NOTICKS 0x0010 #define HUDS_NOTICKS 0x0010
#define HUDS_ARITHTIC 0x0020 #define HUDS_ARITHTIC 0x0020
#define HUDS_DECITICS 0x0040 #define HUDS_DECITICS 0x0040
#define HUDS_NOTEXT 0x0080 #define HUDS_NOTEXT 0x0080
// Ladder orientaion // Ladder orientaion
// #define HUD_VERTICAL 1 // #define HUD_VERTICAL 1
@ -523,9 +523,13 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day );
#endif // _HUD_H #endif // _HUD_H
/* $Log$ /* $Log$
/* Revision 1.10 1998/07/13 21:28:02 curt /* Revision 1.11 1998/07/24 21:36:55 curt
/* Converted the aoa scale to a radio altimeter. /* Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in
/* ImageGetRawData() to match usage.
/* /*
* Revision 1.10 1998/07/13 21:28:02 curt
* Converted the aoa scale to a radio altimeter.
*
* Revision 1.9 1998/07/13 21:00:48 curt * Revision 1.9 1998/07/13 21:00:48 curt
* Integrated Charlies latest HUD updates. * Integrated Charlies latest HUD updates.
* Wrote access functions for current fgOPTIONS. * Wrote access functions for current fgOPTIONS.

View file

@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//========== Top of hud_card class member definitions ============= //========== Top of hud_card class member definitions =============
hud_card :: hud_card ::
hud_card( int x, hud_card( int x,

View file

@ -1,4 +1,4 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//============ Top of dual_instr_item class member definitions ============ //============ Top of dual_instr_item class member definitions ============
dual_instr_item :: dual_instr_item ::

View file

@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//============== Top of guage_instr class member definitions ============== //============== Top of guage_instr class member definitions ==============
guage_instr :: guage_instr ::
guage_instr( int x, guage_instr( int x,

View file

@ -1,4 +1,4 @@
// Abstract Base Class instr_item // Abstract Base Class instr_item
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>

View file

@ -1,4 +1,4 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -19,8 +19,8 @@
#include "hud.hxx" #include "hud.hxx"
//======================= Top of instr_label class ========================= //======================= Top of instr_label class =========================
instr_label :: instr_label ::
instr_label( int x, instr_label( int x,
int y, int y,

View file

@ -1,4 +1,4 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//====================== Top of HudLadder Class ======================= //====================== Top of HudLadder Class =======================
HudLadder :: HudLadder ::
HudLadder( int x, HudLadder( int x,
int y, int y,

View file

@ -1,4 +1,4 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//============== Top of instr_scale class memeber definitions =============== //============== Top of instr_scale class memeber definitions ===============
// //
// Notes: // Notes:
// 1. instr_scales divide the specified location into half and then // 1. instr_scales divide the specified location into half and then

View file

@ -19,7 +19,7 @@
#include "hud.hxx" #include "hud.hxx"
//============ Top of fgTBI_instr class member definitions ============== //============ Top of fgTBI_instr class member definitions ==============
fgTBI_instr :: fgTBI_instr ::
fgTBI_instr( int x, fgTBI_instr( int x,

View file

@ -210,7 +210,7 @@ static void ImageGetRow( Image *image, unsigned char *buf, int y, int z)
} }
} }
static void ImageGetRawData( Image *image, char *data) static void ImageGetRawData( Image *image, unsigned char *data)
{ {
int i, j, k; int i, j, k;
int remain; int remain;
@ -416,10 +416,14 @@ void fgPanelUpdate ( void ) {
/* $Log$ /* $Log$
/* Revision 1.3 1998/07/13 21:00:52 curt /* Revision 1.4 1998/07/24 21:37:00 curt
/* Integrated Charlies latest HUD updates. /* Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in
/* Wrote access functions for current fgOPTIONS. /* ImageGetRawData() to match usage.
/* /*
* Revision 1.3 1998/07/13 21:00:52 curt
* Integrated Charlies latest HUD updates.
* Wrote access functions for current fgOPTIONS.
*
* Revision 1.2 1998/07/03 11:55:37 curt * Revision 1.2 1998/07/03 11:55:37 curt
* A few small rearrangements and tweaks. * A few small rearrangements and tweaks.
* *