diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index ecf96f2f053cf2ca8e3cb135b34cfc7e2dccd0c0..77f8e6a5595908f5df0717af563039114f3387cf 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index df8487f2349dff45ba10a48198b669c1e81d892f..0c2a92e5ab4bebc9ce420f88e88ffb5d4cf285f2 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1568,8 +1568,6 @@ static void CL_LoadReceivedSavegame(void)
automapactive = false;
// load a base level
- playerdeadview = false;
-
if (P_LoadNetGame())
{
const INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
diff --git a/src/d_main.c b/src/d_main.c
index df33987525d1520278c094f717309625c58327f2..f807e3070c71051383089b9d052d2a5d2ad53385 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -720,7 +720,6 @@ void D_StartTitle(void)
maptol = 0;
gameaction = ga_nothing;
- playerdeadview = false;
displayplayer = consoleplayer = 0;
//demosequence = -1;
gametype = GT_COOP;
diff --git a/src/d_main.h b/src/d_main.h
index 6dc273b1558d8ac6329a15100946dc889095eebf..d73b19d1f6e5fd34ab5fd0470a5c762379c6fd8b 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -34,7 +34,7 @@ void D_SRB2Loop(void) FUNCNORETURN;
// D_SRB2Main()
// Not a globally visible function, just included for source reference,
// calls all startup code, parses command line options.
-// If not overrided by user input, calls N_AdvanceDemo.
+// If not overrided by user input, calls D_AdvanceDemo.
//
void D_SRB2Main(void);
@@ -51,9 +51,6 @@ const char *D_Home(void);
//
// BASE LEVEL
//
-void D_PageTicker(void);
-// pagename is lumpname of a 320x200 patch to fill the screen
-void D_PageDrawer(const char *pagename);
void D_AdvanceDemo(void);
void D_StartTitle(void);
diff --git a/src/d_net.c b/src/d_net.c
index 643c41ac921507e6a76613348fa90d859a2e1daa..8de5cf088aaf6b2d6c17d5fc9d9f51ff5c5c0b69 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -49,7 +49,9 @@ doomcom_t *doomcom = NULL;
/// \brief network packet data, points inside doomcom
doomdata_t *netbuffer = NULL;
+#ifdef DEBUGFILE
FILE *debugfile = NULL; // put some net info in a file during the game
+#endif
#define MAXREBOUND 8
static doomdata_t reboundstore[MAXREBOUND];
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index d8fae72f798ff874e17d630628f3e269a37fe7a3..023bbd094d2daff0a23db6c80a2ad28e91c9eeec 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -212,7 +212,6 @@ void Command_ExitGame_f(void);
void Command_Retry_f(void);
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect);
-void ObjectPlace_OnChange(void);
void ItemFinder_OnChange(void);
void D_SetPassword(const char *pw);
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index 88fc807f408cb4f285086fdabd854658b83063ad..ec6f4412fc51860b568740ad7f359a5c9868abd1 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -165,9 +165,11 @@ INT32 I_StartSound ( sfxenum_t id,
INT32 vol,
INT32 sep,
INT32 pitch,
- INT32 priority )
+ INT32 priority,
+ INT32 channel)
{
int voice;
+ (void)channel;
if (nosound)
return 0;
diff --git a/src/doomstat.h b/src/doomstat.h
index 8072a15528f56a23727da9a6d7b32bcf86db4166..341cc70a961b340fd2c7322df498b8bf4bd9ee20 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -445,19 +445,17 @@ extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
#if defined (macintosh)
#define DEBFILE(msg) I_OutputMsg(msg)
-extern FILE *debugfile;
#else
#define DEBUGFILE
#ifdef DEBUGFILE
#define DEBFILE(msg) { if (debugfile) { fputs(msg, debugfile); fflush(debugfile); } }
-extern FILE *debugfile;
#else
#define DEBFILE(msg) {}
-extern FILE *debugfile;
#endif
#endif
#ifdef DEBUGFILE
+extern FILE *debugfile;
extern INT32 debugload;
#endif
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index 51dbb610d13657ab567bfd8314ea53dc6ba40350..143da186c1ba07428cce37caebdb96ad7664118c 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -23,13 +23,14 @@ void I_UpdateSound(void){};
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
diff --git a/src/f_finale.c b/src/f_finale.c
index a8b27bb807499f44b2855526f33e119a8cf1db4f..fb1387c11e1a31b147ba93b7b9d3fdfefd126668 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -442,7 +442,6 @@ void F_StartIntro(void)
G_SetGamestate(GS_INTRO);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1130,7 +1129,6 @@ void F_StartCredits(void)
}
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1277,7 +1275,6 @@ void F_StartGameEvaluation(void)
G_SaveGame((UINT32)cursaveslot);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1388,7 +1385,6 @@ void F_StartGameEnd(void)
G_SetGamestate(GS_GAMEEND);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1591,7 +1587,6 @@ void F_StartContinue(void)
gameaction = ga_nothing;
keypressed = false;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1760,7 +1755,6 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset
G_SetGamestate(GS_CUTSCENE);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
diff --git a/src/g_game.c b/src/g_game.c
index 4f1c49b428bdb7165146518e5387f8496b44bfc1..0e8c14f6a86928cd705209016e35751f2eef95da 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3616,7 +3616,6 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
mapmusflags |= MUSIC_RELOADRESET;
ultimatemode = pultmode;
- playerdeadview = false;
automapactive = false;
imcontinuing = false;
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 17eb8761c9650eea7ca4b87d6dc157a3dd078979..a32609fc80ebb1e0316f1c1f6d2dd5897a00c707 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -564,8 +564,6 @@ static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
subsector_t *sub;
seg_t *lseg;
- sscount++;
-
sub = &subsectors[num];
count = sub->numlines;
lseg = &segs[sub->firstline];
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 871a6a493743844946313162170ad78e5fa5a3b7..ecb70a0f9bea7099d6298ea19ac456589d63ce8c 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3264,7 +3264,6 @@ static void HWR_Subsector(size_t num)
if (num < numsubsectors)
{
- sscount++;
// subsector
sub = &subsectors[num];
// sector
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 7b22f33f189b5a602ca043862b21ca2e8cc0d678..5356ba8acd40e3a765b9fc7e099f3f849d73c7df 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -78,9 +78,6 @@ extern boolean chat_on;
// set true whenever the tab rankings are being shown for any reason
extern boolean hu_showscores;
-// P_DeathThink sets this true to show scores while dead, in multiplayer
-extern boolean playerdeadview;
-
// init heads up data at game startup.
void HU_Init(void);
diff --git a/src/i_sound.h b/src/i_sound.h
index 084479ee1860485b23537983653b067e7b2d0094..098c9be176c56d87fb35eefd00acd32bcf2dec68 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -64,7 +64,7 @@ void I_ShutdownSound(void);
\return sfx handle
*/
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
/** \brief Stops a sound channel.
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 2540665ad57e8f901f315238ad74d9c352e01878..e2af700953deabdde06e0419afaa81409c7afdf6 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -492,7 +492,9 @@ static void GIF_framewrite(void)
// screen regions are handled in GIF_lzw
{
- UINT16 delay = 3; // todo
+ int d1 = (int)((100.0/NEWTICRATE)*(gif_frames+1));
+ int d2 = (int)((100.0/NEWTICRATE)*(gif_frames));
+ UINT16 delay = d1-d2;
INT32 startline;
WRITEMEM(p, gifframe_gchead, 4);
diff --git a/src/nds/i_sound.c b/src/nds/i_sound.c
index 8dea4ad7d494ae78eba6eeefd9a6e0a3e5109184..a17c7f66a24a746e68e78147dc943fd0892c093b 100644
--- a/src/nds/i_sound.c
+++ b/src/nds/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
diff --git a/src/p_local.h b/src/p_local.h
index 1fd7ada04219b928fe1619e2398fb4fef5ba500a..b82bcf0ecfab5c930b7416d6ed92ddca8fe7516a 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -68,7 +68,6 @@
// both the head and tail of the thinker list
extern thinker_t thinkercap;
-extern INT32 runcount;
void P_InitThinkers(void);
void P_AddThinker(thinker_t *thinker);
diff --git a/src/p_user.c b/src/p_user.c
index 91b5feb8585a96bc04413f62dbc56e0aeea4d637..11d610a899ece63703c620e3d127a519ff026e83 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8654,8 +8654,6 @@ void P_DoPityCheck(player_t *player)
// P_PlayerThink
//
-boolean playerdeadview; // show match/chaos/tag/capture the flag rankings while in death view
-
void P_PlayerThink(player_t *player)
{
ticcmd_t *cmd;
@@ -8844,10 +8842,6 @@ void P_PlayerThink(player_t *player)
if (player->playerstate == PST_DEAD)
{
player->mo->flags2 &= ~MF2_SHADOW;
- // show the multiplayer rankings while dead
- if (player == &players[displayplayer])
- playerdeadview = true;
-
P_DeathThink(player);
return;
@@ -8868,9 +8862,6 @@ void P_PlayerThink(player_t *player)
player->lives = cv_startinglives.value;
}
- if (player == &players[displayplayer])
- playerdeadview = false;
-
if ((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE)
{
cmd->buttons &= BT_USE; // Remove all buttons except BT_USE
diff --git a/src/r_main.c b/src/r_main.c
index f2a0c8894223dbda55bc5b69632cf6f694018d7f..d1cd71b3fdc80f7b7eb3a46648010d9287aeabfb 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -60,7 +60,6 @@ fixed_t projectiony; // aspect ratio
// just for profiling purposes
size_t framecount;
-size_t sscount;
size_t loopcount;
fixed_t viewx, viewy, viewz;
@@ -492,9 +491,6 @@ static void R_InitTextureMapping(void)
// Take out the fencepost cases from viewangletox.
for (i = 0; i < FINEANGLES/2; i++)
{
- t = FixedMul(FINETANGENT(i), focallength);
- t = centerx - t;
-
if (viewangletox[i] == -1)
viewangletox[i] = 0;
else if (viewangletox[i] == viewwidth+1)
@@ -964,8 +960,6 @@ void R_SkyboxFrame(player_t *player)
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
- sscount = 0;
-
// recalc necessary stuff for mouseaiming
// slopes are already calculated for the full possible view (which is 4*viewheight).
@@ -1089,8 +1083,6 @@ void R_SetupFrame(player_t *player, boolean skybox)
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
- sscount = 0;
-
// recalc necessary stuff for mouseaiming
// slopes are already calculated for the full possible view (which is 4*viewheight).
diff --git a/src/r_state.h b/src/r_state.h
index 49d0457b262c767621dde508f85f3a481a9feb3d..ac3e1fa42576a050c4edfdf177b560defc08eead 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -108,7 +108,4 @@ extern angle_t rw_normalangle;
// angle to line origin
extern angle_t rw_angle1;
-// Segs count?
-extern size_t sscount;
-
#endif
diff --git a/src/s_sound.c b/src/s_sound.c
index 76ee4c649242a19e1a65be0188165db313d41ab4..3b35b36f6a32a731e37ad542b770ee740d89e172 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -529,7 +529,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
// Assigns the handle to one of the channels in the
// mix/output buffer.
- channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+ channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
}
dontplay:
@@ -579,7 +579,7 @@ dontplay:
// Assigns the handle to one of the channels in the
// mix/output buffer.
- channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+ channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
}
void S_StartSound(const void *origin, sfxenum_t sfx_id)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index cfdb32303e9c8e415ba2b523ae9280cb565eda77..4b4ad3e6272eac2c75721e0ba24adce670630911 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -419,10 +419,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->lumpnum = LUMPERROR;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
- INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+ INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
Mix_Volume(handle, volume);
Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
(void)pitch; // Mixer can't handle pitch
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 6c70c163b0c041c8c4dec78656e38ec3126f2176..a7c8383a338188426e8deb3b7fd90953934c1d72 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -604,10 +604,11 @@ void I_FreeSfx(sfxinfo_t * sfx)
// Pitching (that is, increased speed of playback)
// is set, but currently not used by mixing.
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)priority;
(void)pitch;
+ (void)channel;
if (nosound)
return 0;
diff --git a/src/sdl12/mixer_sound.c b/src/sdl12/mixer_sound.c
index 542a6716989793b0b3452a9825ef190ea95e585b..daf09ab911eb940208e3ff65655344769c396468 100644
--- a/src/sdl12/mixer_sound.c
+++ b/src/sdl12/mixer_sound.c
@@ -376,10 +376,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->data = NULL;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
- INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+ INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
Mix_Volume(handle, volume);
Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
(void)pitch; // Mixer can't handle pitch
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index 6ba83104ee81033a0f9bb4935ecf25adfda1115e..01a27153e8c2941607ca8b206d2e02023a50119d 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -621,10 +621,11 @@ void I_FreeSfx(sfxinfo_t * sfx)
// Pitching (that is, increased speed of playback)
// is set, but currently not used by mixing.
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)priority;
(void)pitch;
+ (void)channel;
if (nosound)
return 0;
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 58644457a0b909df3b700e181ef8a4fadff3d111..e50a4737e8b81a220fb2b36664da2cc40693492d 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -353,12 +353,13 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->data = NULL;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
FMOD_SOUND *sound;
FMOD_CHANNEL *chan;
INT32 i;
float frequency;
+ (void)channel;
sound = (FMOD_SOUND *)S_sfx[id].data;
I_Assert(sound != NULL);
diff --git a/src/win32ce/win_snd.c b/src/win32ce/win_snd.c
index f9c6521786717c45fabd620a54a500295e82a708..14ce4add4dd42f0b42d42d1f82122acbf35cc211 100644
--- a/src/win32ce/win_snd.c
+++ b/src/win32ce/win_snd.c
@@ -538,7 +538,8 @@ INT32 I_StartSound (sfxenum_t id,
INT32 vol,
INT32 sep,
INT32 pitch,
- INT32 priority)
+ INT32 priority,
+ INT32 channel)
{
HRESULT hr;
LPDIRECTSOUNDBUFFER dsbuffer;
@@ -549,6 +550,7 @@ INT32 I_StartSound (sfxenum_t id,
#ifdef SURROUND
LPDIRECTSOUNDBUFFER dssurround;
#endif
+ (void)channel;
if (nosound)
return -1;