diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-11-23 11:29:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 13:29:18 -0300 |
| commit | 6b493d3f9d79dd2546e833998f3b9ba8a747223a (patch) | |
| tree | bde8720d11cca4fec61b4493e709342e27519706 /src/code/z_quake.c | |
| parent | 837eb1c80687fe9b57a3c7b841547c33feeed6c7 (diff) | |
z_bgcheck.c (#357)
* first few functions
* two more almost matching functions
* Rebase to NBS, get it to compile
* BgCheck_RaycastFloorStaticList OK, fix-up some functions
* BgCheck_SphVsStaticWall OK! and a few others
* more z_bgcheck NON_MATCHINGS
* OK more functions, reorganize external reference #defines
* More functions OK, more struct fixes
* More OKs
* Decomp all the way to the end of bgcheck
* All functions attempted
* Rename functions
* formatting, data migration
* Give names to unk structs, rename some structs, fix some non-equivalent functions
* WaterBox_GetSurfaceImpl OK
* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.
* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings
* pr change requests
* fix crc maybe
* implement more changes
* implement alf's changes
Diffstat (limited to 'src/code/z_quake.c')
| -rw-r--r-- | src/code/z_quake.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_quake.c b/src/code/z_quake.c index d08ff5993..9c5288139 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -416,8 +416,9 @@ void Quake2_ClearType(s32 type) { } s32 Quake2_GetFloorQuake(Player* player) { - if (func_800C9D8C(&sQuake2Context.globalCtx->colCtx, player->actor.floorPoly, player->actor.floorBgId) == 0) { - return func_800C9E18(&sQuake2Context.globalCtx->colCtx, player->actor.floorPoly, player->actor.floorBgId); + if (!SurfaceType_IsConveyor(&sQuake2Context.globalCtx->colCtx, player->actor.floorPoly, player->actor.floorBgId)) { + return SurfaceType_GetConveyorSpeed(&sQuake2Context.globalCtx->colCtx, player->actor.floorPoly, + player->actor.floorBgId); } return 0; } |