From 168f69adf21b75f90deba4bf114f35941d7fd656 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 7 Mar 2019 00:18:48 +0000 Subject: [PATCH] Shut up some -pedantic warnings --- src/Draw.h | 2 +- src/KeyControl.h | 2 +- src/NpChar.h | 2 +- src/Sound.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Draw.h b/src/Draw.h index 628fa023..2cc30aeb 100644 --- a/src/Draw.h +++ b/src/Draw.h @@ -47,7 +47,7 @@ typedef enum Surface_Ids SURFACE_ID_CREDIT_CAST = 35, SURFACE_ID_CREDITS_IMAGE = 36, SURFACE_ID_CASTS = 37, - SURFACE_ID_MAX = 40, + SURFACE_ID_MAX = 40 } Surface_Ids; struct SURFACE; diff --git a/src/KeyControl.h b/src/KeyControl.h index 251600eb..475bed3f 100644 --- a/src/KeyControl.h +++ b/src/KeyControl.h @@ -31,7 +31,7 @@ enum KEYBIND KEY_ALT_UP = 0x00180000, //Alt up actually has 2 seperate keys, but they're kind of merged together (and also for some reason the second one is +/=) KEY_L = 0x00080000, - KEY_PLUS = 0x00100000, + KEY_PLUS = 0x00100000 }; extern int gKey; diff --git a/src/NpChar.h b/src/NpChar.h index 43050386..2a39f345 100644 --- a/src/NpChar.h +++ b/src/NpChar.h @@ -24,7 +24,7 @@ enum NPC_flags npc_altDir = 0x1000, //Spawn facing to the right (or however the npc interprets the direction as) npc_interact = 0x2000, //Run event when interacted with npc_hideSet = 0x4000, //Hide when flag is set - npc_showDamage = 0x8000, //Show #Damage taken + npc_showDamage = 0x8000 //Show #Damage taken }; struct NPCHAR diff --git a/src/Sound.h b/src/Sound.h index 2bbcbc3a..19c2c88f 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -86,7 +86,7 @@ enum MUSIC_IDS mus_LivingWaterway = 0x26, mus_SealChamber = 0x27, mus_TorokosTheme = 0x28, - mus_White = 0x29, + mus_White = 0x29 }; #define SOUND_NO 0x100