hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add NO_SLEEP define

Browse Source
This commit is contained in:
Arceveti
2021-11-01 13:39:24 -07:00
parent 21041e27ff
commit 0306ded434
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config/config_movement.h
View File

@@ -27,6 +27,9 @@
// Change the movement speed when hanging from a ceiling (the vanilla value is 4.0f, has no effect if BETTER_HANGING is enabled)
#define HANGING_SPEED 12.0f
// Prevents Mario from falling asleep while idle
#define NO_SLEEP
// Disables fall damage
#define NO_FALL_DAMAGE

8
src/game/mario_actions_stationary.c
View File

@@ -118,7 +118,7 @@ s32 act_idle(struct MarioState *m) {
if (check_common_idle_cancels(m)) {
return TRUE;
}
#ifndef NO_SLEEP
if (m->actionState == ACT_STATE_IDLE_RESET_OR_SLEEP) {
if ((m->area->terrainType & TERRAIN_MASK) == TERRAIN_SNOW) {
return set_mario_action(m, ACT_SHIVERING, 0);
@@ -126,7 +126,7 @@ s32 act_idle(struct MarioState *m) {
return set_mario_action(m, ACT_START_SLEEPING, 0);
}
}
#endif
if (m->actionArg & 0x1) {
set_mario_animation(m, MARIO_ANIM_STAND_AGAINST_WALL);
} else {
@@ -154,18 +154,22 @@ s32 act_idle(struct MarioState *m) {
// 10 cycles before sleeping.
// actionTimer is used to track how many cycles have passed.
if (++m->actionState == ACT_STATE_IDLE_RESET_OR_SLEEP) {
#ifndef NO_SLEEP
f32 deltaYOfFloorBehindMario = (m->pos[1] - find_floor_height_relative_polar(m, -0x8000, 60.0f));
if ((deltaYOfFloorBehindMario < -24.0f)
|| (24.0f < deltaYOfFloorBehindMario)
|| (m->floor->flags & SURFACE_FLAG_DYNAMIC)) {
m->actionState = ACT_STATE_IDLE_HEAD_LEFT;
} else {
#endif
// If Mario hasn't turned his head 10 times yet, stay idle instead of going to sleep.
m->actionTimer++;
if (m->actionTimer < 10) {
m->actionState = ACT_STATE_IDLE_HEAD_LEFT;
}
#ifndef NO_SLEEP
}
#endif
}
}
}