etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 03:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore vanilla pause camera zoom out as gLevelValues field

Browse source
This commit is contained in:
Agent X 2024-03-03 17:30:20 -05:00
parent a32af25896
commit 87a83806a1
6 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View file

@ -930,6 +930,7 @@
--- @field public wingCapDurationTotwc integer --- @field public wingCapDurationTotwc integer
--- @field public wingCapLookUpReq integer --- @field public wingCapLookUpReq integer
--- @field public wingCapSequence SeqId --- @field public wingCapSequence SeqId
--- @field public zoomOutCameraOnPause integer
--- @class LinearTransitionPoint --- @class LinearTransitionPoint
--- @field public dist number --- @field public dist number

1
docs/lua/structs.md
View file

@ -1269,6 +1269,7 @@
| wingCapDurationTotwc | `integer` | | | wingCapDurationTotwc | `integer` | |
| wingCapLookUpReq | `integer` | | | wingCapLookUpReq | `integer` | |
| wingCapSequence | [enum SeqId](constants.md#enum-SeqId) | | | wingCapSequence | [enum SeqId](constants.md#enum-SeqId) | |
| zoomOutCameraOnPause | `integer` | |
[:arrow_up_small:](#) [:arrow_up_small:](#)

9
src/game/hardcoded.c
View file

@ -112,7 +112,7 @@ struct LevelValues gDefaultLevelValues = {
.CcmSlideStarPos = { 2500.0f, -4350.0f, 5750.0f }, .CcmSlideStarPos = { 2500.0f, -4350.0f, 5750.0f },
.UkikiCageStarPos = { 2500.0f, -1200.0f, 1300.0f }, .UkikiCageStarPos = { 2500.0f, -1200.0f, 1300.0f },
.UnagiStarPos = { 6833.0f, -3654.0f, 2230.0f }, .UnagiStarPos = { 6833.0f, -3654.0f, 2230.0f },
.JetstreamRingStarPos = { 3400.0f, -3200.0f, -500.0f }, .JetstreamRingStarPos = { 3400.0f, -3200.0f, -500.0f }
}, },
.cellHeightLimit = CELL_HEIGHT_LIMIT, .cellHeightLimit = CELL_HEIGHT_LIMIT,
.floorLowerLimit = FLOOR_LOWER_LIMIT, .floorLowerLimit = FLOOR_LOWER_LIMIT,
@ -122,7 +122,8 @@ struct LevelValues gDefaultLevelValues = {
.maxCoins = 999, .maxCoins = 999,
.numCoinsToLife = 50, .numCoinsToLife = 50,
.wdwWaterLevelSpeed = 10.0f, .wdwWaterLevelSpeed = 10.0f,
.useGlobalStarIds = FALSE .useGlobalStarIds = FALSE,
.zoomOutCameraOnPause = TRUE
}; };
struct LevelValues gLevelValues = { 0 }; struct LevelValues gLevelValues = { 0 };
@ -245,7 +246,7 @@ struct BehaviorValues gDefaultBehaviorValues = {
.WigglerAttack3Dialog = DIALOG_151, .WigglerAttack3Dialog = DIALOG_151,
.WigglerDialog = DIALOG_150, .WigglerDialog = DIALOG_150,
.WingCourseDialog = DIALOG_131, .WingCourseDialog = DIALOG_131,
.YoshiDialog = DIALOG_161, .YoshiDialog = DIALOG_161
}, },
.trajectories = { .trajectories = {
.KoopaBobTrajectory = (Trajectory*) bob_seg7_trajectory_koopa, .KoopaBobTrajectory = (Trajectory*) bob_seg7_trajectory_koopa,
@ -277,7 +278,7 @@ struct BehaviorValues gDefaultBehaviorValues = {
.PlatformBitfsTrajectory = (Trajectory*) bitfs_seg7_trajectory_070159AC, .PlatformBitfsTrajectory = (Trajectory*) bitfs_seg7_trajectory_070159AC,
.PlatformHmcTrajectory = (Trajectory*) hmc_seg7_trajectory_0702B86C, .PlatformHmcTrajectory = (Trajectory*) hmc_seg7_trajectory_0702B86C,
.PlatformLllTrajectory = (Trajectory*) lll_seg7_trajectory_0702856C, .PlatformLllTrajectory = (Trajectory*) lll_seg7_trajectory_0702856C,
.PlatformLll2Trajectory = (Trajectory*) lll_seg7_trajectory_07028660, .PlatformLll2Trajectory = (Trajectory*) lll_seg7_trajectory_07028660
} }
}; };

1
src/game/hardcoded.h
View file

@ -88,6 +88,7 @@ struct LevelValues {
u16 numCoinsToLife; u16 numCoinsToLife;
f32 wdwWaterLevelSpeed; f32 wdwWaterLevelSpeed;
u8 useGlobalStarIds; u8 useGlobalStarIds;
u8 zoomOutCameraOnPause;
}; };
extern struct LevelValues gLevelValues; extern struct LevelValues gLevelValues;

4
src/game/level_update.c
View file

@ -1335,7 +1335,9 @@ s32 play_mode_paused(void) {
game_exit(); game_exit();
}*/ }*/
gCameraMovementFlags &= ~CAM_MOVE_PAUSE_SCREEN; if (!gLevelValues.zoomOutCameraOnPause) {
gCameraMovementFlags &= ~CAM_MOVE_PAUSE_SCREEN;
}
return 0; return 0;
} }

3
src/pc/lua/smlua_cobject_autogen.c
View file

@ -995,7 +995,7 @@ static struct LuaObjectField sLakituStateFields[LUA_LAKITU_STATE_FIELD_COUNT] =
{ "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE }, { "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE },
}; };
#define LUA_LEVEL_VALUES_FIELD_COUNT 48 #define LUA_LEVEL_VALUES_FIELD_COUNT 49
static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = { static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = {
{ "bubbleOnDeathBarrierInCapStages", LVT_U8, offsetof(struct LevelValues, bubbleOnDeathBarrierInCapStages), false, LOT_NONE }, { "bubbleOnDeathBarrierInCapStages", LVT_U8, offsetof(struct LevelValues, bubbleOnDeathBarrierInCapStages), false, LOT_NONE },
{ "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE }, { "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE },
@ -1045,6 +1045,7 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] =
{ "wingCapDurationTotwc", LVT_U16, offsetof(struct LevelValues, wingCapDurationTotwc), false, LOT_NONE }, { "wingCapDurationTotwc", LVT_U16, offsetof(struct LevelValues, wingCapDurationTotwc), false, LOT_NONE },
{ "wingCapLookUpReq", LVT_S16, offsetof(struct LevelValues, wingCapLookUpReq), false, LOT_NONE }, { "wingCapLookUpReq", LVT_S16, offsetof(struct LevelValues, wingCapLookUpReq), false, LOT_NONE },
{ "wingCapSequence", LVT_S32, offsetof(struct LevelValues, wingCapSequence), false, LOT_NONE }, { "wingCapSequence", LVT_S32, offsetof(struct LevelValues, wingCapSequence), false, LOT_NONE },
{ "zoomOutCameraOnPause", LVT_U8, offsetof(struct LevelValues, zoomOutCameraOnPause), false, LOT_NONE },
}; };
#define LUA_LINEAR_TRANSITION_POINT_FIELD_COUNT 5 #define LUA_LINEAR_TRANSITION_POINT_FIELD_COUNT 5