github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

better name

Browse source
This commit is contained in:
Eric Hoey 2025-04-30 18:27:20 -04:00
commit 5f9640e448
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
View file

@ -62,11 +62,11 @@ void CrawlSpeed_Register() {
COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT, shouldRegister, { COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT, shouldRegister, {
Player* player = GET_PLAYER(gPlayState); Player* player = GET_PLAYER(gPlayState);
bool worldPosition = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) && bool excludeWellBackroom = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
(player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) && (player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) &&
gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL; gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL;
bool glitchAiding = CVAR_GLITCH_AIDING_VALUE; bool glitchAiding = CVAR_GLITCH_AIDING_VALUE;
if (glitchAiding && worldPosition) { if (glitchAiding && excludeWellBackroom) {
*should = true; *should = true;
} else { } else {
ExitCrawlspace(player, gPlayState); ExitCrawlspace(player, gPlayState);
@ -82,11 +82,11 @@ void CrawlSpeed_Register() {
s16 initTimer = va_arg(args, s16); s16 initTimer = va_arg(args, s16);
CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*); CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*);
CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*); CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*);
bool worldPosition = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) && bool excludeWellBackroom = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
(player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) && (player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) &&
gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL; gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL;
bool glitchAiding = CVAR_GLITCH_AIDING_VALUE; bool glitchAiding = CVAR_GLITCH_AIDING_VALUE;
if (glitchAiding && worldPosition) { if (glitchAiding && excludeWellBackroom) {
*should = true; *should = true;
} else { } else {
ExitCrawlspaceCS(gPlayState, csCam, actionParameters, initTimer, atPoints, eyePoints); ExitCrawlspaceCS(gPlayState, csCam, actionParameters, initTimer, atPoints, eyePoints);