From 5faec7c80dd2d22884a63cbbe556965949d2a9df Mon Sep 17 00:00:00 2001
From: SushiTee <weichel.sascha@gmail.com>
Date: Sun, 26 Sep 2010 14:53:20 +0200
Subject: changed pickup animation speed for demos according to demospeed
 (fixes issue 72)

---
 src/game/client/components/items.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/game/client/components/items.cpp')

diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp
index b29bee99..b4d696f7 100644
--- a/src/game/client/components/items.cpp
+++ b/src/game/client/components/items.cpp
@@ -1,4 +1,5 @@
 #include <engine/graphics.h>
+#include <engine/demo.h>
 #include <game/generated/protocol.h>
 #include <game/generated/client_data.h>
 
@@ -111,8 +112,21 @@ void CItems::RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCu
 	Graphics()->QuadsSetRotation(Angle);
 
 	float Offset = Pos.y/32.0f + Pos.x/32.0f;
-	Pos.x += cosf(Client()->LocalTime()*2.0f+Offset)*2.5f;
-	Pos.y += sinf(Client()->LocalTime()*2.0f+Offset)*2.5f;
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+	{
+		const IDemoPlayer::CInfo *pInfo = DemoPlayer()->BaseInfo();
+		
+		if(!pInfo->m_Paused)
+		{
+			Pos.x += cosf(Client()->LocalTime()*pInfo->m_Speed*2.0f+Offset)*2.5f;
+			Pos.y += sinf(Client()->LocalTime()*pInfo->m_Speed*2.0f+Offset)*2.5f;
+		}
+	}
+	else
+	{
+		Pos.x += cosf(Client()->LocalTime()*2.0f+Offset)*2.5f;
+		Pos.y += sinf(Client()->LocalTime()*2.0f+Offset)*2.5f;
+	}
 	RenderTools()->DrawSprite(Pos.x, Pos.y, Size);
 	Graphics()->QuadsEnd();
 }
-- 
cgit 1.4.1