Shut up some -pedantic warnings
This commit is contained in:
parent
2266a5ee6d
commit
168f69adf2
4 changed files with 4 additions and 4 deletions
|
@ -47,7 +47,7 @@ typedef enum Surface_Ids
|
||||||
SURFACE_ID_CREDIT_CAST = 35,
|
SURFACE_ID_CREDIT_CAST = 35,
|
||||||
SURFACE_ID_CREDITS_IMAGE = 36,
|
SURFACE_ID_CREDITS_IMAGE = 36,
|
||||||
SURFACE_ID_CASTS = 37,
|
SURFACE_ID_CASTS = 37,
|
||||||
SURFACE_ID_MAX = 40,
|
SURFACE_ID_MAX = 40
|
||||||
} Surface_Ids;
|
} Surface_Ids;
|
||||||
|
|
||||||
struct SURFACE;
|
struct SURFACE;
|
||||||
|
|
|
@ -31,7 +31,7 @@ enum KEYBIND
|
||||||
KEY_ALT_UP = 0x00180000,
|
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 +/=)
|
//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_L = 0x00080000,
|
||||||
KEY_PLUS = 0x00100000,
|
KEY_PLUS = 0x00100000
|
||||||
};
|
};
|
||||||
|
|
||||||
extern int gKey;
|
extern int gKey;
|
||||||
|
|
|
@ -24,7 +24,7 @@ enum NPC_flags
|
||||||
npc_altDir = 0x1000, //Spawn facing to the right (or however the npc interprets the direction as)
|
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_interact = 0x2000, //Run event when interacted with
|
||||||
npc_hideSet = 0x4000, //Hide when flag is set
|
npc_hideSet = 0x4000, //Hide when flag is set
|
||||||
npc_showDamage = 0x8000, //Show #Damage taken
|
npc_showDamage = 0x8000 //Show #Damage taken
|
||||||
};
|
};
|
||||||
|
|
||||||
struct NPCHAR
|
struct NPCHAR
|
||||||
|
|
|
@ -86,7 +86,7 @@ enum MUSIC_IDS
|
||||||
mus_LivingWaterway = 0x26,
|
mus_LivingWaterway = 0x26,
|
||||||
mus_SealChamber = 0x27,
|
mus_SealChamber = 0x27,
|
||||||
mus_TorokosTheme = 0x28,
|
mus_TorokosTheme = 0x28,
|
||||||
mus_White = 0x29,
|
mus_White = 0x29
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SOUND_NO 0x100
|
#define SOUND_NO 0x100
|
||||||
|
|
Loading…
Add table
Reference in a new issue