[Orxonox-commit 6981] r11602 - in code/branches/SOBv2_HS17: data/levels src/modules/superorxobros

[varxth at orxonox.net]

Author: varxth
Date: 2017-11-27 15:55:34 +0100 (Mon, 27 Nov 2017)
New Revision: 11602

Modified:
   code/branches/SOBv2_HS17/data/levels/SOB.oxw
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc
Log:
! angeschrieben

Modified: code/branches/SOBv2_HS17/data/levels/SOB.oxw
===================================================================
--- code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-27 14:32:34 UTC (rev 11601)
+++ code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-27 14:55:34 UTC (rev 11602)
@@ -68,7 +68,7 @@
 		<SOBFireball collisionType="dynamic" speed=90>
 			<attached>
 				<Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
-				
+
 				<ParticleSpawner source="Orxonox/fire4" startdelay=0  position="-4,0,0" visible="false"/>
 				
 			</attached>
@@ -114,8 +114,8 @@
 
 
 
-					<!--Gumba
 
+
 					<SOBGumba collisionType="dynamic" speed=40 position = "240,0,0">
 						<attached>
 							<Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/> 
@@ -125,7 +125,7 @@
 							<BoxCollisionShape position="0,0,0" halfExtents="5,5,3" /> 			
 						</collisionShapes>
 					</SOBGumba>
-				Gumba-->
+
 					<SOBGumba collisionType="dynamic" speed=30 position = "420,0,0">
 						<attached>
 							<Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/> 

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc	2017-11-27 14:32:34 UTC (rev 11601)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc	2017-11-27 14:55:34 UTC (rev 11602)
@@ -167,7 +167,7 @@
         //If player has reached end of level
         if (this->figure_ != nullptr && figure_->lvlEnded_) {
             std::stringstream a;
-            if(newHighscore){
+            if(!newHighscore){
                 a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
             }
             else{