- delete bindings in the *destructor* (must have been an editing accident)

[flightgear.git] / src / Cockpit / panel.cxx

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index de9a7877866653942f97814f17346401ac0caf95..cc0785c9347d72f8944922b8a6832d296bf01026 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -29,6 +29,10 @@
 #include <stdio.h>     // sprintf
 #include <string.h>
 
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
+
 #include <plib/ssg.h>
 #include <plib/fnt.h>
 
@@ -53,7 +57,6 @@
 // my hardware/driver requires many more.
 #define POFF_UNITS 4
 
-\f
 ////////////////////////////////////////////////////////////////////////
 // Local functions.
 ////////////////////////////////////////////////////////////////////////
@@ -595,14 +598,14 @@ FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h,
                               bool repeatable)
     : _button(button), _x(x), _y(y), _w(w), _h(h), _repeatable(repeatable)
 {
-  for (unsigned int i = 0; i < 2; i++) {
-      for (unsigned int j = 0; j < _bindings[i].size(); j++)
-          delete _bindings[i][j];
-  }
 }
 
 FGPanelAction::~FGPanelAction ()
 {
+  for (unsigned int i = 0; i < 2; i++) {
+      for (unsigned int j = 0; j < _bindings[i].size(); j++)
+          delete _bindings[i][j];
+  }
 }
 
 void
@@ -1092,8 +1095,9 @@ FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
 }
 
 FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
-                          const string &fmt, float mult, float offs)
-  : _type(type), _fmt(fmt), _mult(mult), _offs(offs)
+                          const string &fmt, float mult, float offs,
+                           bool truncation)
+  : _type(type), _fmt(fmt), _mult(mult), _offs(offs), _trunc(truncation)
 {
   if (_fmt.empty()) {
     if (type == TEXT_VALUE)
@@ -1117,7 +1121,9 @@ FGTextLayer::Chunk::getValue () const
       sprintf(_buf, _fmt.c_str(), _node->getStringValue());
       break;
     case DOUBLE_VALUE:
-      sprintf(_buf, _fmt.c_str(), _offs + _node->getFloatValue() * _mult);
+      double d = _offs + _node->getFloatValue() * _mult;
+      if (_trunc)  d = (d < 0) ? -floor(-d) : floor(d);
+      sprintf(_buf, _fmt.c_str(), d);
       break;
     }
     return _buf;