Misc tweaks.

diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index 2d27bf059912e60d61271aa4d316d88ecf61ddb9..ff6584175332de5db362b28d950533ce7c9e4602 100644 (file)
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -698,7 +698,7 @@ int FGAutopilot::run() {
            total_adj = -1.0;
        }
 
-       globals->get_controls()->set_elevator( total_adj );
+       globals->get_controls()->set_elevator_trim( total_adj );
     }
 
     // auto throttle

diff --git a/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp b/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp
index 97c74229a363e9ff5278c453b5c0a848a082b768..0d4293934bc1f20e99db140340366badea90e7be 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp
+++ b/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp
@@ -70,7 +70,7 @@
  USA or view http://www.gnu.org/copyleft/gpl.html.
 
 **********************************************************************/
-#include <simgear/compiler.h>    // to disable C4244 d to f warning
+#include <simgear/compiler.h>    // MSVC: to disable C4244 d to f warning
 
 #include "uiuc_1Dinterpolation.h"
 

diff --git a/src/FDM/UIUCModel/uiuc_parsefile.cpp b/src/FDM/UIUCModel/uiuc_parsefile.cpp
index b09d41e014e99df615360cd21be942c3c7fcd887..d74caa281a5070f6cf2dd0514bb57b0e2fd27368 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.cpp
+++ b/src/FDM/UIUCModel/uiuc_parsefile.cpp
@@ -80,7 +80,7 @@ ParseFile :: ~ParseFile ()
 
 void ParseFile :: removeComments(string& inputLine)
 {
-  unsigned int pos = inputLine.find_first_of(COMMENT);
+  int pos = inputLine.find_first_of(COMMENT);
   
   if (pos != inputLine.npos) // a "#" exists in the line 
   {
@@ -94,8 +94,8 @@ void ParseFile :: removeComments(string& inputLine)
 
 string ParseFile :: getToken(string inputLine, int tokenNo)
 {
-  unsigned int pos = 0;
-  unsigned int pos1 = 0;
+  int pos = 0;
+  int pos1 = 0;
   int tokencounter = 0;
 
   while (tokencounter < tokenNo)
@@ -118,7 +118,7 @@ string ParseFile :: getToken(string inputLine, int tokenNo)
 
 void ParseFile :: storeCommands(string inputLine)
 {
-  unsigned int pos;
+  int pos;
   int pos1;
   // int wordlength;
   string line;