diff --git a/Dockerfile b/Dockerfile index c85714e9..a0f91e68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,13 @@ RUN apt-get update && \ build-essential \ libcapstone-dev \ pkgconf \ - python3 + python3 \ + libz-dev RUN mkdir /sm64 WORKDIR /sm64 ENV PATH="/sm64/tools:${PATH}" -CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64ex-coop make -j4 HEADLESS=1\n' \ - 'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage' +# docker build -t sm64ex-coop . +# docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64ex-coop make -j HEADLESS=1 +# see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index bf1bafc6..b0fb1610 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -53,7 +53,7 @@ void play_knockback_sound(struct MarioState *m) { #endif s32 lava_boost_on_wall(struct MarioState *m) { - if (Cheats.enabled && Cheats.godMode) { return; } + if (Cheats.enabled && Cheats.godMode) { return FALSE; } m->faceAngle[1] = atan2s(m->wallNormal[2], m->wallNormal[0]); if (m->forwardVel < 24.0f) {