diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 36d13fc145ccf7ccc63e4847b5f72bdfb28bf15f..6e22dde239b1e4e1097119d289a08e4ef422a5a1 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -401,8 +401,7 @@ static void ExtraDataTicker(void)
DEBFILE(va("player %d kicked [gametic=%u] reason as follows:\n", i, gametic));
}
CONS_Alert(CONS_WARNING, M_GetText("Got unknown net command [%s]=%d (max %d)\n"), sizeu1(curpos - bufferstart), *curpos, bufferstart[0]);
- D_FreeTextcmd(gametic);
- return;
+ break;
}
}
}
@@ -3308,7 +3307,7 @@ void SV_StopServer(void)
localtextcmd[0] = 0;
localtextcmd2[0] = 0;
- for (i = 0; i < BACKUPTICS; i++)
+ for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
D_Clearticcmd(i);
consoleplayer = 0;
diff --git a/src/d_main.c b/src/d_main.c
index fbec5f7d8d35fcaf4adb0cb02052013098ee00a3..df33987525d1520278c094f717309625c58327f2 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1051,15 +1051,6 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm());
- else
- {
- size_t z;
- char junkpw[25];
- for (z = 0; z < 24; z++)
- junkpw[z] = (char)(rand() & 64)+32;
- junkpw[24] = '\0';
- D_SetPassword(junkpw);
- }
// add any files specified on the command line with -file wadfile
// to the wad list
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 673d64fd82e754386e1cc87eeca569b2763e3c08..727d5eff47b6b90e5b5175021693d032527b75f5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2656,10 +2656,12 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
#define BASESALT "basepasswordstorage"
static UINT8 adminpassmd5[16];
+static boolean adminpasswordset = false;
void D_SetPassword(const char *pw)
{
D_MD5PasswordPass((const UINT8 *)pw, strlen(pw), BASESALT, &adminpassmd5);
+ adminpasswordset = true;
}
// Remote Administration
@@ -2728,6 +2730,12 @@ static void Got_Login(UINT8 **cp, INT32 playernum)
READMEM(*cp, sentmd5, 16);
+ if (!adminpasswordset)
+ {
+ CONS_Printf(M_GetText("Password from %s failed (no password set).\n"), player_names[playernum]);
+ return;
+ }
+
if (client)
return;
@@ -3951,7 +3959,7 @@ static void Command_RestartAudio_f(void)
I_ShutdownSound();
I_StartupSound();
I_InitMusic();
-
+
// These must be called or no sound and music until manually set.
I_SetSfxVolume(cv_soundvolume.value);
@@ -3959,7 +3967,7 @@ static void Command_RestartAudio_f(void)
I_SetMIDIMusicVolume(cv_midimusicvolume.value);
if (Playing()) // Gotta make sure the player is in a level
P_RestoreMusic(&players[consoleplayer]);
-
+
}
/** Quits a game and returns to the title screen.
diff --git a/src/f_finale.c b/src/f_finale.c
index 958bef0f6687d32dbbfb89a4d7faa2bbea33d60e..a8b27bb807499f44b2855526f33e119a8cf1db4f 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -977,7 +977,6 @@ static const char *credits[] = {
"\1Programming",
"Alam \"GBC\" Arias",
"Logan \"GBA\" Arias",
- "Colette \"fickle\" Bordelon",
"Callum Dickinson",
"Scott \"Graue\" Feeney",
"Nathan \"Jazz\" Giroux",
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index a5fe6b67322595d4ca69cb5badefaa3f123ec0e2..d7c73415ab2de8d431d422a86f03f5bb4f398239 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -2182,27 +2182,34 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
else if (drawtextured)
{
-#ifdef ESLOPE // P.S. this is better-organized than the old version
- fixed_t offs = sides[(newline ? newline : rover->master)->sidenum[0]].rowoffset;
- grTex = HWR_GetTexture(texnum);
-
- wallVerts[3].t = (*rover->topheight - h + offs) * grTex->scaleY;
- wallVerts[2].t = (*rover->topheight - hS + offs) * grTex->scaleY;
- wallVerts[0].t = (*rover->topheight - l + offs) * grTex->scaleY;
- wallVerts[1].t = (*rover->topheight - lS + offs) * grTex->scaleY;
-#else
- grTex = HWR_GetTexture(texnum);
+ fixed_t texturevpeg;
+ // Wow, how was this missing from OpenGL for so long?
+ // ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
+ // -- Monster Iestyn 26/06/18
if (newline)
{
- wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset) * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset)) * grTex->scaleY;
+ texturevpeg = sides[newline->sidenum[0]].rowoffset;
+ if (newline->flags & ML_DONTPEGBOTTOM)
+ texturevpeg -= *rover->topheight - *rover->bottomheight;
}
else
{
- wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * grTex->scaleY;
+ texturevpeg = sides[rover->master->sidenum[0]].rowoffset;
+ if (gr_linedef->flags & ML_DONTPEGBOTTOM)
+ texturevpeg -= *rover->topheight - *rover->bottomheight;
}
+
+ grTex = HWR_GetTexture(texnum);
+
+#ifdef ESLOPE
+ wallVerts[3].t = (*rover->topheight - h + texturevpeg) * grTex->scaleY;
+ wallVerts[2].t = (*rover->topheight - hS + texturevpeg) * grTex->scaleY;
+ wallVerts[0].t = (*rover->topheight - l + texturevpeg) * grTex->scaleY;
+ wallVerts[1].t = (*rover->topheight - lS + texturevpeg) * grTex->scaleY;
+#else
+ wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + texturevpeg) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (*rover->topheight - l + texturevpeg) * grTex->scaleY;
#endif
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
@@ -3941,7 +3948,7 @@ static void HWR_DrawSpriteShadow(gr_vissprite_t *spr, GLPatch_t *gpatch, float t
angle_t shadowdir;
// Set direction
- if (splitscreen && stplyr != &players[displayplayer])
+ if (splitscreen && stplyr == &players[secondarydisplayplayer])
shadowdir = localangle2 + FixedAngle(cv_cam2_rotate.value);
else
shadowdir = localangle + FixedAngle(cv_cam_rotate.value);
@@ -5302,7 +5309,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
}
heightsec = thing->subsector->sector->heightsec;
- phs = players[displayplayer].mo->subsector->sector->heightsec;
+ if (viewplayer->mo && viewplayer->mo->subsector)
+ phs = viewplayer->mo->subsector->sector->heightsec;
+ else
+ phs = -1;
if (heightsec != -1 && phs != -1) // only clip things which are in special sectors
{
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index f59c1d4fcca7b41fc671a0724f3b0c2a0abeedb5..756d5a09821b052fe93668be33d04189af4fdc39 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -33,6 +33,7 @@
#include "hw_drv.h"
#include "hw_light.h"
#include "hw_md2.h"
+#include "../d_main.h"
#include "../r_bsp.h"
#include "../r_main.h"
#include "../m_misc.h"
@@ -67,6 +68,10 @@
#endif
#endif
+#ifndef errno
+#include "errno.h"
+#endif
+
#define NUMVERTEXNORMALS 162
float avertexnormals[NUMVERTEXNORMALS][3] = {
{-0.525731f, 0.000000f, 0.850651f},
@@ -288,7 +293,8 @@ static md2_model_t *md2_readModel(const char *filename)
if (model == NULL)
return 0;
- file = fopen(filename, "rb");
+ //Filename checking fixed ~Monster Iestyn and Golden
+ file = fopen(va("%s"PATHSEP"%s", srb2home, filename), "rb");
if (!file)
{
free(model);
@@ -477,7 +483,8 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
#endif
#endif
png_FILE_p png_FILE;
- char *pngfilename = va("md2/%s", filename);
+ //Filename checking fixed ~Monster Iestyn and Golden
+ char *pngfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename);
FIL_ForceExtension(pngfilename, ".png");
png_FILE = fopen(pngfilename, "rb");
@@ -605,7 +612,8 @@ static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
size_t pw, ph, size, ptr = 0;
INT32 ch, rep;
FILE *file;
- char *pcxfilename = va("md2/%s", filename);
+ //Filename checking fixed ~Monster Iestyn and Golden
+ char *pcxfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename);
FIL_ForceExtension(pcxfilename, ".pcx");
file = fopen(pcxfilename, "rb");
@@ -795,11 +803,12 @@ void HWR_InitMD2(void)
}
// read the md2.dat file
- f = fopen("md2.dat", "rt");
+ //Filename checking fixed ~Monster Iestyn and Golden
+ f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f)
{
- CONS_Printf("%s", M_GetText("Error while loading md2.dat\n"));
+ CONS_Printf("%s %s\n", M_GetText("Error while loading md2.dat:"), strerror(errno));
nomd2s = true;
return;
}
@@ -861,7 +870,8 @@ void HWR_AddPlayerMD2(int skin) // For MD2's that were added after startup
CONS_Printf("AddPlayerMD2()...\n");
// read the md2.dat file
- f = fopen("md2.dat", "rt");
+ //Filename checking fixed ~Monster Iestyn and Golden
+ f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f)
{
@@ -906,7 +916,8 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
return;
// Read the md2.dat file
- f = fopen("md2.dat", "rt");
+ //Filename checking fixed ~Monster Iestyn and Golden
+ f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f)
{
@@ -1347,7 +1358,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
frame = (spr->mobj->frame & FF_FRAMEMASK) % md2->model->header.numFrames;
buff = md2->model->glCommandBuffer;
curr = &md2->model->frames[frame];
- if (cv_grmd2.value == 1)
+ if (cv_grmd2.value == 1 && tics <= durs)
{
// frames are handled differently for states with FF_ANIMATE, so get the next frame differently for the interpolation
if (spr->mobj->frame & FF_ANIMATE)
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 566e73748e1baf088aa212e6ae7ebefc423500de..3239b7c5ea4016296b48c921bb893d1e82e4c86d 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -77,7 +77,9 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
deny:
//must be hacked/buggy client
- lua_settop(gL, 0); // clear stack
+ if (gL) // check if Lua is actually turned on first, you dummmy -- Monster Iestyn 04/07/18
+ lua_settop(gL, 0); // clear stack
+
CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
if (server)
{
diff --git a/src/m_menu.c b/src/m_menu.c
index 0ab771579c288f4f7453826d3a2e649409ececac..79ac6800b7cf18a7fb7df362f37dc5329f150e4a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6543,7 +6543,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
if (choice < 32 || choice > 127 || itemOn != 0)
break;
l = strlen(setupm_name);
- if (l < MAXPLAYERNAME-1)
+ if (l < MAXPLAYERNAME)
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_name[l] =(char)choice;
diff --git a/src/m_misc.c b/src/m_misc.c
index 041899a3b77060ac6868494a11f3a25a39748376..5c4e7f2f943c0e0e33d1d147d66c5d4659430e8b 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -56,7 +56,9 @@ typedef off_t off64_t;
#endif
#endif
-#if defined (_WIN32)
+#if defined(__MINGW32__) && ((__GNUC__ > 7) || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3))
+#define PRIdS "u"
+#elif defined (_WIN32)
#define PRIdS "Iu"
#elif defined (_PSP) || defined (_arch_dreamcast) || defined (DJGPP) || defined (_WII) || defined (_NDS) || defined (_PS3)
#define PRIdS "u"