diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index d936721b63e3bfcf63f4760308d26daab03da40b..bce41d4ecc5e927c8ac4c406a3800aadb06659c1 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -1527,7 +1527,7 @@ linedeftypes
title = "Bustable Block";
prefix = "(254)";
flags8text = "[3] Slope skew sides";
- flags64text = "[6] Only bustable by Knuckles";
+ flags64text = "[6] Strong characters only";
flags128text = "[7] Only block non-players";
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
@@ -2175,7 +2175,7 @@ linedeftypes
title = "Award Rings";
prefix = "(460)";
}
-
+
461
{
title = "Spawn Object";
@@ -3302,36 +3302,6 @@ thingtypes
height = 40;
flags8text = "[8] Cannot move";
}
- 124
- {
- title = "AquaBuzz";
- sprite = "BBUZA1";
- width = 20;
- height = 24;
- }
- 105
- {
- title = "Jetty-Syn Bomber";
- sprite = "JETBB1";
- width = 20;
- height = 50;
- flags8text = "[8] Cannot move";
- }
- 106
- {
- title = "Jetty-Syn Gunner";
- sprite = "JETGB1";
- width = 20;
- height = 48;
- flags8text = "[8] Cannot move";
- }
- 107
- {
- title = "Crawla Commander";
- sprite = "CCOMA1";
- width = 16;
- height = 32;
- }
108
{
title = "Deton";
@@ -3339,13 +3309,6 @@ thingtypes
width = 20;
height = 32;
}
- 109
- {
- title = "Skim";
- sprite = "SKIMA1";
- width = 16;
- height = 24;
- }
110
{
title = "Turret";
@@ -3361,10 +3324,24 @@ thingtypes
height = 64;
angletext = "Firing delay";
}
- 112
+ 122
{
- title = "Spincushion";
- sprite = "SHRPA1";
+ title = "Spring Shell (Green)";
+ sprite = "SSHLA1";
+ width = 24;
+ height = 40;
+ }
+ 125
+ {
+ title = "Spring Shell (Yellow)";
+ sprite = "SSHLI1";
+ width = 24;
+ height = 40;
+ }
+ 109
+ {
+ title = "Skim";
+ sprite = "SKIMA1";
width = 16;
height = 24;
}
@@ -3375,26 +3352,21 @@ thingtypes
width = 12;
height = 20;
}
- 114
+ 126
{
- title = "Snailer";
- sprite = "SNLRA3A7";
+ title = "Crushstacean";
+ sprite = "CRABA0";
width = 24;
- height = 48;
- }
- 115
- {
- title = "Bird Aircraft Strike Hazard";
- sprite = "VLTRF1";
- width = 12;
- height = 24;
+ height = 32;
+ flags8text = "[8] Move left from spawn";
}
- 116
+ 136
{
- title = "Pointy";
- sprite = "PNTYA1";
- width = 8;
- height = 16;
+ title = "Banpyura";
+ sprite = "CR2BA0";
+ width = 24;
+ height = 32;
+ flags8text = "[8] Move left from spawn";
}
117
{
@@ -3427,6 +3399,13 @@ thingtypes
flags4text = "[4] 90 degrees clockwise";
flags8text = "[8] Double speed";
}
+ 115
+ {
+ title = "Bird Aircraft Strike Hazard";
+ sprite = "VLTRF1";
+ width = 12;
+ height = 24;
+ }
120
{
title = "Green Snapper";
@@ -3441,19 +3420,13 @@ thingtypes
width = 24;
height = 32;
}
- 122
- {
- title = "Spring Shell (Green)";
- sprite = "SSHLA1";
- width = 24;
- height = 40;
- }
- 125
+ 134
{
- title = "Spring Shell (Yellow)";
- sprite = "SSHLI1";
- width = 24;
- height = 40;
+ title = "Canarivore";
+ sprite = "CANAA0";
+ width = 12;
+ height = 80;
+ hangs = 1;
}
123
{
@@ -3462,28 +3435,51 @@ thingtypes
width = 18;
height = 36;
}
- 126
+ 135
{
- title = "Crushstacean";
- sprite = "CRABA0";
+ title = "Pterabyte Spawner";
+ sprite = "PTERA2A8";
+ width = 16;
+ height = 16;
+ parametertext = "No. Pterabytes";
+ }
+ 136
+ {
+ title = "Pyre Fly";
+ sprite = "PYREA0";
width = 24;
- height = 32;
- flags8text = "[8] Move left from spawn";
+ height = 34;
+ flags8text = "[8] Start on fire";
}
- 127
+ 105
{
- title = "Hive Elemental";
- sprite = "HIVEA0";
- width = 32;
- height = 80;
- parametertext = "No. bees";
+ title = "Jetty-Syn Bomber";
+ sprite = "JETBB1";
+ width = 20;
+ height = 50;
+ flags8text = "[8] Cannot move";
}
- 128
+ 106
{
- title = "Bumble Bore";
- sprite = "BUMBA1";
+ title = "Jetty-Syn Gunner";
+ sprite = "JETGB1";
+ width = 20;
+ height = 48;
+ flags8text = "[8] Cannot move";
+ }
+ 112
+ {
+ title = "Spincushion";
+ sprite = "SHRPA1";
width = 16;
- height = 32;
+ height = 24;
+ }
+ 114
+ {
+ title = "Snailer";
+ sprite = "SNLRA3A7";
+ width = 24;
+ height = 48;
}
129
{
@@ -3499,6 +3495,13 @@ thingtypes
width = 24;
height = 32;
}
+ 107
+ {
+ title = "Crawla Commander";
+ sprite = "CCOMA1";
+ width = 16;
+ height = 32;
+ }
131
{
title = "Spinbobert";
@@ -3522,29 +3525,34 @@ thingtypes
height = 24;
hangs = 1;
}
- 134
+ 127
{
- title = "Canarivore";
- sprite = "CANAA0";
- width = 12;
+ title = "Hive Elemental";
+ sprite = "HIVEA0";
+ width = 32;
height = 80;
- hangs = 1;
+ parametertext = "No. bees";
}
- 135
+ 128
{
- title = "Pterabyte Spawner";
- sprite = "PTERA2A8";
+ title = "Bumblebore";
+ sprite = "BUMBA1";
width = 16;
- height = 16;
- parametertext = "No. Pterabytes";
+ height = 32;
}
- 136
+ 124
{
- title = "Pyre Fly";
- sprite = "PYREA0";
- width = 24;
- height = 34;
- flags8text = "[8] Start on fire";
+ title = "AquaBuzz";
+ sprite = "BBUZA1";
+ width = 20;
+ height = 24;
+ }
+ 116
+ {
+ title = "Pointy";
+ sprite = "PNTYA1";
+ width = 8;
+ height = 16;
}
}
@@ -4141,6 +4149,34 @@ thingtypes
angletext = "Retraction interval";
parametertext = "Initial delay";
}
+ 1130
+ {
+ title = "Small Mace";
+ sprite = "SMCEA0";
+ width = 17;
+ height = 34;
+ }
+ 1131
+ {
+ title = "Big Mace";
+ sprite = "BMCEA0";
+ width = 34;
+ height = 68;
+ }
+ 1136
+ {
+ title = "Small Fireball";
+ sprite = "SFBRA0";
+ width = 17;
+ height = 34;
+ }
+ 1137
+ {
+ title = "Large Fireball";
+ sprite = "BFBRA0";
+ width = 34;
+ height = 68;
+ }
}
springs
@@ -4218,6 +4254,15 @@ thingtypes
flags4text = "[4] Ignore gravity";
flags8text = "[8] Rotate 22.5° CCW";
}
+ 557
+ {
+ arrow = 1;
+ title = "Diagonal Blue Spring";
+ sprite = "BSPRD2";
+ width = 16;
+ flags4text = "[4] Ignore gravity";
+ flags8text = "[8] Rotate 22.5° CCW";
+ }
558
{
arrow = 1;
@@ -4248,6 +4293,38 @@ thingtypes
width = 16;
height = 32;
}
+ 1134
+ {
+ title = "Yellow Spring Ball";
+ sprite = "YSPBA0";
+ width = 17;
+ height = 34;
+ }
+ 1135
+ {
+ title = "Red Spring Ball";
+ sprite = "RSPBA0";
+ width = 17;
+ height = 34;
+ }
+ 544
+ {
+ arrow = 1;
+ title = "Yellow Boost Panel";
+ sprite = "BSTYA0";
+ flags8text = "[8] Force spin";
+ width = 28;
+ height = 2;
+ }
+ 545
+ {
+ arrow = 1;
+ title = "Red Boost Panel";
+ sprite = "BSTRA0";
+ flags8text = "[8] Force spin";
+ width = 28;
+ height = 2;
+ }
}
patterns
@@ -4828,7 +4905,7 @@ thingtypes
}
1104
{
- title = "Mace";
+ title = "Mace Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@@ -4838,7 +4915,7 @@ thingtypes
}
1105
{
- title = "Chain & Maces";
+ title = "Chain with Maces Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@@ -4848,7 +4925,7 @@ thingtypes
}
1106
{
- title = "Chained Spring";
+ title = "Chained Spring Spawnpoint";
sprite = "YSPBA0";
width = 17;
height = 34;
@@ -4858,7 +4935,7 @@ thingtypes
}
1107
{
- title = "Chain";
+ title = "Chain Spawnpoint";
sprite = "BMCHA0";
width = 17;
height = 34;
@@ -4868,7 +4945,7 @@ thingtypes
1108
{
arrow = 1;
- title = "Chain (Hidden)";
+ title = "Hidden Chain Spawnpoint";
sprite = "internal:chain3";
width = 17;
height = 34;
@@ -4876,7 +4953,7 @@ thingtypes
}
1109
{
- title = "Firebar";
+ title = "Firebar Spawnpoint";
sprite = "BFBRA0";
width = 17;
height = 34;
@@ -4886,7 +4963,7 @@ thingtypes
}
1110
{
- title = "Custom Mace";
+ title = "Custom Mace Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@@ -5571,30 +5648,16 @@ thingtypes
title = "BSZ Clover";
sprite = "BSZ8B0";
}
- 1472
- {
- title = "Palm Tree Trunk (Big)";
- width = 16;
- height = 160;
- sprite = "BSZ8C0";
- }
1473
{
- title = "Palm Tree Leaves (Big)";
+ title = "Palm Tree (Big)";
width = 16;
height = 160;
sprite = "BSZ8D0";
}
- 1474
- {
- title = "Palm Tree Trunk (Small)";
- width = 8;
- height = 80;
- sprite = "BSZ8E0";
- }
1475
{
- title = "Palm Tree Leaves (Small)";
+ title = "Palm Tree (Small)";
width = 16;
height = 80;
sprite = "BSZ8F0";
@@ -6416,4 +6479,4 @@ thingsfilters
}
}
-}
\ No newline at end of file
+}
diff --git a/libs/libopenmpt/lib/x86/libopenmpt.lib b/libs/libopenmpt/lib/x86/libopenmpt.lib
index 3f814528acc851cec1e764547570756c24d65225..c81c4c4edc15454f65e9f36738e17591a4ec8d15 100644
Binary files a/libs/libopenmpt/lib/x86/libopenmpt.lib and b/libs/libopenmpt/lib/x86/libopenmpt.lib differ
diff --git a/libs/libopenmpt/lib/x86_64/libopenmpt.lib b/libs/libopenmpt/lib/x86_64/libopenmpt.lib
index 75e3849fac966542b457684ca6f55a41237211d3..216d93b45b32cc968decb30aa240839bef2c13d6 100644
Binary files a/libs/libopenmpt/lib/x86_64/libopenmpt.lib and b/libs/libopenmpt/lib/x86_64/libopenmpt.lib differ
diff --git a/src/command.c b/src/command.c
index cfb36f02fbf8e0d56694c856e51b5ed2641dd7e4..d39730f98e74ab976b0a529b373f46f8f869b41e 100644
--- a/src/command.c
+++ b/src/command.c
@@ -49,6 +49,7 @@ static void COM_Exec_f(void);
static void COM_Wait_f(void);
static void COM_Help_f(void);
static void COM_Toggle_f(void);
+static void COM_Add_f(void);
static void CV_EnforceExecVersion(void);
static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
@@ -291,6 +292,7 @@ void COM_Init(void)
COM_AddCommand("wait", COM_Wait_f);
COM_AddCommand("help", COM_Help_f);
COM_AddCommand("toggle", COM_Toggle_f);
+ COM_AddCommand("add", COM_Add_f);
RegisterNetXCmd(XD_NETVAR, Got_NetVar);
}
@@ -709,15 +711,21 @@ static void COM_Help_f(void)
if (COM_Argc() > 1)
{
- cvar = CV_FindVar(COM_Argv(1));
+ const char *help = COM_Argv(1);
+ cvar = CV_FindVar(help);
if (cvar)
{
- CONS_Printf(M_GetText("Variable %s:\n"), cvar->name);
+ boolean floatmode = false;
+ const char *cvalue = NULL;
+ CONS_Printf("\x82""Variable %s:\n", cvar->name);
CONS_Printf(M_GetText(" flags :"));
if (cvar->flags & CV_SAVE)
CONS_Printf("AUTOSAVE ");
if (cvar->flags & CV_FLOAT)
+ {
CONS_Printf("FLOAT ");
+ floatmode = true;
+ }
if (cvar->flags & CV_NETVAR)
CONS_Printf("NETVAR ");
if (cvar->flags & CV_CALL)
@@ -727,59 +735,113 @@ static void COM_Help_f(void)
CONS_Printf("\n");
if (cvar->PossibleValue)
{
- if (stricmp(cvar->PossibleValue[0].strvalue, "MIN") == 0)
- {
- for (i = 1; cvar->PossibleValue[i].strvalue != NULL; i++)
- if (!stricmp(cvar->PossibleValue[i].strvalue, "MAX"))
- break;
- CONS_Printf(M_GetText(" range from %d to %d\n"), cvar->PossibleValue[0].value,
- cvar->PossibleValue[i].value);
- CONS_Printf(M_GetText(" Current value: %d\n"), cvar->value);
- }
+ CONS_Printf(" Possible values:\n");
+ if (cvar->PossibleValue == CV_YesNo)
+ CONS_Printf(" Yes or No (On or Off, 1 or 0)\n");
+ else if (cvar->PossibleValue == CV_OnOff)
+ CONS_Printf(" On or Off (Yes or No, 1 or 0)\n");
else
{
- const char *cvalue = NULL;
- CONS_Printf(M_GetText(" possible value : %s\n"), cvar->name);
+#define MINVAL 0
+#define MAXVAL 1
+ if (!stricmp(cvar->PossibleValue[MINVAL].strvalue, "MIN"))
+ {
+ if (floatmode)
+ CONS_Printf(" range from %f to %f\n", FIXED_TO_FLOAT(cvar->PossibleValue[MINVAL].value),
+ FIXED_TO_FLOAT(cvar->PossibleValue[MAXVAL].value));
+ else
+ CONS_Printf(" range from %d to %d\n", cvar->PossibleValue[MINVAL].value,
+ cvar->PossibleValue[MAXVAL].value);
+ i = MAXVAL+1;
+ }
+#undef MINVAL
+#undef MAXVAL
+
+ //CONS_Printf(M_GetText(" possible value : %s\n"), cvar->name);
while (cvar->PossibleValue[i].strvalue)
{
- CONS_Printf(" %-2d : %s\n", cvar->PossibleValue[i].value,
- cvar->PossibleValue[i].strvalue);
+ if (floatmode)
+ CONS_Printf(" %-2f : %s\n", FIXED_TO_FLOAT(cvar->PossibleValue[i].value),
+ cvar->PossibleValue[i].strvalue);
+ else
+ CONS_Printf(" %-2d : %s\n", cvar->PossibleValue[i].value,
+ cvar->PossibleValue[i].strvalue);
if (cvar->PossibleValue[i].value == cvar->value)
cvalue = cvar->PossibleValue[i].strvalue;
i++;
}
- if (cvalue)
- CONS_Printf(M_GetText(" Current value: %s\n"), cvalue);
- else
- CONS_Printf(M_GetText(" Current value: %d\n"), cvar->value);
}
}
+
+ if (cvalue)
+ CONS_Printf(" Current value: %s\n", cvalue);
+ else if (cvar->string)
+ CONS_Printf(" Current value: %s\n", cvar->string);
else
- CONS_Printf(M_GetText(" Current value: %d\n"), cvar->value);
+ CONS_Printf(" Current value: %d\n", cvar->value);
}
else
- CONS_Printf(M_GetText("No help for this command/variable\n"));
+ {
+ for (cmd = com_commands; cmd; cmd = cmd->next)
+ {
+ if (strcmp(cmd->name, help))
+ continue;
+
+ CONS_Printf("\x82""Command %s:\n", cmd->name);
+ CONS_Printf(" help is not available for commands");
+ CONS_Printf("\x82""\nCheck wiki.srb2.org for more or try typing <name> without arguments\n");
+ return;
+ }
+
+ CONS_Printf("No exact match, searching...\n");
+
+ // variables
+ CONS_Printf("\x82""Variables:\n");
+ for (cvar = consvar_vars; cvar; cvar = cvar->next)
+ {
+ if ((cvar->flags & CV_NOSHOWHELP) || (!strstr(cvar->name, help)))
+ continue;
+ CONS_Printf("%s ", cvar->name);
+ i++;
+ }
+
+ // commands
+ CONS_Printf("\x82""\nCommands:\n");
+ for (cmd = com_commands; cmd; cmd = cmd->next)
+ {
+ if (!strstr(cmd->name, help))
+ continue;
+ CONS_Printf("%s ",cmd->name);
+ i++;
+ }
+
+ CONS_Printf("\x82""\nCheck wiki.srb2.org for more or type help <command or variable>\n");
+
+ CONS_Debug(DBG_GAMELOGIC, "\x87Total : %d\n", i);
+ }
+ return;
}
else
{
- // commands
- CONS_Printf("\x82%s", M_GetText("Commands\n"));
- for (cmd = com_commands; cmd; cmd = cmd->next)
+ // variables
+ CONS_Printf("\x82""Variables:\n");
+ for (cvar = consvar_vars; cvar; cvar = cvar->next)
{
- CONS_Printf("%s ",cmd->name);
+ if (cvar->flags & CV_NOSHOWHELP)
+ continue;
+ CONS_Printf("%s ", cvar->name);
i++;
}
- // variables
- CONS_Printf("\n\x82%s", M_GetText("Variables\n"));
- for (cvar = consvar_vars; cvar; cvar = cvar->next)
+ // commands
+ CONS_Printf("\x82""\nCommands:\n");
+ for (cmd = com_commands; cmd; cmd = cmd->next)
{
- if (!(cvar->flags & CV_NOSHOWHELP))
- CONS_Printf("%s ", cvar->name);
+ CONS_Printf("%s ",cmd->name);
i++;
}
- CONS_Printf("\n\x82%s", M_GetText("Read help file for more or type help <command or variable>\n"));
+ CONS_Printf("\x82""\nCheck wiki.srb2.org for more or type help <command or variable>\n");
CONS_Debug(DBG_GAMELOGIC, "\x82Total : %d\n", i);
}
@@ -816,6 +878,30 @@ static void COM_Toggle_f(void)
CV_AddValue(cvar, +1);
}
+/** Command variant of CV_AddValue
+ */
+static void COM_Add_f(void)
+{
+ consvar_t *cvar;
+
+ if (COM_Argc() != 3)
+ {
+ CONS_Printf(M_GetText("Add <cvar_name> <value>: Add to the value of a cvar. Negative values work too!\n"));
+ return;
+ }
+ cvar = CV_FindVar(COM_Argv(1));
+ if (!cvar)
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("%s is not a cvar\n"), COM_Argv(1));
+ return;
+ }
+
+ if (( cvar->flags & CV_FLOAT ))
+ CV_Set(cvar, va("%f", FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2))));
+ else
+ CV_AddValue(cvar, atoi(COM_Argv(2)));
+}
+
// =========================================================================
// VARIABLE SIZE BUFFERS
// =========================================================================
@@ -1123,32 +1209,42 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
{
+#define MINVAL 0
+#define MAXVAL 1
INT32 i;
- // search for maximum
- for (i = 1; var->PossibleValue[i].strvalue; i++)
- if (!stricmp(var->PossibleValue[i].strvalue, "MAX"))
- break;
#ifdef PARANOIA
- if (!var->PossibleValue[i].strvalue)
+ if (!var->PossibleValue[MAXVAL].strvalue)
I_Error("Bounded cvar \"%s\" without maximum!\n", var->name);
#endif
- if ((v != INT32_MIN && v < var->PossibleValue[0].value) || !stricmp(valstr, "MIN"))
+ // search for other
+ for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
+ if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
+ {
+ var->value = var->PossibleValue[i].value;
+ var->string = var->PossibleValue[i].strvalue;
+ goto finish;
+ }
+
+
+ if ((v != INT32_MIN && v < var->PossibleValue[MINVAL].value) || !stricmp(valstr, "MIN"))
{
- v = var->PossibleValue[0].value;
- valstr = var->PossibleValue[0].strvalue;
+ v = var->PossibleValue[MINVAL].value;
+ valstr = var->PossibleValue[MINVAL].strvalue;
override = true;
overrideval = v;
}
- else if ((v != INT32_MIN && v > var->PossibleValue[i].value) || !stricmp(valstr, "MAX"))
+ else if ((v != INT32_MIN && v > var->PossibleValue[MAXVAL].value) || !stricmp(valstr, "MAX"))
{
- v = var->PossibleValue[i].value;
- valstr = var->PossibleValue[i].strvalue;
+ v = var->PossibleValue[MAXVAL].value;
+ valstr = var->PossibleValue[MAXVAL].strvalue;
override = true;
overrideval = v;
}
if (v == INT32_MIN)
goto badinput;
+#undef MINVAL
+#undef MAXVAL
}
else
{
@@ -1515,6 +1611,9 @@ void CV_AddValue(consvar_t *var, INT32 increment)
{
INT32 newvalue, max;
+ if (!increment)
+ return;
+
// count pointlimit better
if (var == &cv_pointlimit && (gametype == GT_MATCH))
increment *= 50;
@@ -1538,13 +1637,11 @@ void CV_AddValue(consvar_t *var, INT32 increment)
if (var->PossibleValue)
{
-#define MINVAL 0
if (var == &cv_nextmap)
{
// Special case for the nextmap variable, used only directly from the menu
INT32 oldvalue = var->value - 1, gt;
gt = cv_newgametype.value;
- if (increment != 0) // Going up!
{
newvalue = var->value - 1;
do
@@ -1575,21 +1672,58 @@ void CV_AddValue(consvar_t *var, INT32 increment)
return;
}
}
+#define MINVAL 0
+#define MAXVAL 1
else if (var->PossibleValue[MINVAL].strvalue && !strcmp(var->PossibleValue[MINVAL].strvalue, "MIN"))
{
- // search the next to last
- for (max = 0; var->PossibleValue[max+1].strvalue; max++)
- ;
+#ifdef PARANOIA
+ if (!var->PossibleValue[MAXVAL].strvalue)
+ I_Error("Bounded cvar \"%s\" without maximum!\n", var->name);
+#endif
- if (newvalue < var->PossibleValue[MINVAL].value) // add the max+1
- newvalue += var->PossibleValue[max].value - var->PossibleValue[MINVAL].value + 1;
+ if (newvalue < var->PossibleValue[MINVAL].value || newvalue > var->PossibleValue[MAXVAL].value)
+ {
+ INT32 currentindice = -1, newindice;
+ for (max = MAXVAL+1; var->PossibleValue[max].strvalue; max++)
+ {
+ if (var->PossibleValue[max].value == newvalue)
+ {
+ increment = 0;
+ currentindice = max;
+ }
+ else if (var->PossibleValue[max].value == var->value)
+ currentindice = max;
+ }
- newvalue = var->PossibleValue[MINVAL].value + (newvalue - var->PossibleValue[MINVAL].value)
- % (var->PossibleValue[max].value - var->PossibleValue[MINVAL].value + 1);
+ if (increment)
+ {
+ increment = (increment > 0) ? 1 : -1;
+ if (currentindice == -1 && max != MAXVAL+1)
+ newindice = ((increment > 0) ? MAXVAL : max) + increment;
+ else
+ newindice = currentindice + increment;
- CV_SetValue(var, newvalue);
-#undef MINVAL
+ if (newindice >= max || newindice <= MAXVAL)
+ {
+ if (var == &cv_pointlimit && (gametype == GT_MATCH) && increment > 0)
+ CV_SetValue(var, 50);
+ else
+ {
+ newvalue = var->PossibleValue[((increment > 0) ? MINVAL : MAXVAL)].value;
+ CV_SetValue(var, newvalue);
+ }
+ }
+ else
+ CV_Set(var, var->PossibleValue[newindice].strvalue);
+ }
+ else
+ CV_Set(var, var->PossibleValue[currentindice].strvalue);
+ }
+ else
+ CV_SetValue(var, newvalue);
}
+#undef MINVAL
+#undef MAXVAL
else
{
INT32 currentindice = -1, newindice;
@@ -1599,8 +1733,6 @@ void CV_AddValue(consvar_t *var, INT32 increment)
if (var->PossibleValue[max].value == var->value)
currentindice = max;
- max--;
-
if (var == &cv_chooseskin)
{
// Special case for the chooseskin variable, used only directly from the menu
@@ -1632,7 +1764,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
var->value);
#endif
- newindice = (currentindice + increment + max + 1) % (max+1);
+ newindice = (currentindice + increment + max) % max;
CV_Set(var, var->PossibleValue[newindice].strvalue);
}
}
diff --git a/src/console.c b/src/console.c
index 09a6cab453b288f83d9d5778ab88cc878837642a..11e236696093e3c754c26a861d8862206af9312a 100644
--- a/src/console.c
+++ b/src/console.c
@@ -175,11 +175,11 @@ static void CONS_Clear_f(void)
// Choose english keymap
//
-static void CONS_English_f(void)
+/*static void CONS_English_f(void)
{
shiftxform = english_shiftxform;
CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English"));
-}
+}*/
static char *bindtable[NUMINPUTS];
@@ -394,7 +394,7 @@ void CON_Init(void)
// register our commands
//
COM_AddCommand("cls", CONS_Clear_f);
- COM_AddCommand("english", CONS_English_f);
+ //COM_AddCommand("english", CONS_English_f);
// set console full screen for game startup MAKE SURE VID_Init() done !!!
con_destlines = vid.height;
con_curlines = vid.height;
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 476bb1a1ea357b36c56894a36645e474e101ef73..411d847b54e90d5b310d1e340f02d403c527b919 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -83,11 +83,9 @@ tic_t jointimeout = (10*TICRATE);
static boolean sendingsavegame[MAXNETNODES]; // Are we sending the savegame?
static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
-#ifdef NEWPING
UINT16 pingmeasurecount = 1;
UINT32 realpingtable[MAXPLAYERS]; //the base table of ping where an average will be sent to everyone.
UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values.
-#endif
SINT8 nodetoplayer[MAXNETNODES];
SINT8 nodetoplayer2[MAXNETNODES]; // say the numplayer for this node if any (splitscreen)
UINT8 playerpernode[MAXNETNODES]; // used specialy for scplitscreen
@@ -621,6 +619,10 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
rsp->friction = LONG(players[i].mo->friction);
rsp->movefactor = LONG(players[i].mo->movefactor);
+ rsp->sprite = (spritenum_t)LONG(players[i].mo->sprite);
+ rsp->frame = LONG(players[i].mo->frame);
+ rsp->sprite2 = players[i].mo->sprite2;
+ rsp->anim_duration = SHORT(players[i].mo->anim_duration);
rsp->tics = LONG(players[i].mo->tics);
rsp->statenum = (statenum_t)LONG(players[i].mo->state-states); // :(
rsp->eflags = (UINT16)SHORT(players[i].mo->eflags);
@@ -767,8 +769,17 @@ static void resynch_read_player(resynch_pak *rsp)
players[i].mo->momy = LONG(rsp->momy);
players[i].mo->momz = LONG(rsp->momz);
players[i].mo->movefactor = LONG(rsp->movefactor);
+
+ // Don't use P_SetMobjStateNF to restore state, write/read all the values manually!
+ // This should stop those stupid console errors, hopefully.
+ // -- Monster Iestyn
+ players[i].mo->sprite = (spritenum_t)LONG(rsp->sprite);
+ players[i].mo->frame = LONG(rsp->frame);
+ players[i].mo->sprite2 = rsp->sprite2;
+ players[i].mo->anim_duration = SHORT(rsp->anim_duration);
players[i].mo->tics = LONG(rsp->tics);
- P_SetMobjStateNF(players[i].mo, LONG(rsp->statenum));
+ players[i].mo->state = &states[LONG(rsp->statenum)];
+
players[i].mo->x = LONG(rsp->x);
players[i].mo->y = LONG(rsp->y);
players[i].mo->z = LONG(rsp->z);
@@ -1253,7 +1264,8 @@ static boolean CL_SendJoin(void)
netbuffer->u.clientcfg.localplayers = localplayers;
netbuffer->u.clientcfg.version = VERSION;
netbuffer->u.clientcfg.subversion = SUBVERSION;
-
+ strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
+ strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
}
@@ -1312,33 +1324,13 @@ static void SV_SendPlayerInfo(INT32 node)
continue;
}
- netbuffer->u.playerinfo[i].node = (UINT8)playernode[i];
+ netbuffer->u.playerinfo[i].node = i;
strncpy(netbuffer->u.playerinfo[i].name, (const char *)&player_names[i], MAXPLAYERNAME+1);
netbuffer->u.playerinfo[i].name[MAXPLAYERNAME] = '\0';
//fetch IP address
- {
- const char *claddress;
- UINT32 numericaddress[4];
-
- memset(netbuffer->u.playerinfo[i].address, 0, 4);
- if (playernode[i] == 0)
- {
- //127.0.0.1
- netbuffer->u.playerinfo[i].address[0] = 127;
- netbuffer->u.playerinfo[i].address[3] = 1;
- }
- else if (playernode[i] > 0 && I_GetNodeAddress && (claddress = I_GetNodeAddress(playernode[i])) != NULL)
- {
- if (sscanf(claddress, "%d.%d.%d.%d", &numericaddress[0], &numericaddress[1], &numericaddress[2], &numericaddress[3]) < 4)
- goto badaddress;
- netbuffer->u.playerinfo[i].address[0] = (UINT8)numericaddress[0];
- netbuffer->u.playerinfo[i].address[1] = (UINT8)numericaddress[1];
- netbuffer->u.playerinfo[i].address[2] = (UINT8)numericaddress[2];
- netbuffer->u.playerinfo[i].address[3] = (UINT8)numericaddress[3];
- }
- }
- badaddress:
+ //No, don't do that, you fuckface.
+ memset(netbuffer->u.playerinfo[i].address, 0, 4);
if (G_GametypeHasTeams())
{
@@ -2870,12 +2862,10 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
HU_AddChatText(va("\x82*%s has been kicked (Go away)", player_names[pnum]), false);
kickreason = KR_KICK;
break;
-#ifdef NEWPING
case KICK_MSG_PING_HIGH:
HU_AddChatText(va("\x82*%s left the game (Broke ping limit)", player_names[pnum]), false);
kickreason = KR_PINGLIMIT;
break;
-#endif
case KICK_MSG_CON_FAIL:
HU_AddChatText(va("\x82*%s left the game (Synch Failure)", player_names[pnum]), false);
kickreason = KR_SYNCH;
@@ -2948,10 +2938,8 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
D_StartTitle();
if (msg == KICK_MSG_CON_FAIL)
M_StartMessage(M_GetText("Server closed connection\n(synch failure)\nPress ESC\n"), NULL, MM_NOTHING);
-#ifdef NEWPING
else if (msg == KICK_MSG_PING_HIGH)
M_StartMessage(M_GetText("Server closed connection\n(Broke ping limit)\nPress ESC\n"), NULL, MM_NOTHING);
-#endif
else if (msg == KICK_MSG_BANNED)
M_StartMessage(M_GetText("You have been banned by the server\n\nPress ESC\n"), NULL, MM_NOTHING);
else if (msg == KICK_MSG_CUSTOM_KICK)
@@ -2969,7 +2957,7 @@ consvar_t cv_allownewplayer = {"allowjoin", "On", CV_SAVE|CV_NETVAR, CV_OnOff, N
consvar_t cv_joinnextround = {"joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE, maxplayers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t resynchattempts_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t resynchattempts_cons_t[] = {{1, "MIN"}, {20, "MAX"}, {0, "No"}, {0, NULL}};
consvar_t cv_resynchattempts = {"resynchattempts", "10", CV_SAVE, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
consvar_t cv_blamecfail = {"blamecfail", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
@@ -3199,6 +3187,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
if (!splitscreen && !botingame)
CL_ClearPlayer(newplayernum);
playeringame[newplayernum] = true;
+ READSTRINGN(*p, player_names[newplayernum], MAXPLAYERNAME);
G_AddPlayer(newplayernum);
if (newplayernum+1 > doomcom->numslots)
doomcom->numslots = (INT16)(newplayernum+1);
@@ -3231,10 +3220,10 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
{
const char *address;
if (I_GetNodeAddress && (address = I_GetNodeAddress(node)) != NULL)
- HU_AddChatText(va("\x82*Player %d has joined the game (node %d) (%s)", newplayernum+1, node, address), false); // merge join notification + IP to avoid clogging console/chat.
+ HU_AddChatText(va("\x82*%s has joined the game (node %d) (%s)", player_names[newplayernum], node, address), false); // merge join notification + IP to avoid clogging console/chat.
}
else
- HU_AddChatText(va("\x82*Player %d has joined the game (node %d)", newplayernum+1, node), false); // if you don't wanna see the join address.
+ HU_AddChatText(va("\x82*%s has joined the game (node %d)", player_names[newplayernum], node), false); // if you don't wanna see the join address.
}
if (server && multiplayer && motd[0] != '\0')
@@ -3245,10 +3234,11 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
#endif
}
-static boolean SV_AddWaitingPlayers(void)
+static boolean SV_AddWaitingPlayers(const char *name, const char *name2)
{
INT32 node, n, newplayer = false;
- UINT8 buf[2];
+ UINT8 buf[2 + MAXPLAYERNAME];
+ UINT8 *p;
UINT8 newplayernum = 0;
// What is the reason for this? Why can't newplayernum always be 0?
@@ -3331,18 +3321,23 @@ static boolean SV_AddWaitingPlayers(void)
playernode[newplayernum] = (UINT8)node;
+ p = buf + 2;
buf[0] = (UINT8)node;
buf[1] = newplayernum;
if (playerpernode[node] < 1)
+ {
nodetoplayer[node] = newplayernum;
+ WRITESTRINGN(p, name, MAXPLAYERNAME);
+ }
else
{
nodetoplayer2[node] = newplayernum;
buf[1] |= 0x80;
+ WRITESTRINGN(p, name2, MAXPLAYERNAME);
}
playerpernode[node]++;
- SendNetXCmd(XD_ADDPLAYER, &buf, 2);
+ SendNetXCmd(XD_ADDPLAYER, &buf, p - buf);
DEBFILE(va("Server added player %d node %d\n", newplayernum, node));
// use the next free slot (we can't put playeringame[newplayernum] = true here)
@@ -3404,7 +3399,7 @@ boolean SV_SpawnServer(void)
else doomcom->numslots = 1;
}
- return SV_AddWaitingPlayers();
+ return SV_AddWaitingPlayers(cv_playername.zstring, cv_playername2.zstring);
}
void SV_StopServer(void)
@@ -3475,6 +3470,9 @@ static size_t TotalTextCmdPerTic(tic_t tic)
*/
static void HandleConnect(SINT8 node)
{
+ char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME + 1];
+ INT32 i;
+
if (bannednode && bannednode[node])
SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server"));
else if (netbuffer->u.clientcfg.version != VERSION
@@ -3494,6 +3492,16 @@ static void HandleConnect(SINT8 node)
boolean newnode = false;
#endif
+ for (i = 0; i < netbuffer->u.clientcfg.localplayers - playerpernode[node]; i++)
+ {
+ strlcpy(names[i], netbuffer->u.clientcfg.names[i], MAXPLAYERNAME + 1);
+ if (!EnsurePlayerNameIsGood(names[i], -1))
+ {
+ SV_SendRefuse(node, "Bad player name");
+ return;
+ }
+ }
+
// client authorised to join
nodewaiting[node] = (UINT8)(netbuffer->u.clientcfg.localplayers - playerpernode[node]);
if (!nodeingame[node])
@@ -3534,7 +3542,7 @@ static void HandleConnect(SINT8 node)
SV_SendSaveGame(node); // send a complete game state
DEBFILE("send savegame\n");
}
- SV_AddWaitingPlayers();
+ SV_AddWaitingPlayers(names[0], names[1]);
player_joining = true;
}
#else
@@ -3841,7 +3849,7 @@ static void HandlePacketFromPlayer(SINT8 node)
break;
// Ignore tics from those not synched
- if (resynch_inprogress[node])
+ if (resynch_inprogress[node] && nettics[node] == gametic)
break;
// To save bytes, only the low byte of tic numbers are sent
@@ -4175,7 +4183,6 @@ static void HandlePacketFromPlayer(SINT8 node)
resynch_local_inprogress = true;
CL_AcknowledgeResynch(&netbuffer->u.resynchpak);
break;
-#ifdef NEWPING
case PT_PING:
// Only accept PT_PING from the server.
if (node != servernode)
@@ -4203,7 +4210,6 @@ static void HandlePacketFromPlayer(SINT8 node)
}
break;
-#endif
case PT_SERVERCFG:
break;
case PT_FILEFRAGMENT:
@@ -4699,7 +4705,7 @@ void TryRunTics(tic_t realtics)
if (player_joining)
return;
- if (neededtic > gametic)
+ if (neededtic > gametic && !resynch_local_inprogress)
{
if (advancedemo)
D_StartTitle();
@@ -4717,7 +4723,6 @@ void TryRunTics(tic_t realtics)
}
}
-#ifdef NEWPING
static inline void PingUpdate(void)
{
INT32 i;
@@ -4775,7 +4780,6 @@ static inline void PingUpdate(void)
pingmeasurecount = 1; //Reset count
}
-#endif
void NetUpdate(void)
{
@@ -4800,7 +4804,6 @@ void NetUpdate(void)
gametime = nowtime;
-#ifdef NEWPING
if (server)
{
if (netgame && !(gametime % 255))
@@ -4811,7 +4814,6 @@ void NetUpdate(void)
realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
pingmeasurecount++;
}
-#endif
if (client)
maketic = neededtic;
@@ -4853,8 +4855,13 @@ void NetUpdate(void)
for (i = 0; i < MAXNETNODES; ++i)
if (resynch_inprogress[i])
{
- SV_SendResynch(i);
- counts = -666;
+ if (!nodeingame[i] || nettics[i] == gametic)
+ {
+ SV_SendResynch(i);
+ counts = -666;
+ }
+ else
+ counts = 0; // Let the client catch up with the server
}
// Do not make tics while resynching
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index d09d2aa48e024a5d7ce0451b26bf347663f83469..d7c210895ab5c2d0a376d384d31d586898925e6e 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -15,6 +15,7 @@
#include "d_ticcmd.h"
#include "d_netcmd.h"
+#include "d_net.h"
#include "tables.h"
#include "d_player.h"
@@ -73,9 +74,7 @@ typedef enum
PT_LOGIN, // Login attempt from the client.
-#ifdef NEWPING
PT_PING, // Packet sent to tell clients the other client's latency to server.
-#endif
NUMPACKETTYPE
} packettype_t;
@@ -265,6 +264,10 @@ typedef struct
fixed_t friction;
fixed_t movefactor;
+ spritenum_t sprite;
+ UINT32 frame;
+ UINT8 sprite2;
+ UINT16 anim_duration;
INT32 tics;
statenum_t statenum;
UINT32 flags;
@@ -322,6 +325,7 @@ typedef struct
UINT8 subversion; // Contains build version
UINT8 localplayers;
UINT8 mode;
+ char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME];
} ATTRPACK clientconfig_pak;
#define MAXSERVERNAME 32
@@ -421,9 +425,7 @@ typedef struct
msaskinfo_pak msaskinfo; // 22 bytes
plrinfo playerinfo[MAXPLAYERS]; // 1152 bytes (I'd say 36~38)
plrconfig playerconfig[MAXPLAYERS]; // (up to) 896 bytes (welp they ARE)
-#ifdef NEWPING
UINT32 pingtable[MAXPLAYERS]; // 128 bytes
-#endif
} u; // This is needed to pack diff packet types data together
} ATTRPACK doomdata_t;
@@ -457,9 +459,7 @@ extern consvar_t cv_playbackspeed;
#define KICK_MSG_PLAYER_QUIT 3
#define KICK_MSG_TIMEOUT 4
#define KICK_MSG_BANNED 5
-#ifdef NEWPING
#define KICK_MSG_PING_HIGH 6
-#endif
#define KICK_MSG_CUSTOM_KICK 7
#define KICK_MSG_CUSTOM_BAN 8
@@ -484,11 +484,9 @@ extern SINT8 servernode;
void Command_Ping_f(void);
extern tic_t connectiontimeout;
extern tic_t jointimeout;
-#ifdef NEWPING
extern UINT16 pingmeasurecount;
extern UINT32 realpingtable[MAXPLAYERS];
extern UINT32 playerpingtable[MAXPLAYERS];
-#endif
extern consvar_t cv_joinnextround, cv_allownewplayer, cv_maxplayers, cv_resynchattempts, cv_blamecfail, cv_maxsend, cv_noticedownload, cv_downloadspeed;
diff --git a/src/d_main.c b/src/d_main.c
index 37637edd60c708a01034385c62bd9945b6ffd356..e71b1cdb3601a40707fe71b437598fef3ab5b1ad 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -359,7 +359,7 @@ static void D_Display(void)
// clean up border stuff
// see if the border needs to be initially drawn
- if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction && curbghide))
+ if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction && curbghide && (!hidetitlemap)))
{
// draw the view directly
@@ -1244,24 +1244,40 @@ void D_SRB2Main(void)
sound_disabled = true;
midi_disabled = digital_disabled = true;
}
- else
+ if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
{
- CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
- }
- if (M_CheckParm("-nosound"))
sound_disabled = true;
- if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
- midi_disabled = digital_disabled = true;
+ digital_disabled = true;
+ midi_disabled = true;
+ }
else
{
- if (M_CheckParm("-nomidimusic"))
- midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
- if (M_CheckParm("-nodigmusic"))
- digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ if (M_CheckParm("-nosound"))
+ sound_disabled = true;
+ if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
+ {
+ digital_disabled = true;
+ midi_disabled = true;
+ }
+ else
+ {
+ if (M_CheckParm("-nomidimusic"))
+ midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ if (M_CheckParm("-nodigmusic"))
+ digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ }
+ }
+ if (!( sound_disabled && digital_disabled
+#ifndef NO_MIDI
+ && midi_disabled
+#endif
+ ))
+ {
+ CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
+ I_StartupSound();
+ I_InitMusic();
+ S_InitSfxChannels(cv_soundvolume.value);
}
- I_StartupSound();
- I_InitMusic();
- S_InitSfxChannels(cv_soundvolume.value);
CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init();
diff --git a/src/d_net.c b/src/d_net.c
index 9f68c187c472e7cf73175c0f1ed55dcaccdba31b..cbfef7726ab8e5e96077c4c09b900193eb07582c 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -185,22 +185,10 @@ typedef struct
UINT8 nextacknum;
UINT8 flags;
-#ifndef NEWPING
- // jacobson tcp timeout evaluation algorithm (Karn variation)
- fixed_t ping;
- fixed_t varping;
- INT32 timeout; // computed with ping and varping
-#endif
} node_t;
static node_t nodes[MAXNETNODES];
-#ifndef NEWPING
-#define PINGDEFAULT ((200*TICRATE*FRACUNIT)/1000)
-#define VARPINGDEFAULT ((50*TICRATE*FRACUNIT)/1000)
-#define TIMEOUT(p,v) (p+4*v+FRACUNIT/2)>>FRACBITS;
-#else
-#define NODETIMEOUT 14 //What the above boiled down to...
-#endif
+#define NODETIMEOUT 14
#ifndef NONET
// return <0 if a < b (mod 256)
@@ -320,19 +308,7 @@ static UINT8 GetAcktosend(INT32 node)
static void RemoveAck(INT32 i)
{
INT32 node = ackpak[i].destinationnode;
-#ifndef NEWPING
- fixed_t trueping = (I_GetTime() - ackpak[i].senttime)<<FRACBITS;
- if (ackpak[i].resentnum)
- {
- // +FRACUNIT/2 for round
- nodes[node].ping = (nodes[node].ping*7 + trueping)/8;
- nodes[node].varping = (nodes[node].varping*7 + abs(nodes[node].ping-trueping))/8;
- nodes[node].timeout = TIMEOUT(nodes[node].ping,nodes[node].varping);
- }
- DEBFILE(va("Remove ack %d trueping %d ping %f var %f timeout %d\n",ackpak[i].acknum,trueping>>FRACBITS,(double)FIXED_TO_FLOAT(nodes[node].ping),(double)FIXED_TO_FLOAT(nodes[node].varping),nodes[node].timeout));
-#else
DEBFILE(va("Remove ack %d\n",ackpak[i].acknum));
-#endif
ackpak[i].acknum = 0;
if (nodes[node].flags & NF_CLOSE)
Net_CloseConnection(node);
@@ -519,11 +495,7 @@ void Net_AckTicker(void)
{
const INT32 nodei = ackpak[i].destinationnode;
node_t *node = &nodes[nodei];
-#ifdef NEWPING
if (ackpak[i].acknum && ackpak[i].senttime + NODETIMEOUT < I_GetTime())
-#else
- if (ackpak[i].acknum && ackpak[i].senttime + node->timeout < I_GetTime())
-#endif
{
if (ackpak[i].resentnum > 10 && (node->flags & NF_CLOSE))
{
@@ -534,13 +506,8 @@ void Net_AckTicker(void)
ackpak[i].acknum = 0;
continue;
}
-#ifdef NEWPING
DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
NODETIMEOUT, I_GetTime()));
-#else
- DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
- node->timeout, I_GetTime()));
-#endif
M_Memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
ackpak[i].senttime = I_GetTime();
ackpak[i].resentnum++;
@@ -658,11 +625,6 @@ void Net_WaitAllAckReceived(UINT32 timeout)
static void InitNode(node_t *node)
{
node->acktosend_head = node->acktosend_tail = 0;
-#ifndef NEWPING
- node->ping = PINGDEFAULT;
- node->varping = VARPINGDEFAULT;
- node->timeout = TIMEOUT(node->ping, node->varping);
-#endif
node->firstacktosend = 0;
node->nextacknum = 1;
node->remotefirstack = 0;
@@ -843,9 +805,7 @@ static const char *packettypename[NUMPACKETTYPE] =
"CLIENTJOIN",
"NODETIMEOUT",
"RESYNCHING",
-#ifdef NEWPING
"PING"
-#endif
};
static void DebugPrintpacket(const char *header)
@@ -1384,30 +1344,73 @@ boolean D_CheckNetGame(void)
return ret;
}
+struct pingcell
+{
+ INT32 num;
+ INT32 ms;
+};
+
+static int pingcellcmp(const void *va, const void *vb)
+{
+ const struct pingcell *a, *b;
+ a = va;
+ b = vb;
+ return ( a->ms - b->ms );
+}
+
+/*
+New ping command formatted nicely to present ping in
+ascending order. And with equally spaced columns.
+The caller's ping is presented at the bottom too, for
+convenience.
+*/
+
void Command_Ping_f(void)
{
-#ifndef NEWPING
- if(server)
+ struct pingcell pingv[MAXPLAYERS];
+ INT32 pingc;
+
+ int name_width = 0;
+ int ms_width = 0;
+
+ int n;
+ INT32 i;
+
+ pingc = 0;
+ for (i = 1; i < MAXPLAYERS; ++i)
+ if (playeringame[i])
{
-#endif
- INT32 i;
- for (i = 0; i < MAXPLAYERS;i++)
- {
-#ifndef NEWPING
- const INT32 node = playernode[i];
- if (playeringame[i] && node != 0)
- CONS_Printf(M_GetText("%.2d : %s\n %d tics, %d ms.\n"), i, player_names[i],
- GetLag(node), G_TicsToMilliseconds(GetLag(node)));
-#else
- if (playeringame[i] && i != 0)
- CONS_Printf(M_GetText("%.2d : %s\n %d ms\n"), i, player_names[i], playerpingtable[i]);
-#endif
- }
-#ifndef NEWPING
+ n = strlen(player_names[i]);
+ if (n > name_width)
+ name_width = n;
+
+ n = playerpingtable[i];
+ if (n > ms_width)
+ ms_width = n;
+
+ pingv[pingc].num = i;
+ pingv[pingc].ms = playerpingtable[i];
+ pingc++;
+ }
+
+ if (ms_width < 10) ms_width = 1;
+ else if (ms_width < 100) ms_width = 2;
+ else ms_width = 3;
+
+ qsort(pingv, pingc, sizeof (struct pingcell), &pingcellcmp);
+
+ for (i = 0; i < pingc; ++i)
+ {
+ CONS_Printf("%02d : %-*s %*d ms\n",
+ pingv[i].num,
+ name_width, player_names[pingv[i].num],
+ ms_width, pingv[i].ms);
+ }
+
+ if (!server && playeringame[consoleplayer])
+ {
+ CONS_Printf("\nYour ping is %d ms\n", playerpingtable[consoleplayer]);
}
- else
- CONS_Printf(M_GetText("Only the server can use this.\n"));
-#endif
}
void D_CloseConnection(void)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 1e69d371eaaaea84c1d38475bdf40ad77bd45cbc..b14f92b33bae700dbbbb79a5b526c2110129ad23 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -74,6 +74,7 @@ static void Got_Clearscores(UINT8 **cp, INT32 playernum);
static void PointLimit_OnChange(void);
static void TimeLimit_OnChange(void);
static void NumLaps_OnChange(void);
+static void BaseNumLaps_OnChange(void);
static void Mute_OnChange(void);
static void Hidetime_OnChange(void);
@@ -210,7 +211,7 @@ consvar_t cv_allowteamchange = {"allowteamchange", "Yes", CV_NETVAR, CV_YesNo, N
consvar_t cv_startinglives = {"startinglives", "3", CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t respawntime_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}};
consvar_t cv_respawntime = {"respawndelay", "3", CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_competitionboxes = {"competitionboxes", "Mystery", CV_NETVAR|CV_CHEAT, competitionboxes_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -315,16 +316,17 @@ consvar_t cv_timetic = {"timerres", "Classic", CV_SAVE, timetic_cons_t, NULL, 0,
static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-person only"}, {2, "Always"}, {0, NULL}};
consvar_t cv_powerupdisplay = {"powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t pointlimit_cons_t[] = {{0, "MIN"}, {999999990, "MAX"}, {0, NULL}};
-consvar_t cv_pointlimit = {"pointlimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t,
+static CV_PossibleValue_t pointlimit_cons_t[] = {{1, "MIN"}, {MAXSCORE, "MAX"}, {0, "None"}, {0, NULL}};
+consvar_t cv_pointlimit = {"pointlimit", "None", CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t,
PointLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t timelimit_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
-consvar_t cv_timelimit = {"timelimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
+static CV_PossibleValue_t timelimit_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "None"}, {0, NULL}};
+consvar_t cv_timelimit = {"timelimit", "None", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t numlaps_cons_t[] = {{0, "MIN"}, {50, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
consvar_t cv_numlaps = {"numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usemapnumlaps = {"usemaplaps", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
+consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
// log elemental hazards -- not a netvar, is local to current player
consvar_t cv_hazardlog = {"hazardlog", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -340,9 +342,7 @@ static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE
consvar_t cv_nettimeout = {"nettimeout", "350", CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t jointimeout_cons_t[] = {{5*TICRATE, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
consvar_t cv_jointimeout = {"jointimeout", "350", CV_CALL|CV_SAVE, jointimeout_cons_t, JoinTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef NEWPING
consvar_t cv_maxping = {"maxping", "0", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
// Intermission time Tails 04-19-2002
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};
@@ -497,7 +497,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_friendlyfire);
CV_RegisterVar(&cv_pointlimit);
CV_RegisterVar(&cv_numlaps);
- CV_RegisterVar(&cv_usemapnumlaps);
+ CV_RegisterVar(&cv_basenumlaps);
CV_RegisterVar(&cv_hazardlog);
@@ -573,9 +573,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_skipmapcheck);
CV_RegisterVar(&cv_sleep);
-#ifdef NEWPING
CV_RegisterVar(&cv_maxping);
-#endif
#ifdef SEENAMES
CV_RegisterVar(&cv_allowseenames);
@@ -740,6 +738,8 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_chasefreelook);
CV_RegisterVar(&cv_chasefreelook2);
CV_RegisterVar(&cv_tutorialprompt);
+ CV_RegisterVar(&cv_showfocuslost);
+ CV_RegisterVar(&cv_pauseifunfocused);
// g_input.c
CV_RegisterVar(&cv_sideaxis);
@@ -879,7 +879,7 @@ void D_RegisterClientCommands(void)
* \sa CleanupPlayerName, SetPlayerName, Got_NameAndColor
* \author Graue <graue@oceanbase.org>
*/
-static boolean IsNameGood(char *name, INT32 playernum)
+boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
{
INT32 ix;
@@ -920,14 +920,14 @@ static boolean IsNameGood(char *name, INT32 playernum)
if (len > 1)
{
name[len-1] = '\0';
- if (!IsNameGood (name, playernum))
+ if (!EnsurePlayerNameIsGood (name, playernum))
return false;
}
else if (len == 1) // Agh!
{
// Last ditch effort...
sprintf(name, "%d", M_RandomKey(10));
- if (!IsNameGood (name, playernum))
+ if (!EnsurePlayerNameIsGood (name, playernum))
return false;
}
else
@@ -1056,12 +1056,12 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
* \param newname New name for that player. Should be good, but won't
* necessarily be if the client is maliciously modified or
* buggy.
- * \sa CleanupPlayerName, IsNameGood
+ * \sa CleanupPlayerName, EnsurePlayerNameIsGood
* \author Graue <graue@oceanbase.org>
*/
static void SetPlayerName(INT32 playernum, char *newname)
{
- if (IsNameGood(newname, playernum))
+ if (EnsurePlayerNameIsGood(newname, playernum))
{
if (strcasecmp(newname, player_names[playernum]) != 0)
{
@@ -1692,7 +1692,7 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pultmode, boolean rese
// Kick bot from special stages
if (botskin)
{
- if (G_IsSpecialStage(mapnum))
+ if (G_IsSpecialStage(mapnum) || (mapheaderinfo[mapnum-1] && (mapheaderinfo[mapnum-1]->typeoflevel & TOL_NIGHTS)))
{
if (botingame)
{
@@ -2032,8 +2032,6 @@ static void Command_Suicide(void)
UINT8 buf[4];
UINT8 *cp = buf;
- WRITEINT32(cp, consoleplayer);
-
if (!(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION))
{
CONS_Printf(M_GetText("You must be in a level to use this.\n"));
@@ -2053,6 +2051,7 @@ static void Command_Suicide(void)
return;
}
+ WRITEINT32(cp, consoleplayer);
SendNetXCmd(XD_SUICIDE, &buf, 4);
}
@@ -4465,3 +4464,14 @@ static void Command_ShowTime_f(void)
CONS_Printf(M_GetText("The current time is %f.\nThe timelimit is %f\n"), (double)leveltime/TICRATE, (double)timelimitintics/TICRATE);
}
+
+static void BaseNumLaps_OnChange(void)
+{
+ if (gametype == GT_RACE)
+ {
+ if (cv_basenumlaps.value)
+ CONS_Printf(M_GetText("Number of laps will be changed to map defaults next round.\n"));
+ else
+ CONS_Printf(M_GetText("Number of laps will be changed to %d next round.\n"), cv_basenumlaps.value);
+ }
+}
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 5076c8afa3ffa7bc04c1cf48591b618726b83769..e789e5b50f467d8dceec697ab841adcf851e0bf4 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -66,7 +66,7 @@ extern consvar_t cv_friendlyfire;
extern consvar_t cv_pointlimit;
extern consvar_t cv_timelimit;
extern consvar_t cv_numlaps;
-extern consvar_t cv_usemapnumlaps;
+extern consvar_t cv_basenumlaps;
extern UINT32 timelimitintics;
extern consvar_t cv_allowexitlevel;
@@ -107,9 +107,7 @@ extern consvar_t cv_ringslinger, cv_soundtest;
extern consvar_t cv_specialrings, cv_powerstones, cv_matchboxes, cv_competitionboxes;
-#ifdef NEWPING
extern consvar_t cv_maxping;
-#endif
extern consvar_t cv_skipmapcheck;
@@ -190,6 +188,7 @@ typedef union {
// add game commands, needs cleanup
void D_RegisterServerCommands(void);
void D_RegisterClientCommands(void);
+boolean EnsurePlayerNameIsGood(char *name, INT32 playernum);
void D_SendPlayerConfig(void);
void Command_ExitGame_f(void);
void Command_Retry_f(void);
diff --git a/src/d_player.h b/src/d_player.h
index ff8c312039900e0b329226e8470d524020389be8..90098917f6a9b1cd341e0c74d9c457c967ac59d2 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -252,6 +252,8 @@ typedef enum
pw_spacetime, // In space, no one can hear you spin!
pw_extralife, // Extra Life timer
pw_pushing,
+ pw_justsprung,
+ pw_noautobrake,
pw_super, // Are you super?
pw_gravityboots, // gravity boots
diff --git a/src/dehacked.c b/src/dehacked.c
index 5ce4a475b7ce8d1c2af63c37105149819e6aafa7..e84a818efafbedf35f89423647bd37a19be86459 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -313,7 +313,13 @@ static boolean findFreeSlot(INT32 *num)
if (*num >= MAXSKINS)
return false;
- description[*num].picname[0] = '\0'; // Redesign your logo. (See M_DrawSetupChoosePlayerMenu in m_menu.c...)
+ // Redesign your logo. (See M_DrawSetupChoosePlayerMenu in m_menu.c...)
+ description[*num].picname[0] = '\0';
+ description[*num].nametag[0] = '\0';
+ description[*num].displayname[0] = '\0';
+ description[*num].oppositecolor = SKINCOLOR_NONE;
+ description[*num].tagtextcolor = SKINCOLOR_NONE;
+ description[*num].tagoutlinecolor = SKINCOLOR_NONE;
// Found one! ^_^
return (description[*num].used = true);
@@ -326,9 +332,16 @@ static void readPlayer(MYFILE *f, INT32 num)
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
char *word;
char *word2;
+ char *displayname = ZZ_Alloc(MAXLINELEN+1);
INT32 i;
boolean slotfound = false;
+ #define SLOTFOUND \
+ if (!slotfound && (slotfound = findFreeSlot(&num)) == false) \
+ goto done;
+
+ displayname[MAXLINELEN] = '\0';
+
do
{
if (myfgets(s, MAXLINELEN, f))
@@ -336,6 +349,17 @@ static void readPlayer(MYFILE *f, INT32 num)
if (s[0] == '\n')
break;
+ for (i = 0; i < MAXLINELEN-3; i++)
+ {
+ char *tmp;
+ if (s[i] == '=')
+ {
+ tmp = &s[i+2];
+ strncpy(displayname, tmp, SKINNAMESIZE);
+ break;
+ }
+ }
+
word = strtok(s, " ");
if (word)
strupr(word);
@@ -346,8 +370,7 @@ static void readPlayer(MYFILE *f, INT32 num)
{
char *playertext = NULL;
- if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
- goto done;
+ SLOTFOUND
for (i = 0; i < MAXLINELEN-3; i++)
{
@@ -395,11 +418,54 @@ static void readPlayer(MYFILE *f, INT32 num)
if (fastcmp(word, "PICNAME"))
{
- if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
- goto done;
-
+ SLOTFOUND
strncpy(description[num].picname, word2, 8);
}
+ // new character select
+ else if (fastcmp(word, "DISPLAYNAME"))
+ {
+ SLOTFOUND
+ // replace '#' with line breaks
+ // (also remove any '\n')
+ {
+ char *cur = NULL;
+
+ // remove '\n'
+ cur = strchr(displayname, '\n');
+ if (cur)
+ *cur = '\0';
+
+ // turn '#' into '\n'
+ cur = strchr(displayname, '#');
+ while (cur)
+ {
+ *cur = '\n';
+ cur = strchr(cur, '#');
+ }
+ }
+ // copy final string
+ strncpy(description[num].displayname, displayname, SKINNAMESIZE);
+ }
+ else if (fastcmp(word, "OPPOSITECOLOR") || fastcmp(word, "OPPOSITECOLOUR"))
+ {
+ SLOTFOUND
+ description[num].oppositecolor = (UINT8)get_number(word2);
+ }
+ else if (fastcmp(word, "NAMETAG") || fastcmp(word, "TAGNAME"))
+ {
+ SLOTFOUND
+ strncpy(description[num].nametag, word2, 8);
+ }
+ else if (fastcmp(word, "TAGTEXTCOLOR") || fastcmp(word, "TAGTEXTCOLOUR"))
+ {
+ SLOTFOUND
+ description[num].tagtextcolor = (UINT8)get_number(word2);
+ }
+ else if (fastcmp(word, "TAGOUTLINECOLOR") || fastcmp(word, "TAGOUTLINECOLOUR"))
+ {
+ SLOTFOUND
+ description[num].tagoutlinecolor = (UINT8)get_number(word2);
+ }
else if (fastcmp(word, "STATUS"))
{
/*
@@ -417,9 +483,7 @@ static void readPlayer(MYFILE *f, INT32 num)
else if (fastcmp(word, "SKINNAME"))
{
// Send to free slot.
- if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
- goto done;
-
+ SLOTFOUND
strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
strlwr(description[num].skinname);
}
@@ -427,8 +491,9 @@ static void readPlayer(MYFILE *f, INT32 num)
deh_warning("readPlayer %d: unknown word '%s'", num, word);
}
} while (!myfeof(f)); // finish when the line is empty
-
+ #undef SLOTFOUND
done:
+ Z_Free(displayname);
Z_Free(s);
}
@@ -4441,6 +4506,21 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_CRUSHCLAW_WAIT",
"S_CRUSHCHAIN",
+ // Banpyura
+ "S_BANPYURA_ROAM1",
+ "S_BANPYURA_ROAM2",
+ "S_BANPYURA_ROAM3",
+ "S_BANPYURA_ROAM4",
+ "S_BANPYURA_ROAMPAUSE",
+ "S_CDIAG1",
+ "S_CDIAG2",
+ "S_CDIAG3",
+ "S_CDIAG4",
+ "S_CDIAG5",
+ "S_CDIAG6",
+ "S_CDIAG7",
+ "S_CDIAG8",
+
// Jet Jaw
"S_JETJAW_ROAM1",
"S_JETJAW_ROAM2",
@@ -5907,6 +5987,12 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FLAMEJETFLAME1",
"S_FLAMEJETFLAME2",
"S_FLAMEJETFLAME3",
+ "S_FLAMEJETFLAME4",
+ "S_FLAMEJETFLAME5",
+ "S_FLAMEJETFLAME6",
+ "S_FLAMEJETFLAME7",
+ "S_FLAMEJETFLAME8",
+ "S_FLAMEJETFLAME9",
// Spinning flame jets
"S_FJSPINAXISA1", // Counter-clockwise
@@ -5972,6 +6058,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_TARGET_RESPAWN",
"S_TARGET_ALLDONE",
+ // ATZ's green flame
+ "S_GREENFLAME",
+
// Stalagmites
"S_STG0",
"S_STG1",
@@ -6661,6 +6750,16 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_BHORIZ7",
"S_BHORIZ8",
+ "S_BOOSTERSOUND",
+ "S_YELLOWBOOSTERROLLER",
+ "S_YELLOWBOOSTERSEG_LEFT",
+ "S_YELLOWBOOSTERSEG_RIGHT",
+ "S_YELLOWBOOSTERSEG_FACE",
+ "S_REDBOOSTERROLLER",
+ "S_REDBOOSTERSEG_LEFT",
+ "S_REDBOOSTERSEG_RIGHT",
+ "S_REDBOOSTERSEG_FACE",
+
// Rain
"S_RAIN1",
"S_RAINRETURN",
@@ -7313,6 +7412,8 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_CRUSHSTACEAN", // Crushstacean
"MT_CRUSHCLAW", // Big meaty claw
"MT_CRUSHCHAIN", // Chain
+ "MT_BANPYURA", // Banpyura
+ "MT_BANPSPRING", // Banpyura spring
"MT_JETJAW", // Jet Jaw
"MT_SNAILER", // Snailer
"MT_VULTURE", // BASH
@@ -7450,6 +7551,11 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_REDHORIZ",
"MT_BLUEHORIZ",
+ "MT_BOOSTERSEG",
+ "MT_BOOSTERROLLER",
+ "MT_YELLOWBOOSTER",
+ "MT_REDBOOSTER",
+
// Interactive Objects
"MT_BUBBLES", // Bubble source
"MT_SIGN", // Level end sign
@@ -7708,6 +7814,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_TRAPGOYLEDOWN",
"MT_TRAPGOYLELONG",
"MT_TARGET",
+ "MT_GREENFLAME",
// Stalagmites
"MT_STALAGMITE0",
@@ -8353,6 +8460,8 @@ static const char *const POWERS_LIST[] = {
"SPACETIME", // In space, no one can hear you spin!
"EXTRALIFE", // Extra Life timer
"PUSHING",
+ "JUSTSPRUNG",
+ "NOAUTOBRAKE",
"SUPER", // Are you super?
"GRAVITYBOOTS", // gravity boots
@@ -8916,9 +9025,9 @@ struct {
{"FF_PLATFORM",FF_PLATFORM}, ///< You can jump up through this to the top.
{"FF_REVERSEPLATFORM",FF_REVERSEPLATFORM}, ///< A fall-through floor in normal gravity, a platform in reverse gravity.
{"FF_INTANGABLEFLATS",FF_INTANGABLEFLATS}, ///< Both flats are intangable, but the sides are still solid.
- {"FF_SHATTER",FF_SHATTER}, ///< Used with ::FF_BUSTUP. Thinks everyone's Knuckles.
- {"FF_SPINBUST",FF_SPINBUST}, ///< Used with ::FF_BUSTUP. Jump or fall onto it while curled in a ball.
- {"FF_ONLYKNUX",FF_ONLYKNUX}, ///< Used with ::FF_BUSTUP. Only Knuckles can break this rock.
+ {"FF_SHATTER",FF_SHATTER}, ///< Used with ::FF_BUSTUP. Bustable on mere touch.
+ {"FF_SPINBUST",FF_SPINBUST}, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames.
+ {"FF_STRONGBUST",FF_STRONGBUST }, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee).
{"FF_RIPPLE",FF_RIPPLE}, ///< Ripple the flats
{"FF_COLORMAPONLY",FF_COLORMAPONLY}, ///< Only copy the colormap, not the lightlevel
{"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
@@ -9049,6 +9158,7 @@ struct {
{"V_OFFSET",V_OFFSET},
{"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE},
{"V_FLIP",V_FLIP},
+ {"V_CENTERNAMETAG",V_CENTERNAMETAG},
{"V_SNAPTOTOP",V_SNAPTOTOP},
{"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM},
{"V_SNAPTOLEFT",V_SNAPTOLEFT},
@@ -10068,6 +10178,23 @@ static inline int lib_getenum(lua_State *L)
} else if (fastcmp(word,"mapmusposition")) {
lua_pushinteger(L, mapmusposition);
return 1;
+ // local player variables, by popular request
+ } else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
+ if (consoleplayer < 0 || !playeringame[consoleplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"displayplayer")) { // player visible on screen (aka display player 1)
+ if (displayplayer < 0 || !playeringame[displayplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[displayplayer], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"secondarydisplayplayer")) { // local/display player 2, for splitscreen
+ if (!splitscreen || secondarydisplayplayer < 0 || !playeringame[secondarydisplayplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[secondarydisplayplayer], META_PLAYER);
+ return 1;
+ // end local player variables
} else if (fastcmp(word,"server")) {
if ((!multiplayer || !netgame) && !playeringame[serverplayer])
return 0;
diff --git a/src/doomdef.h b/src/doomdef.h
index 8d44d0896758316e60eb93afe845fe249d505477..676c86e0d68b8c844c6edf042804f3a68589b048 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -509,13 +509,17 @@ INT32 I_GetKey(void);
// Max gamepad/joysticks that can be detected/used.
#define MAX_JOYSTICKS 4
+#ifndef M_PIl
+#define M_PIl 3.1415926535897932384626433832795029L
+#endif
+
// Floating point comparison epsilons from float.h
#ifndef FLT_EPSILON
#define FLT_EPSILON 1.1920928955078125e-7f
#endif
#ifndef DBL_EPSILON
-#define DBL_EPSILON 2.2204460492503131e-16
+#define DBL_EPSILON 2.2204460492503131e-16l
#endif
// An assert-type mechanism.
@@ -561,9 +565,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Polyobject fake flat code
#define POLYOBJECTS_PLANES
-/// Improved way of dealing with ping values and a ping limit.
-#define NEWPING
-
/// See name of player in your crosshair
#define SEENAMES
diff --git a/src/doomstat.h b/src/doomstat.h
index 57e37f72dc98dfbcbecdb225292e6bcc10c71db7..7d06f03e24445c868d385f6dc83002fbcb542ab2 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -327,7 +327,7 @@ typedef struct
// Music stuff.
UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds
char musintername[7]; ///< Intermission screen music.
-
+
char muspostbossname[7]; ///< Post-bossdeath music.
UINT16 muspostbosstrack; ///< Post-bossdeath track.
UINT32 muspostbosspos; ///< Post-bossdeath position
@@ -433,6 +433,7 @@ typedef struct
tic_t time; ///< Time in which the level was finished.
UINT32 score; ///< Score when the level was finished.
UINT16 rings; ///< Rings when the level was finished.
+ boolean gotperfect; ///< Got perfect bonus?
} recorddata_t;
/** Setup for one NiGHTS map.
diff --git a/src/f_finale.c b/src/f_finale.c
index e84d8227974e91d1257ea3469e0a9955a0b8c905..eb1415042bc2a10efa6f0798db80b53a93db101d 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -75,6 +75,7 @@ INT32 curbgcolor;
INT32 curbgxspeed;
INT32 curbgyspeed;
boolean curbghide;
+boolean hidetitlemap; // WARNING: set to false by M_SetupNextMenu and M_ClearMenus
static UINT8 curDemo = 0;
static UINT32 demoDelayLeft;
@@ -1585,15 +1586,15 @@ void F_StartEnding(void)
UINT8 skinnum = players[consoleplayer].skin;
spritedef_t *sprdef;
spriteframe_t *sprframe;
- if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 7)
+ if (skins[skinnum].sprites[SPR2_XTRA].numframes >= (XTRA_ENDING+2)+1)
{
sprdef = &skins[skinnum].sprites[SPR2_XTRA];
// character head, skin specific
- sprframe = &sprdef->spriteframes[4];
+ sprframe = &sprdef->spriteframes[XTRA_ENDING];
endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
- sprframe = &sprdef->spriteframes[5];
+ sprframe = &sprdef->spriteframes[XTRA_ENDING+1];
endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
- sprframe = &sprdef->spriteframes[6];
+ sprframe = &sprdef->spriteframes[XTRA_ENDING+2];
endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
}
else // Show a star if your character doesn't have an ending firework display. (Basically the MISSINGs for this)
@@ -2098,12 +2099,12 @@ void F_InitMenuPresValues(void)
curfadevalue = 16;
curhidepics = hidetitlepics;
curbgcolor = -1;
- curbgxspeed = titlescrollxspeed;
- curbgyspeed = titlescrollyspeed;
- curbghide = true;
+ curbgxspeed = (gamestate == GS_TIMEATTACK) ? 0 : titlescrollxspeed;
+ curbgyspeed = (gamestate == GS_TIMEATTACK) ? 22 : titlescrollyspeed;
+ curbghide = (gamestate == GS_TIMEATTACK) ? false : true;
// Find current presentation values
- M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "SRB2BACK" : "TITLESKY");
+ M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "RECATTBG" : "TITLESKY");
M_SetMenuCurFadeValue(16);
M_SetMenuCurHideTitlePics();
}
diff --git a/src/f_finale.h b/src/f_finale.h
index d640abc8a4896590a406d79a5505050cd20cd29f..58c492c3d9578725a59df4049b78dc027810a2c6 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -94,6 +94,7 @@ extern INT32 curbgcolor;
extern INT32 curbgxspeed;
extern INT32 curbgyspeed;
extern boolean curbghide;
+extern boolean hidetitlemap;
#define TITLEBACKGROUNDACTIVE (curfadevalue >= 0 || curbgname[0])
diff --git a/src/g_game.c b/src/g_game.c
index 449591d05d9915bb00b17e82bec28efd290dccce..e2f43e4f26e13948b94b2cbfbf32e7b3f69e76e5 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -361,6 +361,8 @@ consvar_t cv_chatbacktint = {"chatbacktint", "On", CV_SAVE, CV_OnOff, NULL, 0, N
static CV_PossibleValue_t consolechat_cons_t[] = {{0, "Window"}, {1, "Console"}, {2, "Window (Hidden)"}, {0, NULL}};
consvar_t cv_consolechat = {"chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+// Pause game upon window losing focus
+consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_crosshair = {"crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_crosshair2 = {"crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -1711,65 +1713,6 @@ static INT32 camtoggledelay, camtoggledelay2 = 0;
//
boolean G_Responder(event_t *ev)
{
- // allow spy mode changes even during the demo
- if (gamestate == GS_LEVEL && ev->type == ev_keydown
- && (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
- {
- if (splitscreen || !netgame)
- displayplayer = consoleplayer;
- else
- {
- // spy mode
- do
- {
- displayplayer++;
- if (displayplayer == MAXPLAYERS)
- displayplayer = 0;
-
- if (!playeringame[displayplayer])
- continue;
-
- if (players[displayplayer].spectator)
- continue;
-
- if (G_GametypeHasTeams())
- {
- if (players[consoleplayer].ctfteam
- && players[displayplayer].ctfteam != players[consoleplayer].ctfteam)
- continue;
- }
- else if (gametype == GT_HIDEANDSEEK)
- {
- if (players[consoleplayer].pflags & PF_TAGIT)
- continue;
- }
- // Other Tag-based gametypes?
- else if (G_TagGametype())
- {
- if (!players[consoleplayer].spectator
- && (players[consoleplayer].pflags & PF_TAGIT) != (players[displayplayer].pflags & PF_TAGIT))
- continue;
- }
- else if (G_GametypeHasSpectators() && G_RingSlingerGametype())
- {
- if (!players[consoleplayer].spectator)
- continue;
- }
-
- break;
- } while (displayplayer != consoleplayer);
-
- // change statusbar also if playing back demo
- if (singledemo)
- ST_changeDemoView();
-
- // tell who's the view
- CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]);
-
- return true;
- }
- }
-
// any other key pops up menu if in demos
if (gameaction == ga_nothing && !singledemo &&
((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN))
@@ -1846,6 +1789,65 @@ boolean G_Responder(event_t *ev)
if (HU_Responder(ev))
return true; // chat ate the event
+ // allow spy mode changes even during the demo
+ if (gamestate == GS_LEVEL && ev->type == ev_keydown
+ && (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
+ {
+ if (splitscreen || !netgame)
+ displayplayer = consoleplayer;
+ else
+ {
+ // spy mode
+ do
+ {
+ displayplayer++;
+ if (displayplayer == MAXPLAYERS)
+ displayplayer = 0;
+
+ if (!playeringame[displayplayer])
+ continue;
+
+ if (players[displayplayer].spectator)
+ continue;
+
+ if (G_GametypeHasTeams())
+ {
+ if (players[consoleplayer].ctfteam
+ && players[displayplayer].ctfteam != players[consoleplayer].ctfteam)
+ continue;
+ }
+ else if (gametype == GT_HIDEANDSEEK)
+ {
+ if (players[consoleplayer].pflags & PF_TAGIT)
+ continue;
+ }
+ // Other Tag-based gametypes?
+ else if (G_TagGametype())
+ {
+ if (!players[consoleplayer].spectator
+ && (players[consoleplayer].pflags & PF_TAGIT) != (players[displayplayer].pflags & PF_TAGIT))
+ continue;
+ }
+ else if (G_GametypeHasSpectators() && G_RingSlingerGametype())
+ {
+ if (!players[consoleplayer].spectator)
+ continue;
+ }
+
+ break;
+ } while (displayplayer != consoleplayer);
+
+ // change statusbar also if playing back demo
+ if (singledemo)
+ ST_changeDemoView();
+
+ // tell who's the view
+ CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]);
+
+ return true;
+ }
+ }
+
// update keys current state
G_MapEventsToControls(ev);
@@ -3339,6 +3341,7 @@ void G_LoadGameData(void)
UINT32 recscore;
tic_t rectime;
UINT16 recrings;
+ boolean gotperf;
UINT8 recmares;
INT32 curmare;
@@ -3431,6 +3434,7 @@ void G_LoadGameData(void)
recscore = READUINT32(save_p);
rectime = (tic_t)READUINT32(save_p);
recrings = READUINT16(save_p);
+ gotperf = (boolean)READUINT8(save_p);
if (recrings > 10000 || recscore > MAXSCORE)
goto datacorrupt;
@@ -3442,6 +3446,9 @@ void G_LoadGameData(void)
mainrecords[i]->time = rectime;
mainrecords[i]->rings = recrings;
}
+
+ if (gotperf)
+ mainrecords[i]->gotperfect = gotperf;
}
// Nights records
@@ -3573,12 +3580,14 @@ void G_SaveGameData(void)
WRITEUINT32(save_p, mainrecords[i]->score);
WRITEUINT32(save_p, mainrecords[i]->time);
WRITEUINT16(save_p, mainrecords[i]->rings);
+ WRITEUINT8(save_p, mainrecords[i]->gotperfect);
}
else
{
WRITEUINT32(save_p, 0);
WRITEUINT32(save_p, 0);
WRITEUINT16(save_p, 0);
+ WRITEUINT8(save_p, 0);
}
}
diff --git a/src/g_game.h b/src/g_game.h
index df1301dd7c392071a14fa66870c9f8fc7f099883..198cbc396ccb5d76b1596d3ef7d45b89ee755d98 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -59,6 +59,8 @@ extern boolean pausebreakkey;
extern boolean promptactive;
+extern consvar_t cv_pauseifunfocused;
+
// used in game menu
extern consvar_t cv_tutorialprompt;
extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection, cv_compactscoreboard;
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 48393249214ff7dc7dd13051d88f5b50c2478a44..9e454bcd5275dd28150e33f053fc5ee20c79ddb0 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -201,7 +201,7 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
// (do not accept hit with the extensions)
num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx;
frac = num / den;
- if (frac < 0.0 || frac > 1.0)
+ if (frac < 0.0l || frac > 1.0l)
return NULL;
// now get the frac along the BSP line
diff --git a/src/hardware/hw_dll.h b/src/hardware/hw_dll.h
index 452e9037c2dab8f14bf1798113a22b87f3f95049..3fa5852d88d844060f6a3601e148d1a540461493 100644
--- a/src/hardware/hw_dll.h
+++ b/src/hardware/hw_dll.h
@@ -61,9 +61,6 @@ typedef void (*I_Error_t) (const char *error, ...) FUNCIERROR;
// ==========================================================================
// Constants
-#ifndef M_PIl
-#define M_PIl 3.1415926535897932384626433832795029L
-#endif
#define DEGREE (0.017453292519943295769236907684883l) // 2*PI/360
void DBG_Printf(const char *lpFmt, ...) /*FUNCPRINTF*/;
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index f4637ff7f4aee2d3350dc3e74f921ed870916de0..fa66536b6592edd1687ba80e066bb6603f405780 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -162,6 +162,8 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_TURR
&lspr[NOLIGHT], // SPR_SHRP
&lspr[NOLIGHT], // SPR_CRAB
+ &lspr[NOLIGHT], // SPR_CR2B
+ &lspr[NOLIGHT], // SPR_CSPR
&lspr[NOLIGHT], // SPR_JJAW
&lspr[NOLIGHT], // SPR_SNLR
&lspr[NOLIGHT], // SPR_VLTR
@@ -199,7 +201,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_EGGO
&lspr[NOLIGHT], // SPR_SEBH
&lspr[NOLIGHT], // SPR_FAKE
- &lspr[NOLIGHT], // SPR_SHCK
+ &lspr[LBLUESHINE_L],// SPR_SHCK
// Boss 4 (Castle Eggman)
&lspr[NOLIGHT], // SPR_EGGP
@@ -404,6 +406,11 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_HHPL
&lspr[NOLIGHT], // SPR_SHRM
&lspr[NOLIGHT], // SPR_HHZM
+
+ // Azure Temple Scenery
+ &lspr[NOLIGHT], // SPR_BGAR
+ &lspr[NOLIGHT], // SPR_RCRY
+ &lspr[GREENBALL_L], // SPR_CFLM
// Botanic Serenity Scenery
&lspr[NOLIGHT], // SPR_BSZ1
@@ -424,7 +431,6 @@ light_t *t_lspr[NUMSPRITES] =
// Misc Scenery
&lspr[NOLIGHT], // SPR_STLG
&lspr[NOLIGHT], // SPR_DBAL
- &lspr[NOLIGHT], // SPR_RCRY
// Powerup Indicators
&lspr[NOLIGHT], // SPR_ARMA
@@ -478,6 +484,8 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_SSWY
&lspr[NOLIGHT], // SPR_SSWR
&lspr[NOLIGHT], // SPR_SSWB
+ &lspr[NOLIGHT], // SPR_BSTY
+ &lspr[NOLIGHT], // SPR_BSTR
// Environmental Effects
&lspr[NOLIGHT], // SPR_RAIN
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 3bc643c3c2537f691e9545ceccfeec370c9a2539..428656bf2a396b6bc707e6677eecc09bf3e497eb 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -71,6 +71,10 @@ patch_t *lt_font[LT_FONTSIZE];
patch_t *cred_font[CRED_FONTSIZE];
patch_t *ttlnum[20]; // act numbers (0-19)
+// Name tag fonts
+patch_t *ntb_font[NT_FONTSIZE];
+patch_t *nto_font[NT_FONTSIZE];
+
static player_t *plr;
boolean chat_on; // entering a chat message?
static char w_chat[HU_MAXMSGLEN];
@@ -246,6 +250,32 @@ void HU_LoadGraphics(void)
ttlnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
}
+ // cache the base name tag font for entire game execution
+ j = NT_FONTSTART;
+ for (i = 0; i < NT_FONTSIZE; i++)
+ {
+ sprintf(buffer, "NTFNT%.3d", j);
+ j++;
+
+ if (W_CheckNumForName(buffer) == LUMPERROR)
+ ntb_font[i] = NULL;
+ else
+ ntb_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+ }
+
+ // cache the outline name tag font for entire game execution
+ j = NT_FONTSTART;
+ for (i = 0; i < NT_FONTSIZE; i++)
+ {
+ sprintf(buffer, "NTFNO%.3d", j);
+ j++;
+
+ if (W_CheckNumForName(buffer) == LUMPERROR)
+ nto_font[i] = NULL;
+ else
+ nto_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+ }
+
// cache the crosshairs, don't bother to know which one is being used,
// just cache all 3, they're so small anyway.
for (i = 0; i < HU_CROSSHAIRS; i++)
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index ab77e67b6f9a36cd3f390344a0337f9a5e666c4c..55b61d4b7a995d6ffb4f9fd85958ed0d25d2ba66 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -35,6 +35,12 @@
#define CRED_FONTEND 'Z' // the last font character
#define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
+// Name tag font
+// Used by base and outline font set
+#define NT_FONTSTART '!' // the first font character
+#define NT_FONTEND 'Z' // the last font character
+#define NT_FONTSIZE (NT_FONTEND - NT_FONTSTART + 1)
+
#define HU_CROSSHAIRS 3 // maximum of 9 - see HU_Init();
extern char *shiftxform; // english translation shift table
@@ -77,6 +83,8 @@ extern patch_t *tallnum[10];
extern patch_t *nightsnum[10];
extern patch_t *lt_font[LT_FONTSIZE];
extern patch_t *cred_font[CRED_FONTSIZE];
+extern patch_t *ntb_font[NT_FONTSIZE];
+extern patch_t *nto_font[NT_FONTSIZE];
extern patch_t *ttlnum[20];
extern patch_t *emeraldpics[3][8];
extern patch_t *rflagico;
diff --git a/src/i_tcp.c b/src/i_tcp.c
index f2b4336dc313faba1f0c3bebe84e31e89fb923ab..da92f27673fa4edc872b2056bfdbc64bea9d07cf 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -776,6 +776,8 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
#endif
#endif
mysockaddr_t straddr;
+ struct sockaddr_in sin;
+ socklen_t len = sizeof(sin);
if (s == (SOCKET_TYPE)ERRSOCKET)
return (SOCKET_TYPE)ERRSOCKET;
@@ -869,12 +871,16 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
}
+ if (getsockname(s, (struct sockaddr *)&sin, &len) == -1)
+ CONS_Alert(CONS_WARNING, M_GetText("Failed to get port number\n"));
+ else
+ current_port = (UINT16)ntohs(sin.sin_port);
+
return s;
}
static boolean UDP_Socket(void)
{
- const char *sock_port = NULL;
size_t s;
struct my_addrinfo *ai, *runp, hints;
int gaie;
@@ -896,20 +902,11 @@ static boolean UDP_Socket(void)
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
- if (M_CheckParm("-clientport"))
- {
- if (!M_IsNextParm())
- I_Error("syntax: -clientport <portnum>");
- sock_port = M_GetNextParm();
- }
- else
- sock_port = port_name;
-
if (M_CheckParm("-bindaddr"))
{
while (M_IsNextParm())
{
- gaie = I_getaddrinfo(M_GetNextParm(), sock_port, &hints, &ai);
+ gaie = I_getaddrinfo(M_GetNextParm(), port_name, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -930,7 +927,7 @@ static boolean UDP_Socket(void)
}
else
{
- gaie = I_getaddrinfo("0.0.0.0", sock_port, &hints, &ai);
+ gaie = I_getaddrinfo("0.0.0.0", port_name, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -945,8 +942,8 @@ static boolean UDP_Socket(void)
#ifdef HAVE_MINIUPNPC
if (UPNP_support)
{
- I_UPnP_rem(sock_port, "UDP");
- I_UPnP_add(NULL, sock_port, "UDP");
+ I_UPnP_rem(port_name, "UDP");
+ I_UPnP_add(NULL, port_name, "UDP");
}
#endif
}
@@ -963,7 +960,7 @@ static boolean UDP_Socket(void)
{
while (M_IsNextParm())
{
- gaie = I_getaddrinfo(M_GetNextParm(), sock_port, &hints, &ai);
+ gaie = I_getaddrinfo(M_GetNextParm(), port_name, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -984,7 +981,7 @@ static boolean UDP_Socket(void)
}
else
{
- gaie = I_getaddrinfo("::", sock_port, &hints, &ai);
+ gaie = I_getaddrinfo("::", port_name, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -1260,7 +1257,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
int gaie;
if (!port || !port[0])
- port = port_name;
+ port = DEFAULTPORT;
DEBFILE(va("Creating new node: %s@%s\n", address, port));
@@ -1424,14 +1421,15 @@ boolean I_InitTcpNetwork(void)
if (!I_InitTcpDriver())
return false;
- if (M_CheckParm("-udpport"))
+ if (M_CheckParm("-port"))
+ // Combined -udpport and -clientport into -port
+ // As it was really redundant having two seperate parms that does the same thing
{
if (M_IsNextParm())
strcpy(port_name, M_GetNextParm());
else
strcpy(port_name, "0");
}
- current_port = (UINT16)atoi(port_name);
// parse network game options,
if (M_CheckParm("-server") || dedicated)
diff --git a/src/info.c b/src/info.c
index 95af4fa821f1e6d1df96a2e392e593b353afb149..9af477e4210d8e107fcdb3d3e1194d832b81e47d 100644
--- a/src/info.c
+++ b/src/info.c
@@ -50,6 +50,8 @@ char sprnames[NUMSPRITES + 1][5] =
"TURR", // Pop-Up Turret
"SHRP", // Sharp
"CRAB", // Crushstacean
+ "CR2B", // Banpyura
+ "CSPR", // Banpyura spring
"JJAW", // Jet Jaw
"SNLR", // Snailer
"VLTR", // BASH
@@ -299,6 +301,11 @@ char sprnames[NUMSPRITES + 1][5] =
"SHRM", // Mushroom
"HHZM", // Misc
+ // Azure Temple Scenery
+ "BGAR", // ATZ Gargoyles
+ "RCRY", // ATZ Red Crystal (Target)
+ "CFLM", // Green torch flame
+
// Botanic Serenity Scenery
"BSZ1", // Tall flowers
"BSZ2", // Medium flowers
@@ -318,7 +325,6 @@ char sprnames[NUMSPRITES + 1][5] =
// Misc Scenery
"STLG", // Stalagmites
"DBAL", // Disco
- "RCRY", // ATZ Red Crystal (Target)
// Powerup Indicators
"ARMA", // Armageddon Shield Orb
@@ -372,6 +378,8 @@ char sprnames[NUMSPRITES + 1][5] =
"SSWY", // Yellow Side Spring
"SSWR", // Red Side Spring
"SSWB", // Blue Side Spring
+ "BSTY", // Yellow Booster
+ "BSTR", // Red Booster
// Environmental Effects
"RAIN", // Rain
@@ -1006,6 +1014,22 @@ state_t states[NUMSTATES] =
{SPR_CRAB, 3, 37, {NULL}, 0, 0, S_CRUSHCLAW_AIM}, // S_CRUSHCLAW_WAIT
{SPR_CRAB, 4, -1, {NULL}, 0, 0, S_NULL}, // S_CRUSHCHAIN
+ // Banpyura
+ {SPR_CR2B, 0, 3, {A_CrushstaceanWalk}, 0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM2}, // S_BANPYURA_ROAM1
+ {SPR_CR2B, 1, 3, {A_CrushstaceanWalk}, 0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM3}, // S_BANPYURA_ROAM2
+ {SPR_CR2B, 0, 3, {A_CrushstaceanWalk}, 0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM4}, // S_BANPYURA_ROAM3
+ {SPR_CR2B, 2, 3, {A_CrushstaceanWalk}, 0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM1}, // S_BANPYURA_ROAM4
+ {SPR_CR2B, 0, 40, {NULL}, 0, 0, S_BANPYURA_ROAM1}, // S_BANPYURA_ROAMPAUSE
+
+ {SPR_CSPR, 0, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1}, // S_CDIAG1
+ {SPR_CSPR, 1, 1, {A_Pain}, 0, 0, S_CDIAG3}, // S_CDIAG2
+ {SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG4}, // S_CDIAG3
+ {SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG5}, // S_CDIAG4
+ {SPR_CSPR, 4, 1, {A_CrushclawAim}, 50, 20, S_CDIAG6}, // S_CDIAG5
+ {SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG7}, // S_CDIAG6
+ {SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG8}, // S_CDIAG7
+ {SPR_CSPR, 1, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1}, // S_CDIAG8
+
// Jet Jaw
{SPR_JJAW, 0, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM2}, // S_JETJAW_ROAM1
{SPR_JJAW, 0, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM3}, // S_JETJAW_ROAM2
@@ -2509,6 +2533,12 @@ state_t states[NUMSTATES] =
{SPR_FLME, FF_FULLBRIGHT , 4, {NULL}, 0, 0, S_FLAMEJETFLAME2}, // S_FLAMEJETFLAME1
{SPR_FLME, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_FLAMEJETFLAME3}, // S_FLAMEJETFLAME2
{SPR_FLME, FF_FULLBRIGHT|2, 11, {NULL}, 0, 0, S_NULL}, // S_FLAMEJETFLAME3
+ {SPR_FLME, FF_FULLBRIGHT|3, 4, {NULL}, 0, 0, S_FLAMEJETFLAME5}, // S_FLAMEJETFLAME4
+ {SPR_FLME, FF_FULLBRIGHT|4, 5, {NULL}, 0, 0, S_FLAMEJETFLAME6}, // S_FLAMEJETFLAME5
+ {SPR_FLME, FF_FULLBRIGHT|5, 11, {NULL}, 0, 0, S_NULL}, // S_FLAMEJETFLAME6
+ {SPR_FLME, FF_FULLBRIGHT|6, 4, {NULL}, 0, 0, S_FLAMEJETFLAME8}, // S_FLAMEJETFLAME7
+ {SPR_FLME, FF_FULLBRIGHT|7, 5, {NULL}, 0, 0, S_FLAMEJETFLAME9}, // S_FLAMEJETFLAME8
+ {SPR_FLME, FF_FULLBRIGHT|8, 11, {NULL}, 0, 0, S_NULL}, // S_FLAMEJETFLAME9
// Spinning flame jets
// A: Counter-clockwise
@@ -2547,31 +2577,31 @@ state_t states[NUMSTATES] =
{SPR_WVIN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_WALLVINE_SHORT
// Trapgoyles
- {SPR_GARG, 0, 67, {NULL}, 0, 0, S_TRAPGOYLE_CHECK}, // S_TRAPGOYLE
- {SPR_GARG, 0, 3, {NULL}, 0, 0, S_TRAPGOYLE_FIRE1}, // S_TRAPGOYLE_CHECK
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE2}, // S_TRAPGOYLE_FIRE1
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE3}, // S_TRAPGOYLE_FIRE2
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE}, // S_TRAPGOYLE_FIRE3
-
- {SPR_GARG, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEUP_CHECK}, // S_TRAPGOYLEUP
- {SPR_GARG, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEUP_FIRE1}, // S_TRAPGOYLEUP_CHECK
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE2}, // S_TRAPGOYLEUP_FIRE1
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE3}, // S_TRAPGOYLEUP_FIRE2
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP}, // S_TRAPGOYLEUP_FIRE3
-
- {SPR_GARG, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEDOWN_CHECK}, // S_TRAPGOYLEDOWN
- {SPR_GARG, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEDOWN_FIRE1}, // S_TRAPGOYLEDOWN_CHECK
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE2}, // S_TRAPGOYLEDOWN_FIRE1
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE3}, // S_TRAPGOYLEDOWN_FIRE2
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN}, // S_TRAPGOYLEDOWN_FIRE3
-
- {SPR_GARG, 0, 135, {NULL}, 0, 0, S_TRAPGOYLELONG_CHECK}, // S_TRAPGOYLELONG
- {SPR_GARG, 0, 3, {NULL}, 0, 0, S_TRAPGOYLELONG_FIRE1}, // S_TRAPGOYLELONG_CHECK
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE2}, // S_TRAPGOYLELONG_FIRE1
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE3}, // S_TRAPGOYLELONG_FIRE2
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE4}, // S_TRAPGOYLELONG_FIRE3
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE5}, // S_TRAPGOYLELONG_FIRE4
- {SPR_GARG, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG}, // S_TRAPGOYLELONG_FIRE5
+ {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLE_CHECK}, // S_TRAPGOYLE
+ {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLE_FIRE1}, // S_TRAPGOYLE_CHECK
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE2}, // S_TRAPGOYLE_FIRE1
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE3}, // S_TRAPGOYLE_FIRE2
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE}, // S_TRAPGOYLE_FIRE3
+
+ {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEUP_CHECK}, // S_TRAPGOYLEUP
+ {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEUP_FIRE1}, // S_TRAPGOYLEUP_CHECK
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE2}, // S_TRAPGOYLEUP_FIRE1
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE3}, // S_TRAPGOYLEUP_FIRE2
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP}, // S_TRAPGOYLEUP_FIRE3
+
+ {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEDOWN_CHECK}, // S_TRAPGOYLEDOWN
+ {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEDOWN_FIRE1}, // S_TRAPGOYLEDOWN_CHECK
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE2}, // S_TRAPGOYLEDOWN_FIRE1
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE3}, // S_TRAPGOYLEDOWN_FIRE2
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN}, // S_TRAPGOYLEDOWN_FIRE3
+
+ {SPR_BGAR, 0, 135, {NULL}, 0, 0, S_TRAPGOYLELONG_CHECK}, // S_TRAPGOYLELONG
+ {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLELONG_FIRE1}, // S_TRAPGOYLELONG_CHECK
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE2}, // S_TRAPGOYLELONG_FIRE1
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE3}, // S_TRAPGOYLELONG_FIRE2
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE4}, // S_TRAPGOYLELONG_FIRE3
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE5}, // S_TRAPGOYLELONG_FIRE4
+ {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG}, // S_TRAPGOYLELONG_FIRE5
// Target/Red Crystal
{SPR_RCRY, 0, -1, {NULL}, 0, 0, S_TARGET_IDLE}, // S_TARGET_IDLE
@@ -2580,6 +2610,9 @@ state_t states[NUMSTATES] =
{SPR_RCRY, 1, 0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL}, // S_TARGET_RESPAWN
{SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags}, MF_PUSHABLE, 1, S_TARGET_ALLDONE}, // S_TARGET_ALLDONE
+ // Green flame
+ {SPR_CFLM, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 3, S_GREENFLAME}, // S_GREENFLAME
+
// Stalagmites
{SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_STG0
{SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_STG1
@@ -3273,6 +3306,17 @@ state_t states[NUMSTATES] =
{SPR_SSWB, 2, 1, {NULL}, 0, 0, S_BHORIZ8}, // S_BHORIZ7
{SPR_SSWB, 1, 1, {NULL}, 0, 0, S_BHORIZ1}, // S_BHORIZ8
+ // Boosters
+ {SPR_NULL, 0, 1, {A_Pain}, 0, 0, S_INVISIBLE}, // S_BOOSTERSOUND
+ {SPR_BSTY, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL}, // S_YELLOWBOOSTERROLLER
+ {SPR_BSTY, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL}, // S_YELLOWBOOSTERSEG_LEFT
+ {SPR_BSTY, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL}, // S_YELLOWBOOSTERSEG_RIGHT
+ {SPR_BSTY, 9|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWBOOSTERSEG_FACE
+ {SPR_BSTR, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL}, // S_REDBOOSTERROLLER
+ {SPR_BSTR, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL}, // S_REDBOOSTERSEG_LEFT
+ {SPR_BSTR, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL}, // S_REDBOOSTERSEG_RIGHT
+ {SPR_BSTR, 9|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_REDBOOSTERSEG_FACE
+
// Rain
{SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, -1, {NULL}, 0, 0, S_NULL}, // S_RAIN1
{SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, 1, {NULL}, 0, 0, S_RAIN1}, // S_RAINRETURN
@@ -4060,7 +4104,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MT_THOK, // damage
sfx_None, // activesound
MF_SOLID|MF_SHOOTABLE, // flags
- MT_NULL // raisestate
+ (statenum_t)MT_NULL// raisestate
},
{ // MT_TAILSOVERLAY
@@ -4484,7 +4528,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_XPLD1, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
- 1, // speed
+ 600, // speed
22*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
@@ -4492,7 +4536,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_s3kd2l, // activesound
MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
- MT_CRUSHCHAIN // raisestate
+ (statenum_t)MT_CRUSHCHAIN// raisestate
},
{ // MT_CRUSHCHAIN
@@ -4522,6 +4566,60 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_BANPYURA
+ 138, // doomednum
+ S_BANPYURA_ROAM1, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 32, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_XPLD_FLICKY, // deathstate
+ S_NULL, // xdeathstate
+ sfx_pop, // deathsound
+ 8, // speed
+ 24*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BANPSPRING
+ -1, // doomednum
+ S_CDIAG1, // spawnstate
+ 1, // spawnhealth
+ S_CDIAG2, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_cdfm08, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_XPLD1, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 300, // speed
+ 22*FRACUNIT, // radius
+ 22*FRACUNIT, // height
+ 0, // display offset
+ 11*FRACUNIT, // mass
+ 11*FRACUNIT, // damage
+ sfx_None, // activesound
+ MF_SPRING|MF_NOGRAVITY, // flags
+ S_CDIAG2 // raisestate
+ },
+
{ // MT_JETJAW
113, // doomednum
S_JETJAW_ROAM1, // spawnstate
@@ -7561,12 +7659,120 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
32*FRACUNIT, // height
0, // display offset
0, // mass
- 1*FRACUNIT, // damage
+ 11*FRACUNIT, // damage
sfx_None, // activesound
MF_SPRING|MF_NOGRAVITY, // flags
S_BHORIZ2 // raisestate
},
+ { // MT_BOOSTERSEG
+ -1, // doomednum
+ S_INVISIBLE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 28*FRACUNIT, // radius
+ 16*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BOOSTERROLLER
+ -1, // doomednum
+ S_INVISIBLE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 14*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_YELLOWBOOSTER
+ 544, // doomednum
+ S_INVISIBLE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 3, // painchance
+ sfx_cdfm62, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 28*FRACUNIT, // radius
+ FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 36*FRACUNIT, // damage
+ sfx_None, // activesound
+ MF_SPRING|MF_NOGRAVITY, // flags
+ S_BOOSTERSOUND // raisestate
+ },
+
+ { // MT_REDBOOSTER
+ 545, // doomednum
+ S_INVISIBLE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 3, // painchance
+ sfx_cdfm62, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 28*FRACUNIT, // radius
+ FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 72*FRACUNIT, // damage
+ sfx_None, // activesound
+ MF_SPRING|MF_NOGRAVITY, // flags
+ S_BOOSTERSOUND // raisestate
+ },
+
{ // MT_BUBBLES
500, // doomednum
S_BUBBLES1, // spawnstate
@@ -11105,7 +11311,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_SMALLMACE
- -1, // doomednum
+ 1130, // doomednum
S_SMALLMACE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11132,7 +11338,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_BIGMACE
- -1, // doomednum
+ 1131, // doomednum
S_BIGMACE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11187,7 +11393,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_BIGGRABCHAIN
-1, // doomednum
- S_BIGGRABCHAIN, // spawnstate
+ S_BIGGRABCHAIN, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11213,7 +11419,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_YELLOWSPRINGBALL
- -1, // doomednum
+ 1134, // doomednum
S_YELLOWSPRINGBALL, // spawnstate
1000, // spawnhealth
S_YELLOWSPRINGBALL2, // seestate
@@ -11240,7 +11446,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_REDSPRINGBALL
- -1, // doomednum
+ 1135, // doomednum
S_REDSPRINGBALL, // spawnstate
1000, // spawnhealth
S_REDSPRINGBALL2, // seestate
@@ -11267,7 +11473,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_SMALLFIREBAR
- -1, // doomednum
+ 1136, // doomednum
S_SMALLFIREBAR1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11294,7 +11500,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_BIGFIREBAR
- -1, // doomednum
+ 1137, // doomednum
S_BIGFIREBAR1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11830,7 +12036,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_None, // activesound
MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags
- MT_ROCKCRUMBLE3 // raisestate
+ (statenum_t)MT_ROCKCRUMBLE3// raisestate
},
{ // MT_BRAMBLES
@@ -12532,7 +12738,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_s3k76, // activesound
MF_PUSHABLE, // flags
- MT_MINECARTSIDEMARK // raisestate
+ (statenum_t)MT_MINECARTSIDEMARK// raisestate
},
{ // MT_MINECARTSEG
@@ -13480,6 +13686,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_GREENFLAME
+ 1505, // doomednum
+ S_GREENFLAME, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ MT_NULL, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOGRAVITY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_STALAGMITE0
1900, // doomednum
S_STG0, // spawnstate
diff --git a/src/info.h b/src/info.h
index 023024c9b0e9badb7c7ec1732c96039b2f6013d3..0d258f0c6b6c29a5be02f906141db2fe1e628b91 100644
--- a/src/info.h
+++ b/src/info.h
@@ -306,6 +306,8 @@ typedef enum sprite
SPR_TURR, // Pop-Up Turret
SPR_SHRP, // Sharp
SPR_CRAB, // Crushstacean
+ SPR_CR2B, // Banpyura
+ SPR_CSPR, // Banpyura spring
SPR_JJAW, // Jet Jaw
SPR_SNLR, // Snailer
SPR_VLTR, // BASH
@@ -554,6 +556,11 @@ typedef enum sprite
SPR_HHPL, // Dr Seuss Trees
SPR_SHRM, // Mushroom
SPR_HHZM, // Misc
+
+ // Azure Temple Scenery
+ SPR_BGAR, // ATZ Gargoyles
+ SPR_RCRY, // ATZ Red Crystal (Target)
+ SPR_CFLM, // Green torch flame
// Botanic Serenity Scenery
SPR_BSZ1, // Tall flowers
@@ -574,7 +581,6 @@ typedef enum sprite
// Misc Scenery
SPR_STLG, // Stalagmites
SPR_DBAL, // Disco
- SPR_RCRY, // ATZ Red Crystal (Target)
// Powerup Indicators
SPR_ARMA, // Armageddon Shield Orb
@@ -628,6 +634,8 @@ typedef enum sprite
SPR_SSWY, // Yellow Side Spring
SPR_SSWR, // Red Side Spring
SPR_SSWB, // Blue Side Spring
+ SPR_BSTY, // Yellow Booster
+ SPR_BSTR, // Red Booster
// Environmental Effects
SPR_RAIN, // Rain
@@ -871,6 +879,12 @@ typedef enum playersprite
NUMPLAYERSPRITES
} playersprite_t;
+// SPR2_XTRA
+#define XTRA_LIFEPIC 0 // Life icon patch
+#define XTRA_CHARSEL 1 // Character select picture
+#define XTRA_CONTINUE 2 // Continue icon
+#define XTRA_ENDING 3 // Ending finale patches
+
typedef enum state
{
S_NULL,
@@ -1165,6 +1179,21 @@ typedef enum state
S_CRUSHCLAW_WAIT,
S_CRUSHCHAIN,
+ // Banpyura
+ S_BANPYURA_ROAM1,
+ S_BANPYURA_ROAM2,
+ S_BANPYURA_ROAM3,
+ S_BANPYURA_ROAM4,
+ S_BANPYURA_ROAMPAUSE,
+ S_CDIAG1,
+ S_CDIAG2,
+ S_CDIAG3,
+ S_CDIAG4,
+ S_CDIAG5,
+ S_CDIAG6,
+ S_CDIAG7,
+ S_CDIAG8,
+
// Jet Jaw
S_JETJAW_ROAM1,
S_JETJAW_ROAM2,
@@ -2631,6 +2660,12 @@ typedef enum state
S_FLAMEJETFLAME1,
S_FLAMEJETFLAME2,
S_FLAMEJETFLAME3,
+ S_FLAMEJETFLAME4,
+ S_FLAMEJETFLAME5,
+ S_FLAMEJETFLAME6,
+ S_FLAMEJETFLAME7,
+ S_FLAMEJETFLAME8,
+ S_FLAMEJETFLAME9,
// Spinning flame jets
S_FJSPINAXISA1, // Counter-clockwise
@@ -2696,6 +2731,9 @@ typedef enum state
S_TARGET_RESPAWN,
S_TARGET_ALLDONE,
+ // ATZ's green flame
+ S_GREENFLAME,
+
// Stalagmites
S_STG0,
S_STG1,
@@ -3385,6 +3423,17 @@ typedef enum state
S_BHORIZ7,
S_BHORIZ8,
+ // Booster
+ S_BOOSTERSOUND,
+ S_YELLOWBOOSTERROLLER,
+ S_YELLOWBOOSTERSEG_LEFT,
+ S_YELLOWBOOSTERSEG_RIGHT,
+ S_YELLOWBOOSTERSEG_FACE,
+ S_REDBOOSTERROLLER,
+ S_REDBOOSTERSEG_LEFT,
+ S_REDBOOSTERSEG_RIGHT,
+ S_REDBOOSTERSEG_FACE,
+
// Rain
S_RAIN1,
S_RAINRETURN,
@@ -4059,6 +4108,8 @@ typedef enum mobj_type
MT_CRUSHSTACEAN, // Crushstacean
MT_CRUSHCLAW, // Big meaty claw
MT_CRUSHCHAIN, // Chain
+ MT_BANPYURA, // Banpyura
+ MT_BANPSPRING, // Banpyura spring
MT_JETJAW, // Jet Jaw
MT_SNAILER, // Snailer
MT_VULTURE, // BASH
@@ -4196,6 +4247,11 @@ typedef enum mobj_type
MT_REDHORIZ,
MT_BLUEHORIZ,
+ MT_BOOSTERSEG,
+ MT_BOOSTERROLLER,
+ MT_YELLOWBOOSTER,
+ MT_REDBOOSTER,
+
// Interactive Objects
MT_BUBBLES, // Bubble source
MT_SIGN, // Level end sign
@@ -4454,6 +4510,7 @@ typedef enum mobj_type
MT_TRAPGOYLEDOWN,
MT_TRAPGOYLELONG,
MT_TARGET, // AKA Red Crystal
+ MT_GREENFLAME,
// Stalagmites
MT_STALAGMITE0,
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 45e116c344243ec23a78f05eb1d0581160747d52..37b1f3e0663e90882e5a5a3ec78fec4c925c05f7 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -50,6 +50,7 @@ enum hook {
hook_FollowMobj,
hook_PlayerCanDamage,
hook_PlayerQuit,
+ hook_IntermissionThinker,
hook_MAX // last hook
};
@@ -91,5 +92,6 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing); // Hook for P_SpawnM
boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj); // Hook for P_PlayerAfterThink Smiles mobj-following
UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj); // Hook for P_PlayerCanDamage
void LUAh_PlayerQuit(player_t *plr, int reason); // Hook for player quitting
+void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
#endif
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 7f7e8adc672d19dcb6276bcff0075bc51f56bfb8..03c7ce9113094ef6425a560bdac2ed9410cb8c76 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -61,6 +61,7 @@ const char *const hookNames[hook_MAX+1] = {
"FollowMobj",
"PlayerCanDamage",
"PlayerQuit",
+ "IntermissionThinker",
NULL
};
@@ -1322,4 +1323,27 @@ void LUAh_PlayerQuit(player_t *plr, int reason)
lua_settop(gL, 0);
}
+// Hook for Y_Ticker
+void LUAh_IntermissionThinker(void)
+{
+ hook_p hookp;
+ if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8))))
+ return;
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_IntermissionThinker)
+ continue;
+
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ if (lua_pcall(gL, 0, 0, 0)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ }
+ }
+}
+
#endif
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 8c1134bca7c942ed4fe18398570e0713ec9fe686..865b61e8fcb6cd1206beb4b8d4485dea99cf59c4 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -637,6 +637,68 @@ static int libd_drawString(lua_State *L)
return 0;
}
+static int libd_drawNameTag(lua_State *L)
+{
+ INT32 x;
+ INT32 y;
+ const char *str;
+ INT32 flags;
+ UINT8 basecolor;
+ UINT8 outlinecolor;
+ UINT8 *basecolormap = NULL;
+ UINT8 *outlinecolormap = NULL;
+
+ HUDONLY
+
+ x = luaL_checkinteger(L, 1);
+ y = luaL_checkinteger(L, 2);
+ str = luaL_checkstring(L, 3);
+ flags = luaL_optinteger(L, 4, 0);
+ basecolor = luaL_optinteger(L, 5, SKINCOLOR_BLUE);
+ outlinecolor = luaL_optinteger(L, 6, SKINCOLOR_ORANGE);
+ if (basecolor != SKINCOLOR_NONE)
+ basecolormap = R_GetTranslationColormap(TC_DEFAULT, basecolor, GTC_CACHE);
+ if (outlinecolor != SKINCOLOR_NONE)
+ outlinecolormap = R_GetTranslationColormap(TC_DEFAULT, outlinecolor, GTC_CACHE);
+
+ flags &= ~V_PARAMMASK; // Don't let crashes happen.
+ V_DrawNameTag(x, y, flags, FRACUNIT, basecolormap, outlinecolormap, str);
+ return 0;
+}
+
+static int libd_drawScaledNameTag(lua_State *L)
+{
+ fixed_t x;
+ fixed_t y;
+ const char *str;
+ INT32 flags;
+ fixed_t scale;
+ UINT8 basecolor;
+ UINT8 outlinecolor;
+ UINT8 *basecolormap = NULL;
+ UINT8 *outlinecolormap = NULL;
+
+ HUDONLY
+
+ x = luaL_checkfixed(L, 1);
+ y = luaL_checkfixed(L, 2);
+ str = luaL_checkstring(L, 3);
+ flags = luaL_optinteger(L, 4, 0);
+ scale = luaL_optinteger(L, 5, FRACUNIT);
+ if (scale < 0)
+ return luaL_error(L, "negative scale");
+ basecolor = luaL_optinteger(L, 6, SKINCOLOR_BLUE);
+ outlinecolor = luaL_optinteger(L, 7, SKINCOLOR_ORANGE);
+ if (basecolor != SKINCOLOR_NONE)
+ basecolormap = R_GetTranslationColormap(TC_DEFAULT, basecolor, GTC_CACHE);
+ if (outlinecolor != SKINCOLOR_NONE)
+ outlinecolormap = R_GetTranslationColormap(TC_DEFAULT, outlinecolor, GTC_CACHE);
+
+ flags &= ~V_PARAMMASK; // Don't let crashes happen.
+ V_DrawNameTag(FixedInt(x), FixedInt(y), flags, scale, basecolormap, outlinecolormap, str);
+ return 0;
+}
+
static int libd_stringWidth(lua_State *L)
{
const char *str = luaL_checkstring(L, 1);
@@ -659,6 +721,13 @@ static int libd_stringWidth(lua_State *L)
return 1;
}
+static int libd_nameTagWidth(lua_State *L)
+{
+ HUDONLY
+ lua_pushinteger(L, V_NameTagWidth(luaL_checkstring(L, 1)));
+ return 1;
+}
+
static int libd_getColormap(lua_State *L)
{
INT32 skinnum = TC_DEFAULT;
@@ -837,9 +906,12 @@ static luaL_Reg lib_draw[] = {
{"drawPaddedNum", libd_drawPaddedNum},
{"drawFill", libd_drawFill},
{"drawString", libd_drawString},
+ {"drawNameTag", libd_drawNameTag},
+ {"drawScaledNameTag", libd_drawScaledNameTag},
{"fadeScreen", libd_fadeScreen},
// misc
{"stringWidth", libd_stringWidth},
+ {"nameTagWidth", libd_nameTagWidth},
// m_random
{"RandomFixed",libd_RandomFixed},
{"RandomByte",libd_RandomByte},
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index dbb69b7e26dd4129600a7915a7a8426a6cd23c54..1da232efa0e07bd9899d45333f05fa78aa564c63 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -411,37 +411,53 @@ static int sector_iterate(lua_State *L)
// sector.lines, i -> sector.lines[i]
// sector.lines.valid, for validity checking
+//
+// 25/9/19 Monster Iestyn
+// Modified this and _num to use triple pointers, to allow for a new hack of mine involving offsetof
+// this way we don't need to check frontsector or backsector of line #0 in the array
+//
static int sectorlines_get(lua_State *L)
{
- line_t **seclines = *((line_t ***)luaL_checkudata(L, 1, META_SECTORLINES));
+ line_t ***seclines = *((line_t ****)luaL_checkudata(L, 1, META_SECTORLINES));
size_t i;
size_t numoflines = 0;
lua_settop(L, 2);
if (!lua_isnumber(L, 2))
{
int field = luaL_checkoption(L, 2, NULL, valid_opt);
- if (!seclines)
+ if (!seclines || !(*seclines))
{
if (field == 0) {
lua_pushboolean(L, 0);
return 1;
}
- return luaL_error(L, "accessed sector_t doesn't exist anymore.");
+ return luaL_error(L, "accessed sector_t.lines doesn't exist anymore.");
} else if (field == 0) {
lua_pushboolean(L, 1);
return 1;
}
}
+/* a snip from sector_t struct in r_defs.h, for reference
+ size_t linecount;
+ struct line_s **lines; // [linecount] size
+*/
+ // get the "linecount" by shifting our retrieved memory address of "lines" to where "linecount" is in the sector_t, then dereferencing the result
+ // we need this to determine the array's actual size, and therefore also the maximum value allowed as an index
+ // this only works if seclines is actually a pointer to a sector's lines member in memory, oh boy
+ numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+
+/* OLD HACK
// check first linedef to figure which of its sectors owns this sector->lines pointer
// then check that sector's linecount to get a maximum index
- //if (!seclines[0])
+ //if (!(*seclines)[0])
//return luaL_error(L, "no lines found!"); // no first linedef?????
- if (seclines[0]->frontsector->lines == seclines)
- numoflines = seclines[0]->frontsector->linecount;
- else if (seclines[0]->backsector && seclines[0]->backsector->lines == seclines) // check backsector exists first
- numoflines = seclines[0]->backsector->linecount;
+ if ((*seclines)[0]->frontsector->lines == *seclines)
+ numoflines = (*seclines)[0]->frontsector->linecount;
+ else if ((*seclines)[0]->backsector && *seclines[0]->backsector->lines == *seclines) // check backsector exists first
+ numoflines = (*seclines)[0]->backsector->linecount;
//if neither sector has it then ???
+*/
if (!numoflines)
return luaL_error(L, "no lines found!");
@@ -449,23 +465,21 @@ static int sectorlines_get(lua_State *L)
i = (size_t)lua_tointeger(L, 2);
if (i >= numoflines)
return 0;
- LUA_PushUserdata(L, seclines[i], META_LINE);
+ LUA_PushUserdata(L, (*seclines)[i], META_LINE);
return 1;
}
+// #(sector.lines) -> sector.linecount
static int sectorlines_num(lua_State *L)
{
- line_t **seclines = *((line_t ***)luaL_checkudata(L, 1, META_SECTORLINES));
+ line_t ***seclines = *((line_t ****)luaL_checkudata(L, 1, META_SECTORLINES));
size_t numoflines = 0;
- // check first linedef to figure which of its sectors owns this sector->lines pointer
- // then check that sector's linecount to get a maximum index
- //if (!seclines[0])
- //return luaL_error(L, "no lines found!"); // no first linedef?????
- if (seclines[0]->frontsector->lines == seclines)
- numoflines = seclines[0]->frontsector->linecount;
- else if (seclines[0]->backsector && seclines[0]->backsector->lines == seclines) // check backsector exists first
- numoflines = seclines[0]->backsector->linecount;
- //if neither sector has it then ???
+
+ if (!seclines || !(*seclines))
+ return luaL_error(L, "accessed sector_t.lines doesn't exist anymore.");
+
+ // see comments in the _get function above
+ numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
lua_pushinteger(L, numoflines);
return 1;
}
@@ -543,7 +557,7 @@ static int sector_get(lua_State *L)
LUA_PushUserdata(L, §ors[sector->camsec], META_SECTOR);
return 1;
case sector_lines: // lines
- LUA_PushUserdata(L, sector->lines, META_SECTORLINES);
+ LUA_PushUserdata(L, §or->lines, META_SECTORLINES); // push the address of the "lines" member in the struct, to allow our hacks in sectorlines_get/_num to work
return 1;
case sector_ffloors: // ffloors
lua_pushcfunction(L, lib_iterateSectorFFloors);
@@ -579,6 +593,7 @@ static int sector_set(lua_State *L)
case sector_thinglist: // thinglist
case sector_heightsec: // heightsec
case sector_camsec: // camsec
+ case sector_lines: // lines
case sector_ffloors: // ffloors
#ifdef ESLOPE
case sector_fslope: // f_slope
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 063158b263b58b4f4a6b7764a6c3075a4e72867c..30026da49bdf2c4d8d4e5ad9b045e00615d10b2d 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -164,6 +164,8 @@ static int mobj_get(lua_State *L)
enum mobj_e field = Lua_optoption(L, 2, NULL, mobj_opt);
lua_settop(L, 2);
+ INLEVEL
+
if (!mo) {
if (field == mobj_valid) {
lua_pushboolean(L, 0);
@@ -409,6 +411,8 @@ static int mobj_set(lua_State *L)
enum mobj_e field = Lua_optoption(L, 2, mobj_opt[0], mobj_opt);
lua_settop(L, 3);
+ INLEVEL
+
if (!mo)
return LUA_ErrInvalid(L, "mobj_t");
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index dd9959afbdf3300bc150438e2e5cedce2f40d298..b1222ce672fbc64c4487b6c46cb31498a9de7944 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -25,7 +25,6 @@
static int lib_iteratePlayers(lua_State *L)
{
INT32 i = -1;
- INLEVEL
if (lua_gettop(L) < 2)
{
//return luaL_error(L, "Don't call players.iterate() directly, use it as 'for player in players.iterate do <block> end'.");
@@ -52,7 +51,6 @@ static int lib_getPlayer(lua_State *L)
{
const char *field;
// i -> players[i]
- INLEVEL
if (lua_type(L, 2) == LUA_TNUMBER)
{
lua_Integer i = luaL_checkinteger(L, 2);
diff --git a/src/lua_script.c b/src/lua_script.c
index deb644dc0351c169c60cb859952627278538241c..ec73d7bf70136762eeec08edda22ccdf9ac762d4 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -431,7 +431,7 @@ void LUA_InvalidateLevel(void)
for (i = 0; i < numsectors; i++)
{
LUA_InvalidateUserdata(§ors[i]);
- LUA_InvalidateUserdata(sectors[i].lines);
+ LUA_InvalidateUserdata(§ors[i].lines);
if (sectors[i].ffloors)
{
for (rover = sectors[i].ffloors; rover; rover = rover->next)
@@ -1121,7 +1121,7 @@ void LUA_Archive(void)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i])
+ if (!playeringame[i] && i > 0) // dedicated servers...
continue;
// all players in game will be archived, even if they just add a 0.
ArchiveExtVars(&players[i], "player");
@@ -1157,7 +1157,7 @@ void LUA_UnArchive(void)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i])
+ if (!playeringame[i] && i > 0) // dedicated servers...
continue;
UnArchiveExtVars(&players[i]);
}
diff --git a/src/m_cond.c b/src/m_cond.c
index 539c6d1f6d1fc38efacad7d1e56329a323010afb..b7520aba78e1be64ef810e46bfbb58c3d593b155 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -528,12 +528,22 @@ skincolors_t M_GetEmblemColor(emblem_t *em)
return em->color;
}
-const char *M_GetEmblemPatch(emblem_t *em)
+const char *M_GetEmblemPatch(emblem_t *em, boolean big)
{
- static char pnamebuf[7] = "GOTITn";
+ static char pnamebuf[7];
+
+ if (!big)
+ strcpy(pnamebuf, "GOTITn");
+ else
+ strcpy(pnamebuf, "EMBMn0");
I_Assert(em->sprite >= 'A' && em->sprite <= 'Z');
- pnamebuf[5] = em->sprite;
+
+ if (!big)
+ pnamebuf[5] = em->sprite;
+ else
+ pnamebuf[4] = em->sprite;
+
return pnamebuf;
}
@@ -544,11 +554,21 @@ skincolors_t M_GetExtraEmblemColor(extraemblem_t *em)
return em->color;
}
-const char *M_GetExtraEmblemPatch(extraemblem_t *em)
+const char *M_GetExtraEmblemPatch(extraemblem_t *em, boolean big)
{
- static char pnamebuf[7] = "GOTITn";
+ static char pnamebuf[7];
+
+ if (!big)
+ strcpy(pnamebuf, "GOTITn");
+ else
+ strcpy(pnamebuf, "EMBMn0");
I_Assert(em->sprite >= 'A' && em->sprite <= 'Z');
- pnamebuf[5] = em->sprite;
+
+ if (!big)
+ pnamebuf[5] = em->sprite;
+ else
+ pnamebuf[4] = em->sprite;
+
return pnamebuf;
}
diff --git a/src/m_cond.h b/src/m_cond.h
index f82e49372ed0120da76cdd2bd8d8c0a7f2a128c5..e9859cf11552125e40fdfffba8b57bb2f5497386 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -171,9 +171,9 @@ INT32 M_CountEmblems(void);
// Emblem shit
emblem_t *M_GetLevelEmblems(INT32 mapnum);
skincolors_t M_GetEmblemColor(emblem_t *em);
-const char *M_GetEmblemPatch(emblem_t *em);
+const char *M_GetEmblemPatch(emblem_t *em, boolean big);
skincolors_t M_GetExtraEmblemColor(extraemblem_t *em);
-const char *M_GetExtraEmblemPatch(extraemblem_t *em);
+const char *M_GetExtraEmblemPatch(extraemblem_t *em, boolean big);
// If you're looking to compare stats for unlocks or what not, use these
// They stop checking upon reaching the target number so they
diff --git a/src/m_menu.c b/src/m_menu.c
index fb276f77d1ae78886455ef89085f7dfd6a6c68da..b232fddb369e4001fe963e38e55b24d231063743 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -127,7 +127,6 @@ const char *quitmsg[NUM_QUITMESSAGES];
description_t description[MAXSKINS];
INT16 char_on = -1, startchar = 0;
static char *char_notes = NULL;
-static fixed_t char_scroll = 0;
boolean menuactive = false;
boolean fromlevelselect = false;
@@ -167,6 +166,16 @@ static INT32 vidm_selected = 0;
static INT32 vidm_nummodes;
static INT32 vidm_column_size;
+// new menus
+static tic_t recatkdrawtimer = 0;
+static tic_t ntsatkdrawtimer = 0;
+
+static tic_t charseltimer = 0;
+static fixed_t char_scroll = 0;
+#define charscrollamt 128*FRACUNIT
+
+static tic_t keydown = 0;
+
//
// PROTOTYPES
//
@@ -387,6 +396,8 @@ static void Dummymares_OnChange(void);
// CONSOLE VARIABLES AND THEIR POSSIBLE VALUES GO HERE.
// ==========================================================================
+consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL };
+
static CV_PossibleValue_t map_cons_t[] = {
{1,"MIN"},
{NUMMAPS, "MAX"}
@@ -407,7 +418,7 @@ static CV_PossibleValue_t serversort_cons_t[] = {
{1,"Modified State"},
{2,"Most Players"},
{3,"Least Players"},
- {4,"Max Players"},
+ {4,"Max Player Slots"},
{5,"Gametype"},
{0,NULL}
};
@@ -434,7 +445,8 @@ consvar_t cv_ghost_guest = {"ghost_guest", "Show", CV_SAVE, ghost2_cons_
static CV_PossibleValue_t dummyteam_cons_t[] = {{0, "Spectator"}, {1, "Red"}, {2, "Blue"}, {0, NULL}};
static CV_PossibleValue_t dummyscramble_cons_t[] = {{0, "Random"}, {1, "Points"}, {0, NULL}};
static CV_PossibleValue_t ringlimit_cons_t[] = {{0, "MIN"}, {9999, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t liveslimit_cons_t[] = {{-1, "MIN"}, {99, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t liveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {-1, "Infinite"}, {0, NULL}};
+static CV_PossibleValue_t contlimit_cons_t[] = {{0, "MIN"}, {99, "MAX"}, {0, NULL}};
static CV_PossibleValue_t dummymares_cons_t[] = {
{-1, "END"}, {0,"Overall"}, {1,"Mare 1"}, {2,"Mare 2"}, {3,"Mare 3"}, {4,"Mare 4"}, {5,"Mare 5"}, {6,"Mare 6"}, {7,"Mare 7"}, {8,"Mare 8"}, {0,NULL}
};
@@ -443,7 +455,7 @@ static consvar_t cv_dummyteam = {"dummyteam", "Spectator", CV_HIDEN, dummyteam_c
static consvar_t cv_dummyscramble = {"dummyscramble", "Random", CV_HIDEN, dummyscramble_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummyrings = {"dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummylives = {"dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, contlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static consvar_t cv_dummymares = {"dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange, 0, NULL, NULL, 0, 0, NULL};
// ==========================================================================
@@ -744,8 +756,8 @@ static menuitem_t SP_TimeAttackLevelSelectMenu[] =
// Single Player Time Attack
static menuitem_t SP_TimeAttackMenu[] =
{
- {IT_STRING|IT_KEYHANDLER, NULL, "Level Select...", M_HandleTimeAttackLevelSelect, 52},
- {IT_STRING|IT_CVAR, NULL, "Character", &cv_chooseskin, 62},
+ {IT_STRING|IT_KEYHANDLER, NULL, "Level Select...", M_HandleTimeAttackLevelSelect, 62},
+ {IT_STRING|IT_CVAR, NULL, "Character", &cv_chooseskin, 72},
{IT_DISABLED, NULL, "Guest Option...", &SP_GuestReplayDef, 100},
{IT_DISABLED, NULL, "Replay...", &SP_ReplayDef, 110},
@@ -1230,6 +1242,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{IT_HEADER, NULL, "Diagnostic", NULL, 180},
{IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 186},
{IT_STRING | IT_CVAR, NULL, "Clear Before Redraw", &cv_homremoval, 191},
+ {IT_STRING | IT_CVAR, NULL, "Show \"FOCUS LOST\"", &cv_showfocuslost, 196},
};
static menuitem_t OP_VideoModeMenu[] =
@@ -1323,22 +1336,25 @@ static menuitem_t OP_OpenGLColorMenu[] =
static menuitem_t OP_SoundOptionsMenu[] =
{
- {IT_HEADER, NULL, "Game Audio", NULL, 0}, // 0 // ScrollMenu offsets
- {IT_STRING | IT_CVAR, NULL, "Sound Effects", &cv_gamesounds, 13}, // 6
- {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Sound Volume", &cv_soundvolume, 23}, // 11
+ {IT_HEADER, NULL, "Game Audio", NULL, 0},
+ {IT_STRING | IT_CVAR, NULL, "Sound Effects", &cv_gamesounds, 6},
+ {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Sound Volume", &cv_soundvolume, 11},
+
+ {IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 21},
+ {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Digital Music Volume", &cv_digmusicvolume, 26},
- {IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 43}, // 21
- {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Digital Music Volume", &cv_digmusicvolume, 53}, // 26
+ {IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 36},
+ {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 41},
- {IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 73}, // 36
- {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 83}, // 41
+ {IT_HEADER, NULL, "Accessibility", NULL, 50},
+ {IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 56},
+ {IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 61},
- {IT_HEADER, NULL, "Accessibility", NULL, 103}, // 50
- {IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
- {IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 125}, // 62
+ {IT_STRING | IT_CVAR, NULL, "Play Sound Effects if Unfocused", &cv_playsoundsifunfocused, 71},
+ {IT_STRING | IT_CVAR, NULL, "Play Music if Unfocused", &cv_playmusicifunfocused, 76},
#ifdef HAVE_MIXERX
- {IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 143},
+ {IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 94},
#endif
};
@@ -1961,18 +1977,9 @@ menu_t OP_ColorOptionsDef =
0,
NULL
};
-menu_t OP_SoundOptionsDef =
-{
+menu_t OP_SoundOptionsDef = DEFAULTSCROLLMENUSTYLE(
MN_OP_MAIN + (MN_OP_SOUND << 6),
- "M_SOUND",
- sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t),
- &OP_MainDef,
- OP_SoundOptionsMenu,
- M_DrawGenericMenu,
- 30, 30,
- 0,
- NULL
-};
+ "M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 30, 30);
#ifdef HAVE_MIXERX
menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
#endif
@@ -2295,8 +2302,10 @@ void M_InitMenuPresTables(void)
{
menupres[i].muslooping = true;
}
- if (i == MN_SP_TIMEATTACK || i == MN_SP_NIGHTSATTACK)
- strncpy(menupres[i].musname, "_inter", 7);
+ if (i == MN_SP_TIMEATTACK)
+ strncpy(menupres[i].musname, "_recat", 7);
+ else if (i == MN_SP_NIGHTSATTACK)
+ strncpy(menupres[i].musname, "_nitat", 7);
else if (i == MN_SP_PLAYER)
strncpy(menupres[i].musname, "_chsel", 7);
}
@@ -2389,7 +2398,7 @@ static boolean MIT_SetCurBackground(UINT32 menutype, INT32 level, INT32 *retval,
}
else if (menupres[menutype].bgname[0])
{
- strncpy(curbgname, menupres[menutype].bgname, 9);
+ strncpy(curbgname, menupres[menutype].bgname, 8);
curbgxspeed = menupres[menutype].titlescrollxspeed != INT32_MAX ? menupres[menutype].titlescrollxspeed : titlescrollxspeed;
curbgyspeed = menupres[menutype].titlescrollyspeed != INT32_MAX ? menupres[menutype].titlescrollyspeed : titlescrollyspeed;
return true;
@@ -2507,7 +2516,7 @@ void M_ChangeMenuMusic(const char *defaultmusname, boolean defaultmuslooping)
void M_SetMenuCurBackground(const char *defaultname)
{
- char name[8];
+ char name[9];
strncpy(name, defaultname, 8);
M_IterateMenuTree(MIT_SetCurBackground, &name);
}
@@ -2573,8 +2582,6 @@ static void M_HandleMenuPresState(menu_t *newMenu)
if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK)
return;
- // Find current presentation values
- M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "SRB2BACK" : "TITLESKY");
M_SetMenuCurFadeValue(16);
M_SetMenuCurHideTitlePics();
@@ -2787,31 +2794,19 @@ static void M_ChangeCvar(INT32 choice)
choice = (choice<<1) - 1;
- if (((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_SLIDER)
- ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_INVISSLIDER)
- ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_NOMOD))
+ if (cv->flags & CV_FLOAT)
{
- if (cv->flags & CV_FLOAT && (currentMenu->menuitems[itemOn].status & IT_CV_FLOATSLIDER) == IT_CV_FLOATSLIDER)
+ if (((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_SLIDER)
+ ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_INVISSLIDER)
+ ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_NOMOD)
+ || !(currentMenu->menuitems[itemOn].status & IT_CV_INTEGERSTEP))
{
char s[20];
sprintf(s,"%f",FIXED_TO_FLOAT(cv->value)+(choice)*(1.0f/16.0f));
CV_Set(cv,s);
}
else
- CV_SetValue(cv,cv->value+(choice));
- }
- else if (cv->flags & CV_FLOAT)
- {
- if (currentMenu->menuitems[itemOn].status & IT_CV_INTEGERSTEP)
- {
CV_SetValue(cv,FIXED_TO_FLOAT(cv->value)+(choice));
- }
- else
- {
- char s[20];
- sprintf(s,"%f",FIXED_TO_FLOAT(cv->value)+(choice)*(1.0f/16.0f));
- CV_Set(cv,s);
- }
}
else
CV_AddValue(cv,choice);
@@ -2896,6 +2891,15 @@ static void M_PrevOpt(void)
// (in other words -- stop bullshit happening by mashing buttons in fades)
static boolean noFurtherInput = false;
+static void Command_Manual_f(void)
+{
+ if (modeattacking)
+ return;
+ M_StartControlPanel();
+ currentMenu = &MISC_HelpDef;
+ itemOn = 0;
+}
+
//
// M_Responder
//
@@ -2924,6 +2928,7 @@ boolean M_Responder(event_t *ev)
{
if (ev->type == ev_keydown)
{
+ keydown++;
ch = ev->data1;
// added 5-2-98 remap virtual keys (mouse & joystick buttons)
@@ -3030,6 +3035,8 @@ boolean M_Responder(event_t *ev)
pmousex = lastx += 30;
}
}
+ else if (ev->type == ev_keyup) // Preserve event for other responders
+ keydown = 0;
}
else if (ev->type == ev_keydown) // Preserve event for other responders
ch = ev->data1;
@@ -3046,11 +3053,7 @@ boolean M_Responder(event_t *ev)
switch (ch)
{
case KEY_F1: // Help key
- if (modeattacking)
- return true;
- M_StartControlPanel();
- currentMenu = &MISC_HelpDef;
- itemOn = 0;
+ Command_Manual_f();
return true;
case KEY_F2: // Empty
@@ -3322,7 +3325,7 @@ void M_Drawer(void)
}
// focus lost notification goes on top of everything, even the former everything
- if (window_notinfocus)
+ if (window_notinfocus && cv_showfocuslost.value)
{
M_DrawTextBox((BASEVIDWIDTH/2) - (60), (BASEVIDHEIGHT/2) - (16), 13, 2);
if (gamestate == GS_LEVEL && (P_AutoPause() || paused))
@@ -3477,6 +3480,7 @@ void M_ClearMenus(boolean callexitmenufunc)
if (currentMenu == &MessageDef) // Oh sod off!
currentMenu = &MainDef; // Not like it matters
menuactive = false;
+ hidetitlemap = false;
}
//
@@ -3515,6 +3519,8 @@ void M_SetupNextMenu(menu_t *menudef)
}
}
}
+
+ hidetitlemap = false;
}
//
@@ -3547,6 +3553,8 @@ void M_Init(void)
{
int i;
+ COM_AddCommand("manual", Command_Manual_f);
+
CV_RegisterVar(&cv_nextmap);
CV_RegisterVar(&cv_newgametype);
CV_RegisterVar(&cv_chooseskin);
@@ -3622,9 +3630,13 @@ void M_InitCharacterTables(void)
description[i].used = false;
strcpy(description[i].notes, "???");
strcpy(description[i].picname, "");
+ strcpy(description[i].nametag, "");
strcpy(description[i].skinname, "");
+ strcpy(description[i].displayname, "");
description[i].prev = description[i].next = 0;
- description[i].pic = NULL;
+ description[i].charpic = NULL;
+ description[i].namepic = NULL;
+ description[i].oppositecolor = description[i].tagtextcolor = description[i].tagoutlinecolor = 0;
}
}
@@ -3887,7 +3899,7 @@ static void M_DrawMapEmblems(INT32 mapnum, INT32 x, INT32 y)
lasttype = curtype;
if (emblem->collected)
- V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
+ V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE));
else
V_DrawSmallScaledPatch(x, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
@@ -4326,7 +4338,7 @@ static void M_DrawPauseMenu(void)
continue;
if (emblem->collected)
- V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
+ V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE));
else
V_DrawSmallScaledPatch(40, 44 + (i*8), 0, W_CachePatchName("NEEDIT", PU_CACHE));
@@ -4546,10 +4558,12 @@ static boolean M_LevelAvailableOnPlatter(INT32 mapnum)
if (!(mapheaderinfo[mapnum]->typeoflevel & TOL_COOP))
return true;
- if (mapvisited[mapnum]) // MV_MP
+ if (mapnum+1 == spstage_start)
return true;
- if (mapnum+1 == spstage_start)
+#ifndef DEVELOP
+ if (mapvisited[mapnum]) // MV_MP
+#endif
return true;
/* FALLTHRU */
@@ -4895,13 +4909,25 @@ static void M_HandleLevelPlatter(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
INT32 selectval;
+ UINT8 iter;
switch (choice)
{
case KEY_DOWNARROW:
+ if (lsrow == levelselect.numrows-1)
+ {
+ if (levelselect.numrows < 3)
+ {
+ if (!lsoffs[0]) // prevent sound spam
+ {
+ lsoffs[0] = -8;
+ S_StartSound(NULL,sfx_s3kb7);
+ }
+ return;
+ }
+ lsrow = UINT8_MAX;
+ }
lsrow++;
- if (lsrow == levelselect.numrows)
- lsrow = 0;
lsoffs[0] = lsvseperation(lsrow);
@@ -4915,17 +4941,29 @@ static void M_HandleLevelPlatter(INT32 choice)
break;
case KEY_UPARROW:
- lsoffs[0] = -lsvseperation(lsrow);
-
+ iter = lsrow;
+ if (!lsrow)
+ {
+ if (levelselect.numrows < 3)
+ {
+ if (!lsoffs[0]) // prevent sound spam
+ {
+ lsoffs[0] = 8;
+ S_StartSound(NULL,sfx_s3kb7);
+ }
+ return;
+ }
+ lsrow = levelselect.numrows;
+ }
lsrow--;
- if (lsrow == UINT8_MAX)
- lsrow = levelselect.numrows-1;
+
+ lsoffs[0] = -lsvseperation(iter);
if (levelselect.rows[lsrow].header[0])
lshli = lsrow;
else
{
- UINT8 iter = lsrow;
+ iter = lsrow;
do
iter = ((iter == 0) ? levelselect.numrows-1 : iter-1);
while ((iter != lsrow) && !(levelselect.rows[iter].header[0]));
@@ -4958,7 +4996,7 @@ static void M_HandleLevelPlatter(INT32 choice)
M_LevelSelectWarp(0);
Nextmap_OnChange();
}
- else if (!lsoffs[0]) // prevent sound spam
+ else if (!lsoffs[0]) // prevent sound spam
{
lsoffs[0] = -8;
S_StartSound(NULL,sfx_s3kb2);
@@ -4988,7 +5026,7 @@ static void M_HandleLevelPlatter(INT32 choice)
ifselectvalnextmap(lscol) else ifselectvalnextmap(0)
}
- else if (!lsoffs[1]) // prevent sound spam
+ else if (!lsoffs[1]) // prevent sound spam
{
lsoffs[1] = 8;
S_StartSound(NULL,sfx_s3kb7);
@@ -5017,7 +5055,7 @@ static void M_HandleLevelPlatter(INT32 choice)
ifselectvalnextmap(lscol) else ifselectvalnextmap(0)
}
- else if (!lsoffs[1]) // prevent sound spam
+ else if (!lsoffs[1]) // prevent sound spam
{
lsoffs[1] = -8;
S_StartSound(NULL,sfx_s3kb7);
@@ -5169,18 +5207,187 @@ static void M_DrawLevelPlatterRow(UINT8 row, INT32 y)
}
}
+// new menus
+static void M_DrawRecordAttackForeground(void)
+{
+ patch_t *fg = W_CachePatchName("RECATKFG", PU_CACHE);
+ patch_t *clock = W_CachePatchName("RECCLOCK", PU_CACHE);
+ angle_t fa;
+
+ INT32 i;
+ INT32 height = (SHORT(fg->height)/2);
+ INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
+
+ for (i = -12; i < (BASEVIDHEIGHT/height) + 12; i++)
+ {
+ INT32 y = ((i*height) - (height - ((recatkdrawtimer*2)%height)));
+ // don't draw above the screen
+ {
+ INT32 sy = FixedMul(y, dupz<<FRACBITS) >> FRACBITS;
+ if (vid.height != BASEVIDHEIGHT * dupz)
+ sy += (vid.height - (BASEVIDHEIGHT * dupz)) / 2;
+ if ((sy+height) < 0)
+ continue;
+ }
+ V_DrawFixedPatch(0, y<<FRACBITS, FRACUNIT/2, V_SNAPTOLEFT, fg, NULL);
+ V_DrawFixedPatch(BASEVIDWIDTH<<FRACBITS, y<<FRACBITS, FRACUNIT/2, V_SNAPTORIGHT|V_FLIP, fg, NULL);
+ // don't draw below the screen
+ if (y > vid.height)
+ break;
+ }
+
+ // draw clock
+ fa = (FixedAngle(((recatkdrawtimer * 4) % 360)<<FRACBITS)>>ANGLETOFINESHIFT) & FINEMASK;
+ V_DrawSciencePatch(160<<FRACBITS, (80<<FRACBITS) + (4*FINESINE(fa)), 0, clock, FRACUNIT);
+
+ // Increment timer.
+ recatkdrawtimer++;
+}
+
+// NiGHTS Attack background.
+static void M_DrawNightsAttackMountains(void)
+{
+ static INT32 bgscrollx;
+ INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
+ patch_t *background = W_CachePatchName(curbgname, PU_CACHE);
+ INT32 x = FixedInt(bgscrollx) % SHORT(background->width);
+ INT32 y = BASEVIDHEIGHT - SHORT(background->height)*2;
+
+ if (vid.height != BASEVIDHEIGHT * dupz)
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 158);
+ V_DrawFill(0, y+50, vid.width, BASEVIDHEIGHT, V_SNAPTOLEFT|31);
+
+ V_DrawScaledPatch(x, y, V_SNAPTOLEFT, background);
+ x += SHORT(background->width);
+ if (x < BASEVIDWIDTH)
+ V_DrawScaledPatch(x, y, V_SNAPTOLEFT, background);
+
+ bgscrollx -= (FRACUNIT/2);
+}
+
+// NiGHTS Attack foreground.
+static void M_DrawNightsAttackBackground(void)
+{
+ INT32 x, y = 0;
+ INT32 i;
+
+ // top
+ patch_t *backtopfg = W_CachePatchName("NTSATKT1", PU_CACHE);
+ patch_t *fronttopfg = W_CachePatchName("NTSATKT2", PU_CACHE);
+ INT32 backtopwidth = SHORT(backtopfg->width);
+ //INT32 backtopheight = SHORT(backtopfg->height);
+ INT32 fronttopwidth = SHORT(fronttopfg->width);
+ //INT32 fronttopheight = SHORT(fronttopfg->height);
+
+ // bottom
+ patch_t *backbottomfg = W_CachePatchName("NTSATKB1", PU_CACHE);
+ patch_t *frontbottomfg = W_CachePatchName("NTSATKB2", PU_CACHE);
+ INT32 backbottomwidth = SHORT(backbottomfg->width);
+ INT32 backbottomheight = SHORT(backbottomfg->height);
+ INT32 frontbottomwidth = SHORT(frontbottomfg->width);
+ INT32 frontbottomheight = SHORT(frontbottomfg->height);
+
+ // background
+ M_DrawNightsAttackMountains();
+
+ // back top foreground patch
+ x = -(ntsatkdrawtimer%backtopwidth);
+ V_DrawScaledPatch(x, y, V_SNAPTOTOP|V_SNAPTOLEFT, backtopfg);
+ for (i = 0; i < 3; i++)
+ {
+ x += (backtopwidth);
+ if (x >= vid.width)
+ break;
+ V_DrawScaledPatch(x, y, V_SNAPTOTOP|V_SNAPTOLEFT, backtopfg);
+ }
+
+ // front top foreground patch
+ x = -((ntsatkdrawtimer*2)%fronttopwidth);
+ V_DrawScaledPatch(x, y, V_SNAPTOTOP|V_SNAPTOLEFT, fronttopfg);
+ for (i = 0; i < 3; i++)
+ {
+ x += (fronttopwidth);
+ if (x >= vid.width)
+ break;
+ V_DrawScaledPatch(x, y, V_SNAPTOTOP|V_SNAPTOLEFT, fronttopfg);
+ }
+
+ // back bottom foreground patch
+ x = -(ntsatkdrawtimer%backbottomwidth);
+ y = BASEVIDHEIGHT - backbottomheight;
+ V_DrawScaledPatch(x, y, V_SNAPTOBOTTOM|V_SNAPTOLEFT, backbottomfg);
+ for (i = 0; i < 3; i++)
+ {
+ x += (backbottomwidth);
+ if (x >= vid.width)
+ break;
+ V_DrawScaledPatch(x, y, V_SNAPTOBOTTOM|V_SNAPTOLEFT, backbottomfg);
+ }
+
+ // front bottom foreground patch
+ x = -((ntsatkdrawtimer*2)%frontbottomwidth);
+ y = BASEVIDHEIGHT - frontbottomheight;
+ V_DrawScaledPatch(x, y, V_SNAPTOBOTTOM|V_SNAPTOLEFT, frontbottomfg);
+ for (i = 0; i < 3; i++)
+ {
+ x += (frontbottomwidth);
+ if (x >= vid.width)
+ break;
+ V_DrawScaledPatch(x, y, V_SNAPTOBOTTOM|V_SNAPTOLEFT, frontbottomfg);
+ }
+
+ // Increment timer.
+ ntsatkdrawtimer++;
+}
+
+// NiGHTS Attack floating Super Sonic.
+static patch_t *ntssupersonic[2];
+static void M_DrawNightsAttackSuperSonic(void)
+{
+ const UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_YELLOW, GTC_CACHE);
+ INT32 timer = (ntsatkdrawtimer/4) % 2;
+ angle_t fa = (FixedAngle(((ntsatkdrawtimer * 4) % 360)<<FRACBITS)>>ANGLETOFINESHIFT) & FINEMASK;
+ V_DrawFixedPatch(235<<FRACBITS, (120<<FRACBITS) - (8*FINESINE(fa)), FRACUNIT, 0, ntssupersonic[timer], colormap);
+}
+
static void M_DrawLevelPlatterMenu(void)
{
UINT8 iter = lsrow, sizeselect = (lswide(lsrow) ? 1 : 0);
INT32 y = lsbasey + lsoffs[0] - getheadingoffset(lsrow);
const INT32 cursorx = (sizeselect ? 0 : (lscol*lshseperation));
- if (gamestate == GS_TIMEATTACK)
+ if (currentMenu->prevMenu == &SP_TimeAttackDef)
{
+ M_SetMenuCurBackground("RECATKBG");
+
+ curbgxspeed = 0;
+ curbgyspeed = 18;
+
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
else if (!curbghide || !titlemapinaction)
+ {
F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
+ // Draw and animate foreground
+ if (!strncmp("RECATKBG", curbgname, 8))
+ M_DrawRecordAttackForeground();
+ }
+
+ if (curfadevalue)
+ V_DrawFadeScreen(0xFF00, curfadevalue);
+ }
+
+ if (currentMenu->prevMenu == &SP_NightsAttackDef)
+ {
+ M_SetMenuCurBackground("NTSATKBG");
+
+ if (curbgcolor >= 0)
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
+ else if (!curbghide || !titlemapinaction)
+ {
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 158);
+ M_DrawNightsAttackMountains();
+ }
if (curfadevalue)
V_DrawFadeScreen(0xFF00, curfadevalue);
}
@@ -5188,7 +5395,13 @@ static void M_DrawLevelPlatterMenu(void)
// finds row at top of the screen
while (y > -8)
{
- iter = ((iter == 0) ? levelselect.numrows-1 : iter-1);
+ if (iter == 0)
+ {
+ if (levelselect.numrows < 3)
+ break;
+ iter = levelselect.numrows;
+ }
+ iter--;
y -= lsvseperation(iter);
}
@@ -5197,7 +5410,13 @@ static void M_DrawLevelPlatterMenu(void)
{
M_DrawLevelPlatterRow(iter, y);
y += lsvseperation(iter);
- iter = ((iter == levelselect.numrows-1) ? 0 : iter+1);
+ if (iter == levelselect.numrows-1)
+ {
+ if (levelselect.numrows < 3)
+ break;
+ iter = UINT8_MAX;
+ }
+ iter++;
}
// draw cursor box
@@ -5389,7 +5608,19 @@ static void M_DrawMessageMenu(void)
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
else if (!curbghide || !titlemapinaction)
- F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
+ {
+ if (levellistmode == LLM_NIGHTSATTACK)
+ {
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 158);
+ M_DrawNightsAttackMountains();
+ }
+ else
+ {
+ F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
+ if (!strncmp("RECATKBG", curbgname, 8))
+ M_DrawRecordAttackForeground();
+ }
+ }
if (curfadevalue)
V_DrawFadeScreen(0xFF00, curfadevalue);
}
@@ -6081,9 +6312,9 @@ static void M_PandorasBox(INT32 choice)
else
CV_StealthSetValue(&cv_dummyrings, max(players[consoleplayer].rings, 0));
if (players[consoleplayer].lives == INFLIVES)
- CV_StealthSetValue(&cv_dummylives, -1);
+ CV_StealthSet(&cv_dummylives, "Infinite");
else
- CV_StealthSetValue(&cv_dummylives, players[consoleplayer].lives);
+ CV_StealthSetValue(&cv_dummylives, max(players[consoleplayer].lives, 1));
CV_StealthSetValue(&cv_dummycontinues, players[consoleplayer].continues);
SR_PandorasBox[6].status = ((players[consoleplayer].charflags & SF_SUPER)
#ifndef DEVELOP
@@ -6665,7 +6896,7 @@ static void M_DrawEmblemHints(void)
if (emblem->collected)
{
collected = V_GREENMAP;
- V_DrawMappedPatch(12, 12+(28*j), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
+ V_DrawMappedPatch(12, 12+(28*j), 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE));
}
else
@@ -7616,6 +7847,8 @@ static void M_HandleLoadSave(INT32 choice)
}
if (exitmenu)
{
+ // Is this a hack?
+ charseltimer = 0;
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
@@ -7692,7 +7925,7 @@ static void M_SetupChoosePlayer(INT32 choice)
UINT8 firstvalid = 255;
UINT8 lastvalid = 0;
boolean allowed = false;
- char *name;
+ char *and;
(void)choice;
SP_PlayerMenu[0].status &= ~IT_DYBIGSPACE; // Correcting a hack that may be made below.
@@ -7701,8 +7934,21 @@ static void M_SetupChoosePlayer(INT32 choice)
{
if (description[i].used) // If the character's disabled through SOC, there's nothing we can do for it.
{
- name = strtok(Z_StrDup(description[i].skinname), "&");
- skinnum = R_SkinAvailable(name);
+ and = strchr(description[i].skinname, '&');
+ if (and)
+ {
+ char firstskin[SKINNAMESIZE+1];
+ strncpy(firstskin, description[i].skinname, (and - description[i].skinname));
+ firstskin[(and - description[i].skinname)] = '\0';
+ description[i].skinnum[0] = R_SkinAvailable(firstskin);
+ description[i].skinnum[1] = R_SkinAvailable(and+1);
+ }
+ else
+ {
+ description[i].skinnum[0] = R_SkinAvailable(description[i].skinname);
+ description[i].skinnum[1] = -1;
+ }
+ skinnum = description[i].skinnum[0];
if ((skinnum != -1) && (R_SkinUsable(-1, skinnum)))
{
// Handling order.
@@ -7720,20 +7966,27 @@ static void M_SetupChoosePlayer(INT32 choice)
if (!(description[i].picname[0]))
{
- if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 2)
+ if (skins[skinnum].sprites[SPR2_XTRA].numframes >= XTRA_CHARSEL+1)
{
spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_XTRA];
- spriteframe_t *sprframe = &sprdef->spriteframes[1];
- description[i].pic = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
+ spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_CHARSEL];
+ description[i].charpic = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
}
else
- description[i].pic = W_CachePatchName("MISSING", PU_CACHE);
+ description[i].charpic = W_CachePatchName("MISSING", PU_CACHE);
}
else
- description[i].pic = W_CachePatchName(description[i].picname, PU_CACHE);
+ description[i].charpic = W_CachePatchName(description[i].picname, PU_CACHE);
+
+ if (description[i].nametag[0])
+ {
+ const char *nametag = description[i].nametag;
+ description[i].namepic = NULL;
+ if (W_LumpExists(nametag))
+ description[i].namepic = W_CachePatchName(nametag, PU_CACHE);
+ }
}
// else -- Technically, character select icons without corresponding skins get bundled away behind this too. Sucks to be them.
- Z_Free(name);
}
}
@@ -7753,8 +8006,22 @@ static void M_SetupChoosePlayer(INT32 choice)
return;
}
- if (Playing() == false)
- M_ChangeMenuMusic("_chsel", true);
+ M_ChangeMenuMusic("_chsel", true);
+
+ /* the menus suck -James */
+ if (currentMenu == &SP_LoadDef)/* from save states */
+ {
+ SP_PlayerDef.menuid =
+ MN_SP_MAIN +
+ ( MN_SP_LOAD << 6 ) +
+ ( MN_SP_PLAYER << 12 );
+ }
+ else/* from Secret level select */
+ {
+ SP_PlayerDef.menuid =
+ MN_SR_MAIN +
+ ( MN_SR_PLAYER << 6 );
+ }
SP_PlayerDef.prevMenu = currentMenu;
M_SetupNextMenu(&SP_PlayerDef);
@@ -7768,7 +8035,11 @@ static void M_SetupChoosePlayer(INT32 choice)
char_on = description[char_on].next;
}
}
- char_scroll = 0; // finish scrolling the menu
+
+ // finish scrolling the menu
+ char_scroll = 0;
+ charseltimer = 0;
+
Z_Free(char_notes);
char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[char_on].notes);
}
@@ -7783,6 +8054,9 @@ static void M_HandleChoosePlayerMenu(INT32 choice)
boolean exitmenu = false; // exit to previous menu
INT32 selectval;
+ if (keydown > 1)
+ return;
+
switch (choice)
{
case KEY_DOWNARROW:
@@ -7790,7 +8064,7 @@ static void M_HandleChoosePlayerMenu(INT32 choice)
{
S_StartSound(NULL,sfx_s3kb7);
char_on = selectval;
- char_scroll = -128*FRACUNIT;
+ char_scroll = -charscrollamt;
Z_Free(char_notes);
char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[char_on].notes);
}
@@ -7806,7 +8080,7 @@ static void M_HandleChoosePlayerMenu(INT32 choice)
{
S_StartSound(NULL,sfx_s3kb7);
char_on = selectval;
- char_scroll = 128*FRACUNIT;
+ char_scroll = charscrollamt;
Z_Free(char_notes);
char_notes = V_WordWrap(0, 21*8, V_ALLOWLOWERCASE, description[char_on].notes);
}
@@ -7832,6 +8106,8 @@ static void M_HandleChoosePlayerMenu(INT32 choice)
if (exitmenu)
{
+ // Is this a hack?
+ charseltimer = 0;
if (currentMenu->prevMenu)
M_SetupNextMenu(currentMenu->prevMenu);
else
@@ -7840,100 +8116,218 @@ static void M_HandleChoosePlayerMenu(INT32 choice)
}
// Draw the choose player setup menu, had some fun with player anim
+//define CHOOSEPLAYER_DRAWHEADER
+
static void M_DrawSetupChoosePlayerMenu(void)
{
- const INT32 my = 24;
- patch_t *patch;
- INT32 i, o;
- UINT8 prev, next;
+ const INT32 my = 16;
- // Black BG
- if (curbgcolor >= 0)
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
- else if (!curbghide || !titlemapinaction)
- F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
- if (curfadevalue)
- V_DrawFadeScreen(0xFF00, curfadevalue);
-
- // Character select profile images!1
- M_DrawTextBox(0, my, 16, 20);
+ skin_t *charskin = &skins[0];
+ INT32 skinnum = 0;
+ UINT8 col;
+ UINT8 *colormap = NULL;
+ INT32 prev = -1, next = -1;
+
+ patch_t *charbg = W_CachePatchName("CHARBG", PU_CACHE);
+ patch_t *charfg = W_CachePatchName("CHARFG", PU_CACHE);
+ INT16 bgheight = SHORT(charbg->height);
+ INT16 fgheight = SHORT(charfg->height);
+ INT16 bgwidth = SHORT(charbg->width);
+ INT16 fgwidth = SHORT(charfg->width);
+ INT32 x, y;
+ INT32 w = (vid.width/vid.dupx);
if (abs(char_scroll) > FRACUNIT)
char_scroll -= (char_scroll>>2);
else // close enough.
char_scroll = 0; // just be exact now.
- o = (char_scroll >> FRACBITS) + 16;
+ // Get prev character...
+ prev = description[char_on].prev;
+ // If there's more than one character available...
+ if (prev != char_on)
+ // Let's get the next character now.
+ next = description[char_on].next;
+ else
+ // No there isn't.
+ prev = -1;
- if (o < 0) // A little hacky...
+ // Find skin number from description[]
+ skinnum = description[char_on].skinnum[0];
+ charskin = &skins[skinnum];
+
+ // Use the opposite of the character's skincolor
+ col = description[char_on].oppositecolor;
+ if (!col)
+ col = Color_Opposite[charskin->prefcolor - 1][0];
+
+ // Make the translation colormap
+ colormap = R_GetTranslationColormap(TC_DEFAULT, col, 0);
+
+ // Don't render the title map
+ hidetitlemap = true;
+ charseltimer++;
+
+ // Background and borders
+ V_DrawFill(0, 0, bgwidth, vid.height, V_SNAPTOTOP|colormap[101]);
{
- i = description[char_on].prev;
- o += 128;
+ INT32 sw = (BASEVIDWIDTH * vid.dupx);
+ INT32 bw = (vid.width - sw) / 2;
+ col = colormap[106];
+ if (bw)
+ V_DrawFill(0, 0, bw, vid.height, V_NOSCALESTART|col);
}
- else
- i = char_on;
- // Get prev character...
- prev = description[i].prev;
+ y = (charseltimer%32);
+ V_DrawMappedPatch(0, y-bgheight, V_SNAPTOTOP, charbg, colormap);
+ V_DrawMappedPatch(0, y, V_SNAPTOTOP, charbg, colormap);
+ V_DrawMappedPatch(0, y+bgheight, V_SNAPTOTOP, charbg, colormap);
+ V_DrawMappedPatch(0, -y, V_SNAPTOTOP, charfg, colormap);
+ V_DrawMappedPatch(0, -y+fgheight, V_SNAPTOTOP, charfg, colormap);
+ V_DrawFill(fgwidth, 0, vid.width, vid.height, V_SNAPTOTOP|colormap[106]);
- if (prev != i) // If there's more than one character available...
+ // Character pictures
{
- // Let's get the next character now.
- next = description[i].next;
+ x = 8;
+ y = (my+16) - FixedInt(char_scroll);
+ V_DrawScaledPatch(x, y, 0, description[char_on].charpic);
+ if (prev != -1)
+ V_DrawScaledPatch(x, y - 144, 0, description[prev].charpic);
+ if (next != -1)
+ V_DrawScaledPatch(x, y + 144, 0, description[next].charpic);
+ }
- // Draw prev character if it's visible and its number isn't greater than the current one or there's more than two
- if (o < 32)
+ // Character description
+ {
+ INT32 flags = V_ALLOWLOWERCASE|V_RETURN8;
+ x = 146;
+ y = my + 9;
+ V_DrawString(x, y, flags, char_notes);
+ }
+
+ // Name tags
+ {
+ INT32 ox, oxsh = FixedInt(FixedMul(BASEVIDWIDTH*FRACUNIT, FixedDiv(char_scroll, 128*FRACUNIT))), txsh;
+ patch_t *curpatch = NULL, *prevpatch = NULL, *nextpatch = NULL;
+ const char *curtext = NULL, *prevtext = NULL, *nexttext = NULL;
+ UINT8 curtextcolor = 0, prevtextcolor = 0, nexttextcolor = 0;
+ UINT8 curoutlinecolor = 0, prevoutlinecolor = 0, nextoutlinecolor = 0;
+
+ // Name tag
+ curtext = description[char_on].displayname;
+ curtextcolor = description[char_on].tagtextcolor;
+ curoutlinecolor = description[char_on].tagoutlinecolor;
+ if (curtext[0] == '\0')
+ curpatch = description[char_on].namepic;
+ if (!curtextcolor)
+ curtextcolor = charskin->prefcolor;
+ if (!curoutlinecolor)
+ curoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+
+ txsh = oxsh;
+ ox = 8 + SHORT((description[char_on].charpic)->width)/2;
+ y = my + 144;
+
+ // cur
{
- patch = description[prev].pic;
- if (SHORT(patch->width) >= 256)
- V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT/2, 0, patch, 0, SHORT(patch->height) + 2*(o-32), SHORT(patch->width), 64 - 2*o);
- else
- V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT, 0, patch, 0, SHORT(patch->height) + o - 32, SHORT(patch->width), 32 - o);
- W_UnlockCachedPatch(patch);
+ x = ox - txsh;
+ if (curpatch)
+ x -= (SHORT(curpatch->width)/2);
+
+ if (curtext[0] != '\0')
+ {
+ V_DrawNameTag(
+ x, y, V_CENTERNAMETAG, FRACUNIT,
+ R_GetTranslationColormap(TC_DEFAULT, curtextcolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, 0),
+ curtext
+ );
+ }
+ else if (curpatch)
+ V_DrawScaledPatch(x, y, 0, curpatch);
}
- // Draw next character if it's visible and its number isn't less than the current one or there's more than two
- if (o < 128) // (next != i) was previously a part of this, but it's implicitly true if (prev != i) is true.
+ if (char_scroll)
{
- patch = description[next].pic;
- if (SHORT(patch->width) >= 256)
- V_DrawCroppedPatch(8<<FRACBITS, (my + 168 - o)<<FRACBITS, FRACUNIT/2, 0, patch, 0, 0, SHORT(patch->width), 2*o);
- else
- V_DrawCroppedPatch(8<<FRACBITS, (my + 168 - o)<<FRACBITS, FRACUNIT, 0, patch, 0, 0, SHORT(patch->width), o);
- W_UnlockCachedPatch(patch);
+ // prev
+ if ((prev != -1) && char_scroll < 0)
+ {
+ prevtext = description[prev].displayname;
+ prevtextcolor = description[prev].tagtextcolor;
+ prevoutlinecolor = description[prev].tagoutlinecolor;
+ if (prevtext[0] == '\0')
+ prevpatch = description[prev].namepic;
+ charskin = &skins[description[prev].skinnum[0]];
+ if (!prevtextcolor)
+ prevtextcolor = charskin->prefcolor;
+ if (!prevoutlinecolor)
+ prevoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+
+ x = (ox - txsh) - w;
+ if (prevpatch)
+ x -= (SHORT(prevpatch->width)/2);
+
+ if (prevtext[0] != '\0')
+ {
+ V_DrawNameTag(
+ x, y, V_CENTERNAMETAG, FRACUNIT,
+ R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, 0),
+ prevtext
+ );
+ }
+ else if (prevpatch)
+ V_DrawScaledPatch(x, y, 0, prevpatch);
+ }
+ // next
+ else if ((next != -1) && char_scroll > 0)
+ {
+ nexttext = description[next].displayname;
+ nexttextcolor = description[next].tagtextcolor;
+ nextoutlinecolor = description[next].tagoutlinecolor;
+ if (nexttext[0] == '\0')
+ nextpatch = description[next].namepic;
+ charskin = &skins[description[next].skinnum[0]];
+ if (!nexttextcolor)
+ nexttextcolor = charskin->prefcolor;
+ if (!nextoutlinecolor)
+ nextoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+
+ x = (ox - txsh) + w;
+ if (nextpatch)
+ x -= (SHORT(nextpatch->width)/2);
+
+ if (nexttext[0] != '\0')
+ {
+ V_DrawNameTag(
+ x, y, V_CENTERNAMETAG, FRACUNIT,
+ R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, 0),
+ nexttext
+ );
+ }
+ else if (nextpatch)
+ V_DrawScaledPatch(x, y, 0, nextpatch);
+ }
}
}
- patch = description[i].pic;
- if (o >= 0 && o <= 32)
+ // Alternative menu header
+#ifdef CHOOSEPLAYER_DRAWHEADER
{
- if (SHORT(patch->width) >= 256)
- V_DrawSmallScaledPatch(8, my + 40 - o, 0, patch);
- else
- V_DrawScaledPatch(8, my + 40 - o, 0, patch);
- }
- else
- {
- if (SHORT(patch->width) >= 256)
- V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT/2, 0, patch, 0, (o-32)*2, SHORT(patch->width), SHORT(patch->height) - 2*(o-32));
- else
- V_DrawCroppedPatch(8<<FRACBITS, (my + 8)<<FRACBITS, FRACUNIT, 0, patch, 0, (o-32), SHORT(patch->width), SHORT(patch->height) - (o-32));
+ patch_t *header = W_CachePatchName("M_PICKP", PU_CACHE);
+ INT32 xtitle = 146;
+ INT32 ytitle = (35 - SHORT(header->height))/2;
+ V_DrawFixedPatch(xtitle<<FRACBITS, ytitle<<FRACBITS, FRACUNIT/2, 0, header, NULL);
}
- W_UnlockCachedPatch(patch);
+#endif // CHOOSEPLAYER_DRAWHEADER
- // draw title (or big pic)
M_DrawMenuTitle();
-
- // Character description
- M_DrawTextBox(136, my, 21, 20);
- V_DrawString(146, my + 9, V_RETURN8|V_ALLOWLOWERCASE, char_notes);
}
// Chose the player you want to use Tails 03-02-2002
static void M_ChoosePlayer(INT32 choice)
{
- char *skin1,*skin2;
- INT32 skinnum;
boolean ultmode = (ultimate_selectable && SP_PlayerDef.prevMenu == &SP_LoadDef && saveSlotSelected == NOSAVESLOT);
// skip this if forcecharacter or no characters available
@@ -7942,24 +8336,19 @@ static void M_ChoosePlayer(INT32 choice)
// M_SetupChoosePlayer didn't call us directly, that means we've been properly set up.
char_scroll = 0; // finish scrolling the menu
M_DrawSetupChoosePlayerMenu(); // draw the finally selected character one last time for the fadeout
+ // Is this a hack?
+ charseltimer = 0;
}
M_ClearMenus(true);
- skin1 = strtok(description[choice].skinname, "&");
- skin2 = strtok(NULL, "&");
-
- if (skin2) {
+ if (description[choice].skinnum[1] != -1) {
// this character has a second skin
- skinnum = R_SkinAvailable(skin1);
- botskin = (UINT8)(R_SkinAvailable(skin2)+1);
botingame = true;
-
- botcolor = skins[botskin-1].prefcolor;
-
- // undo the strtok
- description[choice].skinname[strlen(skin1)] = '&';
- } else {
- skinnum = R_SkinAvailable(description[choice].skinname);
+ botskin = (UINT8)(description[choice].skinnum[1]+1);
+ botcolor = skins[description[choice].skinnum[1]].prefcolor;
+ }
+ else
+ {
botingame = false;
botskin = 0;
botcolor = 0;
@@ -7971,7 +8360,7 @@ static void M_ChoosePlayer(INT32 choice)
//lastmapsaved = 0;
gamecomplete = false;
- G_DeferedInitNew(ultmode, G_BuildMapName(startmap), (UINT8)skinnum, false, fromlevelselect);
+ G_DeferedInitNew(ultmode, G_BuildMapName(startmap), (UINT8)description[choice].skinnum[0], false, fromlevelselect);
COM_BufAddText("dummyconsvar 1\n"); // G_DeferedInitNew doesn't do this
if (levelselect.rows)
@@ -8092,7 +8481,7 @@ static void M_DrawStatsMaps(int location)
exemblem = &extraemblems[i];
if (exemblem->collected)
- V_DrawSmallMappedPatch(292, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem), PU_CACHE),
+ V_DrawSmallMappedPatch(292, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetExtraEmblemColor(exemblem), GTC_CACHE));
else
V_DrawSmallScaledPatch(292, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
@@ -8237,16 +8626,27 @@ static void M_HandleLevelStats(INT32 choice)
// Drawing function for Time Attack
void M_DrawTimeAttackMenu(void)
{
- INT32 i, x, y, cursory = 0;
+ INT32 i, x, y, empatx, empaty, cursory = 0;
UINT16 dispstatus;
- patch_t *PictureOfUrFace;
+ patch_t *PictureOfUrFace; // my WHAT
+ patch_t *empatch;
+
+ M_SetMenuCurBackground("RECATKBG");
- M_ChangeMenuMusic("_inter", true); // Eww, but needed for when user hits escape during demo playback
+ curbgxspeed = 0;
+ curbgyspeed = 18;
+
+ M_ChangeMenuMusic("_recat", true); // Eww, but needed for when user hits escape during demo playback
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
else if (!curbghide || !titlemapinaction)
+ {
F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
+ // Draw and animate foreground
+ if (!strncmp("RECATKBG", curbgname, 8))
+ M_DrawRecordAttackForeground();
+ }
if (curfadevalue)
V_DrawFadeScreen(0xFF00, curfadevalue);
@@ -8297,10 +8697,10 @@ void M_DrawTimeAttackMenu(void)
// Character face!
{
- if (skins[cv_chooseskin.value-1].sprites[SPR2_XTRA].numframes >= 2)
+ if (skins[cv_chooseskin.value-1].sprites[SPR2_XTRA].numframes >= XTRA_CHARSEL+1)
{
spritedef_t *sprdef = &skins[cv_chooseskin.value-1].sprites[SPR2_XTRA];
- spriteframe_t *sprframe = &sprdef->spriteframes[1];
+ spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_CHARSEL];
PictureOfUrFace = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
}
else
@@ -8320,6 +8720,7 @@ void M_DrawTimeAttackMenu(void)
patch_t *PictureOfLevel;
lumpnum_t lumpnum;
char beststr[40];
+ char reqscore[40], reqtime[40], reqrings[40];
M_DrawLevelPlatterHeader(32-lsheadingheight/2, cv_nextmap.string, true, false);
@@ -8332,27 +8733,71 @@ void M_DrawTimeAttackMenu(void)
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
y = 32+lsheadingheight;
- V_DrawSmallScaledPatch(208, y, 0, PictureOfLevel);
+ V_DrawSmallScaledPatch(216, y, 0, PictureOfLevel);
+
- if (itemOn == talevel)
+ if (currentMenu == &SP_TimeAttackDef)
{
- /* Draw arrows !! */
- y = y + 25 - 4;
- V_DrawCharacter(208 - 10 - (skullAnimCounter/5), y,
- '\x1C' | V_YELLOWMAP, false);
- V_DrawCharacter(208 + 80 + 2 + (skullAnimCounter/5), y,
- '\x1D' | V_YELLOWMAP, false);
+ if (itemOn == talevel)
+ {
+ /* Draw arrows !! */
+ y = y + 25 - 4;
+ V_DrawCharacter(216 - 10 - (skullAnimCounter/5), y,
+ '\x1C' | V_YELLOWMAP, false);
+ V_DrawCharacter(216 + 80 + 2 + (skullAnimCounter/5), y,
+ '\x1D' | V_YELLOWMAP, false);
+ }
+ // Draw press ESC to exit string on main record attack menu
+ V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
}
- V_DrawString(104 - 72, 32+lsheadingheight/2, 0, "* LEVEL RECORDS *");
+ em = M_GetLevelEmblems(cv_nextmap.value);
+ // Draw record emblems.
+ while (em)
+ {
+ switch (em->type)
+ {
+ case ET_SCORE:
+ yHeight = 33;
+ sprintf(reqscore, "(%u)", em->var);
+ break;
+ case ET_TIME:
+ yHeight = 53;
+ sprintf(reqtime, "(%i:%02i.%02i)", G_TicsToMinutes((tic_t)em->var, true),
+ G_TicsToSeconds((tic_t)em->var),
+ G_TicsToCentiseconds((tic_t)em->var));
+ break;
+ case ET_RINGS:
+ yHeight = 73;
+ sprintf(reqrings, "(%u)", em->var);
+ break;
+ default:
+ goto skipThisOne;
+ }
+
+ empatch = W_CachePatchName(M_GetEmblemPatch(em, true), PU_CACHE);
+
+ empatx = SHORT(empatch->leftoffset)/2;
+ empaty = SHORT(empatch->topoffset)/2;
+
+ if (em->collected)
+ V_DrawSmallMappedPatch(104+76+empatx, yHeight+lsheadingheight/2+empaty, 0, empatch,
+ R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE));
+ else
+ V_DrawSmallScaledPatch(104+76, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDITL", PU_CACHE));
+
+ skipThisOne:
+ em = M_GetLevelEmblems(-1);
+ }
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->score)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%u", mainrecords[cv_nextmap.value-1]->score);
- V_DrawString(104-72, 48+lsheadingheight/2, V_YELLOWMAP, "SCORE:");
- V_DrawRightAlignedString(104+72, 48+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ V_DrawString(104-72, 33+lsheadingheight/2, V_YELLOWMAP, "SCORE:");
+ V_DrawRightAlignedString(104+64, 33+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ V_DrawRightAlignedString(104+72, 43+lsheadingheight/2, V_ALLOWLOWERCASE, reqscore);
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->time)
sprintf(beststr, "(none)");
@@ -8361,39 +8806,23 @@ void M_DrawTimeAttackMenu(void)
G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->time),
G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->time));
- V_DrawString(104-72, 58+lsheadingheight/2, V_YELLOWMAP, "TIME:");
- V_DrawRightAlignedString(104+72, 58+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ V_DrawString(104-72, 53+lsheadingheight/2, V_YELLOWMAP, "TIME:");
+ V_DrawRightAlignedString(104+64, 53+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ V_DrawRightAlignedString(104+72, 63+lsheadingheight/2, V_ALLOWLOWERCASE, reqtime);
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->rings)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%hu", mainrecords[cv_nextmap.value-1]->rings);
- V_DrawString(104-72, 68+lsheadingheight/2, V_YELLOWMAP, "RINGS:");
- V_DrawRightAlignedString(104+72, 68+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ V_DrawString(104-72, 73+lsheadingheight/2, V_YELLOWMAP, "RINGS:");
- // Draw record emblems.
- em = M_GetLevelEmblems(cv_nextmap.value);
- while (em)
- {
- switch (em->type)
- {
- case ET_SCORE: yHeight = 48; break;
- case ET_TIME: yHeight = 58; break;
- case ET_RINGS: yHeight = 68; break;
- default:
- goto skipThisOne;
- }
-
- if (em->collected)
- V_DrawSmallMappedPatch(104+76, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
- R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE));
- else
- V_DrawSmallScaledPatch(104+76, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDIT", PU_CACHE));
+ if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->gotperfect)
+ V_DrawRightAlignedString(104+64, 73+lsheadingheight/2, V_ALLOWLOWERCASE, beststr);
+ else
+ V_DrawRightAlignedString(104+64, 73+lsheadingheight/2, V_ALLOWLOWERCASE|V_YELLOWMAP, beststr);
- skipThisOne:
- em = M_GetLevelEmblems(-1);
- }
+ V_DrawRightAlignedString(104+72, 83+lsheadingheight/2, V_ALLOWLOWERCASE, reqrings);
}
// ALWAYS DRAW level and skin even when not on this menu!
@@ -8485,12 +8914,11 @@ void M_DrawNightsAttackMenu(void)
INT32 i, x, y, cursory = 0;
UINT16 dispstatus;
- M_ChangeMenuMusic("_inter", true); // Eww, but needed for when user hits escape during demo playback
+ M_SetMenuCurBackground("NTSATKBG");
- if (curbgcolor >= 0)
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
- else if (!curbghide || !titlemapinaction)
- F_SkyScroll(curbgxspeed, curbgyspeed, curbgname);
+ M_ChangeMenuMusic("_nitat", true); // Eww, but needed for when user hits escape during demo playback
+
+ M_DrawNightsAttackBackground();
if (curfadevalue)
V_DrawFadeScreen(0xFF00, curfadevalue);
@@ -8548,7 +8976,7 @@ void M_DrawNightsAttackMenu(void)
lumpnum_t lumpnum;
char beststr[40];
- UINT8 bestoverall = G_GetBestNightsGrade(cv_nextmap.value, 0);
+ //UINT8 bestoverall = G_GetBestNightsGrade(cv_nextmap.value, 0);
UINT8 bestgrade = G_GetBestNightsGrade(cv_nextmap.value, cv_dummymares.value);
UINT32 bestscore = G_GetBestNightsScore(cv_nextmap.value, cv_dummymares.value);
tic_t besttime = G_GetBestNightsTime(cv_nextmap.value, cv_dummymares.value);
@@ -8565,10 +8993,10 @@ void M_DrawNightsAttackMenu(void)
V_DrawSmallScaledPatch(208, 32+lsheadingheight, 0, PictureOfLevel);
- V_DrawString(104 - 72, 32+lsheadingheight/2, 0, "* LEVEL RECORDS *");
-
- if (P_HasGrades(cv_nextmap.value, 0))
- V_DrawScaledPatch(235, 135, 0, ngradeletters[bestoverall]);
+ // Super Sonic
+ M_DrawNightsAttackSuperSonic();
+ //if (P_HasGrades(cv_nextmap.value, 0))
+ // V_DrawScaledPatch(235 - (SHORT((ngradeletters[bestoverall])->width)*3)/2, 135, 0, ngradeletters[bestoverall]);
if (P_HasGrades(cv_nextmap.value, cv_dummymares.value))
{//make bigger again
@@ -8610,10 +9038,10 @@ void M_DrawNightsAttackMenu(void)
}
if (em->collected)
- V_DrawSmallMappedPatch(104+76, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
+ V_DrawSmallMappedPatch(104+38, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em, false), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE));
else
- V_DrawSmallScaledPatch(104+76, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDIT", PU_CACHE));
+ V_DrawSmallScaledPatch(104+38, yHeight+lsheadingheight/2, 0, W_CachePatchName("NEEDIT", PU_CACHE));
skipThisOne:
em = M_GetLevelEmblems(-1);
@@ -8621,6 +9049,10 @@ void M_DrawNightsAttackMenu(void)
}
}
+ // Draw press ESC to exit string on main nights attack menu
+ if (currentMenu == &SP_NightsAttackDef)
+ V_DrawString(104-72, 180, V_TRANSLUCENT, M_GetText("Press ESC to exit"));
+
// ALWAYS DRAW level even when not on this menu!
if (currentMenu != &SP_NightsAttackDef)
V_DrawString(SP_NightsAttackDef.x, SP_NightsAttackDef.y + SP_TimeAttackMenu[nalevel].alphaKey, V_TRANSLUCENT, SP_NightsAttackMenu[nalevel].text);
@@ -8649,6 +9081,9 @@ static void M_NightsAttack(INT32 choice)
// This is really just to make sure Sonic is the played character, just in case
M_PatchSkinNameTable();
+ ntssupersonic[0] = W_CachePatchName("NTSSONC1", PU_CACHE);
+ ntssupersonic[1] = W_CachePatchName("NTSSONC2", PU_CACHE);
+
G_SetGamestate(GS_TIMEATTACK); // do this before M_SetupNextMenu so that menu meta state knows that we're switching
titlemapinaction = TITLEMAP_OFF; // Nope don't give us HOMs please
M_SetupNextMenu(&SP_NightsAttackDef);
@@ -9431,6 +9866,12 @@ static void M_ServerOptions(INT32 choice)
}
#endif
+ /* Disable fading because of different menu head. */
+ if (currentMenu == &OP_MainDef)/* from Options menu */
+ OP_ServerOptionsDef.menuid = MN_OP_MAIN + ( MN_OP_SERVER << 6 );
+ else/* from Multiplayer menu */
+ OP_ServerOptionsDef.menuid = MN_MP_MAIN + ( MN_MP_SERVER_OPTIONS << 6 );
+
OP_ServerOptionsDef.prevMenu = currentMenu;
M_SetupNextMenu(&OP_ServerOptionsDef);
}
@@ -9495,6 +9936,8 @@ static void M_ConnectIP(INT32 choice)
return;
}
+ M_ClearMenus(true);
+
COM_BufAddText(va("connect \"%s\"\n", setupm_ip));
// A little "please wait" message.
@@ -9526,7 +9969,6 @@ static void M_HandleConnectIP(INT32 choice)
case KEY_ENTER:
S_StartSound(NULL,sfx_menu1); // Tails
- M_ClearMenus(true);
M_ConnectIP(1);
break;
@@ -9576,6 +10018,7 @@ static void M_HandleConnectIP(INT32 choice)
if (exitmenu)
{
+ currentMenu->lastOn = itemOn;
if (currentMenu->prevMenu)
M_SetupNextMenu (currentMenu->prevMenu);
else
diff --git a/src/m_menu.h b/src/m_menu.h
index 05962d2b19072eda900642223db6f042f7790c8e..3bfa48597b9d2ecafcb086d571eb6d405581a4c8 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -63,6 +63,7 @@ typedef enum
MN_MP_CONNECT,
MN_MP_ROOM,
MN_MP_PLAYERSETUP, // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
+ MN_MP_SERVER_OPTIONS,
// Options
MN_OP_MAIN,
@@ -103,6 +104,7 @@ typedef enum
MN_SR_LEVELSELECT,
MN_SR_UNLOCKCHECKLIST,
MN_SR_EMBLEMHINT,
+ MN_SR_PLAYER,
// Addons (Part of MISC, but let's make it our own)
MN_AD_MAIN,
@@ -323,9 +325,18 @@ typedef struct
char notes[441];
char picname[8];
char skinname[SKINNAMESIZE*2+2]; // skin&skin\0
- patch_t *pic;
+ patch_t *charpic;
UINT8 prev;
UINT8 next;
+
+ // new character select
+ char displayname[SKINNAMESIZE+1];
+ SINT8 skinnum[2];
+ UINT8 oppositecolor;
+ char nametag[8];
+ patch_t *namepic;
+ UINT8 tagtextcolor;
+ UINT8 tagoutlinecolor;
} description_t;
// level select platter
@@ -374,6 +385,7 @@ typedef struct
extern description_t description[MAXSKINS];
+extern consvar_t cv_showfocuslost;
extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;
extern CV_PossibleValue_t gametype_cons_t[];
diff --git a/src/m_misc.c b/src/m_misc.c
index aaaf30d67ff4263967f693f8126ff6b72b1b6f8c..f7d5cf9613b17ff00e5390f4a50710193470707f 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -197,7 +197,7 @@ INT32 M_MapNumber(char first, char second)
// ==========================================================================
// some libcs has no access function, make our own
-#if defined (_WIN32_WCE)
+#if 0
int access(const char *path, int amode)
{
int accesshandle = -1;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 314e976069880219708d92f93bcbfb2df1227198..cc2d64e8b9b7e6901a76bd3d520756cd9cdb3ea5 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -2027,6 +2027,7 @@ void A_CrushstaceanWalk(mobj_t *actor)
|| (actor->reactiontime-- <= 0))
{
actor->flags2 ^= MF2_AMBUSH;
+ P_SetTarget(&actor->target, NULL);
P_SetMobjState(actor, locvar2);
actor->reactiontime = actor->info->reactiontime;
}
@@ -2087,7 +2088,7 @@ void A_CrushclawAim(mobj_t *actor)
return; // there is only one step and it is crab
}
- if (crab->target || P_LookForPlayers(crab, true, false, 600*crab->scale))
+ if (crab->target || P_LookForPlayers(crab, true, false, actor->info->speed*crab->scale))
ang = R_PointToAngle2(crab->x, crab->y, crab->target->x, crab->target->y);
else
ang = crab->angle + ((crab->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);
@@ -2170,7 +2171,7 @@ void A_CrushclawLaunch(mobj_t *actor)
UINT8 i = 0;
for (i = 0; (i < CSEGS); i++)
{
- mobj_t *newchain = P_SpawnMobjFromMobj(actor, 0, 0, 0, actor->info->raisestate);
+ mobj_t *newchain = P_SpawnMobjFromMobj(actor, 0, 0, 0, (mobjtype_t)actor->info->raisestate);
P_SetTarget(&prevchain->target, newchain);
prevchain = newchain;
}
@@ -14214,18 +14215,17 @@ void A_RolloutRock(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-
-#ifdef HAVE_BLUA
- if (LUA_CallAction("A_RolloutRock", actor))
- return;
-#endif
-
UINT8 maxframes = actor->info->reactiontime; // number of frames the mobj cycles through
fixed_t pi = (22*FRACUNIT/7);
fixed_t circumference = FixedMul(2 * pi, actor->radius); // used to calculate when to change frame
fixed_t speed = P_AproxDistance(actor->momx, actor->momy), topspeed = FixedMul(actor->info->speed, actor->scale);
boolean inwater = actor->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER);
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_RolloutRock", actor))
+ return;
+#endif
+
actor->friction = FRACUNIT; // turns out riding on solids sucks, so let's just make it easier on ourselves
if (actor->threshold)
diff --git a/src/p_floor.c b/src/p_floor.c
index 19b7611b8b9ac59c1c4c5cc5916a038a22debf77..1360375a751c3930ea97bc153b8a07dd44a501f2 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -2425,7 +2425,7 @@ void T_RaiseSector(levelspecthink_t *raise)
mobj_t *thing;
sector_t *sector;
INT32 i;
- boolean playeronme = false;
+ boolean playeronme = false, active = false;
fixed_t ceilingdestination, floordestination;
result_e res = 0;
@@ -2459,8 +2459,53 @@ void T_RaiseSector(levelspecthink_t *raise)
break;
}
}
+
+ if (raise->vars[9]) // Dynamically Sinking Platform^tm
+ {
+#define shaketime 10
+ if (raise->vars[11] > shaketime) // State: moving
+ {
+ if (playeronme) // If player is standing on the platform, accelerate
+ {
+ raise->vars[10] += (FRACUNIT >> 5);
+ }
+ else // otherwise, decelerate until inflection
+ {
+ raise->vars[10] -= FRACUNIT >> 3;
+ if (raise->vars[10] <= 0) // inflection!
+ {
+ raise->vars[10] = 0;
+ raise->vars[11] = 0; // allow the shake to occur again (fucks over players attempting to jump-cheese)
+ }
+ }
+ active = raise->vars[10] > 0;
+ }
+ else // State: shaking
+ {
+ if (playeronme || raise->vars[11])
+ {
+ active = true;
+ if (++raise->vars[11] > shaketime)
+ {
+ if (playeronme)
+ raise->vars[10] = FRACUNIT >> 5;
+ else
+ raise->vars[10] = FRACUNIT << 1;
+ }
+ else
+ {
+ raise->vars[10] = ((shaketime/2) - raise->vars[11]) << FRACBITS;
+ if (raise->vars[10] < -raise->vars[2]/2)
+ raise->vars[10] = -raise->vars[2]/2;
+ }
+ }
+ }
+#undef shaketime
+ }
+ else // Air bobbing platform (not a Dynamically Sinking Platform^tm)
+ active = playeronme;
- if (playeronme)
+ if (active)
{
raise->vars[3] = raise->vars[2];
@@ -2554,6 +2599,8 @@ void T_RaiseSector(levelspecthink_t *raise)
raise->vars[3] = origspeed;
}
+ raise->vars[3] += raise->vars[10];
+
res = T_MovePlane
(
raise->sector, // sector
diff --git a/src/p_inter.c b/src/p_inter.c
index f67b0ba7433f742121df771dab14676b2e189701..1098273c8dd4001ac390835eb91480cfa2ac154a 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1501,8 +1501,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
P_SetMobjState(mo2, mo2->info->painstate);
}
}
-
- S_StartSound(toucher, special->info->painsound);
return;
case MT_FAKEMOBILE:
@@ -2482,6 +2480,28 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
target->flags |= MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY;
P_SetThingPosition(target);
+ if (target->player->powers[pw_super])
+ {
+ target->player->powers[pw_super] = 0;
+ if (P_IsLocalPlayer(target->player))
+ {
+ music_stack_noposition = true; // HACK: Do not reposition next music
+ music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
+ }
+ P_RestoreMusic(target->player);
+
+ if (gametype != GT_COOP)
+ {
+ HU_SetCEchoFlags(0);
+ HU_SetCEchoDuration(5);
+ HU_DoCEcho(va("%s\\is no longer super.\\\\\\\\", player_names[target->player-players]));
+ }
+ }
+
+ target->color = target->player->skincolor;
+ target->colorized = false;
+ G_GhostAddColor(GHC_NORMAL);
+
if ((target->player->lives <= 1) && (netgame || multiplayer) && (gametype == GT_COOP) && (cv_cooplives.value == 0))
;
else if (!target->player->bot && !target->player->spectator && !G_IsSpecialStage(gamemap) && (target->player->lives != INFLIVES)
@@ -2627,6 +2647,14 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
}
break;
+ case MT_BANPYURA:
+ if (target->tracer)
+ {
+ S_StopSound(target->tracer);
+ P_KillMobj(target->tracer, inflictor, source, damagetype);
+ }
+ break;
+
case MT_EGGSHIELD:
P_SetObjectMomZ(target, 4*target->scale, false);
P_InstaThrust(target, target->angle, 3*target->scale);
diff --git a/src/p_map.c b/src/p_map.c
index 30bae4943c954dcac5477a138efbdcdb5cc12d97..159489f708c64f5262e7b8c2fa86552608c0944d 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -124,6 +124,7 @@ boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
// Positive spring modes are minor variants of vanilla spring behaviour.
// 1 = launch players in jump
// 2 = don't modify player at all, just add momentum
+// 3 = speed-booster mode (force onto ground, MF_AMBUSH causes auto-spin)
// Negative spring modes are mildly-related gimmicks with customisation.
// -1 = pinball bumper
// Any other spring mode defaults to standard vanilla spring behaviour,
@@ -151,7 +152,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (object->player)
{
- if (object->player->charability == CA_TWINSPIN && object->player->panim == PA_ABILITY)
+ if (spring->info->painchance == 3)
+ ;
+ else if (object->player->charability == CA_TWINSPIN && object->player->panim == PA_ABILITY)
strong = 1;
else if (object->player->charability2 == CA2_MELEE && object->player->panim == PA_ABILITY2)
strong = 2;
@@ -286,7 +289,27 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (spring->info->painchance != 2)
{
if (object->player)
+ {
object->player->pflags &= ~PF_APPLYAUTOBRAKE;
+#ifndef SPRINGSPIN
+ object->player->powers[pw_justsprung] = 5;
+ if (horizspeed)
+ object->player->powers[pw_noautobrake] = ((horizspeed*TICRATE)>>(FRACBITS+3))/9; // TICRATE at 72*FRACUNIT
+ else if (P_MobjFlip(object) == P_MobjFlip(spring))
+ object->player->powers[pw_justsprung] |= (1<<15);
+#else
+ object->player->powers[pw_justsprung] = 15;
+ if (horizspeed)
+ object->player->powers[pw_noautobrake] = ((horizspeed*TICRATE)>>(FRACBITS+3))/9; // TICRATE at 72*FRACUNIT
+ else
+ {
+ if (abs(object->player->rmomx) > object->scale || abs(object->player->rmomy) > object->scale)
+ object->player->drawangle = R_PointToAngle2(0, 0, object->player->rmomx, object->player->rmomy);
+ if (P_MobjFlip(object) == P_MobjFlip(spring))
+ object->player->powers[pw_justsprung] |= (1<<15);
+ }
+#endif
+ }
if ((horizspeed && vertispeed) || (object->player && object->player->homing)) // Mimic SA
{
@@ -321,6 +344,14 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
// Set position!
P_TryMove(object, spring->x + offx, spring->y + offy, true);
+
+ if ((spring->info->painchance == 3))
+ {
+ object->z = spring->z;
+ if (spring->eflags & MFE_VERTICALFLIP)
+ object->z -= object->height;
+ object->momz = 0;
+ }
}
}
@@ -344,8 +375,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (horizspeed)
{
- object->player->drawangle = spring->angle;
- object->angle = spring->angle;
+ object->angle = object->player->drawangle = spring->angle;
if (!demoplayback || P_AnalogMove(object->player))
{
@@ -356,11 +386,25 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
}
}
- pflags = object->player->pflags & (PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // I still need these.
- secondjump = object->player->secondjump;
- washoming = object->player->homing;
if (object->player->pflags & PF_GLIDING)
P_SetPlayerMobjState(object, S_PLAY_FALL);
+ if ((spring->info->painchance == 3))
+ {
+ if (!(pflags = (object->player->pflags & PF_SPINNING)) &&
+ (((object->player->charability2 == CA2_SPINDASH) && (object->player->cmd.buttons & BT_USE))
+ || (spring->flags2 & MF2_AMBUSH)))
+ {
+ pflags = PF_SPINNING;
+ P_SetPlayerMobjState(object, S_PLAY_ROLL);
+ S_StartSound(object, sfx_spin);
+ }
+ else
+ P_SetPlayerMobjState(object, S_PLAY_ROLL);
+ }
+ else
+ pflags = object->player->pflags & (PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // I still need these.
+ secondjump = object->player->secondjump;
+ washoming = object->player->homing;
P_ResetPlayer(object->player);
if (spring->info->painchance == 1) // For all those ancient, SOC'd abilities.
@@ -368,7 +412,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
object->player->pflags |= P_GetJumpFlags(object->player);
P_SetPlayerMobjState(object, S_PLAY_JUMP);
}
- else if ((spring->info->painchance == 2) || (pflags & PF_BOUNCING)) // Adding momentum only.
+ else if ((spring->info->painchance == 2) || ((spring->info->painchance != 3) && (pflags & PF_BOUNCING))) // Adding momentum only.
{
object->player->pflags |= (pflags &~ PF_STARTJUMP);
object->player->secondjump = secondjump;
@@ -382,6 +426,10 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
object->player->pflags |= pflags;
object->player->secondjump = secondjump;
}
+ else if (object->player->dashmode >= 3*TICRATE)
+ P_SetPlayerMobjState(object, S_PLAY_DASH);
+ else if (P_IsObjectOnGround(object) && horizspeed >= FixedMul(object->player->runspeed, object->scale))
+ P_SetPlayerMobjState(object, S_PLAY_RUN);
else
P_SetPlayerMobjState(object, S_PLAY_WALK);
}
diff --git a/src/p_maputl.c b/src/p_maputl.c
index 22998c60e7ac96da14104b4e439a57b1f5a66930..111103294c659d38b8286a36597fa9c97d76f951 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -674,7 +674,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGABLEFLATS) != FF_PLATFORM) // thing is below FOF
{
if (bottomheight < opentop) {
opentop = bottomheight;
@@ -687,7 +687,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
highceiling = bottomheight;
}
- if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
+ if (delta1 < delta2 && (rover->flags & FF_INTANGABLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
{
if (topheight > openbottom) {
openbottom = topheight;
@@ -720,7 +720,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGABLEFLATS) != FF_PLATFORM) // thing is below FOF
{
if (bottomheight < opentop) {
opentop = bottomheight;
@@ -733,7 +733,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
highceiling = bottomheight;
}
- if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
+ if (delta1 < delta2 && (rover->flags & FF_INTANGABLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
{
if (topheight > openbottom) {
openbottom = topheight;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7fa51111d357dcf26b0fe4d4b20a1e7e6f0cece7..e071f79d8ba83a0319ac2f35a64173a07005bf67 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1990,6 +1990,8 @@ void P_XYMovement(mobj_t *mo)
{
mo->momz = transfermomz;
mo->standingslope = NULL;
+ if (player->pflags & PF_SPINNING)
+ player->pflags = (player->pflags & ~PF_SPINNING) | (PF_JUMPED | PF_THOKKED);
}
}
#endif
@@ -4716,13 +4718,17 @@ static void P_Boss4MoveSpikeballs(mobj_t *mobj, angle_t angle, fixed_t fz)
}
}
+#define CEZ3TILT
+
// Pull them closer.
static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
{
INT32 s;
mobj_t *base = mobj, *seg;
- fixed_t originx, originy, workx, worky, dx, dy, bz = mobj->watertop+(8<<FRACBITS);
-
+ fixed_t workx, worky, dx, dy, bz = mobj->watertop+(8<<FRACBITS);
+ fixed_t rad = (9*132)<<FRACBITS;
+#ifdef CEZ3TILT
+ fixed_t originx, originy;
if (mobj->spawnpoint)
{
originx = mobj->spawnpoint->x << FRACBITS;
@@ -4733,13 +4739,25 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
originx = mobj->x;
originy = mobj->y;
}
+#else
+ if (mobj->spawnpoint)
+ {
+ rad -= R_PointToDist2(mobj->x, mobj->y,
+ (mobj->spawnpoint->x<<FRACBITS), (mobj->spawnpoint->y<<FRACBITS));
+ }
+#endif
dz /= 9;
while ((base = base->tracer)) // there are 10 per spoke, remember that
{
- dx = (originx + P_ReturnThrustX(mobj, angle, (9*132)<<FRACBITS) - mobj->x)/9;
- dy = (originy + P_ReturnThrustY(mobj, angle, (9*132)<<FRACBITS) - mobj->y)/9;
+#ifdef CEZ3TILT
+ dx = (originx + P_ReturnThrustX(mobj, angle, rad) - mobj->x)/9;
+ dy = (originy + P_ReturnThrustY(mobj, angle, rad) - mobj->y)/9;
+#else
+ dx = P_ReturnThrustX(mobj, angle, rad)/9;
+ dy = P_ReturnThrustY(mobj, angle, rad)/9;
+#endif
workx = mobj->x + P_ReturnThrustX(mobj, angle, (112)<<FRACBITS);
worky = mobj->y + P_ReturnThrustY(mobj, angle, (112)<<FRACBITS);
for (seg = base, s = 9; seg; seg = seg->hnext, --s)
@@ -4929,6 +4947,7 @@ static void P_Boss4Thinker(mobj_t *mobj)
mobj->movecount += mobj->threshold;
if (mobj->movecount <= 0)
{
+ mobj->flags2 &= ~MF2_INVERTAIMABLE;
mobj->movecount = 0;
mobj->movedir++; // Initialization complete, next phase!
}
@@ -7552,6 +7571,7 @@ void P_MobjThinker(mobj_t *mobj)
mobj->fuse -= 2;
flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
+ P_SetMobjState(flame, S_FLAMEJETFLAME4);
flame->angle = mobj->angle;
@@ -7596,7 +7616,10 @@ void P_MobjThinker(mobj_t *mobj)
flame->momz = -strength;
}
else
+ {
flame->momz = strength;
+ P_SetMobjState(flame, S_FLAMEJETFLAME7);
+ }
P_InstaThrust(flame, mobj->angle, FixedDiv(mobj->fuse*FRACUNIT,3*FRACUNIT));
S_StartSound(flame, sfx_fire);
}
@@ -7735,7 +7758,7 @@ void P_MobjThinker(mobj_t *mobj)
actualwork = work = FixedHypot(mobj->x-players[i].mo->x, mobj->y-players[i].mo->y);
if (player)
{
- if (players[i].skin == 0 || players[i].skin == 3)
+ if (players[i].skin == 0 || players[i].skin == 5)
work = (2*work)/3;
if (work >= pdist)
continue;
@@ -7773,7 +7796,7 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->target != player->mo)
P_SetTarget(&mobj->target, player->mo);
targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN));
- love = (player->skin == 0 || player->skin == 3);
+ love = (player->skin == 0 || player->skin == 5);
switch (stat)
{
@@ -10283,6 +10306,15 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
mobj->reactiontime >>= 1;
}
break;
+ case MT_BANPYURA:
+ {
+ mobj_t *bigmeatyclaw = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_BANPSPRING);
+ bigmeatyclaw->angle = mobj->angle + ((mobj->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);;
+ P_SetTarget(&mobj->tracer, bigmeatyclaw);
+ P_SetTarget(&bigmeatyclaw->tracer, mobj);
+ mobj->reactiontime >>= 1;
+ }
+ break;
case MT_BIGMINE:
mobj->extravalue1 = FixedHypot(mobj->x, mobj->y)>>FRACBITS;
break;
@@ -10308,6 +10340,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
mobj->movefactor = -512*FRACUNIT;
mobj->flags2 |= MF2_CLASSICPUSH;
break;
+ case MT_EGGMOBILE4:
+ mobj->flags2 |= MF2_INVERTAIMABLE;
+ break;
case MT_FLICKY_08:
mobj->color = (P_RandomChance(FRACUNIT/2) ? SKINCOLOR_RED : SKINCOLOR_AQUA);
break;
@@ -10366,13 +10401,13 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break;
case MT_METALSONIC_BATTLE:
case MT_METALSONIC_RACE:
- sc = 3;
+ sc = 5;
break;
case MT_FANG:
sc = 4;
break;
case MT_ROSY:
- sc = 5;
+ sc = 3;
break;
case MT_CORK:
mobj->flags2 |= MF2_SUPERFIRE;
@@ -11558,9 +11593,11 @@ You should think about modifying the deathmatch starts to take full advantage of
if (i == MT_ROSY)
{
- if (mariomode)
+ if (!(gametype == GT_COOP || (mthing->options & MTF_EXTRA)))
+ return; // she doesn't hang out here
+ else if (mariomode)
i = MT_TOAD; // don't remove on penalty of death
- else if (!(netgame || multiplayer) && players[consoleplayer].skin == 5)
+ else if (!(netgame || multiplayer) && players[consoleplayer].skin == 3)
return; // no doubles
}
@@ -12484,6 +12521,76 @@ ML_EFFECT5 : Don't stop thinking when too far away
}
break;
}
+ case MT_REDBOOSTER:
+ {
+ angle_t angle = FixedAngle(mthing->angle << FRACBITS);
+ fixed_t x1 = FINECOSINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y1 = FINESINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t x2 = FINECOSINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y2 = FINESINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+
+ mobj_t *seg = P_SpawnMobjFromMobj(mobj, 26*x1, 26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle-ANGLE_90;
+ P_SetMobjState(seg, S_REDBOOSTERSEG_FACE);
+ seg = P_SpawnMobjFromMobj(mobj, -26*x1, -26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle+ANGLE_90;
+ P_SetMobjState(seg, S_REDBOOSTERSEG_FACE);
+ seg = P_SpawnMobjFromMobj(mobj, 21*x2, 21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERSEG_LEFT);
+ seg = P_SpawnMobjFromMobj(mobj, -21*x2, -21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERSEG_RIGHT);
+
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1+x2), 13*(y1+y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1-x2), 13*(y1-y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1+x2), -13*(y1+y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1-x2), -13*(y1-y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_REDBOOSTERROLLER);
+ break;
+ }
+ case MT_YELLOWBOOSTER:
+ {
+ angle_t angle = FixedAngle(mthing->angle << FRACBITS);
+ fixed_t x1 = FINECOSINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y1 = FINESINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t x2 = FINECOSINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y2 = FINESINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+
+ mobj_t *seg = P_SpawnMobjFromMobj(mobj, 26*x1, 26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle-ANGLE_90;
+ P_SetMobjState(seg, S_YELLOWBOOSTERSEG_FACE);
+ seg = P_SpawnMobjFromMobj(mobj, -26*x1, -26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle+ANGLE_90;
+ P_SetMobjState(seg, S_YELLOWBOOSTERSEG_FACE);
+ seg = P_SpawnMobjFromMobj(mobj, 21*x2, 21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERSEG_LEFT);
+ seg = P_SpawnMobjFromMobj(mobj, -21*x2, -21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERSEG_RIGHT);
+
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1+x2), 13*(y1+y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1-x2), 13*(y1-y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1+x2), -13*(y1+y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1-x2), -13*(y1-y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
+ break;
+ }
default:
break;
}
@@ -12682,7 +12789,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
{
if (mthing->options & MTF_AMBUSH)
{
- if (i == MT_YELLOWDIAG || i == MT_REDDIAG)
+ if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
mobj->angle += ANGLE_22h;
if (i == MT_YELLOWHORIZ || i == MT_REDHORIZ || i == MT_BLUEHORIZ)
@@ -12721,7 +12828,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
if (mthing->options & MTF_OBJECTSPECIAL)
{
- if (i == MT_YELLOWDIAG || i == MT_REDDIAG)
+ if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
mobj->flags |= MF_NOGRAVITY;
if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 69c942236df283f5825f2ce8a1f8b081daa12d61..fb2365bf0983e3de1cdb44b813ab9c333cc4bc48 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -3618,7 +3618,7 @@ static void P_NetUnArchiveThinkers(void)
{
executor_t *delay = NULL;
UINT32 mobjnum;
- for (currentthinker = thlist[i].next; currentthinker != &thlist[i];
+ for (currentthinker = thlist[THINK_MAIN].next; currentthinker != &thlist[THINK_MAIN];
currentthinker = currentthinker->next)
{
if (currentthinker->function.acp1 != (actionf_p1)T_ExecutorDelay)
diff --git a/src/p_setup.c b/src/p_setup.c
index c83c8cd5cefaefecbb763c15f7a5742d64ea8cf5..cef17663635907eaa19feb77a40a33b22a636dc5 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2606,7 +2606,6 @@ boolean P_SetupLevel(boolean skipprecip)
boolean loadedbm = false;
sector_t *ss;
boolean chase;
-
levelloading = true;
// This is needed. Don't touch.
@@ -3047,8 +3046,11 @@ boolean P_SetupLevel(boolean skipprecip)
CONS_Printf(M_GetText("No player currently available to become IT. Awaiting available players.\n"));
}
- else if (gametype == GT_RACE && server && cv_usemapnumlaps.value)
- CV_StealthSetValue(&cv_numlaps, mapheaderinfo[gamemap - 1]->numlaps);
+ else if (gametype == GT_RACE && server)
+ CV_StealthSetValue(&cv_numlaps,
+ (cv_basenumlaps.value)
+ ? cv_basenumlaps.value
+ : mapheaderinfo[gamemap - 1]->numlaps);
// ===========
// landing point for netgames.
diff --git a/src/p_spec.c b/src/p_spec.c
index 5b8e25050d138837b07e5cd6e431666311e4a75d..50939ae5b2fd8beca0ddce735490bb7711487105 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2718,6 +2718,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
CONS_Debug(DBG_GAMELOGIC, "Line type 414 Executor: sfx number %d is invalid!\n", sfxnum);
return;
}
+
if (line->tag != 0) // Do special stuff only if a non-zero linedef tag is set
{
if (line->flags & ML_EFFECT5) // Repeat Midtexture
@@ -2758,30 +2759,32 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
return;
}
}
-
- if (line->flags & ML_NOCLIMB)
+ else
{
- // play the sound from nowhere, but only if display player triggered it
- if (mo && mo->player && (mo->player == &players[displayplayer] || mo->player == &players[secondarydisplayplayer]))
+ if (line->flags & ML_NOCLIMB)
+ {
+ // play the sound from nowhere, but only if display player triggered it
+ if (mo && mo->player && (mo->player == &players[displayplayer] || mo->player == &players[secondarydisplayplayer]))
+ S_StartSound(NULL, sfxnum);
+ }
+ else if (line->flags & ML_EFFECT4)
+ {
+ // play the sound from nowhere
S_StartSound(NULL, sfxnum);
- }
- else if (line->flags & ML_EFFECT4)
- {
- // play the sound from nowhere
- S_StartSound(NULL, sfxnum);
- }
- else if (line->flags & ML_BLOCKMONSTERS)
- {
- // play the sound from calling sector's soundorg
- if (callsec)
- S_StartSound(&callsec->soundorg, sfxnum);
+ }
+ else if (line->flags & ML_BLOCKMONSTERS)
+ {
+ // play the sound from calling sector's soundorg
+ if (callsec)
+ S_StartSound(&callsec->soundorg, sfxnum);
+ else if (mo)
+ S_StartSound(&mo->subsector->sector->soundorg, sfxnum);
+ }
else if (mo)
- S_StartSound(&mo->subsector->sector->soundorg, sfxnum);
- }
- else if (mo)
- {
- // play the sound from mobj that triggered it
- S_StartSound(mo, sfxnum);
+ {
+ // play the sound from mobj that triggered it
+ S_StartSound(mo, sfxnum);
+ }
}
}
break;
@@ -5984,8 +5987,6 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
* to the lowest nearby height if not
* there already.
*
- * Replaces the old "AirBob".
- *
* \param sec Control sector.
* \param actionsector Target sector.
* \param sourceline Control linedef.
@@ -6030,8 +6031,7 @@ static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline)
raise->sourceline = sourceline;
}
-// Function to maintain backwards compatibility
-static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust)
+static void P_AddAirbob(sector_t *sec, line_t *sourceline, boolean noadjust, boolean dynamic)
{
levelspecthink_t *airbob;
@@ -6068,6 +6068,8 @@ static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust)
airbob->vars[5] = sec->ceilingheight;
airbob->vars[4] = airbob->vars[5]
- (sec->ceilingheight - sec->floorheight);
+
+ airbob->vars[9] = dynamic ? 1 : 0;
airbob->sourceline = sourceline;
}
@@ -6891,11 +6893,16 @@ void P_SpawnSpecials(INT32 fromnetsave)
case 151: // Adjustable air bobbing platform
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddOldAirbob(lines[i].frontsector, lines + i, (lines[i].special != 151));
+ P_AddAirbob(lines[i].frontsector, lines + i, (lines[i].special != 151), false);
break;
case 152: // Adjustable air bobbing platform in reverse
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddOldAirbob(lines[i].frontsector, lines + i, true);
+ P_AddAirbob(lines[i].frontsector, lines + i, true, false);
+ break;
+ case 153: // Dynamic Sinking Platform
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
+ lines[i].flags |= ML_BLOCKMONSTERS;
+ P_AddAirbob(lines[i].frontsector, lines + i, false, true);
break;
case 160: // Float/bob platform
@@ -6946,14 +6953,14 @@ void P_SpawnSpecials(INT32 fromnetsave)
case 176: // Air bobbing platform that will crumble and bob on the water when it falls and hits
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB|FF_CRUMBLE, secthinkers);
lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddOldAirbob(lines[i].frontsector, lines + i, true);
+ P_AddAirbob(lines[i].frontsector, lines + i, true, false);
break;
case 177: // Air bobbing platform that will crumble and bob on
// the water when it falls and hits, then never return
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_FLOATBOB|FF_CRUMBLE|FF_NORETURN, secthinkers);
lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddOldAirbob(lines[i].frontsector, lines + i, true);
+ P_AddAirbob(lines[i].frontsector, lines + i, true, false);
break;
case 178: // Crumbling platform that will float when it hits water
@@ -6967,7 +6974,7 @@ void P_SpawnSpecials(INT32 fromnetsave)
case 180: // Air bobbing platform that will crumble
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE, secthinkers);
lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddOldAirbob(lines[i].frontsector, lines + i, true);
+ P_AddAirbob(lines[i].frontsector, lines + i, true, false);
break;
case 190: // Rising Platform FOF (solid, opaque, shadows)
@@ -7075,21 +7082,21 @@ void P_SpawnSpecials(INT32 fromnetsave)
break;
case 252: // Shatter block (breaks when touched)
- ffloorflags = FF_EXISTS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER;
+ ffloorflags = FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER;
if (lines[i].flags & ML_NOCLIMB)
- ffloorflags |= FF_SOLID|FF_SHATTERBOTTOM;
+ ffloorflags |= FF_BLOCKPLAYER|FF_SHATTERBOTTOM;
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
break;
case 253: // Translucent shatter block (see 76)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER|FF_TRANSLUCENT, secthinkers);
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER|FF_TRANSLUCENT, secthinkers);
break;
case 254: // Bustable block
ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_BUSTUP;
if (lines[i].flags & ML_NOCLIMB)
- ffloorflags |= FF_ONLYKNUX;
+ ffloorflags |= FF_STRONGBUST;
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
break;
diff --git a/src/p_user.c b/src/p_user.c
index d740a64d68927fe62d323d7dd7860b9597f67545..7dbef843011520e9b91c747c6adee0f884e927f3 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -191,7 +191,7 @@ boolean P_AutoPause(void)
if (netgame || modeattacking || gamestate == GS_TITLESCREEN)
return false;
- return (menuactive || window_notinfocus);
+ return (menuactive || ( window_notinfocus && cv_pauseifunfocused.value ));
}
//
@@ -2272,7 +2272,8 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
player->mo->momy = ((player->mo->momy - player->cmomy)/3) + player->cmomy;
}
}
- else if (player->charability2 == CA2_MELEE && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)))
+ else if (player->charability2 == CA2_MELEE
+ && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY && player->cmd.buttons & (BT_JUMP|BT_USE))))
{
if (player->mo->state-states != S_PLAY_MELEE_LANDING)
{
@@ -2468,39 +2469,42 @@ static void P_CheckBustableBlocks(player_t *player)
if ((rover->flags & FF_BUSTUP)/* && !rover->master->frontsector->crumblestate*/)
{
- // If it's an FF_SPINBUST, you have to either be jumping, or coming down
- // onto the top from a spin.
- if (rover->flags & FF_SPINBUST && ((!(player->pflags & PF_JUMPED) && !(player->pflags & PF_SPINNING) && !(player->pflags & PF_BOUNCING)) || (player->pflags & PF_STARTDASH)))
+ // If it's an FF_SHATTER, you can break it just by touching it.
+ if (rover->flags & FF_SHATTER)
+ goto bust;
+
+ // If it's an FF_SPINBUST, you can break it if you are in your spinning frames
+ // (either from jumping or spindashing).
+ if (rover->flags & FF_SPINBUST
+ && (((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH))
+ || (player->pflags & PF_JUMPED && !(player->pflags & PF_NOJUMPDAMAGE))))
+ goto bust;
+
+ // You can always break it if you have CA_GLIDEANDCLIMB
+ // or if you are bouncing on it
+ // or you are using CA_TWINSPIN/CA2_MELEE.
+ if (player->charability == CA_GLIDEANDCLIMB
+ || (player->pflags & PF_BOUNCING)
+ || ((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
+ || (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
+ goto bust;
+
+ if (rover->flags & FF_STRONGBUST)
continue;
- // if it's not an FF_SHATTER, you must be spinning (and not jumping)
- // or be super
- // or have CA_GLIDEANDCLIMB
- // or be in dashmode with SF_DASHMODE
- // or be using CA_TWINSPIN
- // or be using CA2_MELEE
- // or are drilling in NiGHTS
- // or are recording for Metal Sonic
- if (!(rover->flags & FF_SHATTER) && !(rover->flags & FF_SPINBUST)
- && !((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED))
+ // If it's not an FF_STRONGBUST, you can break if you are spinning (and not jumping)
+ // or you are super
+ // or you are in dashmode with SF_DASHMODE
+ // or you are drilling in NiGHTS
+ // or you are recording for Metal Sonic
+ if (!((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED))
&& !(player->powers[pw_super])
- && !(player->charability == CA_GLIDEANDCLIMB)
- && !(player->pflags & PF_BOUNCING)
&& !((player->charflags & SF_DASHMODE) && (player->dashmode >= 3*TICRATE))
- && !((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
- && !(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)
&& !(player->pflags & PF_DRILLING)
&& !metalrecording)
continue;
- // Only players with CA_GLIDEANDCLIMB, or CA_TWINSPIN/CA2_MELEE users can break this rock...
- if (!(rover->flags & FF_SHATTER) && (rover->flags & FF_ONLYKNUX)
- && !(player->charability == CA_GLIDEANDCLIMB
- || (player->pflags & PF_BOUNCING)
- || ((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
- || (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)))
- continue;
-
+ bust:
topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
@@ -4175,8 +4179,11 @@ static void P_DoSuperStuff(player_t *player)
{
player->powers[pw_super] = 0;
P_SetPlayerMobjState(player->mo, S_PLAY_STND);
- music_stack_noposition = true; // HACK: Do not reposition next music
- music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
+ if (P_IsLocalPlayer(player))
+ {
+ music_stack_noposition = true; // HACK: Do not reposition next music
+ music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
+ }
P_RestoreMusic(player);
P_SpawnShieldOrb(player);
@@ -4245,7 +4252,7 @@ static void P_DoSuperStuff(player_t *player)
if (gametype != GT_COOP)
player->powers[pw_flashing] = flashingtics-1;
- if ((player->mo->health > 0) && (player->mo->sprite2 & FF_SPR2SUPER))
+ if (player->mo->sprite2 & FF_SPR2SUPER)
P_SetPlayerMobjState(player->mo, player->mo->state-states);
// Inform the netgame that the champion has fallen in the heat of battle.
@@ -4258,8 +4265,11 @@ static void P_DoSuperStuff(player_t *player)
}
// Resume normal music if you're the console player
- music_stack_noposition = true; // HACK: Do not reposition next music
- music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
+ if (P_IsLocalPlayer(player))
+ {
+ music_stack_noposition = true; // HACK: Do not reposition next music
+ music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
+ }
P_RestoreMusic(player);
// If you had a shield, restore its visual significance.
@@ -4367,7 +4377,6 @@ void P_DoJump(player_t *player, boolean soundandstate)
{
player->mo->momz = 9*FRACUNIT;
player->powers[pw_carry] = CR_NONE;
- player->mo->tracer->flags |= MF_PUSHABLE;
P_SetTarget(&player->mo->tracer->target, NULL);
P_SetTarget(&player->mo->tracer, NULL);
}
@@ -10508,7 +10517,7 @@ static mobj_t *P_LookForRails(mobj_t* mobj, fixed_t c, fixed_t s, angle_t target
//Axes must be directly parallel or antiparallel, give or take 5 degrees.
if (angdiff < ANG10)
{
- mark = P_SpawnMobj(nx, ny, nz, mobj->info->raisestate);
+ mark = P_SpawnMobj(nx, ny, nz, (mobjtype_t)mobj->info->raisestate);
return mark;
}
}
@@ -10723,7 +10732,11 @@ static void P_MinecartThink(player_t *player)
}
}
- P_SetPlayerMobjState(player->mo, S_PLAY_STND);
+ if (player->mo->state-states != S_PLAY_STND)
+ {
+ P_SetPlayerMobjState(player->mo, S_PLAY_STND);
+ player->mo->tics = -1;
+ }
// Move player to minecart.
P_TeleportMove(player->mo, minecart->x - minecart->momx, minecart->y - minecart->momy, minecart->z + max(minecart->momz, 0) + 8*FRACUNIT);
@@ -11373,6 +11386,13 @@ void P_PlayerThink(player_t *player)
break;
}
}
+ else if (player->powers[pw_justsprung])
+ {
+#ifdef SPRINGSPIN
+ if (player->powers[pw_justsprung] & (1<<15))
+ player->drawangle += (player->powers[pw_justsprung] & ~(1<<15))*(ANG2+ANG1);
+#endif
+ }
else if ((player->skidtime > (TICRATE/2 - 2) || ((player->pflags & (PF_SPINNING|PF_STARTDASH)) == PF_SPINNING)) && (abs(player->rmomx) > 5*player->mo->scale || abs(player->rmomy) > 5*player->mo->scale)) // spin/skid force
player->drawangle = R_PointToAngle2(0, 0, player->rmomx, player->rmomy);
else if (((player->charability2 == CA2_GUNSLINGER || player->charability2 == CA2_MELEE) && player->panim == PA_ABILITY2) || player->pflags & PF_STASIS || player->skidtime)
@@ -11393,7 +11413,7 @@ void P_PlayerThink(player_t *player)
if (player->mo->eflags & MFE_TOUCHWATER || player->powers[pw_flashing] > (flashingtics/4)*3)
{
diff = (player->mo->angle - player->drawangle);
- factor = 4;
+ factor = 16;
}
else
{
@@ -11402,7 +11422,7 @@ void P_PlayerThink(player_t *player)
}
#else
diff = (player->mo->angle - player->drawangle);
- factor = 4;
+ factor = 16;
#endif
}
else if (player->pflags & PF_STARTDASH)
@@ -11437,7 +11457,9 @@ void P_PlayerThink(player_t *player)
{
boolean currentlyonground = P_IsObjectOnGround(player->mo);
- if (!player->powers[pw_carry] && !player->powers[pw_nocontrol]
+ if (player->powers[pw_noautobrake])
+ ;
+ else if (!player->powers[pw_carry] && !player->powers[pw_nocontrol]
&& ((player->pflags & (PF_AUTOBRAKE|PF_APPLYAUTOBRAKE|PF_STASIS)) == (PF_AUTOBRAKE|PF_APPLYAUTOBRAKE))
&& !(cmd->forwardmove || cmd->sidemove)
&& (player->rmomx || player->rmomy)
@@ -11479,9 +11501,6 @@ void P_PlayerThink(player_t *player)
}
}
- if (player->powers[pw_pushing])
- player->powers[pw_pushing]--;
-
player->mo->movefactor = FRACUNIT; // We're not going to do any more with this, so let's change it back for the next frame.
// Unset statis flags after moving.
@@ -11561,6 +11580,17 @@ void P_PlayerThink(player_t *player)
if (player->powers[pw_tailsfly] && player->powers[pw_tailsfly] < UINT16_MAX && player->charability != CA_SWIM) // tails fly counter
player->powers[pw_tailsfly]--;
+ if (player->powers[pw_pushing] && player->powers[pw_pushing] < UINT16_MAX)
+ player->powers[pw_pushing]--;
+
+ if (player->powers[pw_justsprung] & ((1<<15)-1) && player->powers[pw_justsprung] < UINT16_MAX)
+ player->powers[pw_justsprung]--;
+ else
+ player->powers[pw_justsprung] = 0;
+
+ if (player->powers[pw_pushing] && player->powers[pw_pushing] < UINT16_MAX)
+ player->powers[pw_pushing]--;
+
if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER)))
{
if (player->powers[pw_underwater] <= 12*TICRATE+1)
@@ -12115,7 +12145,7 @@ void P_PlayerAfterThink(player_t *player)
mo->momx = rock->momx;
mo->momy = rock->momy;
mo->momz = 0;
-
+
if (player->panim == PA_IDLE && (mo->momx || mo->momy))
{
P_SetPlayerMobjState(player->mo, S_PLAY_WALK);
diff --git a/src/r_data.c b/src/r_data.c
index b8b3630219c7bbb4adf02ec29f8a5d8ec00049e7..524baad151cf534125790bc125d597f7620d27c5 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -35,7 +35,7 @@
#endif
// Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog
-#ifdef _WIN32_WCE
+#if 0
#define AVOID_ERRNO
#else
#include <errno.h>
@@ -483,7 +483,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
wadnum = patch->wad;
lumpnum = patch->lump;
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+ realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); // can't use W_CachePatchNumPwad because OpenGL
#ifndef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
@@ -557,7 +557,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
texturememory += blocksize;
block = Z_Malloc(blocksize+1, PU_STATIC, &texturecache[texnum]);
- memset(block, 0xFF, blocksize+1); // Transparency hack
+ memset(block, TRANSPARENTPIXEL, blocksize+1); // Transparency hack
// columns lookup table
colofs = (UINT32 *)(void *)block;
@@ -2520,7 +2520,11 @@ void R_PrecacheLevel(void)
"spritememory: %s k\n", sizeu1(flatmemory>>10), sizeu2(texturememory>>10), sizeu3(spritememory>>10));
}
-// https://github.com/coelckers/prboom-plus/blob/master/prboom2/src/r_patch.c#L350
+//
+// R_CheckIfPatch
+//
+// Returns true if the lump is a valid patch.
+//
boolean R_CheckIfPatch(lumpnum_t lump)
{
size_t size;
@@ -2565,6 +2569,71 @@ boolean R_CheckIfPatch(lumpnum_t lump)
return result;
}
+//
+// R_TextureToFlat
+//
+// Convert a texture to a flat.
+//
+void R_TextureToFlat(size_t tex, UINT8 *flat)
+{
+ texture_t *texture = textures[tex];
+
+ fixed_t col, ofs;
+ column_t *column;
+ UINT8 *desttop, *dest, *deststop;
+ UINT8 *source;
+
+ // yea
+ R_CheckTextureCache(tex);
+
+ desttop = flat;
+ deststop = desttop + (texture->width * texture->height);
+
+ for (col = 0; col < texture->width; col++, desttop++)
+ {
+ // no post_t info
+ if (!texture->holes)
+ {
+ column = (column_t *)(R_GetColumn(tex, col));
+ source = (UINT8 *)(column);
+ dest = desttop;
+ for (ofs = 0; dest < deststop && ofs < texture->height; ofs++)
+ {
+ if (source[ofs] != TRANSPARENTPIXEL)
+ *dest = source[ofs];
+ dest += texture->width;
+ }
+ }
+ else
+ {
+ INT32 topdelta, prevdelta = -1;
+ column = (column_t *)((UINT8 *)R_GetColumn(tex, col) - 3);
+ while (column->topdelta != 0xff)
+ {
+ topdelta = column->topdelta;
+ if (topdelta <= prevdelta)
+ topdelta += prevdelta;
+ prevdelta = topdelta;
+
+ dest = desttop + (topdelta * texture->width);
+ source = (UINT8 *)column + 3;
+ for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
+ {
+ if (source[ofs] != TRANSPARENTPIXEL)
+ *dest = source[ofs];
+ dest += texture->width;
+ }
+ column = (column_t *)((UINT8 *)column + column->length + 4);
+ }
+ }
+ }
+}
+
+//
+// R_PatchToFlat
+//
+// Convert a patch to a flat.
+//
void R_PatchToFlat(patch_t *patch, UINT8 *flat)
{
fixed_t col, ofs;
@@ -2599,7 +2668,124 @@ void R_PatchToFlat(patch_t *patch, UINT8 *flat)
}
}
+//
+// R_FlatToPatch
+//
+// Convert a flat to a patch.
+//
+static unsigned char imgbuf[1<<26];
+patch_t *R_FlatToPatch(UINT8 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize, boolean transparency)
+{
+ UINT32 x, y;
+ UINT8 *img;
+ UINT8 *imgptr = imgbuf;
+ UINT8 *colpointers, *startofspan;
+ size_t size = 0;
+
+ // Write image size and offset
+ WRITEINT16(imgptr, width);
+ WRITEINT16(imgptr, height);
+ WRITEINT16(imgptr, leftoffset);
+ WRITEINT16(imgptr, topoffset);
+
+ // Leave placeholder to column pointers
+ colpointers = imgptr;
+ imgptr += width*4;
+
+ // Write columns
+ for (x = 0; x < width; x++)
+ {
+ int lastStartY = 0;
+ int spanSize = 0;
+ startofspan = NULL;
+
+ // Write column pointer
+ WRITEINT32(colpointers, imgptr - imgbuf);
+
+ // Write pixels
+ for (y = 0; y < height; y++)
+ {
+ UINT8 paletteIndex = raw[((y * width) + x)];
+ boolean opaque = transparency ? (paletteIndex != TRANSPARENTPIXEL) : true;
+
+ // End span if we have a transparent pixel
+ if (!opaque)
+ {
+ if (startofspan)
+ WRITEUINT8(imgptr, 0);
+ startofspan = NULL;
+ continue;
+ }
+
+ // Start new column if we need to
+ if (!startofspan || spanSize == 255)
+ {
+ int writeY = y;
+
+ // If we reached the span size limit, finish the previous span
+ if (startofspan)
+ WRITEUINT8(imgptr, 0);
+
+ if (y > 254)
+ {
+ // Make sure we're aligned to 254
+ if (lastStartY < 254)
+ {
+ WRITEUINT8(imgptr, 254);
+ WRITEUINT8(imgptr, 0);
+ imgptr += 2;
+ lastStartY = 254;
+ }
+
+ // Write stopgap empty spans if needed
+ writeY = y - lastStartY;
+
+ while (writeY > 254)
+ {
+ WRITEUINT8(imgptr, 254);
+ WRITEUINT8(imgptr, 0);
+ imgptr += 2;
+ writeY -= 254;
+ }
+ }
+
+ startofspan = imgptr;
+ WRITEUINT8(imgptr, writeY);
+ imgptr += 2;
+ spanSize = 0;
+
+ lastStartY = y;
+ }
+
+ // Write the pixel
+ WRITEUINT8(imgptr, paletteIndex);
+ spanSize++;
+ startofspan[1] = spanSize;
+ }
+
+ if (startofspan)
+ WRITEUINT8(imgptr, 0);
+
+ WRITEUINT8(imgptr, 0xFF);
+ }
+
+ size = imgptr-imgbuf;
+ img = Z_Malloc(size, PU_STATIC, NULL);
+ memcpy(img, imgbuf, size);
+
+ Z_Free(raw);
+
+ if (destsize != NULL)
+ *destsize = size;
+ return (patch_t *)img;
+}
+
#ifndef NO_PNG_LUMPS
+//
+// R_IsLumpPNG
+//
+// Returns true if the lump is a valid PNG.
+//
boolean R_IsLumpPNG(const UINT8 *d, size_t s)
{
if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
@@ -2812,125 +2998,31 @@ static UINT8 *PNG_RawConvert(const UINT8 *png, UINT16 *w, UINT16 *h, INT16 *topo
return flat;
}
+//
+// R_PNGToFlat
+//
// Convert a PNG to a flat.
-UINT8 *R_PNGToFlat(levelflat_t *levelflat, UINT8 *png, size_t size)
+//
+UINT8 *R_PNGToFlat(UINT16 *width, UINT16 *height, UINT8 *png, size_t size)
{
- return PNG_RawConvert(png, &levelflat->width, &levelflat->height, NULL, NULL, size);
+ return PNG_RawConvert(png, width, height, NULL, NULL, size);
}
+//
+// R_PNGToPatch
+//
// Convert a PNG to a patch.
-static unsigned char imgbuf[1<<26];
+//
patch_t *R_PNGToPatch(const UINT8 *png, size_t size, size_t *destsize, boolean transparency)
{
UINT16 width, height;
INT16 topoffset = 0, leftoffset = 0;
UINT8 *raw = PNG_RawConvert(png, &width, &height, &topoffset, &leftoffset, size);
- UINT32 x, y;
- UINT8 *img;
- UINT8 *imgptr = imgbuf;
- UINT8 *colpointers, *startofspan;
-
if (!raw)
I_Error("R_PNGToPatch: conversion failed");
- // Write image size and offset
- WRITEINT16(imgptr, width);
- WRITEINT16(imgptr, height);
- WRITEINT16(imgptr, leftoffset);
- WRITEINT16(imgptr, topoffset);
-
- // Leave placeholder to column pointers
- colpointers = imgptr;
- imgptr += width*4;
-
- // Write columns
- for (x = 0; x < width; x++)
- {
- int lastStartY = 0;
- int spanSize = 0;
- startofspan = NULL;
-
- //printf("%d ", x);
- // Write column pointer (@TODO may be wrong)
- WRITEINT32(colpointers, imgptr - imgbuf);
-
- // Write pixels
- for (y = 0; y < height; y++)
- {
- UINT8 paletteIndex = raw[((y * width) + x)];
- boolean opaque = transparency ? (paletteIndex != TRANSPARENTPIXEL) : true;
-
- // End span if we have a transparent pixel
- if (!opaque)
- {
- if (startofspan)
- WRITEUINT8(imgptr, 0);
- startofspan = NULL;
- continue;
- }
-
- // Start new column if we need to
- if (!startofspan || spanSize == 255)
- {
- int writeY = y;
-
- // If we reached the span size limit, finish the previous span
- if (startofspan)
- WRITEUINT8(imgptr, 0);
-
- if (y > 254)
- {
- // Make sure we're aligned to 254
- if (lastStartY < 254)
- {
- WRITEUINT8(imgptr, 254);
- WRITEUINT8(imgptr, 0);
- imgptr += 2;
- lastStartY = 254;
- }
-
- // Write stopgap empty spans if needed
- writeY = y - lastStartY;
-
- while (writeY > 254)
- {
- WRITEUINT8(imgptr, 254);
- WRITEUINT8(imgptr, 0);
- imgptr += 2;
- writeY -= 254;
- }
- }
-
- startofspan = imgptr;
- WRITEUINT8(imgptr, writeY);///@TODO calculate starting y pos
- imgptr += 2;
- spanSize = 0;
-
- lastStartY = y;
- }
-
- // Write the pixel
- WRITEUINT8(imgptr, paletteIndex);
- spanSize++;
- startofspan[1] = spanSize;
- }
-
- if (startofspan)
- WRITEUINT8(imgptr, 0);
-
- WRITEUINT8(imgptr, 0xFF);
- }
-
- size = imgptr-imgbuf;
- img = Z_Malloc(size, PU_STATIC, NULL);
- memcpy(img, imgbuf, size);
-
- Z_Free(raw);
-
- if (destsize != NULL)
- *destsize = size;
- return (patch_t *)img;
+ return R_FlatToPatch(raw, width, height, leftoffset, topoffset, destsize, transparency);
}
boolean R_PNGDimensions(UINT8 *png, INT16 *width, INT16 *height, size_t size)
@@ -3001,53 +3093,3 @@ boolean R_PNGDimensions(UINT8 *png, INT16 *width, INT16 *height, size_t size)
}
#endif
#endif
-
-void R_TextureToFlat(size_t tex, UINT8 *flat)
-{
- texture_t *texture = textures[tex];
-
- fixed_t col, ofs;
- column_t *column;
- UINT8 *desttop, *dest, *deststop;
- UINT8 *source;
-
- desttop = flat;
- deststop = desttop + (texture->width * texture->height);
-
- for (col = 0; col < texture->width; col++, desttop++)
- {
- column = (column_t *)R_GetColumn(tex, col);
- if (!texture->holes)
- {
- dest = desttop;
- source = (UINT8 *)(column);
- for (ofs = 0; dest < deststop && ofs < texture->height; ofs++)
- {
- if (source[ofs] != TRANSPARENTPIXEL)
- *dest = source[ofs];
- dest += texture->width;
- }
- }
- else
- {
- INT32 topdelta, prevdelta = -1;
- while (column->topdelta != 0xff)
- {
- topdelta = column->topdelta;
- if (topdelta <= prevdelta)
- topdelta += prevdelta;
- prevdelta = topdelta;
-
- dest = desttop + (topdelta * texture->width);
- source = (UINT8 *)(column) + 3;
- for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
- {
- if (source[ofs] != TRANSPARENTPIXEL)
- *dest = source[ofs];
- dest += texture->width;
- }
- column = (column_t *)((UINT8 *)column + column->length + 4);
- }
- }
- }
-}
diff --git a/src/r_data.h b/src/r_data.h
index c2fd284ff016810d5062ebe6523f5eedcb9df025..e71d457663e1eabe06a10cb7c4c7911379c87b0c 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -159,15 +159,14 @@ const char *R_NameForColormap(extracolormap_t *extra_colormap);
#define R_PutRgbaRGBA(r, g, b, a) (R_PutRgbaRGB(r, g, b) + R_PutRgbaA(a))
boolean R_CheckIfPatch(lumpnum_t lump);
-UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
-
-void R_PatchToFlat(patch_t *patch, UINT8 *flat);
void R_TextureToFlat(size_t tex, UINT8 *flat);
+void R_PatchToFlat(patch_t *patch, UINT8 *flat);
+patch_t *R_FlatToPatch(UINT8 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize, boolean transparency);
#ifndef NO_PNG_LUMPS
boolean R_IsLumpPNG(const UINT8 *d, size_t s);
-UINT8 *R_PNGToFlat(levelflat_t *levelflat, UINT8 *png, size_t size);
+UINT8 *R_PNGToFlat(UINT16 *width, UINT16 *height, UINT8 *png, size_t size);
patch_t *R_PNGToPatch(const UINT8 *png, size_t size, size_t *destsize, boolean transparency);
boolean R_PNGDimensions(UINT8 *png, INT16 *width, INT16 *height, size_t size);
#endif
diff --git a/src/r_defs.h b/src/r_defs.h
index 6aeb0671c49ece68838c5fc0c69ddbaf55572682..4a5c38410491b3378badea7925bfa98932d81f4e 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -139,9 +139,9 @@ typedef enum
FF_PLATFORM = 0x2000000, ///< You can jump up through this to the top.
FF_REVERSEPLATFORM = 0x4000000, ///< A fall-through floor in normal gravity, a platform in reverse gravity.
FF_INTANGABLEFLATS = 0x6000000, ///< Both flats are intangable, but the sides are still solid.
- FF_SHATTER = 0x8000000, ///< Used with ::FF_BUSTUP. Thinks everyone's Knuckles.
- FF_SPINBUST = 0x10000000, ///< Used with ::FF_BUSTUP. Jump or fall onto it while curled in a ball.
- FF_ONLYKNUX = 0x20000000, ///< Used with ::FF_BUSTUP. Only Knuckles can break this rock.
+ FF_SHATTER = 0x8000000, ///< Used with ::FF_BUSTUP. Bustable on mere touch.
+ FF_SPINBUST = 0x10000000, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames.
+ FF_STRONGBUST = 0x20000000, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee).
FF_RIPPLE = 0x40000000, ///< Ripple the flats
FF_COLORMAPONLY = 0x80000000, ///< Only copy the colormap, not the lightlevel
FF_GOOWATER = FF_SHATTERBOTTOM, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
diff --git a/src/r_plane.c b/src/r_plane.c
index db5fb0f249d690f70dacabaaca4e87767f7576d4..9f417ee6bff85de8aa409b6d6db677d33b2bff2f 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -44,6 +44,9 @@
// Quincunx antialiasing of flats!
//#define QUINCUNX
+// good night sweet prince
+#define SHITPLANESPARENCY
+
//SoM: 3/23/2000: Use Boom visplane hashing.
visplane_t *visplanes[MAXVISPLANES];
@@ -650,6 +653,11 @@ static void R_DrawSkyPlane(visplane_t *pl)
}
}
+//
+// R_CheckPowersOfTwo
+//
+// Self-explanatory?
+//
boolean R_CheckPowersOfTwo(void)
{
boolean wpow2 = (!(ds_flatwidth & (ds_flatwidth - 1)));
@@ -667,6 +675,11 @@ boolean R_CheckPowersOfTwo(void)
return ds_powersoftwo;
}
+//
+// R_CheckFlatLength
+//
+// Determine the flat's dimensions from the lump length.
+//
void R_CheckFlatLength(size_t size)
{
switch (size)
@@ -723,7 +736,24 @@ void R_CheckFlatLength(size_t size)
}
}
-static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean ispng)
+//
+// R_GenerateFlat
+//
+// Generate a flat from specified width and height.
+//
+static UINT8 *R_GenerateFlat(UINT16 width, UINT16 height)
+{
+ UINT8 *flat = Z_Malloc(width * height, PU_LEVEL, NULL);
+ memset(flat, TRANSPARENTPIXEL, width * height);
+ return flat;
+}
+
+//
+// R_GetTextureFlat
+//
+// Convert a texture or patch to a flat.
+//
+static UINT8 *R_GetTextureFlat(levelflat_t *levelflat, boolean leveltexture, boolean ispng)
{
UINT8 *flat;
textureflat_t *texflat = &texflats[levelflat->texturenum];
@@ -747,14 +777,14 @@ static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boole
// If the texture changed, or the patch doesn't exist, convert either of them to a flat.
if (levelflat->flatpatch == NULL || texturechanged)
{
+ // Level texture
if (leveltexture)
{
texture_t *texture = textures[levelflat->texturenum];
texflat->width = ds_flatwidth = texture->width;
texflat->height = ds_flatheight = texture->height;
- texflat->flat = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL);
- memset(texflat->flat, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
+ texflat->flat = R_GenerateFlat(ds_flatwidth, ds_flatheight);
R_TextureToFlat(levelflat->texturenum, texflat->flat);
flat = texflat->flat;
@@ -762,13 +792,14 @@ static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boole
levelflat->width = ds_flatwidth;
levelflat->height = ds_flatheight;
}
+ // Patch (never happens yet)
else
{
patch = (patch_t *)ds_source;
#ifndef NO_PNG_LUMPS
if (ispng)
{
- levelflat->flatpatch = R_PNGToFlat(levelflat, ds_source, W_LumpLength(levelflat->lumpnum));
+ levelflat->flatpatch = R_PNGToFlat(&levelflat->width, &levelflat->height, ds_source, W_LumpLength(levelflat->lumpnum));
levelflat->topoffset = levelflat->leftoffset = 0;
ds_flatwidth = levelflat->width;
ds_flatheight = levelflat->height;
@@ -782,8 +813,7 @@ static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boole
levelflat->topoffset = patch->topoffset * FRACUNIT;
levelflat->leftoffset = patch->leftoffset * FRACUNIT;
- levelflat->flatpatch = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL);
- memset(levelflat->flatpatch, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
+ levelflat->flatpatch = R_GenerateFlat(ds_flatwidth, ds_flatheight);
R_PatchToFlat(patch, levelflat->flatpatch);
}
flat = levelflat->flatpatch;
@@ -794,11 +824,11 @@ static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boole
flat = levelflat->flatpatch;
ds_flatwidth = levelflat->width;
ds_flatheight = levelflat->height;
-
- xoffs += levelflat->leftoffset;
- yoffs += levelflat->topoffset;
}
+ xoffs += levelflat->leftoffset;
+ yoffs += levelflat->topoffset;
+
levelflat->lasttexturenum = levelflat->texturenum;
return flat;
}
@@ -841,7 +871,11 @@ void R_DrawSinglePlane(visplane_t *pl)
else // Opaque, but allow transparent flat pixels
spanfunc = splatfunc;
+#ifdef SHITPLANESPARENCY
+ if ((spanfunc == splatfunc) != (pl->extra_colormap && (pl->extra_colormap->fog & 4)))
+#else
if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
+#endif
light = (pl->lightlevel >> LIGHTSEGSHIFT);
else
light = LIGHTLEVELS-1;
@@ -895,7 +929,11 @@ void R_DrawSinglePlane(visplane_t *pl)
else // Opaque, but allow transparent flat pixels
spanfunc = splatfunc;
+#ifdef SHITPLANESPARENCY
+ if ((spanfunc == splatfunc) != (pl->extra_colormap && (pl->extra_colormap->fog & 4)))
+#else
if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
+#endif
light = (pl->lightlevel >> LIGHTSEGSHIFT);
else
light = LIGHTLEVELS-1;
@@ -963,15 +1001,15 @@ void R_DrawSinglePlane(visplane_t *pl)
// Check if the flat is actually a wall texture.
if (levelflat->texturenum != 0 && levelflat->texturenum != -1)
- flat = R_GetPatchFlat(levelflat, true, false);
+ flat = R_GetTextureFlat(levelflat, true, false);
#ifndef NO_PNG_LUMPS
// Maybe it's a PNG?!
else if (R_IsLumpPNG(ds_source, size))
- flat = R_GetPatchFlat(levelflat, false, true);
+ flat = R_GetTextureFlat(levelflat, false, true);
#endif
// Maybe it's just a patch, then?
else if (R_CheckIfPatch(levelflat->lumpnum))
- flat = R_GetPatchFlat(levelflat, false, false);
+ flat = R_GetTextureFlat(levelflat, false, false);
// It's a raw flat.
else
{
@@ -1075,7 +1113,7 @@ void R_DrawSinglePlane(visplane_t *pl)
temp = P_GetZAt(pl->slope, pl->viewx, pl->viewy);
zeroheight = FIXED_TO_FLOAT(temp);
-#define ANG2RAD(angle) ((float)((angle)*M_PI)/ANGLE_180)
+#define ANG2RAD(angle) ((float)((angle)*M_PIl)/ANGLE_180)
// p is the texture origin in view space
// Don't add in the offsets at this stage, because doing so can result in
diff --git a/src/s_sound.c b/src/s_sound.c
index 299e4b88976935c271852f024d412bc70a6e635a..00576ff55f03ff6cbe065fcbe049788b518b07f0 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -117,6 +117,10 @@ consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_O
consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
+// Window focus sound sytem toggles
+consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo};
+consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo};
+
#ifdef HAVE_OPENMPT
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -278,6 +282,8 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&cv_samplerate);
CV_RegisterVar(&cv_resetmusic);
CV_RegisterVar(&cv_resetmusicbyheader);
+ CV_RegisterVar(&cv_playsoundsifunfocused);
+ CV_RegisterVar(&cv_playmusicifunfocused);
CV_RegisterVar(&cv_gamesounds);
CV_RegisterVar(&cv_gamedigimusic);
CV_RegisterVar(&cv_gamemidimusic);
@@ -373,6 +379,18 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx)
return W_GetNumForName("dsthok");
}
+//
+// Sound Status
+//
+
+boolean S_SoundDisabled(void)
+{
+ return (
+ sound_disabled ||
+ ( window_notinfocus && ! cv_playsoundsifunfocused.value )
+ );
+}
+
// Stop all sounds, load level info, THEN start sounds.
void S_StopSounds(void)
{
@@ -540,7 +558,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
mobj_t *listenmobj = players[displayplayer].mo;
mobj_t *listenmobj2 = NULL;
- if (sound_disabled || !sound_started)
+ if (S_SoundDisabled() || !sound_started)
return;
// Don't want a sound? Okay then...
@@ -730,7 +748,7 @@ dontplay:
void S_StartSound(const void *origin, sfxenum_t sfx_id)
{
- if (sound_disabled)
+ if (S_SoundDisabled())
return;
if (mariomode) // Sounds change in Mario mode!
@@ -1434,6 +1452,13 @@ boolean S_MusicPaused(void)
return I_SongPaused();
}
+boolean S_MusicNotInFocus(void)
+{
+ return (
+ ( window_notinfocus && ! cv_playmusicifunfocused.value )
+ );
+}
+
musictype_t S_MusicType(void)
{
return I_SongType();
@@ -1867,6 +1892,10 @@ static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
}
S_InitMusicVolume(); // switch between digi and sequence volume
+
+ if (S_MusicNotInFocus())
+ S_PauseAudio();
+
return true;
}
@@ -2009,6 +2038,9 @@ void S_PauseAudio(void)
void S_ResumeAudio(void)
{
+ if (S_MusicNotInFocus())
+ return;
+
if (I_SongPlaying() && I_SongPaused())
I_ResumeSong();
@@ -2202,7 +2234,7 @@ static void Command_RestartAudio_f(void)
void GameSounds_OnChange(void)
{
- if (M_CheckParm("-nosound"))
+ if (M_CheckParm("-nosound") || M_CheckParm("-noaudio"))
return;
if (sound_disabled)
@@ -2220,7 +2252,7 @@ void GameSounds_OnChange(void)
void GameDigiMusic_OnChange(void)
{
- if (M_CheckParm("-nomusic"))
+ if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return;
else if (M_CheckParm("-nodigmusic"))
return;
@@ -2262,7 +2294,7 @@ void GameDigiMusic_OnChange(void)
void GameMIDIMusic_OnChange(void)
{
- if (M_CheckParm("-nomusic"))
+ if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return;
else if (M_CheckParm("-nomidimusic"))
return;
diff --git a/src/s_sound.h b/src/s_sound.h
index 48128527ce62dd816a66608a886595a5df0b65de..20b2489a5de6fdb75f0d8467b0b2058ee27d9324 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -45,6 +45,9 @@ extern consvar_t cv_gamedigimusic;
extern consvar_t cv_gamemidimusic;
extern consvar_t cv_gamesounds;
+extern consvar_t cv_playmusicifunfocused;
+extern consvar_t cv_playsoundsifunfocused;
+
#ifdef HAVE_OPENMPT
extern consvar_t cv_modfilter;
#endif
@@ -144,6 +147,12 @@ void S_StartEx(boolean reset);
//
lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx);
+//
+// Sound Status
+//
+
+boolean S_SoundDisabled(void);
+
//
// Start sound for thing at <origin> using <sound_id> from sounds.h
//
@@ -164,6 +173,7 @@ boolean S_MIDIMusicDisabled(void);
boolean S_MusicDisabled(void);
boolean S_MusicPlaying(void);
boolean S_MusicPaused(void);
+boolean S_MusicNotInFocus(void);
musictype_t S_MusicType(void);
const char *S_MusicName(void);
boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);
diff --git a/src/screen.c b/src/screen.c
index 547036a60bf7b7624d0f4f58622df2f2d44feadf..9939aff93388dcdb816404be9b4795963fc41960 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -421,9 +421,9 @@ void SCR_DisplayTicRate(void)
else if (totaltics == TICRATE) ticcntcolor = V_GREENMAP;
V_DrawString(vid.width-(72*vid.dupx), h,
- V_YELLOWMAP|V_NOSCALESTART, "FPS:");
+ V_YELLOWMAP|V_NOSCALESTART|V_HUDTRANS, "FPS:");
V_DrawString(vid.width-(40*vid.dupx), h,
- ticcntcolor|V_NOSCALESTART, va("%02d/%02u", totaltics, TICRATE));
+ ticcntcolor|V_NOSCALESTART|V_HUDTRANS, va("%02d/%02u", totaltics, TICRATE));
lasttic = ontic;
}
diff --git a/src/screen.h b/src/screen.h
index 3554b5520a541783e3a8b66f780ed1906dd3b3d7..79f21e8e470bd4832d0c20c5d0b04c586b0635b0 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -39,13 +39,8 @@
// we try to re-allocate a minimum of buffers for stability of the memory,
// so all the small-enough tables based on screen size, are allocated once
// and for all at the maximum size.
-#if defined (_WIN32_WCE)
-#define MAXVIDWIDTH 320
-#define MAXVIDHEIGHT 200
-#else
#define MAXVIDWIDTH 1920 // don't set this too high because actually
#define MAXVIDHEIGHT 1200 // lots of tables are allocated with the MAX size.
-#endif
#define BASEVIDWIDTH 320 // NEVER CHANGE THIS! This is the original
#define BASEVIDHEIGHT 200 // resolution of the graphics.
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index f5c7e3714d17fc72ae36622c0c81c21f33d898f8..57591af104922eecc821dea8d3973545b6db7775 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -357,6 +357,14 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
return 0;
}
+static void SDLdoGrabMouse(void)
+{
+ SDL_ShowCursor(SDL_DISABLE);
+ SDL_SetWindowGrab(window, SDL_TRUE);
+ if (SDL_SetRelativeMouseMode(SDL_TRUE) == 0) // already warps mouse if successful
+ wrapmouseok = SDL_TRUE; // TODO: is wrapmouseok or HalfWarpMouse needed anymore?
+}
+
static void SDLdoUngrabMouse(void)
{
SDL_ShowCursor(SDL_ENABLE);
@@ -579,12 +587,18 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
if (cv_usemouse.value) I_StartupMouse();
}
//else firsttimeonmouse = SDL_FALSE;
+
+ if (USE_MOUSEINPUT)
+ SDLdoGrabMouse();
}
else if (!mousefocus && !kbfocus)
{
// Tell game we lost focus, pause music
window_notinfocus = true;
- S_PauseAudio();
+ if (! cv_playmusicifunfocused.value)
+ S_PauseAudio();
+ if (! cv_playsoundsifunfocused.value)
+ S_StopSounds();
if (!disable_mouse)
{
@@ -655,9 +669,7 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
// -- Monster Iestyn
if (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window)
{
- SDL_SetWindowGrab(window, SDL_TRUE);
- if (SDL_SetRelativeMouseMode(SDL_TRUE) == 0) // already warps mouse if successful
- wrapmouseok = SDL_TRUE; // TODO: is wrapmouseok or HalfWarpMouse needed anymore?
+ SDLdoGrabMouse();
}
}
}
@@ -1056,7 +1068,7 @@ void I_StartupMouse(void)
else
firsttimeonmouse = SDL_FALSE;
if (cv_usemouse.value)
- return;
+ SDLdoGrabMouse();
else
SDLdoUngrabMouse();
}
@@ -1164,8 +1176,11 @@ void I_FinishUpdate(void)
if (cv_closedcaptioning.value)
SCR_ClosedCaptions();
- if (cv_ticrate.value)
- SCR_DisplayTicRate();
+ if (st_overlay)
+ {
+ if (cv_ticrate.value)
+ SCR_DisplayTicRate();
+ }
if (rendermode == render_soft && screens[0])
{
diff --git a/src/sounds.c b/src/sounds.c
index e5dfeec8ad09c3db66d13e5ee882a57ef253b966..8dc97b1e635f302c7b45eb32c00926b3cef68600 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -715,7 +715,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"cdfm62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"cdfm62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speed boost"},
{"cdfm63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 11d05f547e0fe2a7480efba60ccb4d01ebe1982d..392cb1c03fe4d600a73f226a9d5eafd431ba4afa 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -351,7 +351,7 @@ void ST_LoadFaceGraphics(INT32 skinnum)
if (skins[skinnum].sprites[SPR2_XTRA].numframes)
{
spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_XTRA];
- spriteframe_t *sprframe = &sprdef->spriteframes[0];
+ spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_LIFEPIC];
faceprefix[skinnum] = W_CachePatchNum(sprframe->lumppat[0], PU_HUDGFX);
if (skins[skinnum].sprites[(SPR2_XTRA|FF_SPR2SUPER)].numframes)
{
diff --git a/src/v_video.c b/src/v_video.c
index 7473001147bda0d95db5bcda274f42186655a21d..34d64cb04bca5c1d33119ff767038965bf2cd665 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1074,7 +1074,7 @@ void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skin
if (skinnum >= 0 && skinnum < numskins && skins[skinnum].sprites[SPR2_XTRA].numframes >= 4)
{
spritedef_t *sprdef = &skins[skinnum].sprites[SPR2_XTRA];
- spriteframe_t *sprframe = &sprdef->spriteframes[3];
+ spriteframe_t *sprframe = &sprdef->spriteframes[XTRA_CONTINUE];
patch_t *patch = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
const UINT8 *colormap = R_GetTranslationColormap(skinnum, skincolor, GTC_CACHE);
@@ -2192,7 +2192,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
w = SHORT(hu_font[c]->width) * dupx;
if (cx > scrwidth)
- break;
+ continue;
if (cx+left + w < 0) //left boundary check
{
cx += w;
@@ -2306,7 +2306,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
w = SHORT(hu_font[c]->width) * dupx / 2;
if (cx > scrwidth)
- break;
+ continue;
if (cx+left + w < 0) //left boundary check
{
cx += w;
@@ -2411,7 +2411,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
w = (SHORT(tny_font[c]->width) * dupx);
if (cx > scrwidth)
- break;
+ continue;
if (cx+left + w < 0) //left boundary check
{
cx += w;
@@ -2509,7 +2509,7 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
w = SHORT(hu_font[c]->width) * dupx;
if ((cx>>FRACBITS) > scrwidth)
- break;
+ continue;
if ((cx>>FRACBITS)+left + w < 0) //left boundary check
{
cx += w<<FRACBITS;
@@ -2621,13 +2621,210 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
w = SHORT(cred_font[c]->width) * dupx;
if ((cx>>FRACBITS) > scrwidth)
- break;
+ continue;
V_DrawSciencePatch(cx, cy, option, cred_font[c], FRACUNIT);
cx += w<<FRACBITS;
}
}
+// Draw a string using the nt_font
+// Note that the outline is a seperate font set
+static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UINT8 *basecolormap, UINT8 *outlinecolormap, const char *string)
+{
+ fixed_t cx, cy, w;
+ INT32 c, dupx, dupy, scrwidth, left = 0;
+ const char *ch = string;
+
+ if (option & V_CENTERNAMETAG)
+ x -= FixedInt(FixedMul((V_NameTagWidth(string)/2)*FRACUNIT, scale));
+ option &= ~V_CENTERNAMETAG; // which is also shared with V_ALLOWLOWERCASE...
+
+ cx = x<<FRACBITS;
+ cy = y<<FRACBITS;
+
+ if (option & V_NOSCALESTART)
+ {
+ dupx = vid.dupx;
+ dupy = vid.dupy;
+ scrwidth = vid.width;
+ }
+ else
+ {
+ dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
+
+ for (;;ch++)
+ {
+ if (!*ch)
+ break;
+ if (*ch == '\n')
+ {
+ cx = x<<FRACBITS;
+ cy += FixedMul((21*dupy)*FRACUNIT, scale);
+ continue;
+ }
+
+ c = toupper(*ch);
+ c -= NT_FONTSTART;
+
+ // character does not exist or is a space
+ if (c < 0 || c >= NT_FONTSIZE || !ntb_font[c] || !nto_font[c])
+ {
+ cx += FixedMul((4 * dupx)*FRACUNIT, scale);
+ continue;
+ }
+
+ w = FixedMul((SHORT(ntb_font[c]->width)+2 * dupx) * FRACUNIT, scale);
+
+ if (FixedInt(cx) > scrwidth)
+ continue;
+ if (cx+(left*FRACUNIT) + w < 0) // left boundary check
+ {
+ cx += w;
+ continue;
+ }
+
+ V_DrawFixedPatch(cx, cy, scale, option, nto_font[c], outlinecolormap);
+ V_DrawFixedPatch(cx, cy, scale, option, ntb_font[c], basecolormap);
+
+ cx += w;
+ }
+}
+
+// Looks familiar.
+void V_DrawNameTag(INT32 x, INT32 y, INT32 option, fixed_t scale, UINT8 *basecolormap, UINT8 *outlinecolormap, const char *string)
+{
+ const char *text = string;
+ const char *first_token = text;
+ char *last_token = strchr(text, '\n');
+ const INT32 lbreakheight = 21;
+ INT32 ntlines;
+
+ if (option & V_CENTERNAMETAG)
+ {
+ ntlines = V_CountNameTagLines(string);
+ y -= FixedInt(FixedMul(((lbreakheight/2) * (ntlines-1))*FRACUNIT, scale));
+ }
+
+ // No line breaks?
+ // Draw entire string
+ if (!last_token)
+ V_DrawNameTagLine(x, y, option, scale, basecolormap, outlinecolormap, string);
+ // Split string by the line break character
+ else
+ {
+ char *str = NULL;
+ INT32 len;
+ while (true)
+ {
+ // There are still lines left to draw
+ if (last_token)
+ {
+ size_t shift = 0;
+ // Free this line
+ if (str)
+ Z_Free(str);
+ // Find string length, do a malloc...
+ len = (last_token-first_token)+1;
+ str = ZZ_Alloc(len);
+ // Copy the line
+ strncpy(str, first_token, len-1);
+ str[len-1] = '\0';
+ // Don't leave a line break character
+ // at the start of the string!
+ if ((strlen(str) >= 2) && (string[0] == '\n') && (string[1] != '\n'))
+ shift++;
+ // Then draw it
+ V_DrawNameTagLine(x, y, option, scale, basecolormap, outlinecolormap, str+shift);
+ }
+ // No line break character was found
+ else
+ {
+ // Don't leave a line break character
+ // at the start of the string!
+ if ((strlen(first_token) >= 2) && (first_token[0] == '\n') && (first_token[1] != '\n'))
+ first_token++;
+ // Then draw it
+ V_DrawNameTagLine(x, y, option, scale, basecolormap, outlinecolormap, first_token);
+ break;
+ }
+
+ // Next line
+ y += FixedInt(FixedMul(lbreakheight*FRACUNIT, scale));
+ if ((last_token-text)+1 >= (signed)strlen(text))
+ last_token = NULL;
+ else
+ {
+ first_token = last_token;
+ last_token = strchr(first_token+1, '\n');
+ }
+ }
+ // Free this line
+ if (str)
+ Z_Free(str);
+ }
+}
+
+// Count the amount of lines in name tag string
+INT32 V_CountNameTagLines(const char *string)
+{
+ INT32 ntlines = 1;
+ const char *text = string;
+ const char *first_token = text;
+ char *last_token = strchr(text, '\n');
+
+ // No line breaks?
+ if (!last_token)
+ return ntlines;
+ // Split string by the line break character
+ else
+ {
+ while (true)
+ {
+ if (last_token)
+ ntlines++;
+ // No line break character was found
+ else
+ break;
+
+ // Next line
+ if ((last_token-text)+1 >= (signed)strlen(text))
+ last_token = NULL;
+ else
+ {
+ first_token = last_token;
+ last_token = strchr(first_token+1, '\n');
+ }
+ }
+ }
+ return ntlines;
+}
+
+INT32 V_NameTagWidth(const char *string)
+{
+ INT32 c, w = 0;
+ size_t i;
+
+ // It's possible for string to be a null pointer
+ if (!string)
+ return 0;
+
+ for (i = 0; i < strlen(string); i++)
+ {
+ c = toupper(string[i]) - NT_FONTSTART;
+ if (c < 0 || c >= NT_FONTSIZE || !ntb_font[c] || !nto_font[c])
+ w += 4;
+ else
+ w += SHORT(ntb_font[c]->width)+2;
+ }
+
+ return w;
+}
+
// Find string width from cred_font chars
//
INT32 V_CreditStringWidth(const char *string)
@@ -2703,7 +2900,7 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
w = SHORT(lt_font[c]->width) * dupx;
if (cx > scrwidth)
- break;
+ continue;
if (cx+left + w < 0) //left boundary check
{
cx += w;
diff --git a/src/v_video.h b/src/v_video.h
index 7eb990295de7c23d35eef3ebf29a243b74081eae..01d50cd57957479dfe74700aba40212caa215996 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -112,6 +112,7 @@ extern RGBA_t *pMasterPalette;
#define V_OFFSET 0x00400000 // account for offsets in patches
#define V_ALLOWLOWERCASE 0x00800000 // (strings only) allow fonts that have lowercase letters to use them
#define V_FLIP 0x00800000 // (patches only) Horizontal flip
+#define V_CENTERNAMETAG 0x00800000 // (nametag only) center nametag lines
#define V_SNAPTOTOP 0x01000000 // for centering
#define V_SNAPTOBOTTOM 0x02000000 // for centering
@@ -205,6 +206,11 @@ INT32 V_LevelActNumWidth(INT32 num); // act number width
void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
INT32 V_CreditStringWidth(const char *string);
+// Draw a string using the nt_font
+void V_DrawNameTag(INT32 x, INT32 y, INT32 option, fixed_t scale, UINT8 *basecolormap, UINT8 *outlinecolormap, const char *string);
+INT32 V_CountNameTagLines(const char *string);
+INT32 V_NameTagWidth(const char *string);
+
// Find string width from hu_font chars
INT32 V_StringWidth(const char *string, INT32 option);
// Find string width from hu_font chars, 0.5x scale
diff --git a/src/y_inter.c b/src/y_inter.c
index 0d6a3d03cff6b9e7676838d7a7a9d93e18cbdbcc..2fed35de30cbfedbae5c930cf29a9b78a9dae2f9 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -35,6 +35,7 @@
#include "p_local.h"
#include "m_cond.h" // condition sets
+#include "lua_hook.h" // IntermissionThinker hook
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -802,6 +803,10 @@ void Y_Ticker(void)
if (paused || P_AutoPause())
return;
+#ifdef HAVE_BLUA
+ LUAh_IntermissionThinker();
+#endif
+
intertic++;
// Team scramble code for team match and CTF.
@@ -1047,6 +1052,9 @@ static void Y_UpdateRecordReplays(void)
if ((UINT16)(players[consoleplayer].rings) > mainrecords[gamemap-1]->rings)
mainrecords[gamemap-1]->rings = (UINT16)(players[consoleplayer].rings);
+ if (data.coop.gotperfbonus)
+ mainrecords[gamemap-1]->gotperfect = true;
+
// Save demo!
bestdemo[255] = '\0';
lastdemo[255] = '\0';
diff --git a/tools/flatb/Makefile b/tools/flatb/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2134973e68099497121ed8d79526e83549897163
--- /dev/null
+++ b/tools/flatb/Makefile
@@ -0,0 +1,9 @@
+.PHONY : all clean
+
+all : flatb
+
+flatb.exe : flatb.c
+ i686-w64-mingw32-gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -o $@ $<
+
+clean :
+ $(RM) flatb flatb.exe
diff --git a/tools/flatb/flatb.c b/tools/flatb/flatb.c
new file mode 100644
index 0000000000000000000000000000000000000000..edc0892324d3728da88a6aad7d98738547c8c37b
--- /dev/null
+++ b/tools/flatb/flatb.c
@@ -0,0 +1,566 @@
+#define HELP \
+"Usage: flatb WAD-file list-file" "\n"\
+"Replace flats and textures by name in a DOOM WAD." "\n"\
+"\n"\
+"list-file may have the following format:" "\n"\
+"\n"\
+"GFZFLR01 GFZFLR02" "\n"\
+"# Comment" "\n"\
+"GFZROCK GFZBLOCK" "\n"\
+"\n"\
+"The first name and second name may be delimited by any whitespace." "\n"\
+"\n"\
+"Copyright 2019 James R." "\n"\
+"All rights reserved." "\n"
+
+/*
+Copyright 2019 James R.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+
+#define cchar const char
+#define cvoid const void
+
+#define LONG int32_t
+
+#define va_inline( __ap,__last, ... )\
+(\
+ va_start (__ap,__last),\
+ __VA_ARGS__,\
+ va_end (__ap)\
+)
+
+#define DELIM "\t\n\r "
+
+typedef struct
+{
+ FILE * fp;
+ cchar * filename;
+}
+File;
+
+int (*le32)(cvoid *);
+
+void
+Pexit (int c, cchar *s, ...)
+{
+ va_list ap;
+ va_inline (ap, s,
+
+ vfprintf(stderr, s, ap)
+
+ );
+ exit(c);
+}
+
+void
+Prexit (cchar *pr, ...)
+{
+ va_list ap;
+ va_inline (ap, pr,
+
+ vfprintf(stderr, pr, ap)
+
+ );
+ perror("");
+ exit(-1);
+}
+
+void
+Fopen (File *f, cchar *filename, const char *mode)
+{
+ FILE *fp;
+ if (!( fp = fopen(filename, mode) ))
+ Prexit("%s", filename);
+ f->filename = filename;
+ f->fp = fp;
+}
+
+void
+Ferr (File *f)
+{
+ if (ferror(f->fp))
+ Prexit("%s", f->filename);
+}
+
+char *
+Fgets (File *f, int b, char *p)
+{
+ if (!( p = fgets(p, b, f->fp) ))
+ Ferr(f);
+ return p;
+}
+
+void
+Fread (File *f, int b, void *p)
+{
+ if (fread(p, 1, b, f->fp) < b)
+ Ferr(f);
+}
+
+void
+Fwrite (File *f, int b, cvoid *s)
+{
+ if (fwrite(s, 1, b, f->fp) < b)
+ Ferr(f);
+}
+
+void
+Fseek (File *f, long o)
+{
+ if (fseek(f->fp, o, SEEK_SET) == -1)
+ Prexit("%s", f->filename);
+}
+
+void *
+Malloc (int b)
+{
+ void *p;
+ if (!( p = malloc(b) ))
+ Prexit("%d", b);
+ return p;
+}
+
+void *
+Calloc (int c, int b)
+{
+ void *p;
+ if (!( p = calloc(c, b) ))
+ Prexit("(%d)%d", c, b);
+ return p;
+}
+
+void
+Reallocp (void *pp, int b)
+{
+ void *p;
+ if (!( p = realloc((*(void **)pp), b) ))
+ Prexit("%d", b);
+ (*(void **)pp) = p;
+}
+
+void
+strucpy (char *p, cchar *s, int n)
+{
+ int c;
+ int i;
+ for (i = 0; i < n && ( c = s[i] ); ++i)
+ p[i] = toupper(c);
+}
+
+int
+e32 (cvoid *s)
+{
+ unsigned int c;
+ c = *(LONG *)s;
+ return (
+ ( c >> 24 ) |
+ (( c >> 8 )& 0x00FF00 )|
+ (( c << 8 )& 0xFF0000 )|
+ ( c << 24 )
+ );
+}
+
+int
+n32 (cvoid *s)
+{
+ return *(LONG *)s;
+}
+
+void
+Ie ()
+{
+ int c;
+ c = 1;
+ if (*(char *)&c == 1)
+ le32 = n32;
+ else
+ le32 = e32;
+}
+
+File wad_file;
+File list_file;
+
+int list_c;
+char *** list_v;
+
+char * directory;
+char * lump;
+int lumpsize;
+
+char * sectors;
+int sectors_c;
+
+char * sides;
+int sides_c;
+
+int st_floors;
+int st_ceilings;
+int st_sectors;
+
+int st_sides;
+int st_uppers;
+int st_mids;
+int st_lowers;
+
+/* this is horseshit */
+char * old;
+char * new;
+int did;
+
+void
+Itable ()
+{
+ char a[1024];
+
+ char ***ttt;
+ char ***ppp;
+
+ char **pp;
+
+ int c;
+
+ while (Fgets(&list_file, sizeof a, a))
+ {
+ c = a[0];
+ if (!(
+ c == '\n' ||
+ c == '#'
+ ))
+ {
+ list_c++;
+ }
+ }
+
+ rewind(list_file.fp);
+
+ list_v = Calloc(list_c, sizeof (char **));
+ for (
+ ttt = ( ppp = list_v ) + list_c;
+ ppp < ttt;
+ ++ppp
+ )
+ {
+ (*ppp) = pp = Calloc(2, sizeof (char *));
+ pp[0] = Malloc(9);
+ pp[1] = Malloc(9);
+ }
+}
+
+void
+Iwad ()
+{
+ char buf[12];
+
+ char * t;
+ char * p;
+ int map;
+
+ char *sector_p;
+ char * side_p;
+
+ int n;
+ int h;
+
+ Fread(&wad_file, 12, buf);
+ if (
+ memcmp(buf, "IWAD", 4) != 0 &&
+ memcmp(buf, "PWAD", 4) != 0
+ )
+ {
+ Pexit(-1,"%s: Not a WAD\n", wad_file.filename);
+ }
+
+ Fseek(&wad_file, (*le32)(&buf[8]));
+
+ n = (*le32)(&buf[4]) * 8;
+ h = n / 9;
+ n *= 2;
+ directory = Malloc(n);
+ /* minimum number of lumps for a map */
+ sectors = Malloc(h);
+ sides = Malloc(h);
+
+ Fread(&wad_file, n, directory);
+
+ sector_p = sectors;
+ side_p = sides;
+ map = 3;
+ for (t = ( p = directory ) + n; p < t; p += 16)
+ {
+ /* looking for SECTORS? Hopefully order doesn't matter in real world. */
+ /* also search for fucking SIDES MY SIDES AAAAAAAAAA */
+ switch (map)
+ {
+ case 0:
+ case 2:
+ if (strncmp(&p[8], "SECTORS", 8) == 0)
+ {
+ /* copy file offset and size */
+ memcpy(sector_p, p, 8);
+ sector_p += 8;
+ sectors_c++;
+ map |= 1;
+ }
+ case 1:
+ if (strncmp(&p[8], "SIDEDEFS", 8) == 0)
+ {
+ memcpy(side_p, p, 8);
+ side_p += 8;
+ sides_c++;
+ map |= 2;
+ }
+ }
+ if (map == 3)
+ {
+ /* MAP marker */
+ if (p[13] == '\0' && strncmp(&p[8], "MAP", 3) == 0)
+ map = 0;
+ }
+ }
+}
+
+void
+Fuckyou (char *p, int f, int *st)
+{
+ if (strncmp(p, old, 8) == 0)
+ {
+ strncpy(p, new, 8);
+ (*st)++;
+ did |= f;
+ }
+}
+
+void
+Epic (char *p, char *t)
+{
+ char *top;
+ char *bot;
+ int i;
+ /* oh hi magic number! */
+ for (; p < t; p += 26)
+ {
+ bot = &p [4];
+ top = &p[12];
+ did = 0;
+ for (i = 0; i < list_c; ++i)
+ {
+ old = list_v[i][0];
+ new = list_v[i][1];
+ switch (did)
+ {
+ case 0:
+ case 2:
+ Fuckyou(bot, 1, &st_floors);
+ case 1:
+ Fuckyou(top, 2, &st_ceilings);
+ }
+ if (did == 3)
+ break;
+ }
+ if (did)
+ st_sectors++;
+ }
+}
+
+void
+Epic2 (char *p, char *t)
+{
+ char *top;
+ char *mid;
+ char *bot;
+ int i;
+ for (; p < t; p += 30)
+ {
+ top = &p [4];
+ bot = &p[12];
+ mid = &p[20];
+ did = 0;
+ for (i = 0; i < list_c; ++i)
+ {
+ old = list_v[i][0];
+ new = list_v[i][1];
+ switch (did)
+ {
+ case 0:
+ case 2:
+ case 4:
+ case 6:
+ Fuckyou(top, 1, &st_uppers);
+ case 1:
+ case 5:
+ Fuckyou(mid, 2, &st_mids);
+ case 3:
+ Fuckyou(bot, 4, &st_lowers);
+ }
+ if (did == 7)
+ break;
+ }
+ if (did)
+ st_sides++;
+ }
+}
+
+void
+Fuck (char *p, int c, void (*fn)(char *,char *))
+{
+ char *t;
+ int offs;
+ int size;
+ for (t = p + c * 8; p < t; p += 8)
+ {
+ offs = (*le32)(p);
+ size = (*le32)(p + 4);
+ if (lumpsize < size)
+ {
+ Reallocp(&lump, size);
+ lumpsize = size;
+ }
+ Fseek(&wad_file, offs);
+ Fread(&wad_file, size, lump);
+ (*fn)(lump, lump + size);
+ Fseek(&wad_file, offs);
+ Fwrite(&wad_file, size, lump);
+ }
+}
+
+void
+Awad ()
+{
+ Fuck (sectors, sectors_c, Epic);
+ Fuck (sides, sides_c, Epic2);
+}
+
+void
+Readtable ()
+{
+ char a[1024];
+
+ int s;
+ char *old;
+ char *new;
+
+ int c;
+
+ s = 0;
+
+ while (Fgets(&list_file, sizeof a, a))
+ {
+ c = a[0];
+ if (!(
+ c == '\n' ||
+ c == '#'
+ ))
+ {
+ if (
+ ( old = strtok(a, DELIM) ) &&
+ ( new = strtok(0, DELIM) )
+ )
+ {
+ strucpy(list_v[s][0], old, 8);
+ strucpy(list_v[s][1], new, 8);
+ ++s;
+ }
+ }
+ }
+}
+
+void
+Cleanup ()
+{
+ char ***ttt;
+ char ***ppp;
+
+ char **pp;
+
+ free(lump);
+ free(sides);
+ free(sectors);
+ free(directory);
+
+ if (list_v)
+ {
+ for (
+ ttt = ( ppp = list_v ) + list_c;
+ ppp < ttt && ( pp = (*ppp) );
+ ++ppp
+ )
+ {
+ free(pp[0]);
+ free(pp[1]);
+ free(pp);
+ }
+ free(list_v);
+ }
+}
+
+int
+main (int ac, char **av)
+{
+ int n;
+
+ if (ac < 3)
+ Pexit(0,HELP);
+
+ Fopen (& wad_file, av[1], "rb+");
+ Fopen (&list_file, av[2], "r");
+
+ if (atexit(Cleanup) != 0)
+ Pexit(-1,"Failed to register cleanup function.\n");
+
+ Itable();
+ Readtable();
+
+ Ie();
+
+ Iwad();
+ Awad();
+
+ printf(
+ "%5d sectors changed.\n"
+ "%5d floors.\n"
+ "%5d ceilings.\n"
+ "\n"
+ "%5d sides.\n"
+ "%5d upper textures.\n"
+ "%5d mid textures.\n"
+ "%5d lower textures.\n",
+
+ st_sectors,
+
+ st_floors,
+ st_ceilings,
+
+ st_sides,
+
+ st_uppers,
+ st_mids,
+ st_lowers);
+
+ return 0;
+}