[Orxonox-commit 3943] r8617 - in code/branches/spacerace: data/levels src/modules/gametypes

[msalomon at orxonox.net]

Author: msalomon
Date: 2011-05-26 22:27:55 +0200 (Thu, 26 May 2011)
New Revision: 8617

Modified:
   code/branches/spacerace/data/levels/spaceRace.oxw
   code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc
Log:
Changed the model of the check point.


Modified: code/branches/spacerace/data/levels/spaceRace.oxw
===================================================================
--- code/branches/spacerace/data/levels/spaceRace.oxw	2011-05-26 20:03:32 UTC (rev 8616)
+++ code/branches/spacerace/data/levels/spaceRace.oxw	2011-05-26 20:27:55 UTC (rev 8617)
@@ -60,7 +60,7 @@
     <!-- ------------------CheckPoints----------------- -->
     <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
         <attached>
-        <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
         </attached>
         <collisionShapes>
         <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
@@ -72,7 +72,7 @@
 
     <RaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
           <activity>
@@ -106,7 +106,7 @@
 
     <RaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
           <activity>
@@ -140,7 +140,7 @@
 
     <RaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
    <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger3" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
@@ -175,7 +175,7 @@
 
     <RaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger4" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
          <events>
@@ -210,7 +210,7 @@
 
     <RaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger5" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
@@ -245,7 +245,7 @@
 
     <RaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger6" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
@@ -280,7 +280,7 @@
 
     <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger7" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
@@ -315,7 +315,7 @@
 
     <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
       <DistanceTrigger name="trigger8" position="0,0,0" distance=40 stayActive="true" />
       <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
         <events>
@@ -341,7 +341,7 @@
 
     <RaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
     <attached>
-      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
+      <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
     </attached>
      <collisionShapes>
       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />

Modified: code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc	2011-05-26 20:03:32 UTC (rev 8616)
+++ code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc	2011-05-26 20:27:55 UTC (rev 8617)
@@ -111,8 +111,8 @@
 		  SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
 		  if (gametype)
 		  {
-		     const std::string& message =  "You have " + multi_cast<std::string>(this->bTimeLimit_)
-						   + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1) + "\n";
+		     const std::string& message =  "\nYou have " + multi_cast<std::string>(this->bTimeLimit_)
+						   + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1) + "\n\n";
 		     COUT(0) << message;
 		     const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
 		  }