Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10299


Ignore:
Timestamp:
Mar 2, 2015, 11:19:32 PM (10 years ago)
Author:
landauf
Message:

fixed crash in SimpleRocket (during level-unloading).
improved debug output in GSLevel

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

    r10216 r10299  
    154154            if( GameMode::isMaster() )
    155155            {
    156                 this->getController()->destroy();
     156                if (this->getController())
     157                    this->getController()->destroy();
    157158            }
    158159        }
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r10281 r10299  
    190190            }
    191191        }
    192         orxout(internal_info) << i << " objects remaining.";
    193192        if (i == 0)
    194             orxout(internal_info) << " Well done!" << endl;
     193            orxout(internal_info) << i << " objects remaining. Well done!" << endl;
    195194        else
    196             orxout(internal_info) << " Try harder!" << endl;
     195            orxout(internal_warning) << i << " objects remaining. Try harder!" << endl;
    197196    }
    198197
Note: See TracChangeset for help on using the changeset viewer.