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

6
src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View file

@ -18,7 +18,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx);
const ActorInit Oceff_Wipe3_InitVars = {
ACTOR_OCEFF_WIPE3,
ACTORTYPE_ITEMACTION,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(OceffWipe3),
@ -34,7 +34,7 @@ void OceffWipe3_Init(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe3* this = THIS;
Actor_SetScale(&this->actor, 0.1f);
this->counter = 0;
this->actor.posRot.pos = ACTIVE_CAM->eye;
this->actor.world.pos = ACTIVE_CAM->eye;
// it's actually WIPE3...
osSyncPrintf(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params);
}
@ -51,7 +51,7 @@ void OceffWipe3_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void OceffWipe3_Update(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe3* this = THIS;
this->actor.posRot.pos = ACTIVE_CAM->eye;
this->actor.world.pos = ACTIVE_CAM->eye;
if (this->counter < 100) {
this->counter++;
} else {