Skip to content

Small improvements for #3592 #3792

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Oct 13, 2024
Merged

Small improvements for #3592 #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0be6091
New function
FileEX Jul 20, 2024
e61a498
Basic continuation
FileEX Jul 20, 2024
d64d5bd
Enum clean up
FileEX Jul 21, 2024
d788a64
Serverside
FileEX Jul 21, 2024
79a5cde
Small change
FileEX Jul 21, 2024
ae74b29
Review
FileEX Aug 9, 2024
66354e7
Merge branch 'master' into feature/vehicle_flyingcomponents
FileEX Aug 9, 2024
cb6328d
Merge branch 'master' into feature/vehicle_flyingcomponents
FileEX Sep 12, 2024
d5e2fd4
Merge branch 'master' into feature/vehicle_flyingcomponents
FileEX Sep 12, 2024
549cc8f
Update CAutomobileSA.h
FileEX Sep 13, 2024
4bf5d32
Clean up
FileEX Sep 13, 2024
1b31ad5
Update CVehicleSA.cpp
FileEX Sep 13, 2024
3a9395d
Little changes
FileEX Oct 12, 2024
57a9810
Merge branch 'master' into feature/vehicle_flyingcomponents
FileEX Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Client/game_sa/CVehicleSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,9 +1592,10 @@ bool CVehicleSA::SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComp
if (removalTime <= -1 || !componentObject)
return true;

std::uint32_t CTimer_ms = *reinterpret_cast<std::uint32_t*>(VAR_CTimer_snTimeInMilliseconds);
componentObject->uiObjectRemovalTime = CTimer_ms + static_cast<std::uint32_t>(removalTime);
// Set double-sided
componentObject->bBackfaceCulled = true;

componentObject->uiObjectRemovalTime = pGame->GetSystemTime() + static_cast<std::uint32_t>(removalTime);
return true;
}

Expand Down
2 changes: 0 additions & 2 deletions Client/game_sa/CVehicleSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ struct RwTexture;
#define OFFSET_CBike_Nodes 0x5A0
#define OFFSET_CBoat_Nodes 0x5B0

#define VAR_CTimer_snTimeInMilliseconds 0xB7CB84

struct SRailNodeSA
{
short sX; // x coordinate times 8
Expand Down
Loading