X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FUIUCModel%2Fuiuc_warnings_errors.cpp;h=b8213363e974a79bb85466df777580dd067e84b4;hb=c62b0044380eb0387c447cc33660f74b02cbbce4;hp=f179745599deedb1d7273d28d54f29c206e76306;hpb=dc7b762a126d00ba967b09e81750b47ac3cd7f1a;p=flightgear.git

diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
index f17974559..b8213363e 100644
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -11,9 +11,9 @@ Prints to screen the follow:
 - Error Code (errorCode)
 
 - Message indicating the problem. This message should be preceded by
-"Warning", "Error" or "Note".  Warnings are non-fatal and the code
-will pause.  Errors are fatal and will stop the code.  Notes are only
-for information.
+  "Warning", "Error" or "Note".  Warnings are non-fatal and the code
+  will pause.  Errors are fatal and will stop the code.  Notes are
+  only for information.
  
 
 ----------------------------------------------------------------------
@@ -70,34 +70,57 @@ for information.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **********************************************************************/
-#include <stdlib.h>
+
+#include <iostream>
 
 #include "uiuc_warnings_errors.h"
 
-FG_USING_STD (cerr);
-FG_USING_STD (endl);
+using std::cerr;
+using std::endl;
 
 #ifndef _MSC_VER
-FG_USING_STD (exit);
+using std::exit;
 #endif
 
-void uiuc_warnings_errors(int errorCode, string line)
+void uiuc_warnings_errors(int errorCode, std::string line)
 {
   switch (errorCode)
     {
     case 1:
-	cerr << "UIUC ERROR: The value of the coefficient in \"" << line << "\" should be of type float" << endl;
-	exit(-1);
-        break;
+      cerr << "UIUC ERROR 1: The value of the coefficient in \"" << line << "\" should be of type float" << endl;
+      exit(-1);
+      break;
     case 2:
-	cerr << "UIUC ERROR: Unknown identifier in \"" << line << "\"" << endl;
-	exit(-1);
-        break;
+      cerr << "UIUC ERROR 2: Unknown identifier in \"" << line << "\" (check uiuc_map_*.cpp)" << endl;
+      exit(-1);
+      break;
+    case 3:
+      cerr << "UIUC ERROR 3: Slipstream effects only work w/ the engine simpleSingleModel line: \"" << line  << endl;
+      exit(-1);
+      break;
+    case 4:
+      cerr << "UIUC ERROR 4: Downwash mode does not exist: \"" << line  << endl;
+      exit(-1);
+      break;
+    case 5:
+      cerr << "UIUC ERROR 5: Must use dyn_on_speed not equal to zero: \"" << line << endl;
+      exit(-1);
+      break;
+    case 6:
+      cerr << "UIUC ERROR 6: Table lookup data exceeds 99 point limit: \"" << endl;
+      exit(-1);
+      break;
+    case 7:
+      cerr << "UIUC ERROR 7: Need to download data file for the ornithopter.  Go to http://www.aae.uiuc.edu/m-selig/apasim/Aircraft-uiuc.html " << endl;
+      exit(-1);
+      break;
     }
+
+    cerr << "UIUC UNKNOWN ERROR" << endl;
+    exit(-1);
 }
 
 // end uiuc_warnings_errors.cpp