Changeset 10916 for code/branches/cpp11_v2/src/modules/docking

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

Location:

code/branches/cpp11_v2/src/modules/docking

Files:

• Dock.cc (modified) (2 diffs)
• DockingAnimation.cc (modified) (1 diff)
• DockingEffect.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/docking/Dock.cc

@@ -327 +327 @@
     const DockingEffect* Dock::getEffect(unsigned int i) const
     {
-        for (const auto & elem : this->effects_)
+        for (DockingEffect* effect : this->effects_)
         {
             if(i == 0)
-               return elem;
+               return effect;
             i--;
         }
@@ -346 +346 @@
     const DockingAnimation* Dock::getAnimation(unsigned int i) const
     {
-        for (const auto & elem : this->animations_)
+        for (DockingAnimation* animation : this->animations_)
         {
             if(i == 0)
-               return elem;
+               return animation;
             i--;
         }

code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc

@@ -57 +57 @@
         bool check = true;
 
-        for (auto & animations_animation : animations)
+        for (DockingAnimation* animation : animations)
         {
             if(dock)
-                check &= (animations_animation)->docking(player);
+                check &= animation->docking(player);
             else
-                check &= (animations_animation)->release(player);
+                check &= animation->release(player);
         }
 

code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc

@@ -53 +53 @@
         bool check = true;
 
-        for (auto & effects_effect : effects)
+        for (DockingEffect* effect : effects)
         {
             if (dock)
-                check &= (effects_effect)->docking(player);
+                check &= effect->docking(player);
             else
-                check &= (effects_effect)->release(player);
+                check &= effect->release(player);
         }