weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple minor fixes

Browse Source
This commit is contained in:
Pax1601
2023-03-14 22:25:00 +01:00
parent 16b5e89a3e
commit 9ed4189c28
20 changed files with 91 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/src/aircraft.cpp
View File

@@ -17,6 +17,8 @@ Aircraft::Aircraft(json::value json, int ID) : AirUnit(json, ID)
{
log("New Aircraft created with ID: " + to_string(ID));
addMeasure(L"category", json::value(getCategory()));
setTargetSpeed(targetSpeed);
setTargetAltitude(targetAltitude);
};
void Aircraft::changeSpeed(wstring change)

3
src/core/src/airunit.cpp
View File

@@ -15,7 +15,7 @@ extern UnitsManager* unitsManager;
/* Air unit */
AirUnit::AirUnit(json::value json, int ID) : Unit(json, ID)
{
};
void AirUnit::setState(int newState)
@@ -203,7 +203,6 @@ void AirUnit::taskWingmen()
void AirUnit::AIloop()
{
log(L"AILoop");
/* State machine */
switch (state) {
case State::IDLE: {

11
src/core/src/core.cpp
View File

@@ -11,8 +11,9 @@ auto before = std::chrono::system_clock::now();
UnitsManager* unitsManager = nullptr;
Server* server = nullptr;
Scheduler* scheduler = nullptr;
json::value airbasesData;
json::value bullseyesData;
json::value airbases;
json::value bullseyes;
json::value mission;
mutex mutexLock;
bool initialized = false;
string sessionHash;
@@ -93,9 +94,11 @@ extern "C" DllExport int coreMissionData(lua_State * L)
if (missionData.has_object_field(L"unitsData"))
unitsManager->updateMissionData(missionData[L"unitsData"]);
if (missionData.has_object_field(L"airbases"))
airbasesData = missionData[L"airbases"];
airbases = missionData[L"airbases"];
if (missionData.has_object_field(L"bullseyes"))
bullseyesData = missionData[L"bullseyes"];
bullseyes = missionData[L"bullseyes"];
if (missionData.has_object_field(L"mission"))
mission = missionData[L"mission"];
return(0);
}

2
src/core/src/groundunit.cpp
View File

@@ -17,6 +17,8 @@ GroundUnit::GroundUnit(json::value json, int ID) : Unit(json, ID)
{
log("New Ground Unit created with ID: " + to_string(ID));
addMeasure(L"category", json::value(getCategory()));
setTargetSpeed(targetSpeed);
setTargetAltitude(targetAltitude);
};
void GroundUnit::AIloop()

2
src/core/src/helicopter.cpp
View File

@@ -17,6 +17,8 @@ Helicopter::Helicopter(json::value json, int ID) : AirUnit(json, ID)
{
log("New Helicopter created with ID: " + to_string(ID));
addMeasure(L"category", json::value(getCategory()));
setTargetSpeed(targetSpeed);
setTargetAltitude(targetAltitude);
};
void Helicopter::changeSpeed(wstring change)

2
src/core/src/navyunit.cpp
View File

@@ -17,6 +17,8 @@ NavyUnit::NavyUnit(json::value json, int ID) : Unit(json, ID)
{
log("New Navy Unit created with ID: " + to_string(ID));
addMeasure(L"category", json::value(getCategory()));
setTargetSpeed(targetSpeed);
setTargetAltitude(targetAltitude);
};
void NavyUnit::AIloop()

11
src/core/src/server.cpp
View File

@@ -12,8 +12,9 @@ using namespace std::chrono;
extern UnitsManager* unitsManager;
extern Scheduler* scheduler;
extern json::value airbasesData;
extern json::value bullseyesData;
extern json::value airbases;
extern json::value bullseyes;
extern json::value mission;
extern mutex mutexLock;
extern string sessionHash;
@@ -101,9 +102,11 @@ void Server::handle_get(http_request request)
answer[L"logs"] = logs;
}
else if (path[0] == AIRBASES_URI)
answer[L"airbases"] = airbasesData;
answer[L"airbases"] = airbases;
else if (path[0] == BULLSEYE_URI)
answer[L"bullseyes"] = bullseyesData;
answer[L"bullseyes"] = bullseyes;
else if (path[0] == MISSION_URI)
answer[L"mission"] = mission;
milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
answer[L"time"] = json::value::string(to_wstring(ms.count()));