diff --git a/src/deh_tables.c b/src/deh_tables.c
index 4cb674d9c9b1facb3bfdec7d401e1574f310aab8..1be5a2fb77401aff19b03d23f50f3498d1fcc619 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -5151,6 +5151,7 @@ struct int_const_s const INT_CONST[] = {
{"PAL_MIXUP",PAL_MIXUP},
{"PAL_RECYCLE",PAL_RECYCLE},
{"PAL_NUKE",PAL_NUKE},
+ {"PAL_INVERT",PAL_INVERT},
// for P_DamageMobj
//// Damage types
{"DMG_WATER",DMG_WATER},
diff --git a/src/g_game.c b/src/g_game.c
index 3955834b2170fa203222a5c76f8f9ead60e74fa6..e671eb2d757196466abd0edfe14a8d4b363061f8 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3300,7 +3300,7 @@ boolean G_EnoughPlayersFinished(void)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
+ if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
if (players[i].quittime > 30 * TICRATE)
continue;
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 12972458581e5d3162a02c586b3e65018308f1ea..cf7118fbe0694c206a2d26497196f2cc81d5787f 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2476,7 +2476,7 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
+ | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
if (gametyperules & GTR_TEAMFLAGS)
@@ -2737,12 +2737,12 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
if (circuitmap)
{
if (players[tab[i].num].exiting)
- V_DrawRightAlignedThinString(x+146, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
+ V_DrawRightAlignedThinString(x+100, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else
- V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
}
else
- V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
+ V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
}
else
V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
@@ -2790,7 +2790,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
+ | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
if (G_GametypeUsesLives()) //show lives
@@ -2850,13 +2850,13 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (players[tab[i].num].exiting)
V_DrawRightAlignedThinString(x+128, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
}
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
}
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
y += 9;
if (i == 16)
@@ -3095,7 +3095,7 @@ static void HU_DrawRankings(void)
HU_DrawTeamTabRankings(tab, whiteplayer);
else if (scorelines <= 9 && !cv_compactscoreboard.value)
HU_DrawTabRankings(40, 32, tab, scorelines, whiteplayer);
- else if (scorelines <= 20 && !cv_compactscoreboard.value)
+ else if (scorelines <= 18 && !cv_compactscoreboard.value)
HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer);
else
HU_Draw32TabRankings(14, 28, tab, scorelines, whiteplayer);
diff --git a/src/m_menu.c b/src/m_menu.c
index 30772ab8fdc69ae81519d5c854ce1777f1305052..85d093b943e22a50add4bb3aa111b72fc7a8ef1f 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -11588,9 +11588,7 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
- OP_ServerOptionsMenu[36].status = (netgame
- ? IT_GRAYEDOUT
- : (IT_STRING | IT_CVAR | IT_CV_STRING));
+ OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR | IT_CV_STRING;
OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR;
}
diff --git a/src/p_local.h b/src/p_local.h
index 11a4856cf0a594c054b38c82ac8b8385d58b208f..7390137e97c5a560da5ba864e4e507df941afc31 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -348,6 +348,7 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration);
#define PAL_MIXUP 2
#define PAL_RECYCLE 3
#define PAL_NUKE 4
+#define PAL_INVERT 5
//
// P_ENEMY
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 753d298a4573c6a48ee7467c1f219826ffba031d..11d6305ea7af2889503124847dd7aba83b450000 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2522,7 +2522,7 @@ boolean P_ZMovement(mobj_t *mo)
{
P_KillMobj(mo, NULL, NULL, 0);
}
- return false;
+ return !P_MobjWasRemoved(mo); // allows explosion states to run
}
else
{
diff --git a/src/p_setup.c b/src/p_setup.c
index 15e7c6d09a35b3bcd603d9efe2ff5fbc0784f638..399f66c580997c3130d0171026591c4094013182 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3183,48 +3183,55 @@ static void P_AddBinaryMapTags(void)
{
size_t i;
- for (i = 0; i < numlines; i++)
- {
- // 96: Apply Tag to Tagged Sectors
+ for (i = 0; i < numlines; i++) {
// 97: Apply Tag to Front Sector
// 98: Apply Tag to Back Sector
// 99: Apply Tag to Front and Back Sectors
- if (lines[i].special == 96) {
- size_t j;
- mtag_t tag = Tag_FGet(&lines[i].frontsector->tags);
- mtag_t target_tag = Tag_FGet(&lines[i].tags);
- mtag_t offset_tags[4];
- memset(offset_tags, 0, sizeof(mtag_t)*4);
- if (lines[i].flags & ML_EFFECT6) {
- offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT;
- offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT;
- }
- if (lines[i].flags & ML_TFERLINE) {
- offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT;
- offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT;
- }
+ if (lines[i].special == 97 || lines[i].special == 99)
+ P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]);
+ if (lines[i].special == 98 || lines[i].special == 99)
+ P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
+ }
- for (j = 0; j < numsectors; j++) {
- boolean matches_target_tag = target_tag && Tag_Find(§ors[j].tags, target_tag);
- size_t k; for (k = 0; k < 4; k++) {
- if (lines[i].flags & ML_EFFECT5) {
- if (matches_target_tag || (offset_tags[k] && Tag_Find(§ors[j].tags, offset_tags[k]))) {
- Tag_Add(§ors[j].tags, tag);
- break;
- }
- } else if (matches_target_tag) {
- if (k == 0)
- Tag_Add(§ors[j].tags, tag);
- if (offset_tags[k])
- Tag_Add(§ors[j].tags, offset_tags[k]);
+ // Run this loop after the 97-99 loop to ensure that 96 can search through all of the
+ // 97-99-applied tags.
+ for (i = 0; i < numlines; i++) {
+ size_t j;
+ mtag_t tag, target_tag;
+ mtag_t offset_tags[4];
+
+ // 96: Apply Tag to Tagged Sectors
+ if (lines[i].special != 96)
+ continue;
+
+ tag = Tag_FGet(&lines[i].frontsector->tags);
+ target_tag = Tag_FGet(&lines[i].tags);
+ memset(offset_tags, 0, sizeof(mtag_t)*4);
+ if (lines[i].flags & ML_EFFECT6) {
+ offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT;
+ offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT;
+ }
+ if (lines[i].flags & ML_TFERLINE) {
+ offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT;
+ offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT;
+ }
+
+ for (j = 0; j < numsectors; j++) {
+ boolean matches_target_tag = target_tag && Tag_Find(§ors[j].tags, target_tag);
+ size_t k;
+ for (k = 0; k < 4; k++) {
+ if (lines[i].flags & ML_EFFECT5) {
+ if (matches_target_tag || (offset_tags[k] && Tag_Find(§ors[j].tags, offset_tags[k]))) {
+ Tag_Add(§ors[j].tags, tag);
+ break;
}
+ } else if (matches_target_tag) {
+ if (k == 0)
+ Tag_Add(§ors[j].tags, tag);
+ if (offset_tags[k])
+ Tag_Add(§ors[j].tags, offset_tags[k]);
}
}
- } else {
- if (lines[i].special == 97 || lines[i].special == 99)
- P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]);
- if (lines[i].special == 98 || lines[i].special == 99)
- P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
}
}
diff --git a/src/p_user.c b/src/p_user.c
index 254bcc65ef51910ebe482d0f0452e86bd976a75b..a24848d51c71f828f8db2a64f8bb8265a2674f6f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -11488,7 +11488,7 @@ void P_PlayerThink(player_t *player)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
+ if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
if (players[i].lives <= 0)
continue;
@@ -11520,7 +11520,7 @@ void P_PlayerThink(player_t *player)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
+ if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
if (players[i].quittime > 30 * TICRATE)
continue;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index a328d669e51169ba18d8ae8d046774d3b298eed3..ebf188a06f78978e2039ff1ef053c65be38a72c9 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2291,7 +2291,7 @@ static void ST_drawTextHUD(void)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].spectator)
+ if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
if (players[i].lives <= 0)
continue;