Merge branch 'master' into stagging

demonixis · Aug 17, 2023 · dd07fee · dd07fee
2 parents 31d1a4c + b7d500e
commit dd07fee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 302 deletions.
diff --git a/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/ThirdParty/JSBSim.Build.cs b/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/ThirdParty/JSBSim.Build.cs
@@ -14,8 +14,6 @@ public JSBSim(ReadOnlyTargetRules Target) : base(Target)
                                 Target.Platform == UnrealTargetPlatform.Linux || 
                                 Target.Platform == UnrealTargetPlatform.Android;
 
-        if (!bJSBSimSupported) return;
-
         if (Target.Platform == UnrealTargetPlatform.Win64)
             SetupWindowsPlatform();
         else

diff --git a/src/input_output/FGInputSocket.cpp b/src/input_output/FGInputSocket.cpp
@@ -66,13 +66,13 @@ FGInputSocket::FGInputSocket(FGFDMExec* fdmex) :
 
 FGInputSocket::~FGInputSocket()
 {
-  delete socket;
+  //delete socket;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 bool FGInputSocket::Load(Element* el)
-{
+{/*
   if (!FGInputType::Load(el))
     return false;
 
@@ -87,13 +87,14 @@ bool FGInputSocket::Load(Element* el)
   if (to_upper(action) == "BLOCKING_INPUT")
     BlockingInput = true;
 
-  return true;
+  return true;*/
+  return false;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 bool FGInputSocket::InitModel(void)
-{
+{/*
   if (FGInputType::InitModel()) {
     delete socket;
     socket = new FGfdmSocket(SockPort, SockProtocol);
@@ -103,15 +104,15 @@ bool FGInputSocket::InitModel(void)
 
     return true;
   }
-
+*/
   return false;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 void FGInputSocket::Read(bool Holding)
 {
-  if (!socket) return;
+  /*if (!socket) return;
   if (!socket->GetConnectStatus()) return;
 
   if (BlockingInput)
@@ -270,7 +271,7 @@ void FGInputSocket::Read(bool Holding)
         "   info\n\r\n");
 
       } else {
-        socket->Reply(string("Unknown command: ") + command + "\r\n");
+        //socket->Reply(string("Unknown command: ") + command + "\r\n");
       }
 
       start = string_end;
@@ -284,7 +285,7 @@ void FGInputSocket::Read(bool Holding)
       else
         data.clear();
     }
-  }
+  }*/
 
 }