5 files changed, 9 insertions, 8 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index b1592d93..e67c68d2 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -2292,6 +2292,10 @@ CCamera::StartTransition(int16 newMode)
 		Cams[ActiveCam].BetaSpeed = 0.0f;
 		break;
 
+	case CCam::MODE_BEHINDBOAT:
+		Cams[ActiveCam].BetaSpeed = 0.0f;
+		break;
+
 	case CCam::MODE_FOLLOWPED:
 		// Getting out of vehicle normally
 		betaOffset = DEGTORAD(55.0f);
@@ -2386,10 +2390,6 @@ CCamera::StartTransition(int16 newMode)
 		Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
 		break;
 
-	case CCam::MODE_BEHINDBOAT:
-		Cams[ActiveCam].BetaSpeed = 0.0f;
-		break;
-
 	case CCam::MODE_PED_DEAD_BABY:
 		Cams[ActiveCam].Alpha = DEGTORAD(15.0f);
 		break;
@@ -3994,7 +3994,7 @@ CCamera::CalculateDerivedValues(void)
 {
 	m_cameraMatrix = Invert(m_matrix);
 
-	float hfov = DEGTORAD(CDraw::GetFOV()/2.0f);
+	float hfov = DEGTORAD(CDraw::GetScaledFOV()/2.0f);
 	float c = cos(hfov);
 	float s = sin(hfov);
 
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 1463b4a5..6d810cf0 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1032,7 +1032,7 @@ CFileLoader::Load2dEffect(const char *line)
 			&effect->attractor.dir.y,
 			&effect->attractor.dir.z,
 			&probability);
-		effect->attractor.flags = flags;
+		effect->attractor.type = flags;
 		effect->attractor.probability = probability;
 		break;
 	case EFFECT_PED_ATTRACTOR:
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 67ae0c2f..56c05c71 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -1610,7 +1610,7 @@ int16 CPad::GetSteeringUpDown(void)
 		case 2:
 		{
 			int16 axis = NewState.LeftStickY;
-			int16 dpad = (NewState.DPadUp - NewState.DPadDown) / 2;
+			int16 dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
 			
 			if ( Abs(axis) > Abs(dpad) )
 				return axis;
diff --git a/src/core/Pad.h b/src/core/Pad.h
index d0623a1e..2f50a164 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -445,6 +445,7 @@ public:
 	bool GetLeftShoulder2(void)  { return !!NewState.LeftShoulder2; }
 	bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
 	bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
+	bool GetStart()              { return !!NewState.Start; }
 	int16 GetLeftStickX(void)    { return NewState.LeftStickX; }
 	int16 GetLeftStickY(void)    { return NewState.LeftStickY; }
 	int16 GetRightStickX(void)    { return NewState.RightStickX; }
diff --git a/src/core/common.h b/src/core/common.h
index eb43d8d5..d7c9a1f7 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -111,7 +111,7 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
 #define SCREEN_WIDTH ((float)RsGlobal.width)
 #define SCREEN_HEIGHT ((float)RsGlobal.height)
 #define SCREEN_ASPECT_RATIO (CDraw::GetAspectRatio())
-#define SCREEN_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
+#define SCREEN_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetScaledFOV() * 0.5f)))
 
 // This scales from PS2 pixel coordinates to the real resolution
 #define SCREEN_STRETCH_X(a)   ((a) * (float) SCREEN_WIDTH / DEFAULT_SCREEN_WIDTH)