diff options
| -rw-r--r-- | codeblocks/chocolate-doom.cbp | 5 | ||||
| -rw-r--r-- | setup/configfile.c | 22 | ||||
| -rw-r--r-- | src/net_common.c | 4 |
3 files changed, 14 insertions, 17 deletions
diff --git a/codeblocks/chocolate-doom.cbp b/codeblocks/chocolate-doom.cbp index 1884ed51..e2cf4eea 100644 --- a/codeblocks/chocolate-doom.cbp +++ b/codeblocks/chocolate-doom.cbp @@ -40,9 +40,6 @@ <Add alias="All" targets="Debug;Release;" /> </VirtualTargets> <Compiler> - <Add option="-DFEATURE_MULTIPLAYER" /> - <Add option="-DFEATURE_DEHACKED" /> - <Add option="-DFEATURE_WAD_MERGE" /> <Add directory="..\textscreen" /> <Add directory="..\msvc" /> <Add directory="..\src" /> @@ -52,7 +49,7 @@ </Linker> <Unit filename="chocolate-doom-res.rc"> <Option compilerVar="WINDRES" /> - <Option objectName="codeblocks\chocolate-doom-res.res" /> + <Option objectName="chocolate-doom-res.res" /> <Option target="Debug" /> <Option target="Release" /> </Unit> diff --git a/setup/configfile.c b/setup/configfile.c index f974f043..daba1f52 100644 --- a/setup/configfile.c +++ b/setup/configfile.c @@ -227,16 +227,16 @@ static default_t doom_defaults_list[] = {"usegamma", &usegamma, DEFAULT_INT, 0, 0}, - {"chatmacro0", &chat_macros[0], DEFAULT_STRING, 0 }, - {"chatmacro1", &chat_macros[1], DEFAULT_STRING, 0 }, - {"chatmacro2", &chat_macros[2], DEFAULT_STRING, 0 }, - {"chatmacro3", &chat_macros[3], DEFAULT_STRING, 0 }, - {"chatmacro4", &chat_macros[4], DEFAULT_STRING, 0 }, - {"chatmacro5", &chat_macros[5], DEFAULT_STRING, 0 }, - {"chatmacro6", &chat_macros[6], DEFAULT_STRING, 0 }, - {"chatmacro7", &chat_macros[7], DEFAULT_STRING, 0 }, - {"chatmacro8", &chat_macros[8], DEFAULT_STRING, 0 }, - {"chatmacro9", &chat_macros[9], DEFAULT_STRING, 0 }, + {"chatmacro0", &chat_macros[0], DEFAULT_STRING, 0, 0 }, + {"chatmacro1", &chat_macros[1], DEFAULT_STRING, 0, 0 }, + {"chatmacro2", &chat_macros[2], DEFAULT_STRING, 0, 0 }, + {"chatmacro3", &chat_macros[3], DEFAULT_STRING, 0, 0 }, + {"chatmacro4", &chat_macros[4], DEFAULT_STRING, 0, 0 }, + {"chatmacro5", &chat_macros[5], DEFAULT_STRING, 0, 0 }, + {"chatmacro6", &chat_macros[6], DEFAULT_STRING, 0, 0 }, + {"chatmacro7", &chat_macros[7], DEFAULT_STRING, 0, 0 }, + {"chatmacro8", &chat_macros[8], DEFAULT_STRING, 0, 0 }, + {"chatmacro9", &chat_macros[9], DEFAULT_STRING, 0, 0 }, }; static default_collection_t doom_defaults = @@ -260,7 +260,7 @@ static default_t extra_defaults_list[] = {"vanilla_savegame_limit", &vanilla_savegame_limit, DEFAULT_INT, 0, 0}, {"vanilla_demo_limit", &vanilla_demo_limit, DEFAULT_INT, 0, 0}, #ifdef FEATURE_MULTIPLAYER - {"player_name", &net_player_name, DEFAULT_STRING, 0}, + {"player_name", &net_player_name, DEFAULT_STRING, 0, 0}, #endif }; diff --git a/src/net_common.c b/src/net_common.c index b9a8487d..31444e28 100644 --- a/src/net_common.c +++ b/src/net_common.c @@ -191,7 +191,7 @@ static void NET_Conn_ParseReliableACK(net_connection_t *conn, net_packet_t *pack // Is this an acknowledgement for the first packet in the list? - if (seq == ((conn->reliable_packets->seq + 1) & 0xff)) + if (seq == (unsigned int)((conn->reliable_packets->seq + 1) & 0xff)) { net_reliable_packet_t *rp; @@ -224,7 +224,7 @@ static boolean NET_Conn_ReliablePacket(net_connection_t *conn, return true; } - if (seq != (conn->reliable_recv_seq & 0xff)) + if (seq != (unsigned int)(conn->reliable_recv_seq & 0xff)) { // This is not the next expected packet in the sequence! // |