Skip to content

Commit

Permalink
(CC) Permanently removed IBOX mode (USEIBOX in options)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pventafridda
pventafridda committed Sep 22, 2011
1 parent 3eac55d commit ac8bb2b
Show file tree
Hide file tree
Showing 54 changed files with 2 additions and 4,446 deletions.
0 Common/Header/InfoBox.h → Common/Header/Archive/InfoBox.h
View file
File renamed without changes.
0 Common/Header/InputEvents.USEIBOX.h → Common/Header/Archive/InputEvents.USEIBOX.h
View file
File renamed without changes.
18 changes: 0 additions & 18 deletions Common/Header/Enums.h
View file
Expand Up @@ -62,20 +62,6 @@ typedef enum{
bit7E1,
}BitIndex_t;

#if USEIBOX
// VENTA-ADDON GEOM
typedef enum{
apIg0=0,
apIg1,
apIg2,
apIg3,
apIg4,
apIg5,
apIg6,
apIg7
}InfoBoxGeomAppearance_t;
#endif

// VENTA-ADDON MODEL
typedef enum{
apImPnaGeneric=0,
Expand Down Expand Up @@ -144,10 +130,6 @@ typedef enum{
ckUseTotalEnergy,
ckNotepad,
ckTerrainColors,
#if USEIBOX
// ToggleInfobox MUST be the last one, used only for Aircraft Icons..
ckToggleInfobox,
#endif
} CustomKeyMode_t;

typedef enum{
Expand Down
11 changes: 0 additions & 11 deletions Common/Header/Globals.h
View file
Expand Up @@ -80,15 +80,7 @@ GEXTERN HWND hWndMapWindow; // HWND MapWindow
// infoboxes
GEXTERN int InfoType[MAXINFOWINDOWS];

#if USEIBOX
GEXTERN bool DisplayLocked; // if infoboxes are locked
GEXTERN int CurrentInfoType; // Used for Popup Menu Select
GEXTERN HWND hWndInfoWindow[MAXINFOWINDOWS];
GEXTERN int InfoFocus;
GEXTERN SCREEN_INFO Data_Options[NUMDATAOPTIONS_MAX];
#else
GEXTERN DATAOPTIONS Data_Options[NUMDATAOPTIONS_MAX];
#endif

GEXTERN int NumDataOptions;
GEXTERN BOOL InfoBoxesHidden;
Expand Down Expand Up @@ -430,12 +422,9 @@ GEXTERN int ScreenSizeX;
GEXTERN int ScreenSizeY;
GEXTERN RECT ScreenSizeR;
GEXTERN bool ScreenLandscape;
#if USEIBOX
#else
GEXTERN double ScreenDScale;
GEXTERN int ScreenScale;
GEXTERN bool ScreenIntScale;
#endif

// 091011 Used by TakeoffLanding inside Calculation.cpp - limited values careful
GEXTERN int time_in_flight;
Expand Down
22 changes: 0 additions & 22 deletions Common/Header/InfoBoxLayout.h
View file
Expand Up @@ -4,28 +4,6 @@
#include "StdAfx.h"
#include "Sizes.h"

#if USEIBOX
class InfoBoxLayout {
public:
static bool fullscreen;
static bool landscape;
static bool square;
static double dscale;
static bool IntScaleFlag;
static int scale;
static void CreateInfoBoxes(RECT rc);
static void DestroyInfoBoxes(void);
static int InfoBoxGeometry;
static int ControlWidth, ControlHeight, TitleHeight;
static void ScreenGeometry(RECT rc);
static void Paint(void);
private:
static void GetInfoBoxPosition(int i, RECT rc,
int *x, int *y,
int *sizex, int *sizey);
static void GetInfoBoxSizes(RECT rc);
};
#endif

class ButtonLabel {
public:
Expand Down
10 changes: 0 additions & 10 deletions Common/Header/MapWindow.h
View file
Expand Up @@ -369,19 +369,13 @@ class MapWindow {
static BOOL Initialised;
static bool GliderCenter;
static DWORD timestamp_newdata;
#if USEIBOX
static bool RequestFullScreen;
#endif
static bool LandableReachable;

public:
static Zoom zoom;
static Mode mode;

static RECT MapRect;
#if USEIBOX
static RECT MapRectBig;
#endif
static bool ForceVisibilityScan;

static bool MapDirty;
Expand Down Expand Up @@ -638,10 +632,6 @@ class MapWindow {
static HBRUSH hbFinalGlideAbove;
static HBRUSH hbWind;

#if USEIBOX
static RECT MapRectSmall;
static bool MapFullScreen;
#endif

static DWORD fpsTime0;

Expand Down
12 changes: 0 additions & 12 deletions Common/Header/Units.h
View file
Expand Up @@ -62,10 +62,6 @@ typedef struct{
const TCHAR *Name;
double ToUserFact;
double ToUserOffset;
#if USEIBOX
HBITMAP hBitmap;
POINT BitMapSize;
#endif
}UnitDescriptor_t;

class Units {
Expand All @@ -78,9 +74,6 @@ class Units {
static Units_t UserVerticalSpeedUnit;
static Units_t UserWindSpeedUnit;
static Units_t UserTaskSpeedUnit;
#if USEIBOX
static void setupUnitBitmap(Units_t Unit, HINSTANCE hInst, WORD IDB, int Width, int Height);
#endif
public:

static CoordinateFormats_t CoordinateFormat;
Expand Down Expand Up @@ -146,11 +139,6 @@ class Units {

static double ToUserDistance(double Distance);
static double ToSysDistance(double Distance);
#if USEIBOX
static bool GetUnitBitmap(Units_t Unit, HBITMAP *HBmp, POINT *Org, POINT *Size, int Kind);
static bool LoadUnitBitmap(HINSTANCE hInst);
static bool UnLoadUnitBitmap(void);
#endif
static void TimeToText(TCHAR* text, int d);
static void TimeToTextSimple(TCHAR* text, int d);
static bool TimeToTextDown(TCHAR* text, int d);
Expand Down
6 changes: 0 additions & 6 deletions Common/Header/Utils.h
View file
Expand Up @@ -234,14 +234,8 @@ extern const TCHAR szRegistryDisableAutoLogger[];
extern const TCHAR szRegistryMapFile[];
extern const TCHAR szRegistryBallastSecsToEmpty[];
extern const TCHAR szRegistryUseCustomFonts[];
#if USEIBOX
extern const TCHAR szRegistryFontInfoWindowFont[];
#endif
extern const TCHAR szRegistryFontTitleWindowFont[];
extern const TCHAR szRegistryFontMapWindowFont[];
#if USEIBOX
extern const TCHAR szRegistryFontTitleSmallWindowFont[];
#endif
extern const TCHAR szRegistryFontMapWindowBoldFont[];
extern const TCHAR szRegistryFontCDIWindowFont[];
extern const TCHAR szRegistryFontMapLabelFont[];
Expand Down
167 changes: 0 additions & 167 deletions Common/Header/lk8000.h
View file
Expand Up @@ -23,146 +23,12 @@
#include "Enums.h"


#if USEIBOX
class InfoBoxFormatter {
public:
InfoBoxFormatter(TCHAR *theformat);
virtual ~InfoBoxFormatter() {}

virtual TCHAR *Render(int *color);
virtual TCHAR *RenderTitle(int *color); // VENTA3
void RenderInvalid(int *color);
BOOL Valid;
double Value;
TCHAR Format[FORMAT_SIZE+1];
TCHAR Text[100];
TCHAR CommentText[100];

virtual void AssignValue(int i);
TCHAR *GetCommentText();
BOOL isValid();
};


class FormatterTeamCode: public InfoBoxFormatter {
public:
FormatterTeamCode(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterTeamCode() {}

virtual TCHAR *Render(int *color);
};


class FormatterDiffTeamBearing: public InfoBoxFormatter {
public:
FormatterDiffTeamBearing(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterDiffTeamBearing() {}

virtual TCHAR *Render(int *color);
};


class FormatterWaypoint: public InfoBoxFormatter {
public:
FormatterWaypoint(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterWaypoint() {}

virtual TCHAR *Render(int *color);
};

// VENTA3 / alternates
class FormatterAlternate: public InfoBoxFormatter {
public:
FormatterAlternate(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterAlternate() {}

virtual TCHAR *Render(int *color);
virtual TCHAR *RenderTitle(int *color);
virtual void AssignValue(int i);
};
// VENTA3 bestlanding
/*
class FormatterBestLanding: public InfoBoxFormatter {
public:
FormatterBestLanding(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual TCHAR *Render(int *color);
virtual TCHAR *RenderTitle(int *color);
virtual void AssignValue(int i);
};
*/
class FormatterLowWarning: public InfoBoxFormatter {
public:
FormatterLowWarning(TCHAR *theformat, double the_minimum)
#if 101029
:InfoBoxFormatter(theformat), minimum(the_minimum) {}
virtual ~FormatterLowWarning() {}
#else
:InfoBoxFormatter(theformat) {

minimum = the_minimum;

};
#endif

virtual TCHAR *Render(int *color);
double minimum;
virtual void AssignValue(int i);
};


class FormatterTime: public InfoBoxFormatter {
public:
FormatterTime(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterTime() {}

virtual TCHAR *Render(int *color);
virtual void AssignValue(int i);
int hours;
int mins;
int seconds;
void SecsToDisplayTime(int i);
};


class FormatterAATTime: public FormatterTime {
public:
FormatterAATTime(TCHAR *theformat):FormatterTime(theformat) {};
virtual ~FormatterAATTime() {}

virtual TCHAR *Render(int *color);
virtual void AssignValue(int i);
int status;
};


class FormatterDiffBearing: public InfoBoxFormatter {
public:
FormatterDiffBearing(TCHAR *theformat):InfoBoxFormatter(theformat) {};
virtual ~FormatterDiffBearing() {}

virtual TCHAR *Render(int *color);
};
#endif // USEIBOX

#if USEIBOX
typedef struct _SCREEN_INFO
{
UnitGroup_t UnitGroup;
TCHAR Description[DESCRIPTION_SIZE +1];
TCHAR Title[TITLE_SIZE + 1];
InfoBoxFormatter *Formatter;
void (*Process)(int UpDown);
char next_screen;
char prev_screen;
} SCREEN_INFO;
#else
typedef struct _DATAOPTIONS
{
UnitGroup_t UnitGroup;
TCHAR Description[DESCRIPTION_SIZE +1];
TCHAR Title[TITLE_SIZE + 1];
} DATAOPTIONS;
#endif



Expand Down Expand Up @@ -354,20 +220,6 @@ typedef enum{
bit7E1,
}BitIndex_t;
#if USEIBOX
// VENTA-ADDON GEOM
typedef enum{
apIg0=0,
apIg1,
apIg2,
apIg3,
apIg4,
apIg5,
apIg6,
apIg7
}InfoBoxGeomAppearance_t;
#endif
// VENTA-ADDON MODEL
typedef enum{
apImPnaGeneric=0,
Expand Down Expand Up @@ -436,10 +288,6 @@ typedef enum{
ckUseTotalEnergy,
ckNotepad,
ckTerrainColors,
#if USEIBOX
// ToggleInfobox MUST be the last one, used only for Aircraft Icons..
ckToggleInfobox,
#endif
} CustomKeyMode_t;
typedef enum{
Expand Down Expand Up @@ -609,24 +457,9 @@ typedef struct {

typedef struct{
int DefaultMapWidth;
#if USEIBOX
// THESE ARE USED BY INFOBOX ONLY TO HAVE SIZES READY
FontHeightInfo_t TitleWindowFont;
FontHeightInfo_t MapWindowFont;
FontHeightInfo_t MapWindowBoldFont;
FontHeightInfo_t InfoWindowFont;
FontHeightInfo_t CDIWindowFont;
FontHeightInfo_t StatisticsFont;
FontHeightInfo_t MapLabelFont;
FontHeightInfo_t TitleSmallWindowFont;
//
#endif
BestCruiseTrack_t BestCruiseTrack;
IndLandable_t IndLandable; // landable icon style
bool InverseInfoBox; // InfoBox black or white inverted, used also by LK styles
#if USEIBOX
InfoBoxGeomAppearance_t InfoBoxGeom;
#endif
InfoBoxModelAppearance_t InfoBoxModel;
} Appearance_t;

Expand Down
9 changes: 0 additions & 9 deletions Common/Header/options.h
View file
Expand Up @@ -48,19 +48,10 @@
#define TOPOFASTLABEL 1
#define TOPOFASTCACHE 1

// Use old IBOX mode, requires also a make inside Data/Input after changing InputEvents.h
// with InputEvents.USEIBOX.h - manually!
// #define USEIBOX 1


// No instrument thread. However it is here ready to be used for anything.
#define NOINSTHREAD 1

#if USEIBOX
#define IBLSCALE(x) ( (InfoBoxLayout::IntScaleFlag) ? ((x)*InfoBoxLayout::scale) : ((int)((x)*InfoBoxLayout::dscale)))
#else
#define IBLSCALE(x) ( (ScreenIntScale) ? ((x)*ScreenScale) : ((int)((x)*ScreenDScale)))
#endif
#define NIBLSCALE(x) (LKIBLSCALE[x])
#define MAXIBLSCALE 100 // CAREFUL! NIBLSCALE can be used only UP TO MAXIBLSCALE!

Expand Down
0 Common/Source/InfoBox.cpp → Common/Source/Archive/InfoBox.cpp
View file
File renamed without changes.

0 comments on commit ac8bb2b

Please sign in to comment.