From 4a07586076459bc107ce54b53c8812d9fdd1abf3 Mon Sep 17 00:00:00 2001
From: Erik Persson <erikpersson583@gmail.com>
Date: Thu, 9 Jan 2014 12:43:32 +0100
Subject: [PATCH] state

---
 Code/DanBiasGame/DanBiasGame.vcxproj.user |  22 ++++++++++++++++++++++
 Code/Game/GameLogic/Object.h              |   1 +
 Code/Game/GameLogic/Player.cpp            | Bin 3037 -> 3103 bytes
 Code/GameLogic/GameLogic.vcxproj.user     |  22 ++++++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 Code/DanBiasGame/DanBiasGame.vcxproj.user
 create mode 100644 Code/GameLogic/GameLogic.vcxproj.user

diff --git a/Code/DanBiasGame/DanBiasGame.vcxproj.user b/Code/DanBiasGame/DanBiasGame.vcxproj.user
new file mode 100644
index 00000000..1371945a
--- /dev/null
+++ b/Code/DanBiasGame/DanBiasGame.vcxproj.user
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\Executable\Tester</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Code/Game/GameLogic/Object.h b/Code/Game/GameLogic/Object.h
index a73dc154..5442424f 100644
--- a/Code/Game/GameLogic/Object.h
+++ b/Code/Game/GameLogic/Object.h
@@ -36,6 +36,7 @@ namespace GameLogic
 		int objectID;
 	protected:
 		Oyster::Physics::ICustomBody *rigidBody;
+		Oyster::Physics::ICustomBody::State *state;
 	};
 
 }
diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp
index ecf60dd310744c606c1634c2f19cc31d79702227..c9c356a152677295faf23f618cf3520f0f99d897 100644
GIT binary patch
literal 3103
kcmeIu0Sy2E0K%a6Pwi$7h(KY$fB^#r3>YwAz<_}d3=AIt0RR91

literal 3037
zcmd5;QE%EX5Pl}V!rG+COwdy8jcS!r2rOMF5oJSrLT+NfYltJqfY8+b_MPLzP10=Y
zx@ww~huCM|eg5wA`QEZPh;|`GZ~TZHsW{oZvEG`w=`od5Oo-f6=LbBBSju=jAu(Ck
zcP%JMc&v6<yOhOi6q7AY6B1A~hCh$5S#bWuq+|8_{^ppnAU(INREk|7kp>0^!S+Pb
zA(6!TVYNy_+_qXU(>i2<(MJ^11JWpP`y34LMQlaEa@Omq2}#M;9m2SKriMv&_8STA
zVb1sLZ_aFaGq>jsge{Gh?$C1p8Mx#8ZpZ|zE^sTB`u$PFiTr@iI=xO$g}#Ty4-HV+
z3SkWwuxH>~A&n@+*Ru-Mz1j}gSuBx)4|D2QV~2r0A$o6il%b;1nP6=bN|YZ0%+~$(
zsECEL8M-r06t(^7?ROeTT+cdildUoH9W=eXat8C|{F@KVl?F=<t*sKLBLQ<NOBHI)
zEugE2|Db>Hp0hC9m-ABqg{79V8GTInp5lPVDM&`=Y%=}oOq}aEdbb7Jmc}x3bb8vz
zMz9kCmVBiV512dxK*825yyW4rdoiYRrbZr%DG|jQr7o+L9+(U^_%VjcXFyU~$6>@&
z09%fxvxPky_95FXg@44wfrwD6wsk8gxl<9I=j_rRe6D!AB*C3>m%hxO=ZxkCnMYUh
zWo~Bf_|u~wU~%(8M^|4aeun32w@s>8;G%#Yp2)$_sdRUGYWr@#?}9)`98laov6Cb^
z!kU2E5}Raq%wLxF0ce5>-0o=MbuWsm|6Uan5WxM@xFzCWBXai-Lg)PIutSal!P68a
zf`_V>f>JkVrA3DJaH+XKBo5&!u8CxOiq?YcmH4$yk=A%uRN=$jDp6y-^_q(<iEz7p
zGEkv$4ZA9e&(1{c2AWhLfquijmg+xXp!>g2P*vcUl<KD;uZ9c9_NUj&kvntHyA>1E
zjgy@&g++4o6Vknat@v?8R*x%}YNp=tLyQ|mk(qoBZ&Y4p>-X)3$~=WeIi1obP)32L
z@>&;@$)CN_kItU=R@V!Nt}?H3f1BvSy$*B<?UInKTh1f%oVn?OM0e0W!4nMCOHjEJ
zF*4VwLdI`<mWAzocCW`-rK&|xM|_0{sxbc|f*VFqY5(p3s_DwmTTMI~!r+PaIXrbb
zV>w?&Xq8$HO3Up{9w9Tjdjmx@*~<|<t*y!t3%#253jC<Xt>|n3=sfE`8+R4$U0set
cvV~ULgFX-|XJIzX4r}767PtE`H^Jro31M2q{{R30

diff --git a/Code/GameLogic/GameLogic.vcxproj.user b/Code/GameLogic/GameLogic.vcxproj.user
new file mode 100644
index 00000000..75ed2a95
--- /dev/null
+++ b/Code/GameLogic/GameLogic.vcxproj.user
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\Executable\Tester</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\Executable\Tester</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\Executable\Tester</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\Executable\Tester</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file