mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +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

12
src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
View file

@ -19,7 +19,7 @@ void ObjDekujr_ComeUp(ObjDekujr* this, GlobalContext* globalCtx);
const ActorInit Obj_Dekujr_InitVars = {
ACTOR_OBJ_DEKUJR,
ACTORTYPE_NPC,
ACTORCAT_NPC,
FLAGS,
OBJECT_DEKUJR,
sizeof(ObjDekujr),
@ -107,7 +107,7 @@ void ObjDekujr_ComeUp(ObjDekujr* this, GlobalContext* globalCtx) {
ObjDekujr_SetInitialPos(csCmdNPCAction, &initPos);
ObjDekujr_SetFinalPos(csCmdNPCAction, &finalPos);
if (this->unk_19C == 0) {
this->actor.posRot.pos = initPos;
this->actor.world.pos = initPos;
this->unk_19C = 1;
}
this->actor.shape.rot.x = csCmdNPCAction->urot.x;
@ -141,12 +141,12 @@ void ObjDekujr_Update(Actor* thisx, GlobalContext* globalCtx) {
}
if (this->unk_19B == 1) {
ObjDekujr_ComeUp(this, globalCtx);
this->actor.posRot.pos.x += this->actor.velocity.x;
this->actor.posRot.pos.y += this->actor.velocity.y;
this->actor.posRot.pos.z += this->actor.velocity.z;
this->actor.world.pos.x += this->actor.velocity.x;
this->actor.world.pos.y += this->actor.velocity.y;
this->actor.world.pos.z += this->actor.velocity.z;
} else {
func_80037D98(globalCtx, &this->actor, 0xF, &this->unk_1A0);
Actor_SetHeight(&this->actor, 40.0f);
Actor_SetFocus(&this->actor, 40.0f);
}
}