diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-02-02 23:44:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 18:44:24 -0500 |
| commit | 02b3640bded597ff695f1a66c549662e4de4c294 (patch) | |
| tree | 0ccabcc193efba75ae3a9a3a27bfc972a9dda8ee /src/code | |
| parent | ced724fb9b2c883a02f60019f0cd710512189fde (diff) | |
Fix most actor compiler warnings (#656)
* functions.h
* Bg_Hidan_Kowarerukabe
* Demo_Geff
* Arrow_Fire
* Demo_Sa
* Arms_Hook
* En_Okarina_Effect
* Demo_Im
* Bg_Menkuri_Kaiten
* Bg_Spot09_Obj (minus CollisionHeader)
* Obj_Hsblock
* Obj_Elevator
* En_Anubice_Tag
* Bg_Ydan_Hasi
(minus BgYdanHasi_MoveWater return shenanigans)
* En_Heishi4
* Demo_Go
* Bg_Spot00_Break
* Bg_Hidan_Kousi
* Bg_Spot17_Bakudankabe
* Bg_Spot18_Basket
* En_Dha
* Bg_Jya_Goroiwa
* En_Js
* Bg_Mori_Hineri
* Bg_Spot18_Shutter
* Bg_Jya_Bombchuiwa
* Bg_Bdan_Objects
* Bg_Jya_Amishutter
* Bg_Toki_Swd
* En_Heishi2
* En_Fu
* Bg_Jya_Kanaami
* Bg_Pushbox
* Bg_Spot12_Saku
* En_Ani
* En_Zl1
* En_Vase
* Bg_Spot05_Soko
* En_Crow (and a rename in En_Firefly)
* Bg_Hidan_Fslift
* En_Dog
* Bg_Heavy_Block
* En_Boom
* Bg_Ddan_Kd
* Bg_Spot16_Bombstone
* Demo_Effect
* Bg_Hidan_Syoku
* En_Firefly
* En_Fw
* Bg_Jya_Bombiwa
* En_Fd
* ovl_Bg_Spot15_Saku
* En_Mb
* Bg_Spot18_Obj
* Bg_Zg
* Bg_Bdan_Switch
* En_Md
* En_Box
* En_Bw
* En_Viewer
* En_Hs2
* Bg_Ydan_Maruta
* En_St
* En_Ru1
* Bg_Ddan_Jd
* En_Sb
* Bg_Jya_Cobra
* Bg_Spot12_Gate
* Bg_Haka_Trap
* En_Ms
* En_Kakasi2
* En_Horse_Link_Child
* Obj_Bombiwa
* En_Ds
* En_Kz
* Bg_Umajump
* Bg_Spot03_Taki
* Door_Toki
* Item_Etcetera
* En_Ru2
* En_Niw
* Bg_Spot15_Rrbox
* Demo_Tre_Lgt
* Obj_Oshihiki
* Bg_Mjin
* Bg_Spot18_Futa
* Bg_Spot01_Idosoko
* En_Arow_Trap
* Bg_Mizu_Uzu
* En_Horse_Zelda
* Player
* fix func_800358DC to work in functions.h
* fix fix to functions.h
* enum fixes
* Some review comments addressed
* DynaPoly_GetActor standardisation
* ovl_Daiku_Kakariko
* ovl_En_Vase
* ovl_En_Mk
* ovl_Bg_Spot00_Hanebasi
* ovl_Bg_Spot06_Objects
* ovl_En_Go
* ovl_En_Go2
* ovl_Bg_Jya_Bombiwa
* ovl_En_Cs
* ovl_En_Dodojr
* ovl_En_Ny
* ovl_En_Mm2
* Apply review suggestion
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index f6ba831dd..5c5283703 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4090,7 +4090,7 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { /** * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ -EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, +Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, GlobalContext* globalCtx, s16 params, s32 arg8) { EnPart* spawnedEnPart; @@ -4105,7 +4105,7 @@ EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, spawnedEnPart->timer = timer; spawnedEnPart->rotZ = arg3[1]; spawnedEnPart->rotZSpeed = arg3[2]; - return spawnedEnPart; + return &spawnedEnPart->actor; } return NULL; |