Skip to content
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

Fix replacing markers #3059

Merged
merged 13 commits into from
Sep 19, 2023
Merged

Conversation

TFP-dev
Copy link
Contributor

@TFP-dev TFP-dev commented Jun 8, 2023

Based on #2794. Instead of adding engineReinitMarkers, it executes 3D markers reinit function when replacing or restoring models with id 1316 (ring), 1317 (cylinder and checkpoint) and 1559 (arrow).

markers

Test resource

replace_markers_test_resource.zip

@TheNormalnij TheNormalnij added the enhancement New feature or request label Jun 11, 2023
botder
botder previously approved these changes Sep 17, 2023
Client/mods/deathmatch/logic/CClientDFF.cpp Outdated Show resolved Hide resolved
Client/mods/deathmatch/logic/CClientDFF.cpp Outdated Show resolved Hide resolved
Rename 'bResult' to 'wasReplaced' and reinit markers only after successful model replacement.
@botder botder merged commit f382cfb into multitheftauto:master Sep 19, 2023
6 checks passed
@botder botder added this to the 1.6.1 milestone Sep 19, 2023
MTABot pushed a commit that referenced this pull request Sep 19, 2023
f382cfb Automatically reload models for markers (PR #3059)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants