lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some corrections.

This commit is contained in:
toasterbabe 2017-05-28 21:43:53 +01:00
parent 2765868940
commit f9120e3a44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/m_menu.c
View File

@ -7473,8 +7473,8 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_GRAYEDOUT; // Max players
OP_ServerOptionsMenu[ 3].status = IT_GRAYEDOUT; // Allow WAD downloading
OP_ServerOptionsMenu[ 4].status = IT_GRAYEDOUT; // Allow players to join
OP_ServerOptionsMenu[30].status = IT_GRAYEDOUT; // Master server
OP_ServerOptionsMenu[31].status = IT_GRAYEDOUT; // Attempts to resynchronise
OP_ServerOptionsMenu[33].status = IT_GRAYEDOUT; // Master server
OP_ServerOptionsMenu[34].status = IT_GRAYEDOUT; // Attempts to resynchronise
}
else
{
@ -7483,10 +7483,10 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
if (netgame)
OP_ServerOptionsMenu[30].status = IT_GRAYEDOUT;
OP_ServerOptionsMenu[33].status = IT_GRAYEDOUT;
else
OP_ServerOptionsMenu[30].status = IT_STRING | IT_CVAR | IT_CV_STRING;
OP_ServerOptionsMenu[31].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[33].status = IT_STRING | IT_CVAR | IT_CV_STRING;
OP_ServerOptionsMenu[34].status = IT_STRING | IT_CVAR;
}
#endif

2
src/p_inter.c
View File

@ -1309,7 +1309,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
players[i].starpostangle = special->angle;
players[i].starpostnum = special->health;
if (cv_respawntype.value == 1 && && players[i].lives > 0 && players[i].playerstate == PST_DEAD)
if (cv_respawntype.value == 1 && players[i].lives > 0 && players[i].playerstate == PST_DEAD)
players[i].playerstate = PST_REBORN;
}
}