Merge remote-tracking branch 'origin/Weapons' into Movement

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Entities/PlayerAssaultBlue.xml # resources/Schema/Entities/PlayerAssaultFallbackBlue.xml # resources/Schema/Entities/PlayerAssaultFallbackRed.xml # resources/Schema/Entities/PlayerAssaultRed.xml # resources/Schema/Entities/aaaatestremoveme.xml # resources/Schema/Entities/aim_rays.xml
2016-03-09 15:59:36 +01:00
parent de125663fd 34e551663f
commit 7141756992
13 changed files with 372 additions and 10439 deletions
@@ -60,7 +60,9 @@ protected:
        EntityWrapper Player;
        EntityWrapper WeaponEntity;
        EntityWrapper FirstPersonEntity;
+        EntityWrapper FirstPersonPlayerModel;
        EntityWrapper ThirdPersonEntity;
+        EntityWrapper ThirdPersonPlayerModel;
    };

    IRenderer* m_Renderer;
@@ -301,7 +303,9 @@ private:
        wi.Player = player;
        wi.WeaponEntity = player;
        wi.FirstPersonEntity = firstPersonWeapon;
+        wi.FirstPersonPlayerModel = firstPersonWeapon;
        wi.ThirdPersonEntity = thirdPersonWeapon;
+        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
        
        OnEquip(cWeapon, wi);
    }