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

Shorten gameseq_init_network_players

Browse source
This commit is contained in:
Kp 2016-03-17 03:34:23 +00:00
parent aaaabfeb31
commit 0f35160d55
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/main/gameseq.cpp
View file

@ -209,12 +209,17 @@ static void gameseq_init_network_players()
ConsoleObject = &Objects[0];
k = 0;
j = 0;
const auto multiplayer = Game_mode & GM_MULTI;
const auto multiplayer_coop = Game_mode & GM_MULTI_COOP;
range_for (const auto &&o, vobjptridx)
{
if (( o->type==OBJ_PLAYER ) || (o->type == OBJ_GHOST) || (o->type == OBJ_COOP))
const auto type = o->type;
if (type == OBJ_PLAYER || type == OBJ_GHOST || type == OBJ_COOP)
{
if ( (!(Game_mode & GM_MULTI_COOP) && ((o->type == OBJ_PLAYER)||(o->type==OBJ_GHOST))) ||
((Game_mode & GM_MULTI_COOP) && ((j == 0) || ( o->type==OBJ_COOP ))) )
if (multiplayer_coop
? (j == 0 || type == OBJ_COOP)
: (type == OBJ_PLAYER || type == OBJ_GHOST)
)
{
o->type=OBJ_PLAYER;
Player_init[k].pos = o->pos;
@ -228,7 +233,7 @@ static void gameseq_init_network_players()
obj_delete(o);
j++;
}
if ((o->type==OBJ_ROBOT) && robot_is_companion(&Robot_info[get_robot_id(o)]) && (Game_mode & GM_MULTI))
else if (type == OBJ_ROBOT && multiplayer && robot_is_companion(&Robot_info[get_robot_id(o)]))
obj_delete(o); //kill the buddy in netgames
}
NumNetPlayerPositions = k;