From 3bfb394b70561ba7682f16d15c55b787f77a1ca9 Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:28:49 -0700 Subject: [PATCH] Fix compiler warnings --- include/surface_terrains.h | 2 +- src/engine/surface_load.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/surface_terrains.h b/include/surface_terrains.h index 24ab18dd..cc71af11 100644 --- a/include/surface_terrains.h +++ b/include/surface_terrains.h @@ -155,7 +155,7 @@ #define SURFACE_TRAPDOOR 0x00FF // Bowser Left trapdoor, has no action defined #define SURFACE_IS_NEW_WATER(cmd) (cmd == SURFACE_NEW_WATER || cmd == SURFACE_NEW_WATER_BOTTOM) -#define SURFACE_IS_QUICKSAND(cmd) (cmd >= SURFACE_SHALLOW_QUICKSAND && cmd <= SURFACE_MOVING_QUICKSAND || cmd == SURFACE_INSTANT_MOVING_QUICKSAND) +#define SURFACE_IS_QUICKSAND(cmd) ((cmd >= SURFACE_SHALLOW_QUICKSAND && cmd <= SURFACE_MOVING_QUICKSAND) || cmd == SURFACE_INSTANT_MOVING_QUICKSAND) #define SURFACE_IS_NOT_HARD(cmd) (cmd != SURFACE_HARD && !(cmd >= SURFACE_HARD_SLIPPERY && cmd <= SURFACE_HARD_NOT_SLIPPERY)) #define SURFACE_IS_PAINTING_WOBBLE(cmd) (cmd >= SURFACE_PAINTING_WOBBLE_A6 && cmd <= SURFACE_PAINTING_WOBBLE_D2) #define SURFACE_IS_PAINTING_WOBBLE_LEFT(cmd) (((cmd - SURFACE_PAINTING_WOBBLE_A6) % 3) == 0) diff --git a/src/engine/surface_load.h b/src/engine/surface_load.h index 0f8fea57..7cffe2e4 100644 --- a/src/engine/surface_load.h +++ b/src/engine/surface_load.h @@ -8,7 +8,6 @@ extern u8 gSurfacePoolError; -#define NUM_CELLS (2 * LEVEL_BOUNDARY_MAX / CELL_SIZE) #define NUM_CELLS_INDEX (NUM_CELLS - 1) struct SurfaceNode