Skip to content

Respect ini resolution settings #374

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

Jump to bottom
Closed
briaguya0 wants to merge 8 commits into from
Closed

Respect ini resolution settings #374

briaguya0 wants to merge 8 commits into from

Conversation

@briaguya0
Copy link
Contributor

@briaguya0 briaguya0 commented May 18, 2022 •
edited
Loading

This PR makes it so the windowed resolution set in the .ini is respected when opening soh with sdl/opengl

I only modified the directx code enough to not break the build, not enough to implement the feature (i'm on linux)

@briaguya0
Copy link
Contributor Author

briaguya0 commented May 18, 2022

so it looks like those values aren't making it through to

Shipwright/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp

Line 2603 in 54d997b

gfx_wapi->init(game_name, start_in_fullscreen);

which goes to

Shipwright/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

Lines 148 to 149 in 2b0af54

wnd = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
window_width, window_height, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);

which uses window_width and window_height which are set here

Shipwright/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

Lines 37 to 38 in 2b0af54

static unsigned int window_width = DESIRED_SCREEN_WIDTH;
static unsigned int window_height = DESIRED_SCREEN_HEIGHT;

@briaguya0
Copy link
Contributor Author

briaguya0 commented May 18, 2022

so now the window is being set to the resolution from the .ini, but the game is still rendered at 640x480, i'm thinking it might have something to do with

Shipwright/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

Lines 203 to 206 in 2b0af54

static void gfx_sdl_get_dimensions(uint32_t *width, uint32_t *height) {
*width = window_width;
*height = window_height;
}

but i'm not sure what to do about it

@briaguya0 briaguya0 marked this pull request as ready for review May 18, 2022 22:18
@briaguya0
Copy link
Contributor Author

briaguya0 commented May 23, 2022

when i forked originally i forked from random's linux branch, i'm deleting my old fork and forking from HarbourMasters, so here's a patch file from this PR just in case the code disappears 374.patch.zip

@briaguya0 briaguya0 mentioned this pull request May 23, 2022
Merged
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@briaguya0