diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2022-07-21 21:05:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 05:05:28 +0100 |
| commit | cbeeeb172ab151be24478d2175f4cf7305ceff8c (patch) | |
| tree | 425b852567db972cced61be65544d8d53a1fccbb /src/code/z_sub_s.c | |
| parent | f0e4581e2237630f77d253a823851cafb1ff524f (diff) | |
EnBaba Documented (Bomb Shop Lady) (#825)
* Merge in sub_s_models
* Update subs DL names
* Unused Weight pathing
* Function headers for weightpathing
* TimePathing WIP
* Timepathing, still unsure about unk184
* Move subs functions from functions.h to z64subs.h
* Add fake comment
* Some cleanup and renames
* Renames/cleanup of actors that use timepath
* Cleanup
* More cleanup
* Rename unk stuff
* Merge in upstream/master
* TimeElapsed -> elapsedTime
* Fix
* Final cleanup
* SubS Time Paths
* Still needs dialog action functions
* Fix waypoint comments
* Review pt. 1
* Baba review
* ScheduleResult -> ScheduleOutput
* Forgot to update functions.txt oops
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Finish up docs
* Fix order comments
* Fix
* Change bombShopkeeper struct member to
* Fix a few merge mistakes
* Add ScheduleOutput to namefixer
* format
* Format and fix merge
* Review
* PR
* z64schedule.h
* text summary
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Diffstat (limited to 'src/code/z_sub_s.c')
| -rw-r--r-- | src/code/z_sub_s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index f8c6b1a21..e7491a830 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -480,13 +480,13 @@ void SubS_TimePathing_ComputeInitialY(PlayState* play, Path* path, s32 waypoint, } } -Path* SubS_GetAdditionalPath(PlayState* play, u8 pathIndex, s32 max) { +Path* SubS_GetAdditionalPath(PlayState* play, u8 pathIndex, s32 limit) { Path* path; s32 i = 0; do { path = &play->setupPathList[pathIndex]; - if (i >= max) { + if (i >= limit) { break; } pathIndex = path->unk1; |