Fixed OBJ8 command error handling, turned too many args to INFO, Twin…

…Fan/LiveTraffic#41
TwinFan · Dec 13, 2018 · 944af20 · 944af20
1 parent 943817b
commit 944af20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/XPMPMultiplayerCSL.cpp b/src/XPMPMultiplayerCSL.cpp
@@ -499,10 +499,13 @@ bool ParseObj8AircraftCommand(const std::vector<std::string> &tokens, CSLPackage
 bool ParseObj8Command(const std::vector<std::string> &tokens, CSLPackage_t &package, const string& path, int lineNum, const string& line)
 {
 	// OBJ8 <group> <animate YES|NO> <filename>
-	if (tokens.size() != 4)
+	if (tokens.size() < 4)
 	{
-		XPLMDump(path, lineNum, line) << XPMP_CLIENT_NAME " WARNING: OBJ8_AIRCARFT command takes 1 argument.\n";
+		XPLMDump(path, lineNum, line) << XPMP_CLIENT_NAME " WARNING: OBJ8 command takes 3 arguments.\n";
+        return false;
 	}
+    if (tokens.size() > 4)
+        XPLMDump(path, lineNum, line) << XPMP_CLIENT_NAME " INFO: OBJ8 command takes only 3 arguments, rest ignored.\n";
 
 	// err - obj8 record at stupid place in file
 	if(package.planes.empty() || package.planes.back().plane_type != plane_Obj8) return false;

diff --git a/xplanemp.xcodeproj/project.pbxproj b/xplanemp.xcodeproj/project.pbxproj
@@ -434,6 +434,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)";
 				FRAMEWORK_VERSION = A;
+				HEADER_SEARCH_PATHS = include;
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				INSTALL_PATH = "@loader_path";
 				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(PRODUCT_MODULE_NAME)";
@@ -461,6 +462,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)";
 				FRAMEWORK_VERSION = A;
+				HEADER_SEARCH_PATHS = include;
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				INSTALL_PATH = "@loader_path";
 				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(PRODUCT_MODULE_NAME)";