From 5621d9680b91360c2496cfd595008e8a5674a9e4 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Fri, 27 Mar 2015 18:59:57 -0400 Subject: [PATCH] disable IPX in options menu --- src/menuui/optionsmenumulti.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/menuui/optionsmenumulti.cpp b/src/menuui/optionsmenumulti.cpp index a1c5da2..24e2459 100644 --- a/src/menuui/optionsmenumulti.cpp +++ b/src/menuui/optionsmenumulti.cpp @@ -1029,11 +1029,9 @@ void options_multi_load_protocol_controls() Om_ip_input.hide(); Om_ip_input.disable(); - // disable IPX button in demo -#ifdef FS2_DEMO + // disable IPX button Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.disable(); Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.hide(); -#endif // bogus control Om_pro_bogus.base_create(Om_window, UI_KIND_ICON, 0, 0, 0, 0); @@ -1209,11 +1207,7 @@ void options_multi_protocol_do(int key) // force draw the proper protocol #ifndef MAKE_FS1 // not in FS1 menu - if (Om_protocol == NET_IPX) { - Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.draw_forced(2); - } else { - Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.draw_forced(2); - } + Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.draw_forced(2); #endif // force draw the proper tab button @@ -1477,10 +1471,7 @@ void options_multi_protocol_button_pressed(int n) // ipx mode case OM_PRO_IPX: -#ifndef FS2_DEMO - Om_protocol = NET_IPX; - gamesnd_play_iface(SND_USER_SELECT); -#endif + gamesnd_play_iface(SND_GENERAL_FAIL); break; #endif -- 2.39.2