Changeset 11772 for code/branches/Presentation_HS17_merge

Timestamp:

Feb 18, 2018, 5:49:32 PM (7 years ago)

Author:

landauf

Message:

[SOBv2_HS17] fixed a bunch of runtime warnings

Location:

code/branches/Presentation_HS17_merge

Files:

• data/levels/SOB.oxw (modified) (3 diffs)
• src/modules/superorxobros/SOB.cc (modified) (1 diff)
• src/modules/superorxobros/SOBFireball.cc (modified) (1 diff)
• src/modules/superorxobros/SOBGumba.cc (modified) (1 diff)

code/branches/Presentation_HS17_merge/data/levels/SOB.oxw

@@ -7 +7 @@
 
         <?lua
-        include("HUDTemplates3.oxo")  
-        include("jumpHUD.oxo")
         include("stats.oxo")
         include("templates/lodInformation.oxt")
@@ -80 +78 @@
 
         <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/>                           
@@ -87 +85 @@
                                 <BoxCollisionShape position="0,0,0" halfExtents="5,5,3" />                      
                         </collisionShapes>
-                </SOBGumbaBoss>
+                </SOBGumba>
         </Template>
 

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc

@@ -91 +91 @@
             }
 
-            center_->attach(figure_);
             figure_->setPosition(0, 0, 0);
         }

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc

@@ -183 +183 @@
             setVelocity(velocity);
 
-            if(abs(this->getPosition().z) > 1000) delete this;
+            if(abs(this->getPosition().z) > 1000) this->destroyLater();
         
     }

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc

@@ -140 +140 @@
         }
 
-        if(abs(this->getPosition().z) > 1000) delete this;
+        if(abs(this->getPosition().z) > 1000) this->destroyLater();
 
     }