Skip to content

Mostly fix black loading screen on Mac - #1827

Merged
illwieckz merged 2 commits into
DaemonEngine:masterfrom
slipher:mac-loading
Sep 28, 2025
Merged

illwieckz merged 2 commits into
DaemonEngine:masterfrom
slipher:mac-loading

Conversation

@slipher

@slipher slipher commented Sep 28, 2025

Copy link
Copy Markdown
Member

See #1812

Missed spot from SDL 3 migration. Both the fullscreen argument
(changed from flags to bool) and the return value (changed to bool)
were wrong. The flags mistake was harmless as it converted to the
correct bool value, but the error checking was unreachable.
@illwieckz

illwieckz commented Sep 28, 2025 •

Copy link
Copy Markdown
Member

Weird:

src/engine/client/cl_scrn.cpp:311:3: error: use of undeclared identifier 'SDL_PumpEvents'
  311 |                 SDL_PumpEvents();
      |                 ^

@slipher

slipher commented Sep 28, 2025

Copy link
Copy Markdown
Member Author

Oops, forgot the defined(BUILD_GRAPHICAL_CLIENT) on that part.

@illwieckz

Copy link
Copy Markdown
Member

Thanks for taking care of this!

I'm merging this for the release.

@illwieckz
illwieckz merged commit 11e6b88 into DaemonEngine:master Sep 28, 2025
9 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.

2 participants