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

Actor Struct Changes (and a few related things) (#617)

Browse source 
* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* comment

* review

* feet flags

* horse shadow
This commit is contained in:
fig02 2021-01-18 16:04:04 -05:00 • committed by GitHub
parent 20206fba0d
commit 00a5edea71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
697 changed files with 8157 additions and 7942 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -23,7 +23,7 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx);
const ActorInit Obj_Comb_InitVars = {
ACTOR_OBJ_COMB,
ACTORTYPE_PROP,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_FIELD_KEEP,
sizeof(ObjComb),
@ -92,7 +92,7 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) {
pos1.y = (i - 15) * 0.7f;
pos1.z = Math_CosS(angle) * rand1;
Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &pos);
Math_Vec3f_Sum(&pos1, &this->actor.world.pos, &pos);
velocity.x = (Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f;
velocity.y = (Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f;
@ -125,9 +125,9 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) {
KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, dlist);
}
pos.x = this->actor.posRot.pos.x;
pos.y = this->actor.posRot.pos.y - 10.0f;
pos.z = this->actor.posRot.pos.z;
pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y - 10.0f;
pos.z = this->actor.world.pos.z;
func_80033480(globalCtx, &pos, 40.0f, 6, 70, 60, 1);
}
@ -145,7 +145,7 @@ void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) {
params = -1;
}
if (params >= 0) {
Item_DropCollectible(globalCtx, &this->actor.posRot.pos, params);
Item_DropCollectible(globalCtx, &this->actor.world.pos, params);
}
}
}
@ -202,7 +202,7 @@ void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx) {
this->unk_1B2 += 12000;
this->actionFunc(this, globalCtx);
this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * this->unk_1B0 + this->actor.initPosRot.rot.x;
this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * this->unk_1B0 + this->actor.home.rot.x;
}
void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -212,8 +212,8 @@ void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (118.0f * this->actor.scale.y),
this->actor.posRot.pos.z, 0);
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + (118.0f * this->actor.scale.y),
this->actor.world.pos.z, 0);
Matrix_RotateY(this->actor.shape.rot.y * 0.0000958738f, 1);
Matrix_RotateX(this->actor.shape.rot.x * 0.0000958738f, 1);
Matrix_RotateZ(this->actor.shape.rot.z * 0.0000958738f, 1);