stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 17:22:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

End to sudden death.

Browse source
This commit is contained in:
toasterbabe 2017-04-14 20:46:48 +01:00
parent 95d89078f5
commit 174921c1e1
5 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_netcmd.c
View file

@ -485,7 +485,6 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_itemrespawntime); CV_RegisterVar(&cv_itemrespawntime);
CV_RegisterVar(&cv_itemrespawn); CV_RegisterVar(&cv_itemrespawn);
CV_RegisterVar(&cv_flagtime); CV_RegisterVar(&cv_flagtime);
CV_RegisterVar(&cv_suddendeath);
// misc // misc
CV_RegisterVar(&cv_friendlyfire); CV_RegisterVar(&cv_friendlyfire);

1
src/d_netcmd.h
View file

@ -51,7 +51,6 @@ extern consvar_t cv_itemrespawntime;
extern consvar_t cv_itemrespawn; extern consvar_t cv_itemrespawn;
extern consvar_t cv_flagtime; extern consvar_t cv_flagtime;
extern consvar_t cv_suddendeath;
extern consvar_t cv_skin; extern consvar_t cv_skin;

1
src/m_menu.c
View file

@ -1371,7 +1371,6 @@ static menuitem_t OP_NetgameOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Item Respawn", &cv_itemrespawn, 66}, {IT_STRING | IT_CVAR, NULL, "Item Respawn", &cv_itemrespawn, 66},
{IT_STRING | IT_CVAR, NULL, "Item Respawn time", &cv_itemrespawntime, 74}, {IT_STRING | IT_CVAR, NULL, "Item Respawn time", &cv_itemrespawntime, 74},
{IT_STRING | IT_CVAR, NULL, "Sudden Death", &cv_suddendeath, 90},
{IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 98}, {IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 98},
{IT_STRING | IT_CVAR, NULL, "Force Skin", &cv_forceskin, 114}, {IT_STRING | IT_CVAR, NULL, "Force Skin", &cv_forceskin, 114},

8
src/p_inter.c
View file

@ -3120,14 +3120,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return false; // Don't get hurt by fire generated from friends. return false; // Don't get hurt by fire generated from friends.
} }
// Sudden-Death mode
if (source && source->type == MT_PLAYER)
{
if ((gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF) && cv_suddendeath.value
&& !player->powers[pw_flashing] && !player->powers[pw_invulnerability])
damagetype = DMG_INSTAKILL;
}
// Player hits another player // Player hits another player
if (!force && source && source->player) if (!force && source && source->player)
{ {

1
src/p_mobj.c
View file

@ -8763,7 +8763,6 @@ consvar_t cv_itemrespawntime = {"respawnitemtime", "30", CV_NETVAR|CV_CHEAT, res
consvar_t cv_itemrespawn = {"respawnitem", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_itemrespawn = {"respawnitem", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}}; static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}};
consvar_t cv_flagtime = {"flagtime", "30", CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_flagtime = {"flagtime", "30", CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_suddendeath = {"suddendeath", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
void P_SpawnPrecipitation(void) void P_SpawnPrecipitation(void)
{ {