[Orxonox-commit 1402] r6120 - in code/branches/presentation2: cmake data/overlays src/modules/weapons/projectiles src/orxonox/controllers

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Nov 22 16:25:02 CET 2009


Author: rgrieder
Date: 2009-11-22 16:25:02 +0100 (Sun, 22 Nov 2009)
New Revision: 6120

Modified:
   code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake
   code/branches/presentation2/cmake/SourceFileUtilities.cmake
   code/branches/presentation2/data/overlays/stats.oxo
   code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
   code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
Log:
Found some tabs

Modified: code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake
===================================================================
--- code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake	2009-11-22 15:10:06 UTC (rev 6119)
+++ code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake	2009-11-22 15:25:02 UTC (rev 6120)
@@ -93,7 +93,7 @@
         IF(NOT _old_flags)
           SET(_old_flags "")
         ENDIF()
-	SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES COMPILE_FLAGS "${_old_flags} /FI\"${_pch_header_file}\" /Yu\"${_pch_header_file}\" /Fp\"${_pch_file}\"")
+        SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES COMPILE_FLAGS "${_old_flags} /FI\"${_pch_header_file}\" /Yu\"${_pch_header_file}\" /Fp\"${_pch_file}\"")
       ENDIF(NOT _is_header)
     ENDFOREACH(_file)
 
@@ -151,7 +151,7 @@
         OUTPUT ${_pch_file}
         COMMAND ${CMAKE_CXX_COMPILER}
         ARGS ${pchsupport_compiler_cxx_arg1} ${_pch_gcc_flags} -c -x c++-header -o ${_pch_file} ${_pch_header_file}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS ${_pch_dep_helper_file}
         IMPLICIT_DEPENDS CXX ${_pch_header_file}
         VERBATIM

Modified: code/branches/presentation2/cmake/SourceFileUtilities.cmake
===================================================================
--- code/branches/presentation2/cmake/SourceFileUtilities.cmake	2009-11-22 15:10:06 UTC (rev 6119)
+++ code/branches/presentation2/cmake/SourceFileUtilities.cmake	2009-11-22 15:25:02 UTC (rev 6120)
@@ -74,7 +74,7 @@
       LIST(APPEND _fullpath_sources ${_filepath})
       IF(_compile AND NOT DISABLE_COMPILATIONS)
         LIST(APPEND _compilation ${_filepath})
-	LIST(APPEND _fullpath_sources "H")
+        LIST(APPEND _fullpath_sources "H")
       ENDIF()
     ENDIF()
   ENDFOREACH(_file)

Modified: code/branches/presentation2/data/overlays/stats.oxo
===================================================================
--- code/branches/presentation2/data/overlays/stats.oxo	2009-11-22 15:10:06 UTC (rev 6119)
+++ code/branches/presentation2/data/overlays/stats.oxo	2009-11-22 15:25:02 UTC (rev 6120)
@@ -5,7 +5,7 @@
       <!--OverlayText
        name      = "Title"
        position  = "0.79, 0.19"
-       pickpoint = "1, 1"	
+       pickpoint = "1, 1"
        font      = "Monofur"
        caption   = "Scoreboard"
        colour    = "0, 0.75, 0.2, 1"
@@ -24,7 +24,7 @@
       <OverlayText
        name      = "descr2"
        position  = "0.6, 0.20"
-       pickpoint = "0, 1"	
+       pickpoint = "0, 1"
        font      = "Monofur"
        caption   = "score"
        colour    = "0, 0.75, 0.2, 1"
@@ -33,7 +33,7 @@
       <OverlayText
        name      = "descr3"
        position  = "0.8, 0.20"
-       pickpoint = "0, 1"	
+       pickpoint = "0, 1"
        font      = "Monofur"
        caption   = "deaths"
        colour    = "0, 0.75, 0.2, 1"

Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc	2009-11-22 15:10:06 UTC (rev 6119)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc	2009-11-22 15:25:02 UTC (rev 6120)
@@ -40,7 +40,7 @@
 
 namespace orxonox
 {
-	CreateFactory(Rocket);    
+    CreateFactory(Rocket);
     // create the factory for the Rocket
 
     /**
@@ -51,7 +51,7 @@
     {
         RegisterObject(Rocket);// - register the Rocket class to the core
 
-		this->localAngularVelocity_ = 0;
+        this->localAngularVelocity_ = 0;
         
         if (GameMode::isMaster())
         {

Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.h	2009-11-22 15:10:06 UTC (rev 6119)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.h	2009-11-22 15:25:02 UTC (rev 6120)
@@ -26,7 +26,7 @@
  *
  */
 
-#ifndef _NewNewHumanController_H__	
+#ifndef _NewNewHumanController_H__
 #define _NewNewHumanController_H__
 
 #include "OrxonoxPrereqs.h"




More information about the Orxonox-commit mailing list