Changeset 9945 for code/trunk/src/orxonox

Timestamp:

Jan 3, 2014, 1:50:22 PM (11 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code

Location:

code/trunk/src/orxonox

Files:

• gametypes/Dynamicmatch.cc (modified) (3 diffs)
• infos/PlayerInfo.cc (modified) (1 diff)
• sound/WorldAmbientSound.cc (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/trunk/src/orxonox/gametypes/Dynamicmatch.cc

@@ -276 +276 @@
             else if (friendlyfire && (source == target))
             {
-                    this->playerScored(originator->getPlayer(), -1);
+                this->playerScored(originator->getPlayer(), -1);
             }
         }
@@ -292 +292 @@
             if (playerParty_[originator->getPlayer()] == killer) //reward the killer
             {
-                    this->playerScored(originator->getPlayer(), 25);
+                this->playerScored(originator->getPlayer(), 25);
             }
             return true;
@@ -412 +412 @@
             if (it->second==piggy)//Spieler mit der Pig-party frags++
             {
-                 this->playerScored(it->first);
+                 this->playerScored(it->first);
             }
         }

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -232 +232 @@
         if (tmp == NULL)
         {
-                orxout(verbose) <<  "PlayerInfo: pauseControl, Controller is NULL " << endl;
-                return;
+            orxout(verbose) <<  "PlayerInfo: pauseControl, Controller is NULL " << endl;
+            return;
         }
         tmp->setActive(false);

code/trunk/src/orxonox/sound/WorldAmbientSound.cc

@@ -39 +39 @@
 namespace orxonox
 {
-        SetConsoleCommand("WorldAmbientSound", "nextsong",      &WorldAmbientSound::nextSong);
+    SetConsoleCommand("WorldAmbientSound", "nextsong",      &WorldAmbientSound::nextSong);
 
     RegisterClass(WorldAmbientSound);
@@ -113 +113 @@
     {
 
-        //HACK: Assuption - there is only one WorldAmbientSound in a level and only one level is used.
-        for (ObjectList<WorldAmbientSound>::iterator it = ObjectList<WorldAmbientSound>::begin();
-             it != ObjectList<WorldAmbientSound>::end(); ++it)
-        {
-                while(it->ambientSound_->setAmbientSource(WorldAmbientSound::soundList_[WorldAmbientSound::soundNumber_]) == false){
-                        WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
-                }
-                WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
-        }
+        //HACK: Assuption - there is only one WorldAmbientSound in a level and only one level is used.
+        for (ObjectList<WorldAmbientSound>::iterator it = ObjectList<WorldAmbientSound>::begin();
+             it != ObjectList<WorldAmbientSound>::end(); ++it)
+        {
+            while(it->ambientSound_->setAmbientSource(WorldAmbientSound::soundList_[WorldAmbientSound::soundNumber_]) == false){
+                WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
+            }
+            WorldAmbientSound::soundNumber_ = (WorldAmbientSound::soundNumber_ + 1) % WorldAmbientSound::soundList_.size();
+        }
     }
 }

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -305 +305 @@
     void Pawn::kill()
     {
-        this->damage(this->health_);
+        this->damage(this->health_);
         this->death();
     }
@@ -330 +330 @@
         {
             explosionSound_->play();
-                // Set bAlive_ to false and wait for PawnManager to do the destruction
+            // Set bAlive_ to false and wait for PawnManager to do the destruction
             this->bAlive_ = false;