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

Use imageformats_nopath when looking for per-map texture overrides #207

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

hemebond
Copy link
Contributor

@hemebond hemebond commented Sep 25, 2024

Merge imageformats_nopath into imageformats_other and remove its use. This now correctly loads per-map texture overrides that are looked for in the textures directory.

Fixes #198

@hemebond hemebond requested a review from Cloudwalk9 September 25, 2024 16:20
@divVerent
Copy link
Contributor

This removes support for %s.lmp - is that intended?

@divVerent
Copy link
Contributor

Also wonder if it wouldn't be better to add the override/ variants everywhere.

@hemebond
Copy link
Contributor Author

hemebond commented Oct 25, 2024

Also wonder if it wouldn't be better to add the override/ variants everywhere.

That definitely is not intended, but I suspect lmp files are only used for the interface and menus and are usually under /gfx which would get caught by imageformats_gfx. Ironwail only seems to load /gfx/*.lmp.

Any idea why each imageformats_nopath seems to restrict the types? Could we just add lmp to imageformats_nopath?

@divVerent
Copy link
Contributor

First of all, no objections to adding lmp to imageformats_nopath.

The other issue I have is - this makes imageformats_other unused. So maybe just merge the two into one (and call it imageformats_other, as there now is no more special handling for texture names without a slash)?

@hemebond
Copy link
Contributor Author

hemebond commented Oct 25, 2024

@divVerent Thanks, I've merged _nopath into _other. Tested with texture override mod and it still correctly loaded the map-specific overrides.

@divVerent
Copy link
Contributor

This change is definitely harmless now - once someone tested it that it at least does no damage (it really shouldn't be able to, other than slightly more IO load during map load), it should be OK to merge.

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.

Per-map texture overrides no longer working
2 participants