Merge branch 'master' of github.com:gta-reversed/gta-reversed-modern into reverse/CAECollisionAudioEntity

Author: Pirulax

README.md

@@ -39,7 +39,6 @@ Since this project is done as a hobby, and worked on at irregular intervals, **t
 1. To install all the necessary files (after building the project!), run `contrib/install.py` with **__administrator privileges__** [Necessary to create symlinks on Windows] in the root directory.
 Alternatively, you can install them by yourself:
     * [ASI Loader](https://gtaforums.com/topic/523982-relopensrc-silents-asi-loader/)
-    * [III.VC.SA.WindowedMode.asi](https://github.com/ThirteenAG/III.VC.SA.WindowedMode)
     * Mouse Fix (**dinput8.dll**) [Can be found in the zip in the `contrib` folder]
 
     You can download them in a single [archive](https://github.com/gta-reversed/gta-reversed-modern/blob/master/contrib/plugins.zip).

contrib/plugins.zip

@@ -537,6 +537,7 @@ void InjectHooksMain() {
 #ifdef NOTSA_WINDOWED_MODE
     notsa::InjectWindowedModeHooks();
 #endif
+    CDoor::InjectHooks();
     CControllerConfigManager::InjectHooks();
     CFormation::InjectHooks();
     CHandShaker::InjectHooks();
@@ -623,9 +624,14 @@ void InjectHooksMain() {
     CKeyboardState::InjectHooks();
     CMouseControllerState::InjectHooks();
     CRect::InjectHooks();
-    CVector2D::InjectHooks();
-    CQuaternion::InjectHooks();
-    CMatrix::InjectHooks();
+
+    /******* Don't hook these, performance is bad ********
+    /* CVector::InjectHooks();
+    /* CVector2D::InjectHooks();
+    /* CQuaternion::InjectHooks();
+    /* CMatrix::InjectHooks();
+    /****************************************************/
+
     CMatrixLink::InjectHooks();
     CMatrixLinkList::InjectHooks();
     CEntryInfoNode::InjectHooks();
@@ -733,6 +739,7 @@ void InjectHooksMain() {
     CGangWars::InjectHooks();
     CPlayerPedData::InjectHooks();
     CTimeCycle::InjectHooks();
+    CColourSet::InjectHooks();
     CSkidmarks::InjectHooks();
     CMovingThings::InjectHooks();
     CRoadBlocks::InjectHooks();

source/InjectHooksMain.cpp

@@ -313,7 +313,6 @@ void Idle(void* param) {
         return;
     }
 
-    auto& cc = CTimeCycle::m_CurrentColours;
     if (FrontEndMenuManager.m_bMenuActive || TheCamera.GetScreenFadeStatus() == eNameState::NAME_FADE_IN) {
         CDraw::CalculateAspectRatio();
         CameraSize(Scene.m_pRwCamera, nullptr, SCREEN_VIEW_WINDOW, SCREEN_ASPECT_RATIO);
@@ -341,19 +340,23 @@ void Idle(void* param) {
 
         bool started;
         if (CWeather::LightningFlash) {
-            cc.m_nSkyBottomRed = 255;
-            cc.m_nSkyBottomGreen = 255;
-            cc.m_nSkyBottomBlue = 255;
+            CTimeCycle::SetFogRed(255);
+            CTimeCycle::SetFogGreen(255);
+            CTimeCycle::SetFogBlue(255);
             started = DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255);
         } else {
-            started = DoRWStuffStartOfFrame_Horizon(cc.m_nSkyTopRed, cc.m_nSkyTopGreen, cc.m_nSkyTopBlue, cc.m_nSkyBottomRed, cc.m_nSkyBottomGreen, cc.m_nSkyBottomBlue, 255);
+            started = DoRWStuffStartOfFrame_Horizon(
+                CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(),
+                CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(),
+                255
+            );
         }
         if (!started)
             return;
 
         DefinedState();
-        RwCameraSetFarClipPlane(Scene.m_pRwCamera, cc.m_fFarClip);
-        Scene.m_pRwCamera->fogPlane = cc.m_fFogStart;
+        RwCameraSetFarClipPlane(Scene.m_pRwCamera, CTimeCycle::GetFarClip());
+        Scene.m_pRwCamera->fogPlane = CTimeCycle::GetFogStart();
         CMirrors::RenderMirrorBuffer();
         RenderScene();
         CVisibilityPlugins::RenderWeaponPedsForPC();

source/app/app_game.cpp

@@ -172,7 +172,7 @@ RsEventStatus KeyboardHandler(RsEvent event, void* param) {
 }
 
 // 0x7448B0
-static RsEventStatus HandlePadButtonDown(RsPadButtonStatus* padButtonStatus) {
+RsEventStatus HandlePadButtonDown(RsPadButtonStatus* padButtonStatus) {
     bool  bPadTwo   = false;
     int32 padNumber = padButtonStatus->padID;
 
@@ -188,24 +188,23 @@ static RsEventStatus HandlePadButtonDown(RsPadButtonStatus* padButtonStatus) {
 
     ControlsManager.UpdateJoyButtonState(padNumber);
 
-    for (int32 i = 1; i < JOYBUTTON_COUNT; i++)
-    {
+    for (int32 i = 1; i < JOYBUTTON_COUNT; i++) {
         RsPadButtons btn = RsPadButtons(0);
         if (ControlsManager.m_ButtonStates[i - 1] == true) {
             btn = RsPadButtons(i);
 
             if (FrontEndMenuManager.m_bMenuActive || bPadTwo) {
                 ControlsManager.UpdateJoyInConfigMenus_ButtonDown(btn, padNumber);
             } else {
-                ControlsManager.AffectControllerStateOn_ButtonDown((KeyCode)btn, eControllerType::JOY_STICK);
+                ControlsManager.UpdateJoy_ButtonDown(btn, eControllerType::JOY_STICK);
             }
         }
     }
     return rsEVENTPROCESSED;
 }
 
 // 0x744930
-static RsEventStatus HandlePadButtonUp(RsPadButtonStatus* padButtonStatus) {
+RsEventStatus HandlePadButtonUp(RsPadButtonStatus* padButtonStatus) {
     bool  bPadTwo   = false;
     int32 padNumber = padButtonStatus->padID;
 
@@ -227,6 +226,7 @@ static RsEventStatus HandlePadButtonUp(RsPadButtonStatus* padButtonStatus) {
 
     ControlsManager.UpdateJoyButtonState(padNumber);
 
+    // NOTE: Why 2?
     for (int32 i = 2; i < JOYBUTTON_COUNT; i++) {
         RsPadButtons btn = RsPadButtons(0);
         if (ControlsManager.m_ButtonStates[i - 1] == false) {

source/app/app_input.cpp

@@ -10,6 +10,6 @@ RsEventStatus HandleKeyDown(RsKeyStatus* param);
 RsEventStatus HandleKeyUp(RsKeyStatus* param);
 RsEventStatus KeyboardHandler(RsEvent event, void* param);
 
-RsEventStatus HandlePadButtonDown(RsKeyStatus* param);
-RsEventStatus HandlePadButtonUp(RsKeyStatus* param);
+RsEventStatus HandlePadButtonDown(RsPadButtonStatus* param);
+RsEventStatus HandlePadButtonUp(RsPadButtonStatus* param);
 RsEventStatus PadHandler(RsEvent event, void* param);

source/app/app_input.h

@@ -86,6 +86,9 @@ constexpr inline auto find_value(auto&& mapping, auto&& needle) {
     NOTSA_UNREACHABLE("Needle not in the mapping!");
 }
 
+/*!
+* @brief Find the index of the first occurrence of a value in a range, returning a default index if not found.
+*/
 template<rng::input_range R>
 ptrdiff_t indexof(R&& r, const rng::range_value_t<R>& v, ptrdiff_t defaultIdx = -1) {
     const auto it = rng::find(r, v);

source/extensions/utility.hpp

@@ -168,7 +168,7 @@ CVehicle* CAEAudioUtility::FindVehicleOfPlayer() {
         return vehicle;
 
     auto* attach = player->m_pAttachedTo->AsAutomobile();
-    if (attach && attach->IsVehicle())
+    if (attach && attach->GetIsTypeVehicle())
         return attach;
 
     return vehicle;

source/game_sa/Audio/AEAudioUtility.cpp

@@ -195,7 +195,7 @@ float CAESound::GetSlowMoFrequencyScalingFactor() const {
 
 // 0x4EF7A0
 void CAESound::NewVPSLEntry() {
-    m_IsPhysicallyPlaying  = true;
+    m_IsPhysicallyPlaying  = false;
     m_HasRequestedStopped  = false;
     m_IsAudioHardwareAware = false;
     m_IsInUse              = true;

source/game_sa/Audio/AESound.cpp

@@ -598,7 +598,7 @@ void CAECollisionAudioEntity::ReportBulletHit(CEntity* entity, eSurfaceType surf
     if (!AEAudioHardware.IsSoundBankLoaded(SND_BANK_GENRL_BULLET_HITS, SND_BANK_SLOT_BULLET_HITS)) {
         return;
     }
-    if (entity && entity->IsVehicle()) {
+    if (entity && entity->GetIsTypeVehicle()) {
         surface = entity->AsVehicle()->IsSubBMX()
             ? (eSurfaceType)(188) // todo: C* Surface
             : SURFACE_CAR;