4 files changed, 18 insertions, 23 deletions

diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 0daecad1..24d32511 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -2429,7 +2429,7 @@ CCam::Process_Rocket(const CVector &CameraTarget, float, float, float)
 		ResetStatics = false;
 	}
 
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
@@ -2568,7 +2568,7 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
 	HeadPos.x = 0.0f;
 	HeadPos.y = 0.0f;
 	HeadPos.z = 0.0f;
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f * Cos(m_fInitialPlayerOrientation);
@@ -2657,7 +2657,7 @@ CCam::Process_1stPerson(const CVector &CameraTarget, float TargetOrientation, fl
 			ResetStatics = false;
 		}
 
-		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 		Source = HeadPos;
 		Source.z += 0.1f;
 		Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
@@ -2925,7 +2925,7 @@ CCam::Process_Sniper(const CVector &CameraTarget, float TargetOrientation, float
 		ResetStatics = false;
 	}
 
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index c5e0d6ad..a9229c1c 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2241,7 +2241,7 @@ CMenuManager::DrawBackground()
 		m_menuTransitionProgress = 255;
 	}
 
-	m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, Min(255, m_nMenuFadeAlpha)));
+	m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, FadeIn(255)));
 
 	SetFrontEndRenderStates();
 
@@ -2264,7 +2264,7 @@ CMenuManager::DrawBackground()
 	if (m_menuTransitionProgress == 255) {
 		m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255));
 	} else {
-		m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, Min(m_nMenuFadeAlpha, 255)));
+		m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
 	if (m_bShowMouse) {
@@ -2693,11 +2693,6 @@ CMenuManager::DrawPlayerSetupScreen()
 int
 CMenuManager::FadeIn(int alpha)
 {
-	if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS ||
-		m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS ||
-		m_nCurrScreen == MENUPAGE_DELETING)
-		return alpha;
-
 	return Min(m_nMenuFadeAlpha, alpha);
 }
 
@@ -3242,7 +3237,7 @@ CMenuManager::Process(void)
 		ProcessFileActions();
 		DMAudio.Service();
 
-		// TODO(Miami): What are the functions in here?
+		// Game calls some texture pool cleanup functions in here
 	}
 
 	SwitchMenuOnAndOff();
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 4e1d0edf..ca77d448 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -538,7 +538,7 @@ public:
 	int32 m_nPrevScreen;
 	int32 m_nCurrSaveSlot;
 	int32 m_LastScreenSwitch;
-	uint32 m_nMenuFadeAlpha;
+	int32 m_nMenuFadeAlpha;
 	int32 bOptionHighlightTransitionBlend;
 	bool bMenuChangeOngoing;
 	int32 MouseButtonJustClicked;
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index dc849a46..69f340dd 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -68,32 +68,32 @@ void WeaponCheat()
 
 	CStreaming::RequestModel(MI_GRENADE, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::RequestModel(MI_BOMB, STREAMFLAGS_DONT_REMOVE);
-	CStreaming::RequestModel(MI_AK47, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_RUGER, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::RequestModel(MI_BASEBALL_BAT, STREAMFLAGS_DONT_REMOVE);
-	CStreaming::RequestModel(MI_COLT, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_COLT45, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::RequestModel(MI_ROCKETLAUNCHER, STREAMFLAGS_DONT_REMOVE);
-	CStreaming::RequestModel(MI_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
-	CStreaming::RequestModel(MI_SNIPER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SPAS12_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SNIPERRIFLE, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::RequestModel(MI_MP5, STREAMFLAGS_DONT_REMOVE);
 	CStreaming::LoadAllRequestedModels(false);
 
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BASEBALLBAT, 0);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_COLT45, 100);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MP5, 100);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SHOTGUN, 20);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_AK47, 200);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SPAS12_SHOTGUN, 20);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_RUGER, 200);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SNIPERRIFLE, 5);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_ROCKETLAUNCHER, 5);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_DETONATOR_GRENADE, 5);
 
 	CStreaming::SetModelIsDeletable(MI_GRENADE);
 	CStreaming::SetModelIsDeletable(MI_BOMB);
-	CStreaming::SetModelIsDeletable(MI_AK47);
+	CStreaming::SetModelIsDeletable(MI_RUGER);
 	CStreaming::SetModelIsDeletable(MI_BASEBALL_BAT);
-	CStreaming::SetModelIsDeletable(MI_COLT);
+	CStreaming::SetModelIsDeletable(MI_COLT45);
 	CStreaming::SetModelIsDeletable(MI_ROCKETLAUNCHER);
-	CStreaming::SetModelIsDeletable(MI_SHOTGUN);
-	CStreaming::SetModelIsDeletable(MI_SNIPER);
+	CStreaming::SetModelIsDeletable(MI_SPAS12_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_SNIPERRIFLE);
 	CStreaming::SetModelIsDeletable(MI_MP5);
 }