Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok

Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-30 19:05:52 +02:00
parent aeaadcba0f 235a03ab4c
commit c489547294
12 changed files with 239 additions and 286 deletions
@@ -8,7 +8,8 @@ namespace Components

 	struct WheelPair : Component
 	{
-		// Flag for pair wheels
+		EntityID FakeWheelFront;
+		EntityID FakeWheelBack;

 		virtual WheelPair* Clone() const override { return new WheelPair(*this); }
 	};