From 46d1fa13e13f244358955a21dbb5163d5ddb3d4e Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Tue, 11 Feb 2014 14:14:06 +0100
Subject: [PATCH] premerge

---
 Code/Game/DanBiasGame/GameClientState/GameClientState.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Code/Game/DanBiasGame/GameClientState/GameClientState.h b/Code/Game/DanBiasGame/GameClientState/GameClientState.h
index 378eeefc..5629a4b6 100644
--- a/Code/Game/DanBiasGame/GameClientState/GameClientState.h
+++ b/Code/Game/DanBiasGame/GameClientState/GameClientState.h
@@ -20,7 +20,10 @@ public:
 	struct  ObjPos :public ProtocolStruct
 	{
 		int object_ID;
-		float worldPos[16]; 
+		//float worldPos[16]; 
+		float position[3];
+		float angularAxis[3];
+		float rotation[4];
 	};
 	struct  NewObj :public ProtocolStruct
 	{
@@ -39,7 +42,9 @@ public:
 	};
 	struct  PlayerPos :public ProtocolStruct
 	{
-		float playerPos[3]; 
+		float position[3];
+		float angularAxis[3];
+//		float playerPos[3]; 
 	};
 	struct  PlayerMove :public ProtocolStruct
 	{