mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix RaycastFloor flags (#1328)

Browse source 
* fix raycast floor flags

* format.sh

* Name flags

* Rename RaycastFloor functions, clean up caller code, document z_bg_spot15_rrbox

* change comment to prevent format wrap

* change to "if BGCHECK_GROUND_CHECK_ON is set"

* roman suggestions
This commit is contained in:
mzxrules 2022-08-30 11:49:51 -04:00 • committed by GitHub
parent fe8d5988b9
commit 327a813b37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 497 additions and 451 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View file

@ -98,17 +98,17 @@ void ObjTsubo_ApplyGravity(ObjTsubo* this) {
}
s32 ObjTsubo_SnapToFloor(ObjTsubo* this, PlayState* play) {
CollisionPoly* floorPoly;
CollisionPoly* groundPoly;
Vec3f pos;
s32 bgID;
f32 floorY;
s32 bgId;
f32 groundY;
pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + 20.0f;
pos.z = this->actor.world.pos.z;
floorY = BgCheck_EntityRaycastFloor4(&play->colCtx, &floorPoly, &bgID, &this->actor, &pos);
if (floorY > BGCHECK_Y_MIN) {
this->actor.world.pos.y = floorY;
groundY = BgCheck_EntityRaycastDown4(&play->colCtx, &groundPoly, &bgId, &this->actor, &pos);
if (groundY > BGCHECK_Y_MIN) {
this->actor.world.pos.y = groundY;
Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos);
return true;
} else {