mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +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

22
src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
View file

@ -51,9 +51,9 @@ void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) {
s32 pad1;
s32 pad2;
MtxF mf;
f32 temp;
f32 yIntersect;
Vec3f pos;
CollisionPoly* floorPoly;
CollisionPoly* groundPoly;
OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_dead_ds.c", 157);
@ -65,21 +65,21 @@ void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) {
if (this->rTimer == 0) {
Vec3s rpy;
Vec3f sp44;
Vec3f prevPos;
sp44.x = pos.x - this->velocity.x;
sp44.y = pos.y - this->velocity.y;
sp44.z = pos.z - this->velocity.z;
prevPos.x = pos.x - this->velocity.x;
prevPos.y = pos.y - this->velocity.y;
prevPos.z = pos.z - this->velocity.z;
if (BgCheck_EntitySphVsWall1(&play->colCtx, &this->pos, &pos, &sp44, 1.5f, &floorPoly, 1.0f)) {
func_80038A28(floorPoly, this->pos.x, this->pos.y, this->pos.z, &mf);
if (BgCheck_EntitySphVsWall1(&play->colCtx, &this->pos, &pos, &prevPos, 1.5f, &groundPoly, 1.0f)) {
func_80038A28(groundPoly, this->pos.x, this->pos.y, this->pos.z, &mf);
Matrix_Put(&mf);
} else {
pos.y++;
temp = BgCheck_EntityRaycastFloor1(&play->colCtx, &floorPoly, &pos);
yIntersect = BgCheck_EntityRaycastDown1(&play->colCtx, &groundPoly, &pos);
if (floorPoly != NULL) {
func_80038A28(floorPoly, this->pos.x, temp + 1.5f, this->pos.z, &mf);
if (groundPoly != NULL) {
func_80038A28(groundPoly, this->pos.x, yIntersect + 1.5f, this->pos.z, &mf);
Matrix_Put(&mf);
} else {
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);