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

Enhance Vasudan Mainhall Cheats #6340

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

Conversation

MjnMixael
Copy link
Contributor

Well.. I started out just wanting to create a way for my Vasudan mainhall remake to have the classic cheats available to it.. but I ended up cleaning quite a bit about how the Headz and Fish cheats actually work including a major upgrade to fishtank.cpp so that it can load all anim types instead of just ANI.

Tested everything on retail and custom mainhalls. All seems to work as expected.

I did also bump MAX_FISH from 12 to 24 because we have bigger screens these days so we need more fish! Could always do more though... 👀
image

@MjnMixael MjnMixael added Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle feature A totally new sort of functionality labels Sep 7, 2024
@Goober5000 Goober5000 removed the Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle label Oct 28, 2024
@MjnMixael MjnMixael added the Requested by Active Mod A feature request that has been requested by a mod that is actively in development. label Oct 29, 2024
@@ -1485,6 +1467,9 @@ void main_hall_mouse_release_region(int region)
}

auto sound = Main_hall->door_sounds.at(region).at(1);
if (Vasudan_funny && (main_hall_is_retail_vasudan() || main_hall_allows_headz())) {
Copy link
Member

Choose a reason for hiding this comment

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

Oh very neat PR! Just looking over it, and I wanted to check about something. This section looks like it overrides the sound for all regions, whereas the standard cheat overrides the sound only for the OPTIONS_REGION (original lines 543-565 in manhallmenu.cpp).

Just wanted to check with you to see why that was not changed in main_hall_set_door_headz? [as within the main_hall_set_door_headz function it the animation and background are changed just for the one region]. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh good catch. I had to dive back into the code to remember what I was doing even. main_hall_set_door_headz works for the anim because of a quirk in how we actually handle bitmaps with bmpman. Basically it replaces the currently loaded anim with the headz one and the rest of the code doesn't really care; it just plays whatever animation is in that slot. We can't do that for sounds. That's why this code is here and not in main_hall_set_door_headz.

But you're right this needs a block that checks that we're playing a sound only for the headz region so I've added that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature A totally new sort of functionality Requested by Active Mod A feature request that has been requested by a mod that is actively in development.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants