Skip to content

Conversation

@SirYodaJedi
Copy link
Contributor

Related to #437; required for liquids in GoldSrc to "warp" (where it's used instead of *).

This doesn't do any additional game checking, but I don't think that's a big deal, since ! is unlikely to be used for standard textures anyway. ! support was actually added to Quakespasm about a year ago (in sezero/quakespasm#117 ). If the change in contents proves an issue, an arg could be added to QBSP to disable treating ! as liquids.

@ericwa
Copy link
Owner

ericwa commented Nov 18, 2025

Thanks for looking at this.

My gut feeling would be to make this HLBSP-only, just in case there are any Quake texture wads with !-prefixed textures that mappers were expecting to behave as solids.. but, I guess, if there were, the vkQuake/QS support would have made those swirl already for the last year or so, so maybe it's fine to interpret ! as the same as * for all Q1-like games?

I might push a few docs and tests if that's okay.

@ericwa
Copy link
Owner

ericwa commented Nov 18, 2025

Added a basic test map that checks that we're actually creating CONTENTS_WATER for "!liquidtest"

image

@ericwa
Copy link
Owner

ericwa commented Nov 18, 2025

I think it's fine to merge on my end, if my changes look ok?

@SirYodaJedi SirYodaJedi marked this pull request as ready for review November 18, 2025 06:42
@SirYodaJedi
Copy link
Contributor Author

SirYodaJedi commented Nov 18, 2025

Looks good. If it works, then go ahead and merge. I had it as draft b/c I hadn't tried compiling yet to make sure it builds.

@ericwa ericwa merged commit 8037ed7 into ericwa:main Nov 19, 2025
1 check passed
@SirYodaJedi SirYodaJedi deleted the exclamation branch November 19, 2025 02:49
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