summaryrefslogtreecommitdiffhomepage
path: root/StarsEx/MissionEvent.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-04-06 22:09:14 +0200
committerAki <please@ignore.pl>2022-04-06 22:40:14 +0200
commit8935efd2fe08c357bf0cbc0fea77bcf84d027eef (patch)
tree727d49e7a3b3c9547ef9bfb97f951a954fa39174 /StarsEx/MissionEvent.cpp
parentc4f0fad2b3f64f712efca130b45c07936f448352 (diff)
downloadstarshatter-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/MissionEvent.cpp')
-rw-r--r--StarsEx/MissionEvent.cpp14
1 files changed, 3 insertions, 11 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);
}
}
}