Merge remote-tracking branch 'upstream/master'

librw

@@ -1 +1 @@
-Subproject commit 4541fe86f7ecb119c6fcb4fde7d08121341ce189
+Subproject commit 8b677c4dd77a73da68447556e3b07c6c0371629e

src/control/Pickups.cpp

@@ -623,6 +623,34 @@ CPickups::Update()
 	if (CReplay::IsPlayingBack())
 		return;
 #endif
+#ifdef CAMERA_PICKUP
+	if ( bPickUpcamActivated ) // taken from PS2
+	{
+		float dist = (FindPlayerCoors() - StaticCamCoors).Magnitude2D();
+		float mult;
+		if ( dist < 10.0f )
+			mult = 1.0f - (dist / 10.0f );
+		else 
+			mult = 0.0f;
+		
+		CVector pos = StaticCamCoors;
+		pos.z += (pPlayerVehicle->GetColModel()->boundingBox.GetSize().z + 2.0f) * mult;
+		
+		if ( (CTimer::GetTimeInMilliseconds() - StaticCamStartTime) > 750 )
+		{
+			TheCamera.SetCamPositionForFixedMode(pos, CVector(0.0f, 0.0f, 0.0f));	
+			TheCamera.TakeControl(FindPlayerVehicle(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_SCRIPT);
+		}
+
+		if ( FindPlayerVehicle() != pPlayerVehicle
+			|| (FindPlayerCoors() - StaticCamCoors).Magnitude() > 40.0f
+			|| ((CTimer::GetTimeInMilliseconds() - StaticCamStartTime) > 60000) )
+		{
+			TheCamera.RestoreWithJumpCut();
+			bPickUpcamActivated = false;
+		}
+	}
+#endif
 #define PICKUPS_FRAME_SPAN (6)
 #ifdef FIX_BUGS
 	for (uint32 i = NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN) / PICKUPS_FRAME_SPAN; i < NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN + 1) / PICKUPS_FRAME_SPAN; i++) {

src/core/Game.cpp

@@ -157,6 +157,14 @@ CGame::InitialiseRenderWare(void)
 	
 	CreateDebugFont();
 
+#ifdef LIBRW
+#ifdef PS2_MATFX
+	rw::MatFX::modulateEnvMap = true;
+#else
+	rw::MatFX::modulateEnvMap = false;
+#endif
+#endif
+	
 	CFont::Initialise();
 	CHud::Initialise();
 	CPlayerSkin::Initialise();

src/core/config.h

@@ -209,6 +209,7 @@ enum Config {
 #define TRIANGLE_BACK_BUTTON
 // #define CIRCLE_BACK_BUTTON
 #define HUD_ENHANCEMENTS	// Adjusts some aspects to make the HUD look/behave a little bit better. 
+#define BETA_SLIDING_TEXT
 
 // Script
 #define USE_DEBUG_SCRIPT_LOADER	// makes game load main_freeroam.scm by default
@@ -225,6 +226,7 @@ enum Config {
 
 // Pickups
 //#define MONEY_MESSAGES
+#define CAMERA_PICKUP
 
 // Peds
 #define ANIMATE_PED_COL_MODEL

src/render/Hud.cpp

@@ -1240,10 +1240,17 @@ void CHud::DrawAfterFade()
 			CFont::SetColor(CRGBA(0, 0, 0, 255));
 			CFont::SetFontStyle(FONT_BANK);
 
+#ifdef BETA_SLIDING_TEXT
+			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f) - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]);
+
+			CFont::SetColor(CRGBA(156, 91, 40, 255));
+			CFont::PrintString(SCREEN_WIDTH / 2 - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]);
+#else
 			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]);
 
 			CFont::SetColor(CRGBA(156, 91, 40, 255));
 			CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]);
+#endif
 		}
 	}