From ddf466d61f29118e98564b6be532681d99dd35a6 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 24 Oct 2020 19:52:09 -0400 Subject: [PATCH] Fix compile errors --- src/console.c | 2 +- src/d_clisrv.c | 46 ------------------------------------- src/m_cheat.c | 5 +--- src/m_menu.c | 62 +------------------------------------------------- src/p_user.c | 4 ++-- src/w_wad.c | 2 -- 6 files changed, 5 insertions(+), 116 deletions(-) diff --git a/src/console.c b/src/console.c index 8834daf9a..1546e3630 100644 --- a/src/console.c +++ b/src/console.c @@ -1468,7 +1468,7 @@ void CONS_Printf(const char *fmt, ...) if (con_started) CON_Print(txt); - CON_LogMessage(txt); + CON_LogMessage(txt); Lock_state(); diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 191c0067c..f351df4fd 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2054,52 +2054,6 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node) M_SortServerList(); } -#if defined (MASTERSERVER) && defined (HAVE_THREADS) -struct Fetch_servers_ctx -{ - int id; -}; - -static void -Fetch_servers_thread (struct Fetch_servers_ctx *ctx) -{ - msg_server_t *server_list; - - server_list = GetShortServersList(ctx->id); - - if (server_list) - { - I_lock_mutex(&ms_QueryId_mutex); - { - if (ctx->id != ms_QueryId) - { - free(server_list); - server_list = NULL; - } - } - I_unlock_mutex(ms_QueryId_mutex); - - if (server_list) - { - I_lock_mutex(&m_menu_mutex); - { - if (m_waiting_mode == M_WAITING_SERVERS) - m_waiting_mode = M_NOT_WAITING; - } - I_unlock_mutex(m_menu_mutex); - - I_lock_mutex(&ms_ServerList_mutex); - { - ms_ServerList = server_list; - } - I_unlock_mutex(ms_ServerList_mutex); - } - } - - free(ctx); -} -#endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/ - void CL_QueryServerList (msg_server_t *server_list) { INT32 i; diff --git a/src/m_cheat.c b/src/m_cheat.c index 7d91550c9..1ce1a788b 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -1182,12 +1182,9 @@ void Command_ObjectPlace_f(void) { objectplacing = true; - if (players[0].powers[pw_carry] == CR_NIGHTSMODE) - return; - if (!COM_CheckParm("-silent")) { - HU_SetCEchoFlags(V_RETURN8|V_MONOSPACE|V_AUTOFADEOUT); + HU_SetCEchoFlags(V_RETURN8|V_MONOSPACE); HU_SetCEchoDuration(10); HU_DoCEcho(va(M_GetText( "\\\\\\\\\\\\\\\\\\\\\\\\\x82" diff --git a/src/m_menu.c b/src/m_menu.c index 4d54e0849..632e4f643 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -408,9 +408,6 @@ static void M_HandleMonitorToggles(INT32 choice); // Consvar onchange functions static void Newgametype_OnChange(void); -#ifdef HWRENDER -static void Newrenderer_OnChange(void); -#endif static void Dummymenuplayer_OnChange(void); //static void Dummymares_OnChange(void); static void Dummystaff_OnChange(void); @@ -437,11 +434,6 @@ CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1]; consvar_t cv_newgametype = {"newgametype", "Race", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL}; -#ifdef HWRENDER -consvar_t cv_newrenderer = {"newrenderer", "Software", CV_HIDEN|CV_CALL, cv_renderer_t, Newrenderer_OnChange, 0, NULL, NULL, 0, 0, NULL}; -//static int newrenderer_set = 1;/* Software doesn't need confirmation! */ -#endif - static CV_PossibleValue_t serversort_cons_t[] = { {0,"Ping"}, {1,"Modified State"}, @@ -1264,7 +1256,7 @@ static menuitem_t OP_VideoOptionsMenu[] = {IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20}, #endif #ifdef HWRENDER - {IT_STRING | IT_CVAR, NULL, "Renderer", &cv_newrenderer, 30}, + {IT_STRING | IT_CVAR, NULL, "Renderer", &cv_renderer, 30}, #else {IT_TRANSTEXT | IT_PAIR, "Renderer", "Software", &cv_renderer, 30}, #endif @@ -2273,58 +2265,6 @@ static void Newgametype_OnChange(void) } } -#ifdef HWRENDER - -#if 0 -static void Newrenderer_AREYOUSURE(INT32 c) -{ - int n; - switch (c) - { - case 'y': - case KEY_ENTER: - n = cv_newrenderer.value; - newrenderer_set |= n; - CV_SetValue(&cv_renderer, n); - break; - default: - CV_StealthSetValue(&cv_newrenderer, cv_renderer.value); - } -} - -static void Newrenderer_OnChange(void) -{ - /* Well this works for now because there's only two options. */ - int n; - n = cv_newrenderer.value; - newrenderer_set |= cv_renderer.value; - if (( newrenderer_set & n )) - CV_SetValue(&cv_renderer, n); - else - { - M_StartMessage( - "The OpenGL renderer is incomplete.\n" - "Some visuals may fail to appear, or\n" - "appear incorrectly.\n" - "Do you still want to switch to it?\n" - "\n" - "(Press 'y' or 'n')", - Newrenderer_AREYOUSURE, MM_YESNO - ); - } -} - -#else - -static void Newrenderer_OnChange(void) -{ - CV_SetValue(&cv_renderer, cv_newrenderer.value); // SRB2Kart: don't want the warning -} - -#endif - -#endif/*HWRENDER*/ - void Screenshot_option_Onchange(void) { OP_ScreenshotOptionsMenu[op_screenshot_folder].status = diff --git a/src/p_user.c b/src/p_user.c index 397d9318a..65ec5d1e0 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4489,9 +4489,9 @@ void P_PlayerThink(player_t *player) // check for use if (cmd->buttons & BT_BRAKE) - player->pflags |= PF_USEDOWN; + player->pflags |= PF_SPINDOWN; else - player->pflags &= ~PF_USEDOWN; + player->pflags &= ~PF_SPINDOWN; // IF PLAYER NOT HERE THEN FLASH END IF if (player->quittime && player->powers[pw_flashing] < flashingtics - 1 && !player->gotflag) diff --git a/src/w_wad.c b/src/w_wad.c index c7259e344..18015a944 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -760,8 +760,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); - if (important) - packetsizetally -= nameonlylength(filename) + 22; if (handle) fclose(handle); return W_InitFileError(filename, false);