Ticket #1958: UnitMotionTech.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -26 +26 @@
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpPathfinder.h"
 #include "simulation2/components/ICmpRangeManager.h"
+#include "simulation2/components/ICmpPlayerManager.h"
+#include "simulation2/components/ICmpTechnologyManager.h"
 #include "simulation2/helpers/Geometry.h"
 #include "simulation2/helpers/Render.h"
 #include "simulation2/MessageTypes.h"
@@ -109 +111 @@
         componentManager.SubscribeToMessageType(MT_Update_MotionUnit);
         componentManager.SubscribeToMessageType(MT_RenderSubmit); // for debug overlays
         componentManager.SubscribeToMessageType(MT_PathResult);
+        componentManager.SubscribeGloballyToMessageType(MT_TechnologyModification);
     }
 
     DEFAULT_COMPONENT_ALLOCATOR(UnitMotion)
@@ -395 +398 @@
             PathResult(msgData.ticket, msgData.path);
             break;
         }
+        case MT_TechnologyModification:
+        {
+            const CMessageTechnologyModification& msgData = static_cast<const CMessageTechnologyModification&> (msg);
+            if (msgData.component == L"UnitMotion")
+            {
+                CmpPtr<ICmpOwnership> cmpOwnership(GetSimContext(), GetEntityId());
+                if (cmpOwnership)
+                {
+                    player_id_t owner = cmpOwnership->GetOwner();
+                    if (owner != INVALID_PLAYER && owner == msgData.player)
+                    {
+                        CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSimContext(), SYSTEM_ENTITY);
+                        entity_id_t playerEnt = cmpPlayerManager->GetPlayerByID(owner);
+                        CmpPtr<ICmpTechnologyManager> cmpTechnologyManager(GetSimContext(), playerEnt);
+                        if (playerEnt != INVALID_ENTITY && cmpTechnologyManager)
+                        {
+                            m_WalkSpeed = cmpTechnologyManager->ApplyModifications(L"UnitMotion/Walk/Speed", m_WalkSpeed, GetEntityId());
+                            m_Speed = m_WalkSpeed;
+                            m_RunSpeed = cmpTechnologyManager->ApplyModifications(L"UnitMotion/Run/Speed", m_RunSpeed, GetEntityId());
+                        }
+                    }
+                }
+            }
+            break;
         }
+
+        }
     }
 
     virtual bool IsMoving()