diff --git a/src/SB/Game/zEntPlayer.cpp b/src/SB/Game/zEntPlayer.cpp index af5fe108e..24b7cc1e5 100644 --- a/src/SB/Game/zEntPlayer.cpp +++ b/src/SB/Game/zEntPlayer.cpp @@ -3497,7 +3497,7 @@ static U32 LassoSwingReleaseCB(xAnimTransition* tran, xAnimSingle* anim, void* o return 0; } -bool zEntPlayer_IsSneaking() +S32 zEntPlayer_IsSneaking() { if (gCurrentPlayer != eCurrentPlayerSpongeBob) { diff --git a/src/SB/Game/zEntPlayer.h b/src/SB/Game/zEntPlayer.h index b9ae55c5c..127f10131 100644 --- a/src/SB/Game/zEntPlayer.h +++ b/src/SB/Game/zEntPlayer.h @@ -391,7 +391,7 @@ void zEntPlayer_ShadowModelEnable(); void zEntPlayer_ShadowModelDisable(); void zEntPlayerJumpStart(class xEnt* ent, class zJumpParam* jump); -bool zEntPlayer_IsSneaking(); +S32 zEntPlayer_IsSneaking(); void zEntPlayer_setBoulderMode(U32 mode); void zEntPlayer_GiveHealth(S32); diff --git a/src/SB/Game/zPlatform.cpp b/src/SB/Game/zPlatform.cpp index 1b5cbd9c8..947844a66 100644 --- a/src/SB/Game/zPlatform.cpp +++ b/src/SB/Game/zPlatform.cpp @@ -97,6 +97,14 @@ void zPlatform_Setup(zPlatform* ent, xScene* sc) } } +void zPlatform_Dismount(zPlatform* ent) +{ + if ((ent->subType == 9) && (ent->state == 1)) + { + ent->state = 0; + } +} + void zPlatformTranslate(xEnt* xent, xVec3* dpos, xMat4x3* dmat) { zPlatform* plat = (zPlatform*)xent; diff --git a/src/SB/Game/zVar.cpp b/src/SB/Game/zVar.cpp index d34d70f56..ac83a4fc0 100644 --- a/src/SB/Game/zVar.cpp +++ b/src/SB/Game/zVar.cpp @@ -182,7 +182,7 @@ namespace return zSceneGetAreaname(globals.sceneCur->sceneID); } - char* var_text_CurrentData() + char* var_text_CurrentDate() { iGetCurrFormattedDate(zVar_printf_buffer6); return zVar_printf_buffer6; @@ -672,42 +672,42 @@ S32 zVarEntryCB_CurrentRoom(void*) return room + ((mostSignificantChar - 'A') + 1) * 100; } -S32 zVarEntryCB_CurrentLevelPickup() +S32 zVarEntryCB_CurrentLevelPickup(void*) { return globals.player.Inv_LevelPickups_CurrentLevel; } -S32 zVarEntryCB_CurrentLevelPSocks() +S32 zVarEntryCB_CurrentLevelPSocks(void*) { return globals.player.Inv_PatsSock_CurrentLevel; } -S32 zVarEntryCB_TotalPSocks() +S32 zVarEntryCB_TotalPSocks(void*) { return globals.player.Inv_PatsSock_Total; } -S32 zVarEntryCB_Shinies() +S32 zVarEntryCB_Shinies(void*) { return globals.player.Inv_Shiny; } -S32 zVarEntryCB_Spatulas() +S32 zVarEntryCB_Spatulas(void*) { return globals.player.Inv_Spatula; } -S32 zVarEntryCB_Date() +S32 zVarEntryCB_Date(void*) { return iGetDay() + iGetMonth() * 0x64; } -S32 zVarEntryCB_Hour() +S32 zVarEntryCB_Hour(void*) { return iGetHour(); } -S32 zVarEntryCB_Minute() +S32 zVarEntryCB_Minute(void*) { return iGetMinute(); }