Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10068


Ignore:
Timestamp:
May 22, 2014, 1:12:35 PM (11 years ago)
Author:
smerkli
Message:

Introduced a shippartmanager to hopefully fix the segfaults

Location:
code/branches/modularships/src/orxonox
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/modularships/src/orxonox/CMakeLists.txt

    r10019 r10068  
    3131  PawnManager.cc
    3232  PlayerManager.cc
     33  ShipPartManager.cc
    3334  Radar.cc
    3435#  Test.cc

  • code/branches/modularships/src/orxonox/items/ShipPart.cc

    r10067 r10068  
    8585    void ShipPart::death()
    8686    {
    87         if (!(this->isAlive()))
    88             return;
     87        //if (!(this->isAlive()))
     88            //return;
    8989
    9090        this->explode();
    … …  
    232232        }
    233233        if (this->health_ < 0)
    234             this->death();
     234            this->alive_ = false;
     235            //this->death();
    235236
    236237        // (Ugly) Chatoutput of health, until a GUI for modularspaceships-shipparts is implemented.
Note: See TracChangeset for help on using the changeset viewer.