diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 442749920..c4100a0f9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -84,8 +84,8 @@ static void TeamScramble_OnChange(void); static void NetTimeout_OnChange(void); static void JoinTimeout_OnChange(void); -static void PlayStyle_OnChange(void); -static void LifeDistribution_OnChange(void); +static void CoopStarposts_OnChange(void); +static void CoopLives_OnChange(void); static void Ringslinger_OnChange(void); static void Gravity_OnChange(void); @@ -352,11 +352,11 @@ consvar_t cv_maxping = {"maxping", "0", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NUL static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}}; consvar_t cv_inttime = {"inttime", "10", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t playstyle_cons_t[] = {{0, "Individual"}, {1, "Sharing"}, {2, "Together"}, {0, NULL}}; -consvar_t cv_playstyle = {"playstyle", "Together", CV_NETVAR|CV_CALL|CV_CHEAT, playstyle_cons_t, PlayStyle_OnChange, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t coopstarposts_cons_t[] = {{0, "Individual"}, {1, "Sharing"}, {2, "Together"}, {0, NULL}}; +consvar_t cv_coopstarposts = {"coopstarposts", "Together", CV_NETVAR|CV_CALL|CV_CHEAT, coopstarposts_cons_t, CoopStarposts_OnChange, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t lifedistribution_cons_t[] = {{0, "Individual"}, {1, "Stealing"}, {2, "Sharing"}, {0, NULL}}; -consvar_t cv_lifedistribution = {"lifedistribution", "Stealing", CV_NETVAR|CV_CALL, lifedistribution_cons_t, LifeDistribution_OnChange, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t cooplives_cons_t[] = {{0, "Individual"}, {1, "Stealing"}, {2, "Sharing"}, {0, NULL}}; +consvar_t cv_cooplives = {"cooplives", "Stealing", CV_NETVAR|CV_CALL, cooplives_cons_t, CoopLives_OnChange, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}}; consvar_t cv_advancemap = {"advancemap", "Next", CV_NETVAR, advancemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -516,8 +516,8 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_forceskin); CV_RegisterVar(&cv_downloading); - CV_RegisterVar(&cv_playstyle); - CV_RegisterVar(&cv_lifedistribution); + CV_RegisterVar(&cv_coopstarposts); + CV_RegisterVar(&cv_cooplives); CV_RegisterVar(&cv_specialrings); CV_RegisterVar(&cv_powerstones); @@ -3406,11 +3406,11 @@ static void JoinTimeout_OnChange(void) jointimeout = (tic_t)cv_jointimeout.value; } -static void PlayStyle_OnChange(void) +static void CoopStarposts_OnChange(void) { INT32 i; - if (!(netgame || multiplayer) || gametype != GT_COOP || cv_playstyle.value == 2 || G_IsSpecialStage(gamemap)) + if (!(netgame || multiplayer) || gametype != GT_COOP || cv_coopstarposts.value == 2 || G_IsSpecialStage(gamemap)) return; for (i = 0; i < MAXPLAYERS; i++) @@ -3421,18 +3421,18 @@ static void PlayStyle_OnChange(void) if (!players[i].spectator) continue; - if (players[i].lives <= 0 && !cv_lifedistribution.value) + if (players[i].lives <= 0 && !cv_cooplives.value) continue; P_SpectatorJoinGame(&players[i]); } } -static void LifeDistribution_OnChange(void) +static void CoopLives_OnChange(void) { - if (!(netgame || multiplayer) || gametype != GT_COOP || cv_playstyle.value == 2) + if (!(netgame || multiplayer) || gametype != GT_COOP || cv_coopstarposts.value == 2) return; - if (cv_lifedistribution.value) + if (cv_cooplives.value) { INT32 i; for (i = 0; i < MAXPLAYERS; i++) diff --git a/src/d_netcmd.h b/src/d_netcmd.h index f23ff0bc1..9ab59f6ee 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -89,7 +89,7 @@ extern consvar_t cv_recycler; extern consvar_t cv_itemfinder; -extern consvar_t cv_inttime, cv_playstyle, cv_lifedistribution, cv_advancemap, cv_playersforexit; +extern consvar_t cv_inttime, cv_coopstarposts, cv_cooplives, cv_advancemap, cv_playersforexit; extern consvar_t cv_overtime; extern consvar_t cv_startinglives; diff --git a/src/g_game.c b/src/g_game.c index 5a63f515d..566d536c1 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2628,7 +2628,7 @@ void G_DoReborn(INT32 playernum) token = 0; } } - if (cv_playstyle.value == 2) + if (cv_coopstarposts.value == 2) { for (i = 0; i < MAXPLAYERS; i++) { @@ -2696,7 +2696,7 @@ void G_DoReborn(INT32 playernum) // Not resetting map, so return to level music if (!countdown2 && player->lives <= 0 - && !cv_lifedistribution.value) // not allowed for life steal because no way to come back from zero group lives without addons, which should call this anyways + && !cv_cooplives.value) // not allowed for life steal because no way to come back from zero group lives without addons, which should call this anyways P_RestoreMultiMusic(player); if (player->starposttime) @@ -2739,7 +2739,7 @@ void G_AddPlayer(INT32 playernum) if (!players->exiting) notexiting++; - if (!(cv_playstyle.value && (gametype == GT_COOP) && (p->starpostnum < players[i].starpostnum))) + if (!(cv_coopstarposts.value && (gametype == GT_COOP) && (p->starpostnum < players[i].starpostnum))) continue; p->starposttime = players[i].starposttime; diff --git a/src/m_menu.c b/src/m_menu.c index 2b036f361..0b601a3de 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1390,8 +1390,8 @@ static menuitem_t OP_ServerOptionsMenu[] = {IT_HEADER, NULL, "Cooperative", NULL, 90}, {IT_STRING | IT_CVAR, NULL, "Players required for exit", &cv_playersforexit, 96}, - {IT_STRING | IT_CVAR, NULL, "Play style", &cv_playstyle, 101}, - {IT_STRING | IT_CVAR, NULL, "Life distribution", &cv_lifedistribution, 106}, + {IT_STRING | IT_CVAR, NULL, "Starposts", &cv_coopstarposts, 101}, + {IT_STRING | IT_CVAR, NULL, "Life distribution", &cv_cooplives, 106}, {IT_HEADER, NULL, "Race, Competition", NULL, 115}, {IT_STRING | IT_CVAR, NULL, "Level completion countdown", &cv_countdowntime, 121}, diff --git a/src/p_inter.c b/src/p_inter.c index 8db063ce1..5f730bd6c 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1293,7 +1293,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (player->starpostnum >= special->health) return; // Already hit this post - if (cv_playstyle.value && gametype == GT_COOP && (netgame || multiplayer)) + if (cv_coopstarposts.value && gametype == GT_COOP && (netgame || multiplayer)) { for (i = 0; i < MAXPLAYERS; i++) { @@ -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_playstyle.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i])) + if (cv_coopstarposts.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i])) P_SpectatorJoinGame(&players[i]); //players[i].playerstate = PST_REBORN; } } @@ -2254,7 +2254,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget if (target->player->lives <= 0) // Tails 03-14-2000 { boolean gameovermus = false; - if ((netgame || multiplayer) && (gametype == GT_COOP) && cv_lifedistribution.value) + if ((netgame || multiplayer) && (gametype == GT_COOP) && cv_cooplives.value) { INT32 i; for (i = 0; i < MAXPLAYERS; i++) diff --git a/src/p_mobj.c b/src/p_mobj.c index d90069586..aa76cddf1 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9086,8 +9086,8 @@ void P_SpawnPlayer(INT32 playernum) { if ( ( (multiplayer || netgame) && gametype == GT_COOP && leveltime > 0) // only question status in coop && ( (G_IsSpecialStage(gamemap) && useNightsSS) // late join special stage - || (cv_playstyle.value == 2 && (p->jointime < 1 || p->spectator) ) // late join or die in new coop - || ((!cv_lifedistribution.value || !P_GetLives(p)) && p->lives <= 0))) // game over and can't redistribute lives + || (cv_coopstarposts.value == 2 && (p->jointime < 1 || p->spectator) ) // late join or die in new coop + || ((!cv_cooplives.value || !P_GetLives(p)) && p->lives <= 0))) // game over and can't redistribute lives p->spectator = true; else p->spectator = false; diff --git a/src/p_setup.c b/src/p_setup.c index f7a202aea..3f346523b 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2221,7 +2221,7 @@ static void P_LevelInitStuff(void) // earthquake camera memset(&quake,0,sizeof(struct quake)); - if ((netgame || multiplayer) && gametype == GT_COOP && cv_playstyle.value == 2) + if ((netgame || multiplayer) && gametype == GT_COOP && cv_coopstarposts.value == 2) { for (i = 0; i < MAXPLAYERS; i++) { diff --git a/src/p_user.c b/src/p_user.c index 3dbaf2024..8868a558b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -8110,12 +8110,12 @@ void P_FindEmerald(void) boolean P_GetLives(player_t *player) { INT32 i, maxlivesplayer = -1, livescheck = 1; - if (!(cv_lifedistribution.value + if (!(cv_cooplives.value && (gametype == GT_COOP) && (netgame || multiplayer))) return true; - if (cv_lifedistribution.value == 1 && player->lives > 0) + if (cv_cooplives.value == 1 && player->lives > 0) return true; for (i = 0; i < MAXPLAYERS; i++) @@ -8131,7 +8131,7 @@ boolean P_GetLives(player_t *player) } if (maxlivesplayer != -1 && &players[maxlivesplayer] != player) { - if (cv_lifedistribution.value == 1 && P_IsLocalPlayer(&players[maxlivesplayer])) + if (cv_cooplives.value == 1 && P_IsLocalPlayer(&players[maxlivesplayer])) S_StartSound(NULL, sfx_jshard); // placeholder players[maxlivesplayer].lives--; player->lives++; @@ -8220,7 +8220,7 @@ static void P_DeathThink(player_t *player) G_UseContinue(); // Even if we don't have one this handles ending the game } - if (cv_lifedistribution.value + if (cv_cooplives.value && (gametype == GT_COOP) && (netgame || multiplayer) && (player->lives <= 0)) @@ -8240,7 +8240,7 @@ static void P_DeathThink(player_t *player) player->playerstate = PST_REBORN; else if ((player->lives > 0 || j != MAXPLAYERS) && !G_IsSpecialStage(gamemap)) // Don't allow "click to respawn" in special stages! { - if (gametype == GT_COOP && (netgame || multiplayer) && cv_playstyle.value == 2) + if (gametype == GT_COOP && (netgame || multiplayer) && cv_coopstarposts.value == 2) { P_ConsiderAllGone(); if ((player->deadtimer > 5*TICRATE) || ((cmd->buttons & BT_JUMP) && (player->deadtimer > TICRATE))) @@ -9390,7 +9390,7 @@ void P_PlayerThink(player_t *player) if (!player->spectator) P_PlayerInSpecialSector(player); - else if (gametype == GT_COOP && (netgame || multiplayer) && cv_playstyle.value == 2) + else if (gametype == GT_COOP && (netgame || multiplayer) && cv_coopstarposts.value == 2) P_ConsiderAllGone(); if (player->playerstate == PST_DEAD) diff --git a/src/st_stuff.c b/src/st_stuff.c index d2db20431..b2ef0bf28 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -732,7 +732,7 @@ static void ST_drawLives(void) // lives number if ((netgame || multiplayer) && gametype == GT_COOP) { - switch (cv_lifedistribution.value) + switch (cv_cooplives.value) { case 2: { @@ -1875,7 +1875,7 @@ static void ST_overlayDrawer(void) else p = sboover; - if (cv_lifedistribution.value + if (cv_cooplives.value && gametype == GT_COOP) { INT32 i; @@ -2013,7 +2013,7 @@ static void ST_overlayDrawer(void) V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), V_HUDTRANSHALF, M_GetText("You cannot join the game until the stage has ended.")); else if (gametype == GT_COOP) { - if (cv_lifedistribution.value == 1 + if (cv_cooplives.value == 1 && (netgame || multiplayer)) { INT32 i;