Merge branch 'master' into hardcoding-time-again

This commit is contained in:
Monster Iestyn 2018-01-13 17:49:44 +00:00
commit 87aa9175a1
4 changed files with 14 additions and 6 deletions

View file

@ -407,7 +407,7 @@ static int libd_getSpritePatch(lua_State *L)
static int libd_getSprite2Patch(lua_State *L)
{
INT32 i; // skin number
INT32 j; // sprite2 prefix
playersprite_t j; // sprite2 prefix
UINT32 frame = 0; // 'A'
UINT8 angle = 0;
spritedef_t *sprdef;

View file

@ -102,7 +102,7 @@ static int lib_sprnamelen(lua_State *L)
// push sprite name
static int lib_getSpr2name(lua_State *L)
{
INT32 i;
playersprite_t i;
lua_remove(L, 1); // don't care about spr2names[] dummy userdata.
@ -129,7 +129,7 @@ static int lib_getSpr2name(lua_State *L)
static int lib_getSpr2default(lua_State *L)
{
INT32 i;
playersprite_t i;
lua_remove(L, 1); // don't care about spr2defaults[] dummy userdata.
@ -154,7 +154,7 @@ static int lib_getSpr2default(lua_State *L)
static int lib_setSpr2default(lua_State *L)
{
INT32 i;
playersprite_t i;
UINT8 j = 0;
lua_remove(L, 1); // don't care about spr2defaults[] dummy userdata.

View file

@ -70,6 +70,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
#endif
#if defined (__GNUC__) && (__GNUC__ >= 4)
#define FIXUPO0
#endif
#define SKULLXOFF -32
#define LINEHEIGHT 16
#define STRINGHEIGHT 8
@ -4953,7 +4957,7 @@ static boolean M_AddonsRefresh(void)
#define offs 1
#ifdef __GNUC__
#ifdef FIXUPO0
#pragma GCC optimize ("0")
#endif
@ -5081,7 +5085,7 @@ static void M_DrawAddons(void)
#undef CANSAVE
}
#ifdef __GNUC__
#ifdef FIXUPO0
#pragma GCC reset_options
#endif

View file

@ -103,6 +103,10 @@ static inline VOID MakeCodeWritable(VOID)
\return int
*/
#if defined (__GNUC__) && (__GNUC__ >= 4)
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#endif
#ifdef FORCESDLMAIN
int SDL_main(int argc, char **argv)
#else