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 dependencies on highres and 16-bit in plumbers and dreamweb #4673

Merged
merged 7 commits into from
Feb 28, 2023

Conversation

phcoder
Copy link
Contributor

@phcoder phcoder commented Jan 31, 2023

Dreamweb has undeclared dependency on highres. It's used only for titles. Downscale titles if necessary instead.
Plumbers uses highres only for the windows version. Again BMPs are simple to downscale and the windows version has no movies.
3DO version needs 16-bit but it's better to disable only 3do version if 16-bit is unavailable.
3DO and windows share almost no code and instead it's a mess of variables which are glorified platform markers. I've split windows and 3do versions of plumbers into separate classes

Copy link
Member

@ccawley2011 ccawley2011 left a comment

Choose a reason for hiding this comment

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

In the future, it might be useful to support downscaling for Future Wars, Lost in Time and Mission Supernova as well, but this looks OK for now.

engines/plumbers/metaengine.cpp Outdated Show resolved Hide resolved
graphics/module.mk Show resolved Hide resolved
graphics/scaler/downscaler.cpp Outdated Show resolved Hide resolved
graphics/scaler/downscaler.cpp Outdated Show resolved Hide resolved
engines/plumbers/3do.cpp Show resolved Hide resolved
Copy link
Member

@sev- sev- left a comment

Choose a reason for hiding this comment

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

Added a few notes

graphics/scaler/downscaler.cpp Outdated Show resolved Hide resolved
engines/engine.cpp Outdated Show resolved Hide resolved
engines/engine.cpp Show resolved Hide resolved
engines/plumbers/3do.cpp Outdated Show resolved Hide resolved
engines/plumbers/3do.cpp Outdated Show resolved Hide resolved
engines/plumbers/plumbers.cpp Show resolved Hide resolved
engines/plumbers/windows.cpp Outdated Show resolved Hide resolved
graphics/pixelformat.h Outdated Show resolved Hide resolved
graphics/scaler/downscaler.cpp Outdated Show resolved Hide resolved
graphics/scaler/downscaler.cpp Outdated Show resolved Hide resolved
@sev-
Copy link
Member

sev- commented Feb 25, 2023

@phcoder do you have time to finish it?

@sev-
Copy link
Member

sev- commented Feb 28, 2023

Thank you!

@sev- sev- merged commit 13eb6f3 into scummvm:master Feb 28, 2023
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.

3 participants