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 map waypoint loading #1165

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Fix map waypoint loading #1165

merged 2 commits into from
Oct 31, 2024

Conversation

6emmes
Copy link
Contributor

@6emmes 6emmes commented Oct 27, 2024

Fixes #1053

Copy link
Contributor

@tomsons26 tomsons26 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

either g_waypoints or s_waypoints doesn't seem should exist, looks like only g_waypoints should exist

@6emmes
Copy link
Contributor Author

6emmes commented Oct 28, 2024

@tomsons26
Hi, thanks for comment.
Yes, those two variable are very confusing but it seems accurate to the source code (for example WaypointMap::Update).

@tomsons26
Copy link
Contributor

hu my comment edit didn't save..

remove s_waypoints and make

#ifndef GAME_DLL
WaypointMap *g_waypoints = nullptr;
MapCache *g_theMapCache = nullptr;
#endif

code should be only using g_waypoints, there is no duplicate WaypointMap * global

@xezon xezon merged commit ccef1e1 into TheAssemblyArmada:develop Oct 31, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Maps with custom scripts show no starting positions and player spawns as observer
3 participants