j3d1/KlassischeKeplerKriege
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added player ship delete event and for missiles too.

Browse source
This commit is contained in:
Andreas Ortmann 2016-10-05 23:53:22 +02:00
parent 8ec3f47276
commit dc5cc89792
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
game/state/state.cpp
View file

@ -165,9 +165,16 @@ namespace game {
if (player != nullptr) {
for (Missile *missile : player->missiles) {
missile->player = nullptr;
m_nextEvents.push_back(new MissileEvent(LifeCycle::Destroy, missile));
}
if (player->ship != nullptr) {
ships.remove(player->ship);
m_nextEvents.push_back(new ShipEvent(LifeCycle::Destroy, player->ship));
}
players.remove(player);
delete(player);
}
}
@ -534,6 +541,16 @@ namespace game {
}
break;
case EventType::Ship:
{
auto *se = static_cast<ShipEvent*>(evt);
//std::cout<<"got missile delete event, finally deleting missile #"
// << me->object()->id << std::endl;
delete(se->object());
}
break;
case EventType::Missile:
{
auto *me = static_cast<MissileEvent*>(evt);