diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-04-04 00:33:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 18:33:50 -0400 |
| commit | b9b40805f7f63d0a6cb3c33e55ac420710acef70 (patch) | |
| tree | 1d2ccdd8e9aa54cb99a2f55c36259bc28db56db9 /src/code | |
| parent | 04fb0ac1b1c92b1fa04115b0a73970c789d3f92d (diff) | |
Fix misc 9 (#1183)
* Fix typo `tranform` -> `transform`
* (may be controversial) `indexes` (noun) -> `indices`, both are correct but `indices` prevails in the repo currently, and seems prefered in technical contexts
* Fixup one `@bug`
* Fix typo `relfect` -> `reflect`
* Rename and `@bug` `DemoTreLgt_OverrideLimbDraw`
* Fixup `PLAYER_AP_` to `ARROW_` type conversion
* `posModel` -> `modelPos`
* `effSpawnPosModel` -> `effSpawnModelPos`
* Gohma decay bug: Verified that timers do not prevent UB access
* Reorder summation in a more meaningful way
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_parameter.c | 6 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 6 | ||||
| -rw-r--r-- | src/code/z_skin_awb.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index c4f70d881..18d77312a 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2345,7 +2345,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { { 255, 255, 150 }, { 255, 255, 50 }, }; - static s16 sMagicBorderIndexes[] = { 0, 1, 1, 0 }; + static s16 sMagicBorderIndices[] = { 0, 1, 1, 0 }; static s16 sMagicBorderRatio = 2; static s16 sMagicBorderStep = 1; MessageContext* msgCtx = &globalCtx->msgCtx; @@ -2410,7 +2410,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { case 3: case 4: case 6: - temp = sMagicBorderIndexes[sMagicBorderStep]; + temp = sMagicBorderIndices[sMagicBorderStep]; borderChangeR = ABS(sMagicBorderR - sMagicBorderColors[temp][0]) / sMagicBorderRatio; borderChangeG = ABS(sMagicBorderG - sMagicBorderColors[temp][1]) / sMagicBorderRatio; borderChangeB = ABS(sMagicBorderB - sMagicBorderColors[temp][2]) / sMagicBorderRatio; @@ -2475,7 +2475,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { } } - temp = sMagicBorderIndexes[sMagicBorderStep]; + temp = sMagicBorderIndices[sMagicBorderStep]; borderChangeR = ABS(sMagicBorderR - sMagicBorderColors[temp][0]) / sMagicBorderRatio; borderChangeG = ABS(sMagicBorderG - sMagicBorderColors[temp][1]) / sMagicBorderRatio; borderChangeB = ABS(sMagicBorderB - sMagicBorderColors[temp][2]) / sMagicBorderRatio; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 1b75efbed..2c7b07c6a 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -804,7 +804,7 @@ s32 func_8008F2F8(GlobalContext* globalCtx) { return var + 1; } -u8 sEyeMouthIndexes[][2] = { +u8 sEyeMouthIndices[][2] = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 0, 0 }, { 1, 0 }, { 2, 0 }, { 4, 0 }, { 5, 1 }, { 7, 2 }, { 0, 2 }, { 3, 0 }, { 4, 0 }, { 2, 2 }, { 1, 1 }, { 0, 2 }, { 0, 0 }, }; @@ -868,7 +868,7 @@ void Player_DrawImpl(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTabl OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 1721); if (eyeIndex < 0) { - eyeIndex = sEyeMouthIndexes[face][0]; + eyeIndex = sEyeMouthIndices[face][0]; } #ifndef AVOID_UB @@ -878,7 +878,7 @@ void Player_DrawImpl(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTabl #endif if (mouthIndex < 0) { - mouthIndex = sEyeMouthIndexes[face][1]; + mouthIndex = sEyeMouthIndices[face][1]; } #ifndef AVOID_UB diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index c531d74a1..13ceafa91 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -141,7 +141,7 @@ s32 func_800A698C(Skin* skin, SkinLimb** skeleton, MtxF* limbMatrices, u8 parent } /** - * Recursively applies matrix tranformations to each limb + * Recursively applies matrix transformations to each limb */ s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, Actor* actor, s32 setTranslation) { s32 i; |