[Orxonox-commit 7155] r11772 - in code/branches/Presentation_HS17_merge: data/levels src/modules/superorxobros

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-18 17:49:32 +0100 (Sun, 18 Feb 2018)
New Revision: 11772

Modified:
   code/branches/Presentation_HS17_merge/data/levels/SOB.oxw
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
Log:
[SOBv2_HS17] fixed a bunch of runtime warnings

Modified: code/branches/Presentation_HS17_merge/data/levels/SOB.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/SOB.oxw	2018-02-18 16:38:51 UTC (rev 11771)
+++ code/branches/Presentation_HS17_merge/data/levels/SOB.oxw	2018-02-18 16:49:32 UTC (rev 11772)
@@ -6,8 +6,6 @@
 	/>
 
 	<?lua
-	include("HUDTemplates3.oxo")  
-	include("jumpHUD.oxo")
 	include("stats.oxo")
 	include("templates/lodInformation.oxt")
 	include("overlays/SOBHUD.oxo")
@@ -79,7 +77,7 @@
 	</Template>
 
 	<Template name=gumbaShootable>
-		<SOBGumbaBoss collisionType="dynamic" speed=60>
+		<SOBGumba collisionType="dynamic" speed=60>
 			<attached>
 				<Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/> 				
 			</attached>
@@ -86,7 +84,7 @@
 			<collisionShapes>
 				<BoxCollisionShape position="0,0,0" halfExtents="5,5,3" /> 			
 			</collisionShapes>
-		</SOBGumbaBoss>
+		</SOBGumba>
 	</Template>
 
 

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-18 16:38:51 UTC (rev 11771)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-18 16:49:32 UTC (rev 11772)
@@ -90,7 +90,6 @@
                 figure_->addTemplate(center_->getFigureTemplate());
             }
 
-            center_->attach(figure_);
             figure_->setPosition(0, 0, 0);
         }
         else // If no centerpoint was specified, an error is thrown and the level is exited.

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-18 16:38:51 UTC (rev 11771)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-18 16:49:32 UTC (rev 11772)
@@ -182,7 +182,7 @@
             if(hitCounter_ >= 3) velocity.y = 0.1*speed_;
             setVelocity(velocity);
 
-            if(abs(this->getPosition().z) > 1000) delete this;
+            if(abs(this->getPosition().z) > 1000) this->destroyLater();
         
     }
     

Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc	2018-02-18 16:38:51 UTC (rev 11771)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc	2018-02-18 16:49:32 UTC (rev 11772)
@@ -139,7 +139,7 @@
             }
         }
 
-        if(abs(this->getPosition().z) > 1000) delete this;
+        if(abs(this->getPosition().z) > 1000) this->destroyLater();
 
     }
 }