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

16
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View file

@ -45,7 +45,7 @@ static DemoGeffDrawFunc sDrawFuncs[] = {
const ActorInit Demo_Geff_InitVars = {
ACTOR_DEMO_GEFF,
ACTORTYPE_BOSS,
ACTORCAT_BOSS,
FLAGS,
OBJECT_GEFF,
sizeof(DemoGeff),
@ -137,7 +137,7 @@ void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) {
Actor* propIt;
if (this->demoGt == NULL) {
propIt = globalCtx->actorCtx.actorList[ACTORTYPE_PROP].first;
propIt = globalCtx->actorCtx.actorLists[ACTORCAT_PROP].head;
if ((this->actor.params != 0) && (this->actor.params != 1) && (this->actor.params != 2)) {
targetParams = 2;
} else {
@ -145,9 +145,9 @@ void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) {
}
while (propIt != NULL) {
if (propIt->id == ACTOR_DEMO_GT && propIt->params == targetParams) {
this->deltaPosX = this->actor.posRot.pos.x - propIt->posRot.pos.x;
this->deltaPosY = this->actor.posRot.pos.y - propIt->posRot.pos.y;
this->deltaPosZ = this->actor.posRot.pos.z - propIt->posRot.pos.z;
this->deltaPosX = this->actor.world.pos.x - propIt->world.pos.x;
this->deltaPosY = this->actor.world.pos.y - propIt->world.pos.y;
this->deltaPosZ = this->actor.world.pos.z - propIt->world.pos.z;
this->demoGt = propIt;
}
propIt = propIt->next;
@ -159,9 +159,9 @@ void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) {
DemoGt* demoGt = this->demoGt;
s16 params = this->actor.params;
if (demoGt != NULL && (params != 6) && (params != 7) && (params != 8)) {
this->actor.posRot.pos.x = demoGt->dyna.actor.posRot.pos.x + this->deltaPosX;
this->actor.posRot.pos.y = demoGt->dyna.actor.posRot.pos.y + this->deltaPosY;
this->actor.posRot.pos.z = demoGt->dyna.actor.posRot.pos.z + this->deltaPosZ;
this->actor.world.pos.x = demoGt->dyna.actor.world.pos.x + this->deltaPosX;
this->actor.world.pos.y = demoGt->dyna.actor.world.pos.y + this->deltaPosY;
this->actor.world.pos.z = demoGt->dyna.actor.world.pos.z + this->deltaPosZ;
}
}