Index: code/trunk/src/orxonox/tools/ParticleInterface.cc
===================================================================
--- code/trunk/src/orxonox/tools/ParticleInterface.cc	(revision 3300)
+++ code/trunk/src/orxonox/tools/ParticleInterface.cc	(revision 3301)
@@ -79,5 +79,5 @@
         }
 
-        this->setDetailLevel((unsigned int)detaillevel);
+        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
     }
 
@@ -185,5 +185,5 @@
     void ParticleInterface::detailLevelChanged(unsigned int newlevel)
     {
-        if (newlevel >= (unsigned int)this->detaillevel_)
+        if (newlevel >= static_cast<unsigned int>(this->detaillevel_))
             this->bAllowedByLOD_ = true;
         else
Index: code/trunk/src/orxonox/tools/Shader.cc
===================================================================
--- code/trunk/src/orxonox/tools/Shader.cc	(revision 3300)
+++ code/trunk/src/orxonox/tools/Shader.cc	(revision 3301)
@@ -165,7 +165,7 @@
             if (pointer->first)
             {
-                if ((*((float*)pointer->second)) != value)
-                {
-                    (*((float*)pointer->second)) = value;
+                if ((*static_cast<float*>(pointer->second)) != value)
+                {
+                    (*static_cast<float*>(pointer->second)) = value;
                     return true;
                 }
@@ -173,7 +173,7 @@
             else
             {
-                if ((*((int*)pointer->second)) != (int)value)
-                {
-                    (*((int*)pointer->second)) = (int)value;
+                if ((*static_cast<int*>(pointer->second)) != static_cast<int>(value))
+                {
+                    (*static_cast<int*>(pointer->second)) = static_cast<int>(value);
                     return true;
                 }
@@ -190,7 +190,7 @@
             if (pointer->first)
             {
-                if ((*((float*)pointer->second)) != (float)value)
-                {
-                    (*((float*)pointer->second)) = (float)value;
+                if ((*static_cast<float*>(pointer->second)) != static_cast<float>(value))
+                {
+                    (*static_cast<float*>(pointer->second)) = static_cast<float>(value);
                     return true;
                 }
@@ -198,7 +198,7 @@
             else
             {
-                if ((*((int*)pointer->second)) != value)
-                {
-                    (*((int*)pointer->second)) = value;
+                if ((*static_cast<int*>(pointer->second)) != value)
+                {
+                    (*static_cast<int*>(pointer->second)) = value;
                     return true;
                 }
@@ -214,7 +214,7 @@
         {
             if (pointer->first)
-                return (*((float*)pointer->second));
+                return (*static_cast<float*>(pointer->second));
             else
-                return static_cast<float>(*((int*)pointer->second));
+                return static_cast<float>(*static_cast<int*>(pointer->second));
         }
         else
@@ -309,6 +309,6 @@
                         {
                             void* temp = (definition_iterator->second.isFloat())
-                                            ? (void*)parameter_pointer->getFloatPointer(definition_iterator->second.physicalIndex)
-                                            : (void*)parameter_pointer->getIntPointer(definition_iterator->second.physicalIndex);
+                                            ? static_cast<void*>(parameter_pointer->getFloatPointer(definition_iterator->second.physicalIndex))
+                                            : static_cast<void*>(parameter_pointer->getIntPointer(definition_iterator->second.physicalIndex));
                             ParameterPointer parameter_pointer = ParameterPointer(definition_iterator->second.isFloat(), temp);
 
Index: code/trunk/src/orxonox/tools/Timer.cc
===================================================================
--- code/trunk/src/orxonox/tools/Timer.cc	(revision 3300)
+++ code/trunk/src/orxonox/tools/Timer.cc	(revision 3301)
@@ -136,5 +136,5 @@
         {
             // If active: Decrease the timer by the duration of the last frame
-            this->time_ -= (long long)(time.getDeltaTimeMicroseconds() * this->getTimeFactor());
+            this->time_ -= static_cast<long long>(time.getDeltaTimeMicroseconds() * this->getTimeFactor());
 
             if (this->time_ <= 0)
Index: code/trunk/src/orxonox/tools/Timer.h
===================================================================
--- code/trunk/src/orxonox/tools/Timer.h	(revision 3300)
+++ code/trunk/src/orxonox/tools/Timer.h	(revision 3301)
@@ -103,11 +103,11 @@
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)
-                { if (time > 0.0f) this->time_ += (long long)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ += static_cast<long long>(time * 1000000.0f); }
             /** @brief Decreases the remaining time of the Timer. @param time The amount of time to remove */
             inline void removeTime(float time)
-                { if (time > 0.0f) this->time_ -= (long long)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ -= static_cast<long long>(time * 1000000.0f); }
             /** @brief Sets the interval of the Timer. @param interval The interval */
             inline void setInterval(float interval)
-                { this->interval_ = (long long)(interval * 1000000.0f); }
+                { this->interval_ = static_cast<long long>(interval * 1000000.0f); }
             /** @brief Sets bLoop to a given value. @param bLoop True = loop */
             inline void setLoop(bool bLoop)
