[Orxonox-commit 5959] r10618 - in code/branches/presentationFS15merge/src: libraries/network modules/weapons/projectiles orxonox/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2015-10-04 14:23:33 +0200 (Sun, 04 Oct 2015)
New Revision: 10618

Modified:
   code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc
   code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
   code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua
Log:
tabs -> spaces

Modified: code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc
===================================================================
--- code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc	2015-10-04 12:18:02 UTC (rev 10617)
+++ code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc	2015-10-04 12:23:33 UTC (rev 10618)
@@ -163,7 +163,7 @@
   }
 
   std::string WANDiscovery::getServerListItemRTT(unsigned int index)
- 	{
+  {
     if( index >= this->servers_.size() )
       return BLANKSTRING;
     else{

Modified: code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc	2015-10-04 12:18:02 UTC (rev 10617)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc	2015-10-04 12:23:33 UTC (rev 10618)
@@ -85,9 +85,9 @@
             fire->setSource("Orxonox/rocketfire");
             
             // Add Particle Universe Effects
-    		//ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
-    		//ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
-    		//this->attachOgreObject(pSys1);
+            //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+            //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+            //this->attachOgreObject(pSys1);
 
             this->enableCollisionCallback();
             this->setCollisionResponse(false);

Modified: code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua
===================================================================
--- code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua	2015-10-04 12:18:02 UTC (rev 10617)
+++ code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua	2015-10-04 12:23:33 UTC (rev 10618)
@@ -1 +1 @@
-print	('1: Hello World')
+print ('1: Hello World')