diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2021-12-11 02:21:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 20:21:19 -0500 |
| commit | 05b2cbfc60d396a7cf3b539347fc693d5588cada (patch) | |
| tree | 79b9ebf0082a594fae3b659ffb11b98b64b9e168 /src/code/z_actor.c | |
| parent | 037c1dcad6e37f5135ead0ef2180a57ce256a267 (diff) | |
Doc dodongo's cavern stuff (#1019)
* Document `func_80033480` more
* More doc in `BgDdanKd`
* WIP Document BgDodoago
The dodongo skull light-eyes-with-bomb puzzle
Some TODOs, jank/legacy code which I'm unsure if it achieves something significant
* Finish documenting BgDodoago
* `BgDodoago_WaitExplosives_` -> `BgDodoago_WaitExplosives`
* Run formatter
* `dlistBuffer` -> `displayListHead`
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 4f23e2c78..b1e5366cb 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3159,7 +3159,8 @@ void Actor_SpawnFloorDustRing(GlobalContext* globalCtx, Actor* actor, Vec3f* pos } } -void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 scaleStep, u8 arg6) { +void func_80033480(GlobalContext* globalCtx, Vec3f* posBase, f32 randRangeDiameter, s32 amountMinusOne, s16 scaleBase, + s16 scaleStep, u8 arg6) { Vec3f pos; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; @@ -3167,12 +3168,12 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 u32 var2; s32 i; - for (i = arg3; i >= 0; i--) { - pos.x = arg1->x + ((Rand_ZeroOne() - 0.5f) * arg2); - pos.y = arg1->y + ((Rand_ZeroOne() - 0.5f) * arg2); - pos.z = arg1->z + ((Rand_ZeroOne() - 0.5f) * arg2); + for (i = amountMinusOne; i >= 0; i--) { + pos.x = posBase->x + ((Rand_ZeroOne() - 0.5f) * randRangeDiameter); + pos.y = posBase->y + ((Rand_ZeroOne() - 0.5f) * randRangeDiameter); + pos.z = posBase->z + ((Rand_ZeroOne() - 0.5f) * randRangeDiameter); - scale = (s16)((Rand_ZeroOne() * arg4) * 0.2f) + arg4; + scale = (s16)((Rand_ZeroOne() * scaleBase) * 0.2f) + scaleBase; var2 = arg6; if (var2 != 0) { |
