diff --git a/src/Makefile b/src/Makefile index e60bcf111..1119accfb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -300,11 +300,6 @@ ifdef X86_64 endif endif -# apparently MingW just completely ignores everything so just always force this shit -# FIXME: we should port our code to c24 -CFLAGS+=-std=gnu17 -CPPFLAGS+=-std=gnu17 - ifndef NOPNG OPTS+=-DHAVE_PNG diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 542f87a24..cd416d8d8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1695,7 +1695,7 @@ static void SV_SendPlayerInfo(INT32 node) continue; } - if (players[i].ingame == UINT8_MAX || !players[i].ingame) + if (!players[i].ingame) { netbuffer->u.playerinfo[i].node = 255; // This slot is empty. continue; diff --git a/src/d_think.h b/src/d_think.h index 8177f464d..3517a5370 100644 --- a/src/d_think.h +++ b/src/d_think.h @@ -28,7 +28,8 @@ // To compile this as "ANSI C with classes" we will need to handle the various // action functions cleanly. // -typedef void (*actionf_v)(); +struct mobj_s; +typedef void (*actionf_v)(struct mobj_s *); typedef void (*actionf_p1)(void *); typedef union diff --git a/src/doomtype.h b/src/doomtype.h index 174bba5b1..becdcf402 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -155,23 +155,8 @@ size_t strlcpy(char *dst, const char *src, size_t siz); #define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst) /* Boolean type definition */ - -// \note __BYTEBOOL__ used to be set above if "macintosh" was defined, -// if macintosh's version of boolean type isn't needed anymore, then isn't this macro pointless now? -#ifndef __BYTEBOOL__ - #define __BYTEBOOL__ - - //faB: clean that up !! - #if defined( _MSC_VER) && (_MSC_VER >= 1800) // MSVC 2013 and forward - #include "stdbool.h" - #elif defined (_WIN32) - #define false FALSE // use windows types - #define true TRUE - #define boolean BOOL - #else - typedef enum {false, true} boolean; - #endif -#endif // __BYTEBOOL__ +#include "stdbool.h" +typedef bool boolean; /* 7.18.2.1 Limits of exact-width integer types */ #ifndef INT8_MIN diff --git a/src/m_menu.c b/src/m_menu.c index 17bbdd65d..ce9ad0a49 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7806,7 +7806,10 @@ static void M_PlaybackRewind(INT32 choice) S_PauseAudio(); } else - demo.rewinding = paused = true; + { + demo.rewinding = true; + paused = true; + } } else if (lastconfirmtime + TICRATE/2 < I_GetTime()) { diff --git a/src/s_sound.c b/src/s_sound.c index cb70b03da..b35125437 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1710,7 +1710,8 @@ static void S_QueueMusic(const char *mmusic, UINT16 mflags, boolean looping, UIN static void S_ClearQueue(void) { - queue.name[0] = queue.flags = queue.looping = queue.position = queue.fadeinms = 0; + queue.name[0] = queue.flags = queue.position = queue.fadeinms = 0; + queue.looping = false; } static void S_ChangeMusicToQueue(void)