From 81ca8596c8c860f5c9478deb5e303b86aa7e95eb Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Mon, 20 Apr 2020 07:18:26 +0300 Subject: fixed missing keys in gxt for PL/RU langs --- gamefiles/american.gxt | Bin 0 -> 218578 bytes gamefiles/english.gxt | Bin 0 -> 204494 bytes gamefiles/french.gxt | Bin 0 -> 244494 bytes gamefiles/german.gxt | Bin 0 -> 240448 bytes gamefiles/italian.gxt | Bin 0 -> 239912 bytes gamefiles/russian.gxt | Bin 220394 -> 220398 bytes gamefiles/spanish.gxt | Bin 0 -> 246088 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gamefiles/american.gxt create mode 100644 gamefiles/english.gxt create mode 100644 gamefiles/french.gxt create mode 100644 gamefiles/german.gxt create mode 100644 gamefiles/italian.gxt create mode 100644 gamefiles/spanish.gxt diff --git a/gamefiles/american.gxt b/gamefiles/american.gxt new file mode 100644 index 00000000..eb56fa61 Binary files /dev/null and b/gamefiles/american.gxt differ diff --git a/gamefiles/english.gxt b/gamefiles/english.gxt new file mode 100644 index 00000000..ced720ad Binary files /dev/null and b/gamefiles/english.gxt differ diff --git a/gamefiles/french.gxt b/gamefiles/french.gxt new file mode 100644 index 00000000..cb2874f9 Binary files /dev/null and b/gamefiles/french.gxt differ diff --git a/gamefiles/german.gxt b/gamefiles/german.gxt new file mode 100644 index 00000000..d5a986cf Binary files /dev/null and b/gamefiles/german.gxt differ diff --git a/gamefiles/italian.gxt b/gamefiles/italian.gxt new file mode 100644 index 00000000..95e2dd36 Binary files /dev/null and b/gamefiles/italian.gxt differ diff --git a/gamefiles/russian.gxt b/gamefiles/russian.gxt index 41c4cec8..f403c5c4 100644 Binary files a/gamefiles/russian.gxt and b/gamefiles/russian.gxt differ diff --git a/gamefiles/spanish.gxt b/gamefiles/spanish.gxt new file mode 100644 index 00000000..0fdccce3 Binary files /dev/null and b/gamefiles/spanish.gxt differ -- cgit v1.2.3 From 753343bcaccb3882eba6887d75c6164f397b5a2c Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Mon, 20 Apr 2020 07:20:14 +0300 Subject: rem english.gxt --- gamefiles/english.gxt | Bin 204494 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gamefiles/english.gxt diff --git a/gamefiles/english.gxt b/gamefiles/english.gxt deleted file mode 100644 index ced720ad..00000000 Binary files a/gamefiles/english.gxt and /dev/null differ -- cgit v1.2.3 From 83810168ee59bc58b141f77edfae65ffc7adb0b1 Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Mon, 20 Apr 2020 07:45:17 +0300 Subject: beta OddJob(unique jump etc) sliding text --- src/core/config.h | 1 + src/render/Hud.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/core/config.h b/src/core/config.h index 4ca79cb5..9f5bfeb6 100644 --- a/src/core/config.h +++ b/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 diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index fc399741..137b1afa 100644 --- a/src/render/Hud.cpp +++ b/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 } } -- cgit v1.2.3 From 556a6df4017eb26a4912e62097de3c0033b58a25 Mon Sep 17 00:00:00 2001 From: Fire-Head Date: Mon, 20 Apr 2020 08:17:08 +0300 Subject: camerapickup ps2 code --- src/control/Pickups.cpp | 28 ++++++++++++++++++++++++++++ src/core/config.h | 1 + 2 files changed, 29 insertions(+) diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index f9605ca6..a40821f9 100644 --- a/src/control/Pickups.cpp +++ b/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++) { diff --git a/src/core/config.h b/src/core/config.h index 9f5bfeb6..b5022b9f 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -226,6 +226,7 @@ enum Config { // Pickups //#define MONEY_MESSAGES +#define CAMERA_PICKUP // Peds #define ANIMATE_PED_COL_MODEL -- cgit v1.2.3 From 98fc8ecef09ba9c50a511c3bcfaca3cffe2fed0b Mon Sep 17 00:00:00 2001 From: aap Date: Mon, 20 Apr 2020 16:05:39 +0200 Subject: update librw (matfx) --- librw | 2 +- src/core/Game.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/librw b/librw index e6c7d910..8b677c4d 160000 --- a/librw +++ b/librw @@ -1 +1 @@ -Subproject commit e6c7d910ffc32bc059c4e750a797fde51ee29fd9 +Subproject commit 8b677c4dd77a73da68447556e3b07c6c0371629e diff --git a/src/core/Game.cpp b/src/core/Game.cpp index b1d29161..94c775ae 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -156,6 +156,14 @@ CGame::InitialiseRenderWare(void) LightsCreate(Scene.world); CreateDebugFont(); + +#ifdef LIBRW +#ifdef PS2_MATFX + rw::MatFX::modulateEnvMap = true; +#else + rw::MatFX::modulateEnvMap = false; +#endif +#endif CFont::Initialise(); CHud::Initialise(); -- cgit v1.2.3