Fixed elevation calculations

src/core/include/unitsmanager.h

@@ -22,6 +22,7 @@ public:
 	void getUnitData(stringstream &ss, unsigned long long time);
 	void deleteUnit(unsigned int ID, bool explosion, bool immediate);
 	void acquireControl(unsigned int ID);
+	void loadDatabases();
 	
 private:
 	map<unsigned int, Unit*> units;

src/core/src/core.cpp

@@ -7,10 +7,6 @@
 #include "scheduler.h"
 #include "scriptLoader.h"
 #include "luatools.h"
-#include "aircraft.h"
-#include "helicopter.h"
-#include "groundunit.h"
-#include "navyunit.h"
 #include <chrono>
 using namespace std::chrono;
 
@@ -63,15 +59,12 @@ extern "C" DllExport int coreInit(lua_State* L)
     server = new Server(L);
     scheduler = new Scheduler(L);
 
-    Aircraft::loadDatabase(AIRCRAFT_DATABASE_PATH);
-    Helicopter::loadDatabase(HELICOPTER_DATABASE_PATH);
-    GroundUnit::loadDatabase(GROUNDUNIT_DATABASE_PATH);
-    NavyUnit::loadDatabase(NAVYUNIT_DATABASE_PATH);
-
     registerLuaFunctions(L);
 
     server->start(L);
 
+    unitsManager->loadDatabases();
+
     initialized = true;
     return(0);
 }

src/core/src/groundunit.cpp

@@ -160,13 +160,13 @@ void GroundUnit::AIloop()
 	case State::SIMULATE_FIRE_FIGHT: {
 		setTask("Simulating fire fight");
 
-		if (!getHasTask() || ((double)(rand()) / (double)(RAND_MAX)) < 0.01) {
+		if (!getHasTask() || 0 * (((double)(rand()) / (double)(RAND_MAX)) < 0.01)) {
 			double dist;
 			double bearing1;
 			double bearing2;
 			Geodesic::WGS84().Inverse(position.lat, position.lng, targetPosition.lat, targetPosition.lng, dist, bearing1, bearing2);
 
-			double r = 5; /* m */
+			double r = 15; /* m */
 			/* Default gun values */
 			double barrelHeight = 1.0; /* m */
 			double muzzleVelocity = 860; /* m/s */
@@ -183,12 +183,12 @@ void GroundUnit::AIloop()
 			
 			double lat = 0;
 			double lng = 0;
-			double randomBearing = bearing1 + (((double)(rand()) / (double)(RAND_MAX) - 0.5) * 2) * 15;
+			double randomBearing = bearing1 + 0 * (((double)(rand()) / (double)(RAND_MAX) - 0.5) * 2) * 15;
 			Geodesic::WGS84().Direct(position.lat, position.lng, randomBearing, r, lat, lng);
 
 			std::ostringstream taskSS;
 			taskSS.precision(10);
-			taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << barrelElevation + barrelHeight << ", radius = 0.001}";
+			taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << position.alt + barrelElevation + barrelHeight << ", radius = 0.001}";
 			Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
 			scheduler->appendCommand(command);
 			setHasTask(true);

src/core/src/scheduler.cpp

@@ -579,6 +579,9 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		setCommandModeOptions(value);
 		log(username + " updated the Command Mode Options", true);
 	}
+	else if (key.compare("reloadDatabases") == 0) {
+		unitsManager->loadDatabases();
+	}
 	else
 	{
 		log("Unknown command: " + key);

src/core/src/unitsmanager.cpp

@@ -9,6 +9,7 @@
 #include "weapon.h"
 #include "commands.h"
 #include "scheduler.h"
+#include "defines.h"
 
 #include "base64.hpp"
 using namespace base64;
@@ -157,3 +158,9 @@ void UnitsManager::acquireControl(unsigned int ID) {
 	}	
 }
 
+void UnitsManager::loadDatabases() {
+	Aircraft::loadDatabase(AIRCRAFT_DATABASE_PATH);
+	Helicopter::loadDatabase(HELICOPTER_DATABASE_PATH);
+	GroundUnit::loadDatabase(GROUNDUNIT_DATABASE_PATH);
+	NavyUnit::loadDatabase(NAVYUNIT_DATABASE_PATH);
+}