ADD: added missing cases in order switch and delte some comments
This commit is contained in:
@@ -138,21 +138,12 @@ namespace Entities
|
|||||||
|
|
||||||
void Entity::stop()
|
void Entity::stop()
|
||||||
{
|
{
|
||||||
try {
|
|
||||||
|
|
||||||
PodController_->stopAllPods();
|
PodController_->stopAllPods();
|
||||||
LOG_S(INFO)<<"Pods stoppt";
|
LOG_S(INFO)<<"Pods stoppt";
|
||||||
stopChild();
|
stopChild();
|
||||||
LOG_S(INFO)<<"childs stoppt";
|
LOG_S(INFO)<<"childs stoppt";
|
||||||
|
|
||||||
// MovemtServer_.reset();
|
|
||||||
LOG_S(INFO)<<"MovemtServer_ reseted";
|
|
||||||
|
|
||||||
stopMainLoop = true;
|
|
||||||
|
|
||||||
// BroadcastServer_.reset();
|
|
||||||
LOG_S(INFO)<<"BroadcastServer_ reseted";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (std::vector<std::thread>::iterator it = threads.begin(); it != threads.end();)
|
for (std::vector<std::thread>::iterator it = threads.begin(); it != threads.end();)
|
||||||
@@ -170,9 +161,7 @@ namespace Entities
|
|||||||
// std::this_thread::sleep_for(std::chrono::milliseconds(30000));
|
// std::this_thread::sleep_for(std::chrono::milliseconds(30000));
|
||||||
|
|
||||||
// exit(0);
|
// exit(0);
|
||||||
} catch (const std::exception e) {
|
|
||||||
LOG_S(ERROR)<< e.what();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Entity::startMovementWorker()
|
void Entity::startMovementWorker()
|
||||||
@@ -221,7 +210,6 @@ namespace Entities
|
|||||||
if (newTrack != nullptr)
|
if (newTrack != nullptr)
|
||||||
{
|
{
|
||||||
OwnShipTrack->setPosition(newTrack->getPosition());
|
OwnShipTrack->setPosition(newTrack->getPosition());
|
||||||
// LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -287,6 +275,17 @@ namespace Entities
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case Orders::SYSTEM_STATE_REQUEST:
|
||||||
|
{
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Orders::TRACKLIST_REQUEST:
|
||||||
|
{
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -317,7 +316,6 @@ namespace Entities
|
|||||||
{
|
{
|
||||||
nlohmann::json j;
|
nlohmann::json j;
|
||||||
this->TrackList_->getJsonTRackList(j);
|
this->TrackList_->getJsonTRackList(j);
|
||||||
// WHISPER::StringData(this->OwnShipTrack->getIdentifier(),)
|
|
||||||
this->CommandCommsServer_->sendMessage(j.dump());
|
this->CommandCommsServer_->sendMessage(j.dump());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -340,11 +338,6 @@ namespace Entities
|
|||||||
LOG_S(ERROR)<<e.what();
|
LOG_S(ERROR)<<e.what();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// LOG_S(INFO)<<"sending";
|
|
||||||
// CommandCommsServer_->sendMessage(this->OwnShipTrack->buildMessage().serialize());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user