Changeset 10299 for code/trunk/src

Timestamp:

Mar 2, 2015, 11:19:32 PM (9 years ago)

Author:

landauf

Message:

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

Location:

code/trunk/src

Files:

• modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -154 +154 @@
             if( GameMode::isMaster() )
             {
-                this->getController()->destroy();
+                if (this->getController())
+                    this->getController()->destroy();
             }
         }

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -190 +190 @@
             }
         }
-        orxout(internal_info) << i << " objects remaining.";
         if (i == 0)
-            orxout(internal_info) << " Well done!" << endl;
+            orxout(internal_info) << i << " objects remaining. Well done!" << endl;
         else
-            orxout(internal_info) << " Try harder!" << endl;
+            orxout(internal_warning) << i << " objects remaining. Try harder!" << endl;
     }