TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rearranged game mode check so ANARCHY_ONLY_MISSION will not prohibit CTF, Hoard or Bounty

Browse source
This commit is contained in:
zico 2013-12-10 01:52:19 +01:00
parent a04aa340c5
commit 6bd9c2bfc1
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
similar/main/net_udp.cpp
View file

@ -3144,6 +3144,16 @@ static int net_udp_game_param_handler( newmenu *menu, d_event *event, param_opt
else if (menus[opt->team_anarchy].value) {
Netgame.gamemode = NETGAME_TEAM_ANARCHY;
}
#if defined(DXX_BUILD_DESCENT_II)
else if (menus[opt->capture].value)
Netgame.gamemode = NETGAME_CAPTURE_FLAG;
else if (HoardEquipped() && menus[opt->hoard].value)
Netgame.gamemode = NETGAME_HOARD;
else if (HoardEquipped() && menus[opt->team_hoard].value)
Netgame.gamemode = NETGAME_TEAM_HOARD;
#endif
else if( menus[opt->bounty].value )
Netgame.gamemode = NETGAME_BOUNTY;
#if defined(DXX_BUILD_DESCENT_II)
else if (ANARCHY_ONLY_MISSION) {
int i = 0;
@ -3158,16 +3168,6 @@ static int net_udp_game_param_handler( newmenu *menu, d_event *event, param_opt
Netgame.gamemode = NETGAME_ROBOT_ANARCHY;
else if ( menus[opt->coop].value )
Netgame.gamemode = NETGAME_COOPERATIVE;
#if defined(DXX_BUILD_DESCENT_II)
else if (menus[opt->capture].value)
Netgame.gamemode = NETGAME_CAPTURE_FLAG;
else if (HoardEquipped() && menus[opt->hoard].value)
Netgame.gamemode = NETGAME_HOARD;
else if (HoardEquipped() && menus[opt->team_hoard].value)
Netgame.gamemode = NETGAME_TEAM_HOARD;
#endif
else if( menus[opt->bounty].value )
Netgame.gamemode = NETGAME_BOUNTY;
else Int3(); // Invalid mode -- see Rob
}