5 files changed, 53 insertions, 11 deletions

diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp
index a1121282..8697e7c6 100644
--- a/src/animation/FrameUpdate.cpp
+++ b/src/animation/FrameUpdate.cpp
@@ -47,7 +47,12 @@ FrameUpdateCallBackNonSkinned(AnimBlendFrameData *frame, void *arg)
 			(*node)->Update(vec, q, 1.0f-totalBlendAmount);
 			if((*node)->sequence->HasTranslation())
 				pos += vec;
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 		}
 		++*node;
 	}
@@ -101,7 +106,12 @@ FrameUpdateCallBackWithVelocityExtractionNonSkinned(AnimBlendFrameData *frame, v
 	for(node = updateData->nodes; *node; node++){
 		if((*node)->sequence){
 			bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 			if((*node)->sequence->HasTranslation()){
 				pos += vec;
 				if((*node)->association->HasTranslation()){
@@ -179,7 +189,12 @@ FrameUpdateCallBackWith3dVelocityExtractionNonSkinned(AnimBlendFrameData *frame,
 	for(node = updateData->nodes; *node; node++){
 		if((*node)->sequence){
 			bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 			if((*node)->sequence->HasTranslation()){
 				pos += vec;
 				if((*node)->association->HasTranslation()){
@@ -243,7 +258,12 @@ FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg)
 			(*node)->Update(vec, q, 1.0f-totalBlendAmount);
 			if((*node)->sequence->HasTranslation())
 				pos += vec;
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 		}
 		++*node;
 	}
@@ -298,7 +318,12 @@ FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void
 	for(node = updateData->nodes; *node; node++){
 		if((*node)->sequence){
 			bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 			if((*node)->sequence->HasTranslation()){
 				pos += vec;
 				if((*node)->association->HasTranslation()){
@@ -376,7 +401,12 @@ FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, vo
 	for(node = updateData->nodes; *node; node++){
 		if((*node)->sequence){
 			bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
-			rot += q;
+#ifdef FIX_BUGS
+			if(DotProduct(rot, q) < 0.0f)
+				rot -= q;
+			else
+#endif
+				rot += q;
 			if((*node)->sequence->HasTranslation()){
 				pos += vec;
 				if((*node)->association->HasTranslation()){
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index d3e10889..be70ad66 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -348,9 +348,11 @@ CAnimBlendAssociation*
 RpAnimBlendClumpGetFirstAssociation(RpClump *clump)
 {
 	CAnimBlendClumpData *clumpData = *RPANIMBLENDCLUMPDATA(clump);
-	if(clumpData == nil) return nil;
-	if(clumpData->link.next == nil) return nil;
-	return CAnimBlendAssociation::FromLink(clumpData->link.next); 
+	if(!RpAnimBlendClumpIsInitialized(clump))
+		return nil;
+	if(clumpData->link.next)
+		return CAnimBlendAssociation::FromLink(clumpData->link.next);
+	return nil;
 }
 
 // FillFrameArrayCallBack on PS2
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 20b262c8..21569647 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -4540,6 +4540,9 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
 	}
 
 
+	if(TheCamera.m_bUseTransitionBeta)
+		Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
+
 	Front = CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha));
 	Source = TargetCoors - Front*CamDist;
 	TargetCoors.z -= BaseOffset;	// now get back to the real target coors again
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 098400cc..d64146d7 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -111,8 +111,8 @@ RwObjectNameIdAssocation heliIds[] = {
 };
 
 RwObjectNameIdAssocation planeIds[] = {
-	{ "wheel_front_dummy",	2,	0 },
-	{ "wheel_rear_dummy",	3,	0 },
+	{ "wheel_front_dummy",	PLANE_WHEEL_FRONT,	0 },
+	{ "wheel_rear_dummy",	PLANE_WHEEL_READ,	0 },
 	{ "light_tailplane",	PLANE_POS_LIGHT_TAIL,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "light_left",		PLANE_POS_LIGHT_LEFT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "light_right",	PLANE_POS_LIGHT_RIGHT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
diff --git a/src/vehicles/Plane.h b/src/vehicles/Plane.h
index 7e822d64..a6f6e1d9 100644
--- a/src/vehicles/Plane.h
+++ b/src/vehicles/Plane.h
@@ -2,6 +2,13 @@
 
 #include "Vehicle.h"
 
+enum ePlaneNodes
+{
+	PLANE_WHEEL_FRONT = 2,
+	PLANE_WHEEL_READ,
+	NUM_PLANE_NODES
+};
+
 enum ePlanePositions
 {
 	PLANE_POS_LIGHT_LEFT,