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

added switch for developer mode and fixed crash with removing missiles

Browse source
This commit is contained in:
Andreas Ortmann 2016-09-30 19:03:22 +02:00
parent b5efac002e
commit 5a4e6aaaed
6 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
game/state/player.hpp
View file

@ -23,7 +23,7 @@ namespace game {
std::string name;
std::list<Missile*> missiles;
Player(int id) : id(id), alive(true), speed(0.01), energy(0.0), ship(nullptr), name("<unnamed>")
Player(int id) : id(id), alive(true), speed(1.0), energy(0.0), ship(nullptr), name("<unnamed>")
{
}

8
game/state/state.cpp
View file

@ -184,10 +184,10 @@ namespace game {
void State::advancePlayerMissiles(float dt)
{
std::vector<Missile*> rm;
// advance missiles
for (Player *player : players) {
std::vector<Missile*> rm;
for (Missile *missile : player->missiles) {
//std::cout<<"missile: " << (long unsigned int) missile << std::endl;
@ -339,8 +339,6 @@ namespace game {
void State::deleteTrace(Trace *trace)
{
traces.remove(trace);
if (trace->missile != nullptr) {
// delete backlink.
// XXX: there's a missile without a trace now.
@ -373,7 +371,7 @@ namespace game {
for (Trace *trace : rm) {
traces.remove(trace);
delete(trace);
deleteTrace(trace);
}
}
}