Skip to content

Commit a05d19d

Browse files
committed
Re-enable TCP/IPX selector buttons.
Re-enable the TCP selector button and unhide the IPX selector button. Attempting to select IPX brings up a pop-up that IPX is no longer supported.
1 parent cb65ca8 commit a05d19d

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

code/menuui/optionsmenumulti.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -714,13 +714,6 @@ void options_multi_load_protocol_controls()
714714
Om_ip_input.hide();
715715
Om_ip_input.disable();
716716

717-
// disable/hide IPX button since IPX is no longer supported
718-
Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.disable();
719-
Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.hide();
720-
721-
// disable TCP button since it's the only option
722-
Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.disable();
723-
724717
// bogus control
725718
Om_pro_bogus.base_create(Om_window, UI_KIND_ICON, 0, 0, 0, 0);
726719
}
@@ -776,13 +769,6 @@ void options_multi_enable_protocol_controls()
776769
Om_pro_buttons[gr_screen.res][idx].button.unhide();
777770
}
778771

779-
// disable/hide IPX button since IPX is no longer supported
780-
Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.disable();
781-
Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.hide();
782-
783-
// disable TCP button since it's the only option
784-
Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.disable();
785-
786772
// unhide and enable the tracker input boxes
787773
if(Om_tracker_flag){
788774
Om_tracker_login.enable();
@@ -1126,7 +1112,8 @@ void options_multi_protocol_button_pressed(int n)
11261112

11271113
// ipx mode, no longer supported
11281114
case OM_PRO_IPX:
1129-
Assertion(false, "IPX protocol button pressed even though hidden!");
1115+
gamesnd_play_iface(SND_GENERAL_FAIL);
1116+
popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, "The old IPX protocol is no longer supported.");
11301117
break;
11311118
}
11321119
}

0 commit comments

Comments
 (0)