Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SB/Game/zEntPlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3497,7 +3497,7 @@ static U32 LassoSwingReleaseCB(xAnimTransition* tran, xAnimSingle* anim, void* o
return 0;
}

bool zEntPlayer_IsSneaking()
S32 zEntPlayer_IsSneaking()
{
if (gCurrentPlayer != eCurrentPlayerSpongeBob)
{
Expand Down
2 changes: 1 addition & 1 deletion src/SB/Game/zEntPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 8 additions & 0 deletions src/SB/Game/zPlatform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions src/SB/Game/zVar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down