etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-24 21:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move camera down if ceiling hanging with romhack camera (#407)

Browse source
This commit is contained in:
Sunk 2024-11-11 00:12:25 -05:00 committed by GitHub
parent 42cf0e3eea
commit 945d1efe91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/camera.c
View file

@ -12337,6 +12337,22 @@ void mode_rom_hack_camera(struct Camera *c) {
pos[1] = mPos[1] + desiredHeight; pos[1] = mPos[1] + desiredHeight;
pos[2] = mPos[2] + sins(sRomHackYaw) * desiredDist; pos[2] = mPos[2] + sins(sRomHackYaw) * desiredDist;
// Move camera down for hangable ceilings
if (sMarioCamState->action & ACT_FLAG_HANGING) {
f32 marioCeilHeight = sMarioGeometry.currCeilHeight;
f32 marioFloorHeight = sMarioGeometry.currFloorHeight;
if (marioFloorHeight < marioCeilHeight - 400.f) {
marioFloorHeight = marioCeilHeight - 400.f;
}
f32 goalHeight = marioFloorHeight + (marioCeilHeight - marioFloorHeight) * 0.4f;
if (pos[1] - 400 > goalHeight) {
pos[1] -= 400;
}
}
if (rom_hack_cam_can_see_mario(pos)) { if (rom_hack_cam_can_see_mario(pos)) {
// we can see mario, no need to adjust // we can see mario, no need to adjust
c->pos[0] = pos[0]; c->pos[0] = pos[0];