From 926390d8f66fa4623d3692d93b5c477231a10e3a Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Wed, 27 May 2020 15:32:21 +0100 Subject: [PATCH] Style and dead code removal --- src/xswiftbus/traffic.cpp | 16 +--------------- src/xswiftbus/traffic.h | 5 +---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index bad119aed..7da75f41c 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -16,7 +16,7 @@ #include "utils.h" #include "XPMPMultiplayer.h" #include "XPMPPlaneRenderer.h" -#include "XPLMGraphics.h" +#include #include #include #include @@ -1122,13 +1122,6 @@ namespace XSwiftBus return 1; } - bool CTraffic::isPlusMinusOne(float v) - { - if (std::isnan(v)) { return false; } - if (v > 1.00001f || v < -1.00001f) { return false; } - return true; - } - bool CTraffic::isPlusMinus180(float v) { if (std::isnan(v)) { return false; } @@ -1143,13 +1136,6 @@ namespace XSwiftBus return true; } - bool CTraffic::isZeroTo360(double v) - { - if (std::isnan(v)) { return false; } - if (v < 0 || v >= 360.0) { return false; } - return true; - } - float CTraffic::normalizeToPlusMinus180Deg(float v) { if (std::isnan(v)) { return 0.0f; } diff --git a/src/xswiftbus/traffic.h b/src/xswiftbus/traffic.h index e4cb73822..ee81bfc30 100644 --- a/src/xswiftbus/traffic.h +++ b/src/xswiftbus/traffic.h @@ -18,7 +18,7 @@ #include "terrainprobe.h" #include "menus.h" #include "XPMPMultiplayer.h" -#include "XPLMCamera.h" +#include #include #include #include @@ -158,7 +158,6 @@ namespace XSwiftBus static int preferences(const char *section, const char *name, int def); static float preferences(const char *section, const char *name, float def); - static int orbitOwnAircraftFunc(XPLMCameraPosition_t *cameraPosition, int isLosingControl, void *refcon); static int orbitPlaneFunc(XPLMCameraPosition_t *cameraPosition, int isLosingControl, void *refcon); static int drawCallback(XPLMDrawingPhase phase, int isBefore, void *refcon); static int followAircraftKeySniffer(char character, XPLMKeyFlags flags, char virtualKey, void *refcon); @@ -189,10 +188,8 @@ namespace XSwiftBus //! Check functions //! @{ - static bool isPlusMinusOne(float v); static bool isPlusMinus180(float v); static bool isPlusMinus180(double v); - static bool isZeroTo360(double v); //! @} //! Normalize to (-180, 180] or [0, 360) degrees