Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGJSBBase.cpp

diff --git a/src/FDM/JSBSim/FGJSBBase.cpp b/src/FDM/JSBSim/FGJSBBase.cpp
index 786b57c31e9d09c031998fe8d563640080f5ff2f..bc38f011f116e45f5794c68346e91e7bc8d87eae 100644 (file)
--- a/src/FDM/JSBSim/FGJSBBase.cpp
+++ b/src/FDM/JSBSim/FGJSBBase.cpp
@@ -64,12 +64,13 @@ const double FGJSBBase::ktstofps = 1.68781;
 const double FGJSBBase::inchtoft = 0.08333333;
 const double FGJSBBase::Reng = 1716.0;
 const double FGJSBBase::SHRatio = 1.40;
-const string FGJSBBase::needed_cfg_version = "1.55";
+const string FGJSBBase::needed_cfg_version = "1.57";
 const string FGJSBBase::JSBSim_version = "0.9.1";
 
-queue <struct FGJSBBase::Message*> FGJSBBase::Messages;
-struct FGJSBBase::Message FGJSBBase::localMsg;
+queue <FGJSBBase::Message*> FGJSBBase::Messages;
+FGJSBBase::Message FGJSBBase::localMsg;
 unsigned int FGJSBBase::messageId = 0; 
+unsigned int FGJSBBase::frame = 0;
 
 short FGJSBBase::debug_lvl  = 0;
 
@@ -81,7 +82,7 @@ FGJSBBase::FGJSBBase()
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::PutMessage(struct Message* msg)
+FGJSBBase::Message* FGJSBBase::PutMessage(Message* msg)
 {
   Messages.push(msg);
   return msg;
@@ -89,9 +90,9 @@ struct FGJSBBase::Message* FGJSBBase::PutMessage(struct Message* msg)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::PutMessage(string text)
+FGJSBBase::Message* FGJSBBase::PutMessage(string text)
 {
-  struct Message *msg = new Message();
+  Message *msg = new Message();
   msg->text = text;
   msg->messageId = messageId++;
   msg->subsystem = "FDM";
@@ -102,9 +103,9 @@ struct FGJSBBase::Message* FGJSBBase::PutMessage(string text)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::PutMessage(string text, bool bVal)
+FGJSBBase::Message* FGJSBBase::PutMessage(string text, bool bVal)
 {
-  struct Message *msg = new Message();
+  Message *msg = new Message();
   msg->text = text;
   msg->messageId = messageId++;
   msg->subsystem = "FDM";
@@ -116,35 +117,35 @@ struct FGJSBBase::Message* FGJSBBase::PutMessage(string text, bool bVal)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::PutMessage(string text, int iVal)
+FGJSBBase::Message* FGJSBBase::PutMessage(string text, int iVal)
 {
-  struct Message *msg = new Message();
+  Message *msg = new Message();
   msg->text = text;
   msg->messageId = messageId++;
   msg->subsystem = "FDM";
   msg->type = Message::eInteger;
-  msg->bVal = iVal;
+  msg->bVal = (iVal != 0);
   Messages.push(msg);
   return msg;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::PutMessage(string text, double dVal)
+FGJSBBase::Message* FGJSBBase::PutMessage(string text, double dVal)
 {
-  struct Message *msg = new Message();
+  Message *msg = new Message();
   msg->text = text;
   msg->messageId = messageId++;
   msg->subsystem = "FDM";
   msg->type = Message::eDouble;
-  msg->bVal = dVal;
+  msg->bVal = (dVal != 0.0);
   Messages.push(msg);
   return msg;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::ReadMessage(void)
+FGJSBBase::Message* FGJSBBase::ReadMessage(void)
 {
   if (!Messages.empty()) return Messages.front();
   else                   return NULL;
@@ -152,7 +153,7 @@ struct FGJSBBase::Message* FGJSBBase::ReadMessage(void)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-struct FGJSBBase::Message* FGJSBBase::ProcessMessage(void)
+FGJSBBase::Message* FGJSBBase::ProcessMessage(void)
 {
   if (!Messages.empty())
     localMsg = *(Messages.front());