diff options
author | Aki <please@ignore.pl> | 2022-04-06 22:09:14 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2022-04-06 22:40:14 +0200 |
commit | 8935efd2fe08c357bf0cbc0fea77bcf84d027eef (patch) | |
tree | 727d49e7a3b3c9547ef9bfb97f951a954fa39174 /StarsEx | |
parent | c4f0fad2b3f64f712efca130b45c07936f448352 (diff) | |
download | starshatter-8935efd2fe08c357bf0cbc0fea77bcf84d027eef.zip starshatter-8935efd2fe08c357bf0cbc0fea77bcf84d027eef.tar.gz starshatter-8935efd2fe08c357bf0cbc0fea77bcf84d027eef.tar.bz2 |
Removed direct reference to StarServer in MissionEvent
This also removes multiplayer mission chaining which was broken anyway.
Diffstat (limited to 'StarsEx')
-rw-r--r-- | StarsEx/MissionEvent.cpp | 14 | ||||
-rw-r--r-- | StarsEx/StarServer.cpp | 9 | ||||
-rw-r--r-- | StarsEx/StarServer.h | 1 |
3 files changed, 3 insertions, 21 deletions
diff --git a/StarsEx/MissionEvent.cpp b/StarsEx/MissionEvent.cpp index 575c855..af34bd7 100644 --- a/StarsEx/MissionEvent.cpp +++ b/StarsEx/MissionEvent.cpp @@ -16,7 +16,6 @@ #include "StarSystem.h" #include "Galaxy.h" #include "Starshatter.h" -#include "StarServer.h" #include "Ship.h" #include "ShipDesign.h" #include "Element.h" @@ -698,19 +697,12 @@ MissionEvent::Execute(bool silent) status = COMPLETE; if (end_mission) { - StarServer* server = StarServer::GetInstance(); - if (stars) { stars->EndMission(); } - - else if (server) { - // end mission event uses event_target member - // to forward server to next mission in the chain: - if (event_target.length()) - server->SetNextMission(event_target); - - server->SetGameMode(Game::MENU_MODE); + else { + if (auto game = Game::GetInstance()) + game->SetGameMode(Game::MENU_MODE); } } } diff --git a/StarsEx/StarServer.cpp b/StarsEx/StarServer.cpp index cb3ab21..e5462ae 100644 --- a/StarsEx/StarServer.cpp +++ b/StarsEx/StarServer.cpp @@ -243,15 +243,6 @@ StarServer::SetGameMode(int m) // +--------------------------------------------------------------------+ void -StarServer::SetNextMission(const char* script) -{ - if (lobby_server) - lobby_server->SetServerMission(script); -} - -// +--------------------------------------------------------------------+ - -void StarServer::CreateWorld() { RadioTraffic::Initialize(); diff --git a/StarsEx/StarServer.h b/StarsEx/StarServer.h index f988ba3..a13f278 100644 --- a/StarsEx/StarServer.h +++ b/StarsEx/StarServer.h @@ -44,7 +44,6 @@ public: bool Server() override { return true; } void SetGameMode(int mode) override; - void SetNextMission(const char* script); void CreateWorld(); void Shutdown(bool restart=false); |