-
-
Notifications
You must be signed in to change notification settings - Fork 565
Add ps2scorchedvehicles world special property #5012
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
QueryOfficial
wants to merge
5
commits into
multitheftauto:master
Choose a base branch
from
QueryOfficial:feature/ps2-scorched-vehicles
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b7b274f
Add PS2 scorched vehicles feature
QueryOfficial 1784a8e
Implement PS2 scorched vehicles feature
QueryOfficial 129d323
Refactor PS2 scorched vehicles functionality
QueryOfficial cdb3deb
Add PS2 scorched vehicles settings and GUI integration
QueryOfficial 82e10ea
Address FileEX review: nullptr, CVAR comment, clang-format
QueryOfficial File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /***************************************************************************** | ||
| * | ||
| * PROJECT: Multi Theft Auto | ||
| * LICENSE: See LICENSE in the top level directory | ||
| * FILE: multiplayer_sa/CMultiplayerSA_ScorchedVehicles.cpp | ||
| * | ||
| * Multi Theft Auto is available from https://www.multitheftauto.com/ | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| #include "StdInc.h" | ||
|
|
||
| namespace | ||
| { | ||
| constexpr float SCORCHED_VEHICLE_LIGHTING_PS2 = 0.0f; | ||
|
|
||
| bool ms_bPs2ScorchedVehiclesEnabled = false; | ||
|
|
||
| using WorldReplaceNormalLightsWithScorched_t = void(__cdecl*)(RpWorld* world, float lighting); | ||
|
|
||
| void __cdecl WorldReplaceNormalLightsWithScorched_MTA(RpWorld* world, float lighting) | ||
| { | ||
| if (ms_bPs2ScorchedVehiclesEnabled) | ||
| lighting = SCORCHED_VEHICLE_LIGHTING_PS2; | ||
|
|
||
| // Call WorldReplaceNormalLightsWithScorched | ||
| reinterpret_cast<WorldReplaceNormalLightsWithScorched_t>(0x7357E0)(world, lighting); | ||
| } | ||
| } // namespace | ||
|
|
||
| bool CMultiplayerSA::IsPs2ScorchedVehiclesEnabled() const noexcept | ||
| { | ||
| return ms_bPs2ScorchedVehiclesEnabled; | ||
| } | ||
|
|
||
| void CMultiplayerSA::SetPs2ScorchedVehiclesEnabled(bool enabled) noexcept | ||
| { | ||
| ms_bPs2ScorchedVehiclesEnabled = enabled; | ||
| } | ||
|
|
||
| void CMultiplayerSA::InitHooks_ScorchedVehicles() | ||
| { | ||
| HookInstallCall(0x553E6A, reinterpret_cast<DWORD>(WorldReplaceNormalLightsWithScorched_MTA)); // CRenderer::SetupLightingForEntity | ||
| HookInstallCall(0x554FB7, reinterpret_cast<DWORD>(WorldReplaceNormalLightsWithScorched_MTA)); // CObject::SetupLighting | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.