add

Author: gta191977649

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -795,11 +795,70 @@ void CClientVehicle::SetHealth(float health)
     if (m_pVehicle)
         m_pVehicle->SetHealth(health);
 }
+/*
+
+void CVehicleSA::SetSunGlare(bool show)
+{
+    DEBUG_TRACE("void CVehicleSA::SetSunGlare ( bool show )");
+    if (show)
+    {
+        // Converted from thiscall void CVehicle::DoSunGlare(void) 0x6DD6F0
+        using Signature = void(__cdecl*)(DWORD vehicle);
+        const auto doSunGlare = reinterpret_cast<Signature>(0x6DD6F0);
+
+        
+        doSunGlare(dwThis);
+        g_pCore->GetConsole()->Printf("CVehicleSA:: SetSunGlare()");
+        DWORD dwThis = (DWORD)GetInterface();
+        DWORD dwFunc = 0x6DD6F0;
+
+        if (dwFunc)
+        {
+            _asm
+            {
+                mov     ecx, dwThis
+                call    dwFunc
+            }
+        }
+        printf("called");
+        
+    }
+}
+*/
+void CClientVehicle::SetSunGlare(bool show)
+{
+    g_pCore->GetConsole()->Printf("CClientVehicle:: SetSunGlare checking m_pVehicle...");
+    if (m_pVehicle)
+    {
+        //m_pVehicle->SetSunGlare(true);
+        g_pCore->GetConsole()->Printf("CClientVehicle:: m_pVehicle check pass");
+
+        /* 
+        using Signature = void(__cdecl*)(DWORD vehicle);
+        const auto doSunGlare = reinterpret_cast<Signature>(0x6DD6F0);
+        */
+        DWORD dwThis = (DWORD)m_pVehicle->GetInterface();
+        DWORD dwFunc = 0x6DD6F0;
+
+        if (dwFunc)
+        {
+            _asm
+            {
+                mov     ecx, dwThis
+                call    dwFunc
+            }
+        }
+
+
+        g_pCore->GetConsole()->Printf("CClientVehicle:: SetSunGlare() run");
+    }
+}
 
 void CClientVehicle::Fix()
 {
     if (m_pVehicle)
     {
+        g_pCore->GetConsole()->Printf("CClientVehicle::Fix:: m_pVehicle yes");
         m_pVehicle->Fix();
         // Make sure its visible, if its supposed to be
         m_pVehicle->SetVisible(m_bVisible);

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -212,7 +212,7 @@ class CClientVehicle : public CClientStreamElement
     float GetHealth() const;
     void  SetHealth(float health);
     void  Fix();
-
+    void  SetSunGlare(bool show);
     void             Blow(VehicleBlowFlags blow);
     bool             IsBlown() const noexcept { return m_blowState != VehicleBlowState::INTACT; }
     void             SetBlowState(VehicleBlowState state) { m_blowState = state; }

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2760,6 +2760,17 @@ CClientVehicle* CStaticFunctionDefinitions::CreateVehicle(CResource& Resource, u
 
     return nullptr;
 }
+bool CStaticFunctionDefinitions::AddVehicleSunGlare(CClientVehicle& Vehicle)
+{
+    if (IS_VEHICLE(&Vehicle))
+    {
+        //memset((void*)0x6DD6F0, Entity,1);
+        Vehicle.SetSunGlare(true);
+
+        m_pCore->GetConsole()->Print("LUA VEHICLE GLAR CALLED");
+    }
+    return false;
+}
 
 bool CStaticFunctionDefinitions::FixVehicle(CClientEntity& Entity)
 {

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -226,6 +226,7 @@ class CStaticFunctionDefinitions
     static bool            GetVehicleModelDummyDefaultPosition(unsigned short usModel, eVehicleDummies eDummy, CVector& vecPosition);
 
     // Vehicle set functions
+    static bool AddVehicleSunGlare(CClientVehicle& Vehicle);
     static bool FixVehicle(CClientEntity& Entity);
     static bool BlowVehicle(CClientEntity& Entity, std::optional<bool> withExplosion);
     static bool SetVehicleColor(CClientEntity& Entity, const CVehicleColor& color);
@@ -267,7 +268,7 @@ class CStaticFunctionDefinitions
     static bool SetVehiclePlateText(CClientEntity& Entity, const SString& strText);
     static bool SetHeliBladeCollisionsEnabled(CClientVehicle& Vehicle, bool bEnabled);
     static bool SetVehicleWindowOpen(CClientVehicle& Vehicle, uchar ucWindow, bool bOpen);
-
+    
     // Object get funcs
     static CClientObject* CreateObject(CResource& Resource, unsigned short usModelID, const CVector& vecPosition, const CVector& vecRotation, bool bLowLod);
     static bool           GetObjectScale(CClientObject& Object, CVector& vecScale);

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp

@@ -92,6 +92,7 @@ void CLuaVehicleDefs::LoadFunctions()
         // Vehicle set funcs
         {"createVehicle", CreateVehicle},
         {"fixVehicle", FixVehicle},
+        {"addVehicleSunGlare", AddVehicleSunGlare},
         {"blowVehicle", ArgumentParserWarn<false, BlowVehicle>},
         {"setVehicleTurnVelocity", SetVehicleTurnVelocity},
         {"setVehicleColor", SetVehicleColor},
@@ -1547,6 +1548,27 @@ int CLuaVehicleDefs::FixVehicle(lua_State* luaVM)
     lua_pushboolean(luaVM, false);
     return 1;
 }
+int CLuaVehicleDefs::AddVehicleSunGlare(lua_State* luaVM)
+{
+    CClientVehicle*  pVehicle = NULL;
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pVehicle);
+
+    if (!argStream.HasErrors())
+    {
+        if (CStaticFunctionDefinitions::AddVehicleSunGlare(*pVehicle))
+        {
+            lua_pushboolean(luaVM, true);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 
 bool CLuaVehicleDefs::IsVehicleBlown(CClientVehicle* vehicle)
 {

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h

@@ -82,6 +82,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(IsVehicleWindowOpen);
 
     LUA_DECLARE(FixVehicle);
+    LUA_DECLARE(AddVehicleSunGlare);
     static bool BlowVehicle(CClientEntity* entity, std::optional<bool> withExplosion);
     LUA_DECLARE(SetVehicleRotation);
     LUA_DECLARE(SetVehicleTurnVelocity);

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -578,6 +578,26 @@ CMultiplayerSA::CMultiplayerSA()
     m_dwLastStaticAnimID = eAnimID::ANIM_ID_WALK;
 }
 
+void CVehicle__DoSunGlare(void* this_)
+{
+    //EAXJMP(0x6DD6F0);
+    MemSet((void*)0x6DD6F0, 0x1, 1);
+}
+
+void __declspec(naked) doglare(void)
+{
+    _asm {
+		mov	ecx, 1
+		cmp	[ecx+8], 0            // doglare
+		jle	noglare
+		mov	ecx,esi
+		call	CVehicle__DoSunGlare
+	noglare:
+		mov     [esp+0D4h], edi
+		push	6ABD04h
+		retn
+    }
+}
 void CMultiplayerSA::InitHooks()
 {
     InitKeysyncHooks();
@@ -1510,7 +1530,7 @@ void CMultiplayerSA::InitHooks()
     // Allow water cannon to hit objects and players visually
     MemSet((void*)0x72925D, 0x1, 1);            // objects
     MemSet((void*)0x729263, 0x1, 1);            // players
-
+    
     // Allow crouching with 1HP
     MemPut((void*)0x6943AD, &fDuckingHealthThreshold);
     fDuckingHealthThreshold = 0;
@@ -1519,6 +1539,12 @@ void CMultiplayerSA::InitHooks()
     m_fShadowsOffset = 0.013f;            // GTA default = 0.06f
     for (auto uiAddr : shadowAddr)
         MemPut(uiAddr, &m_fShadowsOffset);
+    //Fuck Sun Glar
+    //MemPut((void*)0x6ABCFD, 0x6DD6F0);
+   
+    //Fuck the wet road reflection
+    MemSet((void*)0x6FB9A0, 0x1C, 1);
+
 
     InitHooks_CrashFixHacks();