diff --git a/src/Makefile b/src/Makefile
index 322e67bfe5bd87abc1bc6bd911cd3ea3a0d9e136..f2d532cd5e9b75e3b559ff02747ad5b7652c5d9d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,4 @@
+
# GNU Make makefile for SRB2
#############################################################################
# Copyright (C) 1998-2000 by DooM Legacy Team.
@@ -357,7 +358,8 @@ endif
ifdef PROFILEMODE
# build with profiling information
- CFLAGS:=-pg $(CFLAGS)
+ CFLAGS+=-pg
+ LDFLAGS+=-pg
endif
ifdef ZDEBUG
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 834b0a327d6533fb21c6d0210ef98e3695d34801..11e6000380bce776af7bd0fb4b1efd5050b7e4da 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -395,8 +395,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;
}
}
}
@@ -3326,7 +3325,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 a5e1a025424dd43ade761e52627e21ea382a84aa..f252e759257640fde93797eb79b2ac7afa467557 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1032,15 +1032,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 e0117815577b26a28b7df2d511823f181a6c481a..7c9d42940ce492b0073747a61abc6ec13d10ceaa 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2725,10 +2725,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
@@ -2797,6 +2799,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;
@@ -4066,7 +4074,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);
@@ -4074,7 +4082,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 db62ddf0924d2fcd389f356a3290b6aa667a51c3..b64766ff68ac1974bd1b514703141d175f8f9e7d 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -987,7 +987,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 f23209379809603634a36cb5aa2c0efa65b5dc6d..119be6b4601f962c4e7a69cc1dca64c91f656f1b 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -2115,27 +2115,34 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
}
else
{
-#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;
@@ -4072,7 +4079,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);
@@ -5480,7 +5487,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/lua_consolelib.c b/src/lua_consolelib.c
index c82c39b4606c4425e2b425d7deece121c568ed7c..d576efb9ab9bc23c7976bfebf3b6dae4b5041f5e 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -85,7 +85,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 a866dac1b95a8ac5fff4b45ba9d324fc5ea02cac..b10ec38ab86b8fe581d05023420451ffdd967ba5 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8829,7 +8829,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
break;
S_StartSound(NULL,sfx_menu1); // Tails
l = strlen(setupm_name);
- if (l < MAXPLAYERNAME-1)
+ if (l < MAXPLAYERNAME)
{
setupm_name[l] = (char)choice;
setupm_name[l+1] = 0;
diff --git a/src/m_misc.c b/src/m_misc.c
index bf637f7c3fcb65ea8b1879872d2f1bdd6724d893..50b6d7a05cb93434d5b0f679c35ce679889b461b 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 (DJGPP)
#define PRIdS "u"
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 71832459182305a2bed1cf1e9e94446508fb8dd0..a82335f6cc1219d658bc847ff2c8f94c30bbe4c2 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -66,6 +66,7 @@ static boolean midimode;
static Mix_Music *music;
static UINT8 music_volume, midi_volume, sfx_volume;
static float loop_point;
+static boolean songpaused;
#ifdef HAVE_LIBGME
static Music_Emu *gme;
@@ -102,6 +103,7 @@ void I_StartupSound(void)
}
sound_started = true;
+ songpaused = false;
Mix_AllocateChannels(256);
}
@@ -450,7 +452,7 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
(void)udata;
// no gme? no music.
- if (!gme || gme_track_ended(gme))
+ if (!gme || gme_track_ended(gme) || songpaused)
return;
// play gme into stream
@@ -458,7 +460,7 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
// apply volume to stream
for (i = 0, p = (short *)stream; i < len/2; i++, p++)
- *p = ((INT32)*p) * music_volume / 31;
+ *p = ((INT32)*p) * music_volume*2 / 42;
}
#endif
@@ -476,12 +478,14 @@ void I_PauseSong(INT32 handle)
{
(void)handle;
Mix_PauseMusic();
+ songpaused = true;
}
void I_ResumeSong(INT32 handle)
{
(void)handle;
Mix_ResumeMusic();
+ songpaused = false;
}
//