Clang-tidy: misc-unused-parameters

Source/DiabloUI/selgame.cpp

@@ -366,7 +366,7 @@ void selgame_Speed_Select(int value)
 	selgame_Password_Init(0);
 }
 
-void selgame_Password_Init(int value)
+void selgame_Password_Init(int /*value*/)
 {
 	memset(&selgame_Password, 0, sizeof(selgame_Password));
 
@@ -424,7 +424,7 @@ static bool IsGameCompatible(GameData *data)
 	return false;
 }
 
-void selgame_Password_Select(int value)
+void selgame_Password_Select(int /*value*/)
 {
 	if (selgame_selectedGame != 0) {
 		strcpy(sgOptions.Network.szPreviousHost, selgame_Ip);

Source/DiabloUI/selhero.cpp

@@ -322,7 +322,7 @@ void SelheroClassSelectorEsc()
 	SelheroListEsc();
 }
 
-void SelheroNameSelect(int value)
+void SelheroNameSelect(int /*value*/)
 {
 
 	if (!UiValidPlayerName(selhero_heroInfo.name)) {

Source/DiabloUI/selok.cpp

@@ -35,7 +35,7 @@ void selok_Free()
 	vecSelOkDialog.clear();
 }
 
-void selok_Select(int value)
+void selok_Select(int /*value*/)
 {
 	selok_endMenu = true;
 }

Source/capture.cpp

@@ -174,7 +174,7 @@ void CaptureScreen()
 	PaletteGetEntries(256, palette);
 	RedPalette();
 
-	lock_buf(2);
+	lock_buf();
 	const CelOutputBuffer &buf = GlobalBackBuffer();
 	success = CaptureHdr(buf.w(), buf.h(), outStream);
 	if (success) {
@@ -183,7 +183,7 @@ void CaptureScreen()
 	if (success) {
 		success = CapturePal(palette, outStream);
 	}
-	unlock_buf(2);
+	unlock_buf();
 	outStream->close();
 
 	if (!success) {

Source/diablo.cpp

@@ -1201,7 +1201,7 @@ static void GetMousePos(int32_t lParam)
 	MousePosition = { (short)(lParam & 0xffff), (short)((lParam >> 16) & 0xffff) };
 }
 
-void DisableInputWndProc(uint32_t uMsg, int32_t wParam, int32_t lParam)
+void DisableInputWndProc(uint32_t uMsg, int32_t /*wParam*/, int32_t lParam)
 {
 	switch (uMsg) {
 	case DVL_WM_KEYDOWN:

Source/dthread.cpp

@@ -19,7 +19,7 @@ event_emul *sghWorkToDoEvent;
 /* rdata */
 static SDL_Thread *sghThread = nullptr;
 
-static unsigned int dthread_handler(void *data)
+static unsigned int dthread_handler(void * /*data*/)
 {
 	const char *error_buf;
 	TMegaPkt *pkt;

Source/dvlnet/abstract_net.h

@@ -38,8 +38,7 @@ public:
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func)
 	    = 0;
-	virtual bool SNetUnregisterEventHandler(event_type evtype,
-	    SEVTHANDLER func)
+	virtual bool SNetUnregisterEventHandler(event_type evtype)
 	    = 0;
 	virtual bool SNetLeaveGame(int type) = 0;
 	virtual bool SNetDropPlayer(int playerid, DWORD flags) = 0;

Source/dvlnet/base.cpp

@@ -201,7 +201,7 @@ void base::SNetGetProviderCaps(struct _SNETCAPS *caps)
 	                                 // of turns in queue?
 }
 
-bool base::SNetUnregisterEventHandler(event_type evtype, SEVTHANDLER func)
+bool base::SNetUnregisterEventHandler(event_type evtype)
 {
 	registered_handlers.erase(evtype);
 	return true;

Source/dvlnet/base.h

@@ -25,8 +25,7 @@ public:
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func);
-	virtual bool SNetUnregisterEventHandler(event_type evtype,
-	    SEVTHANDLER func);
+	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
 	virtual bool SNetDropPlayer(int playerid, DWORD flags);
 	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);

Source/dvlnet/cdwrap.h

@@ -32,8 +32,7 @@ public:
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func);
-	virtual bool SNetUnregisterEventHandler(event_type evtype,
-	    SEVTHANDLER func);
+	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
 	virtual bool SNetDropPlayer(int playerid, DWORD flags);
 	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);
@@ -115,11 +114,11 @@ void cdwrap<T>::SNetGetProviderCaps(struct _SNETCAPS *caps)
 }
 
 template <class T>
-bool cdwrap<T>::SNetUnregisterEventHandler(event_type evtype, SEVTHANDLER func)
+bool cdwrap<T>::SNetUnregisterEventHandler(event_type evtype)
 {
 	registered_handlers.erase(evtype);
 	if (dvlnet_wrap)
-		return dvlnet_wrap->SNetUnregisterEventHandler(evtype, func);
+		return dvlnet_wrap->SNetUnregisterEventHandler(evtype);
 	else
 		return true;
 }

Source/dvlnet/loopback.cpp

@@ -5,12 +5,12 @@
 namespace devilution {
 namespace net {
 
-int loopback::create(std::string addrstr, std::string passwd)
+int loopback::create(std::string /*addrstr*/, std::string /*passwd*/)
 {
 	return plr_single;
 }
 
-int loopback::join(std::string addrstr, std::string passwd)
+int loopback::join(std::string /*addrstr*/, std::string /*passwd*/)
 {
 	ABORT();
 }
@@ -37,7 +37,7 @@ bool loopback::SNetSendMessage(int dest, void *data, unsigned int size)
 	return true;
 }
 
-bool loopback::SNetReceiveTurns(char **data, unsigned int *size, DWORD *status)
+bool loopback::SNetReceiveTurns(char **data, unsigned int *size, DWORD * /*status*/)
 {
 	for (auto i = 0; i < MAX_PLRS; ++i) {
 		size[i] = 0;
@@ -46,7 +46,7 @@ bool loopback::SNetReceiveTurns(char **data, unsigned int *size, DWORD *status)
 	return true;
 }
 
-bool loopback::SNetSendTurn(char *data, unsigned int size)
+bool loopback::SNetSendTurn(char * /*data*/, unsigned int /*size*/)
 {
 	return true;
 }
@@ -65,28 +65,27 @@ void loopback::SNetGetProviderCaps(struct _SNETCAPS *caps)
 	                                 // of turns in queue?
 }
 
-bool loopback::SNetRegisterEventHandler(event_type evtype,
-    SEVTHANDLER func)
+bool loopback::SNetRegisterEventHandler(event_type /*evtype*/,
+    SEVTHANDLER /*func*/)
 {
 	// not called in real singleplayer mode
 	// not needed in pseudo multiplayer mode (?)
 	return true;
 }
 
-bool loopback::SNetUnregisterEventHandler(event_type evtype,
-    SEVTHANDLER func)
+bool loopback::SNetUnregisterEventHandler(event_type /*evtype*/)
 {
 	// not called in real singleplayer mode
 	// not needed in pseudo multiplayer mode (?)
 	return true;
 }
 
-bool loopback::SNetLeaveGame(int type)
+bool loopback::SNetLeaveGame(int /*type*/)
 {
 	return true;
 }
 
-bool loopback::SNetDropPlayer(int playerid, DWORD flags)
+bool loopback::SNetDropPlayer(int /*playerid*/, DWORD /*flags*/)
 {
 	return true;
 }

Source/dvlnet/loopback.h

@@ -30,8 +30,7 @@ public:
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func);
-	virtual bool SNetUnregisterEventHandler(event_type evtype,
-	    SEVTHANDLER func);
+	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
 	virtual bool SNetDropPlayer(int playerid, DWORD flags);
 	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);

Source/dx.cpp

@@ -132,7 +132,7 @@ static void lock_buf_priv()
 	sgdwLockCount++;
 }
 
-void lock_buf(BYTE idx)
+void lock_buf()
 {
 #ifdef _DEBUG
 	++locktbl[idx];
@@ -149,7 +149,7 @@ static void unlock_buf_priv()
 	sgMemCrit.Leave();
 }
 
-void unlock_buf(BYTE idx)
+void unlock_buf()
 {
 #ifdef _DEBUG
 	if (locktbl[idx] == 0)

Source/dx.h

@@ -15,8 +15,8 @@ extern bool RenderDirectlyToOutputSurface;
 CelOutputBuffer GlobalBackBuffer();
 
 void dx_init();
-void lock_buf(BYTE idx);
-void unlock_buf(BYTE idx);
+void lock_buf();
+void unlock_buf();
 void dx_cleanup();
 void dx_reinit();
 void InitPalette();

Source/effects.cpp

@@ -1101,7 +1101,7 @@ static void stream_play(TSFX *pSFX, int lVolume, int lPan)
 			lVolume = VOLUME_MAX;
 		if (pSFX->pSnd == nullptr)
 			pSFX->pSnd = sound_file_load(pSFX->pszName, AllowStreaming);
-		pSFX->pSnd->DSB.Play(lVolume, sound_get_or_set_sound_volume(1), lPan, 0);
+		pSFX->pSnd->DSB.Play(lVolume, sound_get_or_set_sound_volume(1), lPan);
 		sgpStreamSFX = pSFX;
 	}
 }
@@ -1137,7 +1137,7 @@ void FreeMonsterSnd()
 {
 	for (int i = 0; i < nummtypes; i++) {
 		for (auto &variants : Monsters[i].Snds) {
-			for (auto & snd : variants) {
+			for (auto &snd : variants) {
 				snd = nullptr;
 			}
 		}

Source/engine/render/cel_render.cpp

@@ -303,8 +303,7 @@ std::uint8_t *RenderCelOutlinePixels(
 template <bool SkipColorIndexZero, bool North, bool West, bool South, bool East,
     bool ClipWidth = false, bool CheckFirstColumn = false, bool CheckLastColumn = false>
 const byte *RenderCelOutlineRowClipped( // NOLINT(readability-function-cognitive-complexity,misc-no-recursion)
-    const CelOutputBuffer &out, Point position, const byte *src, int srcWidth,
-    ClipX clipX, std::uint8_t color)
+    const CelOutputBuffer &out, Point position, const byte *src, ClipX clipX, std::uint8_t color)
 {
 	std::int_fast16_t remainingWidth = clipX.width;
 	std::uint8_t v;
@@ -373,7 +372,7 @@ void RenderCelOutlineClippedY(const CelOutputBuffer &out, Point position, const
 	if (position.y == dstHeight) {
 		// After-bottom line - can only draw north.
 		src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/false, /*South=*/false, /*East=*/false>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 		--position.y;
 	}
 	if (src == srcEnd)
@@ -382,13 +381,13 @@ void RenderCelOutlineClippedY(const CelOutputBuffer &out, Point position, const
 	if (position.y + 1 == dstHeight) {
 		// Bottom line - cannot draw south.
 		src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/false, /*East=*/true>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 		--position.y;
 	}
 
 	while (position.y > 0 && src != srcEnd) {
 		src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/true, /*East=*/true>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 		--position.y;
 	}
 	if (src == srcEnd)
@@ -396,7 +395,7 @@ void RenderCelOutlineClippedY(const CelOutputBuffer &out, Point position, const
 
 	if (position.y == 0) {
 		src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/true, /*South=*/true, /*East=*/true>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 		--position.y;
 	}
 	if (src == srcEnd)
@@ -405,7 +404,7 @@ void RenderCelOutlineClippedY(const CelOutputBuffer &out, Point position, const
 	if (position.y == -1) {
 		// Special case: the top of the sprite is 1px below the last line, render just the outline above.
 		RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/false, /*South=*/true, /*East=*/false>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 	}
 }
 
@@ -438,7 +437,7 @@ void RenderCelOutlineClippedXY(const CelOutputBuffer &out, Point position, const
 		// After-bottom line - can only draw north.
 		src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/false, /*South=*/false, /*East=*/false,
 		    /*ClipWidth=*/true>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 		--position.y;
 	}
 	if (src == srcEnd)
@@ -449,15 +448,15 @@ void RenderCelOutlineClippedXY(const CelOutputBuffer &out, Point position, const
 		if (position.x <= 0) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/false, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/true, /*CheckLastColumn=*/false>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		} else if (position.x + clipX.width >= out.w()) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/false, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/false, /*CheckLastColumn=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		} else {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/false, /*East=*/true,
 			    /*ClipWidth=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		}
 		--position.y;
 	}
@@ -466,21 +465,21 @@ void RenderCelOutlineClippedXY(const CelOutputBuffer &out, Point position, const
 		while (position.y > 0 && src != srcEnd) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/true, /*CheckLastColumn=*/false>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 			--position.y;
 		}
 	} else if (position.x + clipX.width >= out.w()) {
 		while (position.y > 0 && src != srcEnd) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/false, /*CheckLastColumn=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 			--position.y;
 		}
 	} else {
 		while (position.y > 0 && src != srcEnd) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/true, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 			--position.y;
 		}
 	}
@@ -491,15 +490,15 @@ void RenderCelOutlineClippedXY(const CelOutputBuffer &out, Point position, const
 		if (position.x <= 0) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/true, /*CheckLastColumn=*/false>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		} else if (position.x + clipX.width >= out.w()) {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true, /*CheckFirstColumn=*/false, /*CheckLastColumn=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		} else {
 			src = RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/true, /*South=*/true, /*East=*/true,
 			    /*ClipWidth=*/true>(
-			    out, position, src, srcWidth, clipX, color);
+			    out, position, src, clipX, color);
 		}
 		--position.y;
 	}
@@ -510,7 +509,7 @@ void RenderCelOutlineClippedXY(const CelOutputBuffer &out, Point position, const
 		// Special case: the top of the sprite is 1px below the last line, render just the outline above.
 		RenderCelOutlineRowClipped<SkipColorIndexZero, /*North=*/false, /*West=*/false, /*South=*/true, /*East=*/false,
 		    /*ClipWidth=*/true>(
-		    out, position, src, srcWidth, clipX, color);
+		    out, position, src, clipX, color);
 	}
 }
 

Source/engine/render/dun_render.cpp

@@ -559,7 +559,7 @@ DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineBlended(std::uint8_t *dst, co
 }
 
 template <LightType Light>
-DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineStippled(std::uint8_t *dst, const std::uint8_t *src, std::uint_fast8_t n, const std::uint8_t *tbl, std::uint32_t mask)
+DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLineStippled(std::uint8_t *dst, const std::uint8_t *src, const std::uint8_t *tbl, std::uint32_t mask)
 {
 	if (Light == LightType::FullyDark) {
 		ForEachSetBit(mask, [=](int i) { dst[i] = 0; });
@@ -592,7 +592,7 @@ DVL_ALWAYS_INLINE DVL_ATTRIBUTE_HOT void RenderLine(std::uint8_t *dst, const std
 		} else if (Transparency == TransparencyType::Blended) {
 			RenderLineBlended<Light>(dst, src, n, tbl, mask);
 		} else {
-			RenderLineStippled<Light>(dst, src, n, tbl, mask);
+			RenderLineStippled<Light>(dst, src, tbl, mask);
 		}
 	}
 }

Source/gamemenu.cpp

@@ -90,12 +90,12 @@ void gamemenu_update_multi()
 	gmenu_enable(&sgMultiMenu[2], deathflag);
 }
 
-void gamemenu_previous(bool bActivate)
+void gamemenu_previous(bool /*bActivate*/)
 {
 	gamemenu_on();
 }
 
-void gamemenu_new_game(bool bActivate)
+void gamemenu_new_game(bool /*bActivate*/)
 {
 	for (auto &player : plr) {
 		player._pmode = PM_QUIT;
@@ -110,7 +110,7 @@ void gamemenu_new_game(bool bActivate)
 	gamemenu_off();
 }
 
-void gamemenu_restart_town(bool bActivate)
+void gamemenu_restart_town(bool /*bActivate*/)
 {
 	NetSendCmd(true, CMD_RETOWN);
 }
@@ -179,7 +179,7 @@ int gamemenu_slider_gamma()
 	return gmenu_slider_get(&sgOptionsMenu[2], 30, 100);
 }
 
-void gamemenu_options(bool bActivate)
+void gamemenu_options(bool /*bActivate*/)
 {
 	gamemenu_get_music();
 	gamemenu_get_sound();
@@ -307,7 +307,7 @@ void gamemenu_quit_game(bool bActivate)
 	gbRunGameResult = false;
 }
 
-void gamemenu_load_game(bool bActivate)
+void gamemenu_load_game(bool /*bActivate*/)
 {
 	WNDPROC saveProc = SetWindowProc(DisableInputWndProc);
 	gamemenu_off();
@@ -329,7 +329,7 @@ void gamemenu_load_game(bool bActivate)
 	SetWindowProc(saveProc);
 }
 
-void gamemenu_save_game(bool bActivate)
+void gamemenu_save_game(bool /*bActivate*/)
 {
 	if (pcurs != CURSOR_HAND) {
 		return;

Source/interfac.cpp

@@ -168,7 +168,7 @@ static void InitCutscene(interface_mode uMsg)
 
 static void DrawCutscene()
 {
-	lock_buf(1);
+	lock_buf();
 	const CelOutputBuffer &out = GlobalBackBuffer();
 	DrawArt(out, PANEL_X - (ArtCutsceneWidescreen.w() - PANEL_WIDTH) / 2, UI_OFFSET_Y, &ArtCutsceneWidescreen);
 	CelDrawTo(out, { PANEL_X, 480 - 1 + UI_OFFSET_Y }, *sgpBackCel, 1);
@@ -181,7 +181,7 @@ static void DrawCutscene()
 	    ProgressHeight);
 	SDL_FillRect(out.surface, &rect, BarColor[progress_id]);
 
-	unlock_buf(1);
+	unlock_buf();
 
 	BltFast(&rect, &rect);
 	RenderPresent();

Source/missiles.cpp

@@ -1213,7 +1213,7 @@ void InitMissiles()
 	myPlayer.wReflections = 0;
 }
 
-void AddHiveExplosion(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddHiveExplosion(int mi, Point /*src*/, Point /*dst*/, int midir, int8_t mienemy, int id, int dam)
 {
 	for (int x : { 80, 81 }) {
 		for (int y : { 62, 63 }) {
@@ -1247,7 +1247,7 @@ static bool missiles_found_target(int mi, Point *position, int rad)
 	return false;
 }
 
-void AddFireRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFireRune(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (LineClearMissile(src, dst)) {
 		if (id >= 0)
@@ -1264,7 +1264,7 @@ void AddFireRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	}
 }
 
-void AddLightningRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightningRune(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (LineClearMissile(src, dst)) {
 		if (id >= 0)
@@ -1281,7 +1281,7 @@ void AddLightningRune(int mi, Point src, Point dst, int midir, int8_t mienemy, i
 	}
 }
 
-void AddGreatLightningRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddGreatLightningRune(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (LineClearMissile(src, dst)) {
 		if (id >= 0)
@@ -1298,7 +1298,7 @@ void AddGreatLightningRune(int mi, Point src, Point dst, int midir, int8_t miene
 	}
 }
 
-void AddImmolationRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddImmolationRune(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (LineClearMissile(src, dst)) {
 		if (id >= 0)
@@ -1315,7 +1315,7 @@ void AddImmolationRune(int mi, Point src, Point dst, int midir, int8_t mienemy,
 	}
 }
 
-void AddStoneRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddStoneRune(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (LineClearMissile(src, dst)) {
 		if (id >= 0)
@@ -1332,7 +1332,7 @@ void AddStoneRune(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	}
 }
 
-void AddReflection(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddReflection(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (id >= 0) {
 		int lvl = 2;
@@ -1348,7 +1348,7 @@ void AddReflection(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	missile[mi]._miDelFlag = false;
 }
 
-void AddBerserk(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBerserk(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._mirange = 0;
 	missile[mi]._miDelFlag = true;
@@ -1396,7 +1396,7 @@ void AddBerserk(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	}
 }
 
-void AddHorkSpawn(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddHorkSpawn(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	GetMissileVel(mi, src, dst, 8);
 	missile[mi]._mirange = 9;
@@ -1404,7 +1404,7 @@ void AddHorkSpawn(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	PutMissile(mi);
 }
 
-void AddJester(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddJester(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int spell;
 
@@ -1445,7 +1445,7 @@ void AddJester(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._mirange = 0;
 }
 
-void AddStealPotions(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddStealPotions(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._misource = id;
 	for (int i = 0; i < 3; i++) {
@@ -1520,7 +1520,7 @@ void AddStealPotions(int mi, Point src, Point dst, int midir, int8_t mienemy, in
 	missile[mi]._miDelFlag = true;
 }
 
-void AddManaTrap(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddManaTrap(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._misource = id;
 	for (int i = 0; i < 3; i++) {
@@ -1548,7 +1548,7 @@ void AddManaTrap(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	missile[mi]._miDelFlag = true;
 }
 
-void AddSpecArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddSpecArrow(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	int av = 0;
 
@@ -1576,7 +1576,7 @@ void AddSpecArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._miVar3 = av;
 }
 
-void AddWarp(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddWarp(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	int minDistanceSq = std::numeric_limits<int>::max();
 	if (id >= 0) {
@@ -1608,7 +1608,7 @@ void AddWarp(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 		UseMana(id, SPL_WARP);
 }
 
-void AddLightningWall(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightningWall(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int dam)
 {
 	GetMissileVel(mi, src, dst, 16);
 	missile[mi]._midam = dam;
@@ -1623,7 +1623,7 @@ void AddLightningWall(int mi, Point src, Point dst, int midir, int8_t mienemy, i
 	}
 }
 
-void AddRuneExplosion(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRuneExplosion(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	if (mienemy == TARGET_MONSTERS || mienemy == TARGET_BOTH) {
 		int dmg = 2 * (plr[id]._pLevel + GenerateRndSum(10, 2)) + 4;
@@ -1641,7 +1641,7 @@ void AddRuneExplosion(int mi, Point src, Point dst, int midir, int8_t mienemy, i
 	missile[mi]._mirange = missile[mi]._miAnimLen - 1;
 }
 
-void AddImmolation(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddImmolation(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1668,7 +1668,7 @@ void AddImmolation(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	missile[mi]._mlid = AddLight(src, 8);
 }
 
-void AddFireNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFireNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int /*id*/, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1688,7 +1688,7 @@ void AddFireNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	missile[mi]._mlid = AddLight(src, 8);
 }
 
-void AddLightningArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightningArrow(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1706,7 +1706,7 @@ void AddLightningArrow(int mi, Point src, Point dst, int midir, int8_t mienemy,
 	missile[mi]._midam <<= 6;
 }
 
-void AddMana(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddMana(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	auto &player = plr[id];
 
@@ -1732,7 +1732,7 @@ void AddMana(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	drawmanaflag = true;
 }
 
-void AddMagi(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddMagi(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	auto &player = plr[id];
 
@@ -1743,7 +1743,7 @@ void AddMagi(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	drawmanaflag = true;
 }
 
-void AddRing(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRing(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	if (mienemy == TARGET_MONSTERS)
@@ -1760,7 +1760,7 @@ void AddRing(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	missile[mi]._mirange = 7;
 }
 
-void AddSearch(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddSearch(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	int i, mx, r1, r2;
 	MissileStruct *mis;
@@ -1798,7 +1798,7 @@ void AddSearch(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	}
 }
 
-void AddCboltArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddCboltArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int /*id*/, int /*dam*/)
 {
 	missile[mi]._mirnd = GenerateRnd(15) + 1;
 	if (mienemy != TARGET_MONSTERS) {
@@ -1817,7 +1817,7 @@ void AddCboltArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	missile[mi]._mirange = 256;
 }
 
-void AddLArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1853,7 +1853,7 @@ void AddLArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._mlid = AddLight(src, 5);
 }
 
-void AddArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1905,7 +1905,7 @@ void GetVileMissPos(int mi, Point dst)
 	missile[mi].position.tile = dst;
 }
 
-void AddRndTeleport(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRndTeleport(int mi, Point src, Point dst, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	int pn, r1, r2, nTries;
 
@@ -1948,7 +1948,7 @@ void AddRndTeleport(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	}
 }
 
-void AddFirebolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id, int dam)
+void AddFirebolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -1977,7 +1977,7 @@ void AddFirebolt(int mi, Point src, Point dst, int midir, int8_t micaster, int i
 	missile[mi]._mlid = AddLight(src, 8);
 }
 
-void AddMagmaball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddMagmaball(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	GetMissileVel(mi, src, dst, 16);
 	missile[mi].position.traveled.x += 3 * missile[mi].position.velocity.x;
@@ -1992,7 +1992,7 @@ void AddMagmaball(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._mlid = AddLight(src, 8);
 }
 
-void AddKrull(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddKrull(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	GetMissileVel(mi, src, dst, 16);
 	missile[mi]._mirange = 256;
@@ -2001,7 +2001,7 @@ void AddKrull(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	PutMissile(mi);
 }
 
-void AddTeleport(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddTeleport(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int i, pn, k, j, tx, ty;
 
@@ -2031,7 +2031,7 @@ void AddTeleport(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	}
 }
 
-void AddLightball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightball(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int dam)
 {
 	GetMissileVel(mi, src, dst, 16);
 	missile[mi]._midam = dam;
@@ -2046,7 +2046,7 @@ void AddLightball(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	}
 }
 
-void AddFirewall(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFirewall(int mi, Point src, Point dst, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi]._midam = GenerateRndSum(10, 2) + 2;
 	missile[mi]._midam += id >= 0 ? plr[id]._pLevel : currlevel; // BUGFIX: missing parenthesis around ternary (fixed)
@@ -2065,7 +2065,7 @@ void AddFirewall(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	missile[mi]._miVar2 = 0;
 }
 
-void AddFireball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFireball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2090,7 +2090,7 @@ void AddFireball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	missile[mi]._mlid = AddLight(src, 8);
 }
 
-void AddLightctrl(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightctrl(int mi, Point src, Point dst, int /*midir*/, int8_t mienemy, int id, int dam)
 {
 	if (dam == 0 && mienemy == TARGET_MONSTERS)
 		UseMana(id, SPL_LIGHTNING);
@@ -2101,7 +2101,7 @@ void AddLightctrl(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._mirange = 256;
 }
 
-void AddLightning(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddLightning(int mi, Point /*src*/, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi].position.start = dst;
 	if (midir >= 0) {
@@ -2121,7 +2121,7 @@ void AddLightning(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._mlid = AddLight(missile[mi].position.tile, 4);
 }
 
-void AddMisexp(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddMisexp(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	if (mienemy != 0 && id > 0) {
 		switch (monster[id].MType->mtype) {
@@ -2151,7 +2151,7 @@ void AddMisexp(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._miVar1 = 0;
 }
 
-void AddWeapexp(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddWeapexp(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	missile[mi].position.tile = src;
 	missile[mi].position.start = src;
@@ -2175,7 +2175,7 @@ bool CheckIfTrig(Point position)
 	return false;
 }
 
-void AddTown(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddTown(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int i, j, k, mx, tx, ty, dp;
 
@@ -2226,7 +2226,7 @@ void AddTown(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	}
 }
 
-void AddFlash(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFlash(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	if (id != -1) {
 		if (mienemy == TARGET_MONSTERS) {
@@ -2243,7 +2243,7 @@ void AddFlash(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	missile[mi]._mirange = 19;
 }
 
-void AddFlash2(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFlash2(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	if (mienemy == TARGET_MONSTERS) {
 		if (id != -1) {
@@ -2258,7 +2258,7 @@ void AddFlash2(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._mirange = 19;
 }
 
-void AddManashield(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddManashield(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi]._mirange = 48 * plr[id]._pLevel;
 	if (mienemy == TARGET_MONSTERS)
@@ -2268,7 +2268,7 @@ void AddManashield(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	plr[id].pManaShield = true;
 }
 
-void AddFiremove(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFiremove(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._midam = GenerateRnd(10) + plr[id]._pLevel + 1;
 	GetMissileVel(mi, src, dst, 16);
@@ -2280,7 +2280,7 @@ void AddFiremove(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	missile[mi].position.offset.y -= 32;
 }
 
-void AddGuardian(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddGuardian(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int pn, k, j, tx, ty;
 
@@ -2329,7 +2329,7 @@ void AddGuardian(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	}
 }
 
-void AddChain(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddChain(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miVar1 = dst.x;
 	missile[mi]._miVar2 = dst.y;
@@ -2337,7 +2337,7 @@ void AddChain(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	UseMana(id, SPL_CHAIN);
 }
 
-void AddBloodStar(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBloodStar(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	SetMissDir(mi, dst.x);
 	missile[mi]._midam = 0;
@@ -2345,7 +2345,7 @@ void AddBloodStar(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._mirange = 250;
 }
 
-void AddBone(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBone(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	if (dst.x > 3)
 		dst.x = 2;
@@ -2355,7 +2355,7 @@ void AddBone(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	missile[mi]._mirange = 250;
 }
 
-void AddMetlHit(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddMetlHit(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	if (dst.x > 3)
 		dst.x = 2;
@@ -2385,7 +2385,7 @@ void InitMissileAnimationFromMonster(MissileStruct &mis, int midir, const Monste
 }
 } // namespace
 
-void AddRhino(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRhino(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int graphic = MA_SPECIAL;
 	if (monster[id].MType->mtype < MT_HORNED || monster[id].MType->mtype > MT_OBLORD) {
@@ -2406,7 +2406,7 @@ void AddRhino(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	PutMissile(mi);
 }
 
-void AddFireman(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFireman(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	GetMissileVel(mi, src, dst, 16);
 	auto &mon = monster[id];
@@ -2417,7 +2417,7 @@ void AddFireman(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	PutMissile(mi);
 }
 
-void AddFlare(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFlare(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2448,7 +2448,7 @@ void AddFlare(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	}
 }
 
-void AddAcid(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddAcid(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	GetMissileVel(mi, src, dst, 16);
 	SetMissDir(mi, GetDirection16(src, dst));
@@ -2462,7 +2462,7 @@ void AddAcid(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	PutMissile(mi);
 }
 
-void AddFireWallA(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFireWallA(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int dam)
 {
 	missile[mi]._midam = dam;
 	missile[mi].position.velocity = { 0, 0 };
@@ -2471,7 +2471,7 @@ void AddFireWallA(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._miVar2 = 0;
 }
 
-void AddAcidpud(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddAcidpud(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	int monst;
 
@@ -2483,7 +2483,7 @@ void AddAcidpud(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._miPreFlag = true;
 }
 
-void AddStone(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddStone(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int i, j, k, l, tx, ty, mid;
 
@@ -2527,7 +2527,7 @@ void AddStone(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	}
 }
 
-void AddGolem(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddGolem(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int i;
 	int mx;
@@ -2551,7 +2551,7 @@ void AddGolem(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	UseMana(id, SPL_GOLEM);
 }
 
-void AddEtherealize(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddEtherealize(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	auto &player = plr[id];
 
@@ -2565,12 +2565,12 @@ void AddEtherealize(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 		UseMana(id, SPL_ETHEREALIZE);
 }
 
-void AddDummy(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddDummy(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 }
 
-void AddBlodbur(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBlodbur(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int dam)
 {
 	missile[mi]._midam = dam;
 	missile[mi].position.tile = src;
@@ -2584,7 +2584,7 @@ void AddBlodbur(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._mirange = missile[mi]._miAnimLen;
 }
 
-void AddBoom(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBoom(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int dam)
 {
 	missile[mi].position.tile = dst;
 	missile[mi].position.start = dst;
@@ -2594,7 +2594,7 @@ void AddBoom(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	missile[mi]._miVar1 = 0;
 }
 
-void AddHeal(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddHeal(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	auto &player = plr[id];
 
@@ -2620,7 +2620,7 @@ void AddHeal(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	drawhpflag = true;
 }
 
-void AddHealOther(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddHealOther(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_HEALOTHER);
@@ -2631,7 +2631,7 @@ void AddHealOther(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	}
 }
 
-void AddElement(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddElement(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2654,7 +2654,7 @@ void AddElement(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 
 extern void FocusOnInventory();
 
-void AddIdentify(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddIdentify(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_IDENTIFY);
@@ -2670,7 +2670,7 @@ void AddIdentify(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	}
 }
 
-void AddFirewallC(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFirewallC(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	int i, j, k, tx, ty, pn;
 
@@ -2709,7 +2709,7 @@ void AddFirewallC(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	}
 }
 
-void AddInfra(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddInfra(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi]._mirange = ScaleSpellEffect(1584, missile[mi]._mispllvl);
 	missile[mi]._mirange += missile[mi]._mirange * plr[id]._pISplDur / 128;
@@ -2718,7 +2718,7 @@ void AddInfra(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 		UseMana(id, SPL_INFRA);
 }
 
-void AddWave(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddWave(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miVar1 = dst.x;
 	missile[mi]._miVar2 = dst.y;
@@ -2729,7 +2729,7 @@ void AddWave(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	UseMana(id, SPL_WAVE);
 }
 
-void AddNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddNova(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t mienemy, int id, int /*dam*/)
 {
 	missile[mi]._miVar1 = dst.x;
 	missile[mi]._miVar2 = dst.y;
@@ -2747,7 +2747,7 @@ void AddNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, in
 	missile[mi]._mirange = 1;
 }
 
-void AddBlodboil(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBlodboil(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	auto &player = plr[id];
 
@@ -2769,7 +2769,7 @@ void AddBlodboil(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	player.Say(HeroSpeech::Aaaaargh);
 }
 
-void AddRepair(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRepair(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_REPAIR);
@@ -2785,7 +2785,7 @@ void AddRepair(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	}
 }
 
-void AddRecharge(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRecharge(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_RECHARGE);
@@ -2801,7 +2801,7 @@ void AddRecharge(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
 	}
 }
 
-void AddDisarm(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddDisarm(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_DISARM);
@@ -2816,7 +2816,7 @@ void AddDisarm(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	}
 }
 
-void AddApoca(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddApoca(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miVar1 = 8;
 	missile[mi]._miVar2 = src.y - missile[mi]._miVar1;
@@ -2859,7 +2859,7 @@ void AddFlame(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
 	}
 }
 
-void AddFlamec(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddFlamec(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2874,7 +2874,7 @@ void AddFlamec(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	missile[mi]._mirange = 256;
 }
 
-void AddCbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id, int dam)
+void AddCbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id, int /*dam*/)
 {
 	assert((DWORD)mi < MAXMISSILES);
 
@@ -2894,7 +2894,7 @@ void AddCbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id,
 	missile[mi]._mirange = 256;
 }
 
-void AddHbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id, int dam)
+void AddHbolt(int mi, Point src, Point dst, int midir, int8_t /*micaster*/, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2915,7 +2915,7 @@ void AddHbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id,
 	UseMana(id, SPL_HBOLT);
 }
 
-void AddResurrect(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddResurrect(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	UseMana(id, SPL_RESURRECT);
 	if (id == myplr) {
@@ -2926,7 +2926,7 @@ void AddResurrect(int mi, Point src, Point dst, int midir, int8_t mienemy, int i
 	missile[mi]._miDelFlag = true;
 }
 
-void AddResurrectBeam(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddResurrectBeam(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	missile[mi].position.tile = dst;
 	missile[mi].position.start = missile[mi].position.tile;
@@ -2934,7 +2934,7 @@ void AddResurrectBeam(int mi, Point src, Point dst, int midir, int8_t mienemy, i
 	missile[mi]._mirange = misfiledata[MFILE_RESSUR1].mAnimLen[0];
 }
 
-void AddTelekinesis(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddTelekinesis(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
 {
 	missile[mi]._miDelFlag = true;
 	UseMana(id, SPL_TELEKINESIS);
@@ -2942,7 +2942,7 @@ void AddTelekinesis(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 		NewCursor(CURSOR_TELEKINESIS);
 }
 
-void AddBoneSpirit(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddBoneSpirit(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int /*dam*/)
 {
 	if (src == dst) {
 		dst += static_cast<Direction>(midir);
@@ -2963,7 +2963,7 @@ void AddBoneSpirit(int mi, Point src, Point dst, int midir, int8_t mienemy, int
 	}
 }
 
-void AddRportal(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddRportal(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
 {
 	missile[mi].position.tile = src;
 	missile[mi].position.start = src;
@@ -2973,7 +2973,7 @@ void AddRportal(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
 	PutMissile(mi);
 }
 
-void AddDiabApoca(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, int dam)
+void AddDiabApoca(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t mienemy, int id, int dam)
 {
 	int players = gbIsMultiplayer ? MAX_PLRS : 1;
 	for (int pnum = 0; pnum < players; pnum++) {

Source/monster.cpp

@@ -4690,12 +4690,12 @@ bool DirOK(int i, Direction mdir)
 	return mcount == monster[i].packsize;
 }
 
-bool PosOkMissile(int entity, Point position)
+bool PosOkMissile(int /*entity*/, Point position)
 {
 	return !nMissileTable[dPiece[position.x][position.y]] && (dFlags[position.x][position.y] & BFLAG_MONSTLR) == 0;
 }
 
-bool CheckNoSolid(int entity, Point position)
+bool CheckNoSolid(int /*entity*/, Point position)
 {
 	return !nSolidTable[dPiece[position.x][position.y]];
 }

Source/movie.cpp

@@ -28,8 +28,6 @@ bool loop_movie;
  */
 void play_movie(const char *pszMovie, bool user_can_close)
 {
-	HANDLE video_stream;
-
 	movie_playing = true;
 
 #ifndef NOSOUND
@@ -38,7 +36,7 @@ void play_movie(const char *pszMovie, bool user_can_close)
 	effects_play_sound("Sfx\\Misc\\blank.wav");
 #endif
 
-	if (SVidPlayBegin(pszMovie, loop_movie ? 0x100C0808 : 0x10280808, &video_stream)) {
+	if (SVidPlayBegin(pszMovie, loop_movie ? 0x100C0808 : 0x10280808)) {
 		tagMSG Msg;
 		while (movie_playing) {
 			while (movie_playing && FetchMessage(&Msg)) {
@@ -50,7 +48,7 @@ void play_movie(const char *pszMovie, bool user_can_close)
 						movie_playing = false;
 					break;
 				case DVL_WM_QUIT:
-					SVidPlayEnd(video_stream);
+					SVidPlayEnd();
 					diablo_quit(0);
 					break;
 				}
@@ -58,7 +56,7 @@ void play_movie(const char *pszMovie, bool user_can_close)
 			if (!SVidPlayContinue())
 				break;
 		}
-		SVidPlayEnd(video_stream);
+		SVidPlayEnd();
 	}
 
 #ifndef NOSOUND

Source/msg.cpp

@@ -2400,7 +2400,7 @@ static DWORD On_ENDSHIELD(TCmd *pCmd, int pnum)
 	return sizeof(*pCmd);
 }
 
-static DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd, int pnum)
+static DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd)
 {
 #ifdef _DEBUG
 	if (gbBufferMsgs == 1)
@@ -2416,7 +2416,7 @@ static DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd, int pnum)
 	return sizeof(*pCmd);
 }
 
-static DWORD On_CHEAT_SPELL_LEVEL(TCmd *pCmd, int pnum)
+static DWORD On_CHEAT_SPELL_LEVEL(TCmd *pCmd)
 {
 #ifdef _DEBUG
 	if (gbBufferMsgs == 1)
@@ -2658,9 +2658,9 @@ DWORD ParseCmd(int pnum, TCmd *pCmd)
 	case CMD_ENDSHIELD:
 		return On_ENDSHIELD(pCmd, pnum);
 	case CMD_CHEAT_EXPERIENCE:
-		return On_CHEAT_EXPERIENCE(pCmd, pnum);
+		return On_CHEAT_EXPERIENCE(pCmd);
 	case CMD_CHEAT_SPELL_LEVEL:
-		return On_CHEAT_SPELL_LEVEL(pCmd, pnum);
+		return On_CHEAT_SPELL_LEVEL(pCmd);
 	case CMD_NOVA:
 		return On_NOVA(pCmd, pnum);
 	case CMD_SETSHIELD:

Source/multi.cpp

@@ -666,17 +666,13 @@ static void multi_handle_events(_SNETEVENT *pEvt)
 
 static void multi_event_handler(bool add)
 {
-	DWORD i;
-	bool (*fn)(event_type, SEVTHANDLER);
-
-	if (add)
-		fn = SNetRegisterEventHandler;
-	else
-		fn = SNetUnregisterEventHandler;
-
-	for (i = 0; i < 3; i++) {
-		if (!fn(event_types[i], multi_handle_events) && add) {
-			app_fatal("SNetRegisterEventHandler:\n%s", SDL_GetError());
+	for (int i = 0; i < 3; i++) {
+		if (add) {
+			if (!SNetRegisterEventHandler(event_types[i], multi_handle_events)) {
+				app_fatal("SNetRegisterEventHandler:\n%s", SDL_GetError());
+			}
+		} else {
+			SNetUnregisterEventHandler(event_types[i]);
 		}
 	}
 }

Source/nthread.cpp

@@ -111,7 +111,7 @@ bool nthread_recv_turns(bool *pfSendAsync)
 	return true;
 }
 
-static unsigned int nthread_handler(void *data)
+static unsigned int nthread_handler(void * /*data*/)
 {
 	int delta;
 	bool received;

Source/player.cpp

@@ -38,7 +38,7 @@ struct DirectionSettings {
 	Point map;
 	_scroll_direction scrollDir;
 	PLR_MODE walkMode;
-	void (*walkModeHandler)(int, Point, const DirectionSettings &);
+	void (*walkModeHandler)(int, const DirectionSettings &);
 };
 
 void PM_ChangeLightOff(PlayerStruct &player)
@@ -63,14 +63,14 @@ void PM_ChangeLightOff(PlayerStruct &player)
 	ChangeLightOff(player._plid, { x, y });
 }
 
-void WalkUpwards(int pnum, Point vel, const DirectionSettings &walkParams)
+void WalkUpwards(int pnum, const DirectionSettings &walkParams)
 {
 	auto &player = plr[pnum];
 	dPlayer[player.position.future.x][player.position.future.y] = -(pnum + 1);
 	player.position.temp = walkParams.tileAdd;
 }
 
-void WalkDownwards(int pnum, Point vel, const DirectionSettings &walkParams)
+void WalkDownwards(int pnum, const DirectionSettings & /*walkParams*/)
 {
 	auto &player = plr[pnum];
 	dPlayer[player.position.tile.x][player.position.tile.y] = -(pnum + 1);
@@ -81,7 +81,7 @@ void WalkDownwards(int pnum, Point vel, const DirectionSettings &walkParams)
 	PM_ChangeLightOff(player);
 }
 
-void WalkSides(int pnum, Point vel, const DirectionSettings &walkParams)
+void WalkSides(int pnum, const DirectionSettings &walkParams)
 {
 	auto &player = plr[pnum];
 
@@ -169,7 +169,7 @@ void HandleWalkMode(int pnum, Point vel, Direction dir)
 	//The player's tile position after finishing this movement action
 	player.position.future = dirModeParams.tileAdd + player.position.tile;
 
-	dirModeParams.walkModeHandler(pnum, vel, dirModeParams);
+	dirModeParams.walkModeHandler(pnum, dirModeParams);
 
 	player.position.velocity = vel;
 	player.tempDirection = dirModeParams.dir;

Source/scrollrt.cpp

@@ -1328,12 +1328,12 @@ extern SDL_Surface *pal_surface;
  */
 void ClearScreenBuffer()
 {
-	lock_buf(3);
+	lock_buf();
 
 	assert(pal_surface != nullptr);
 	SDL_FillRect(pal_surface, nullptr, 0);
 
-	unlock_buf(3);
+	unlock_buf();
 }
 
 #ifdef _DEBUG
@@ -1537,9 +1537,9 @@ void scrollrt_draw_game_screen()
 	if (IsHardwareCursor()) {
 		SetHardwareCursorVisible(ShouldShowCursor());
 	} else {
-		lock_buf(0);
+		lock_buf();
 		DrawCursor(GlobalBackBuffer());
-		unlock_buf(0);
+		unlock_buf();
 	}
 
 	DrawMain(hgt, false, false, false, false, false);
@@ -1547,9 +1547,9 @@ void scrollrt_draw_game_screen()
 	RenderPresent();
 
 	if (!IsHardwareCursor()) {
-		lock_buf(0);
+		lock_buf();
 		UndrawCursor(GlobalBackBuffer());
-		unlock_buf(0);
+		unlock_buf();
 	}
 }
 
@@ -1582,7 +1582,7 @@ void DrawAndBlit()
 
 	force_redraw = 0;
 
-	lock_buf(0);
+	lock_buf();
 	const CelOutputBuffer &out = GlobalBackBuffer();
 	UndrawCursor(out);
 
@@ -1618,7 +1618,7 @@ void DrawAndBlit()
 
 	DrawFPS(out);
 
-	unlock_buf(0);
+	unlock_buf();
 
 	DrawMain(hgt, ddsdesc, drawhpflag, drawmanaflag, drawsbarflag, drawbtnflag);
 

Source/storm/storm.h

@@ -304,7 +304,7 @@ void SStrCopy(char *dest, const char *src, int max_length);
 
 bool SFileSetBasePath(const char *);
 bool SNetGetOwnerTurnsWaiting(DWORD *);
-bool SNetUnregisterEventHandler(event_type, SEVTHANDLER);
+bool SNetUnregisterEventHandler(event_type);
 bool SNetRegisterEventHandler(event_type, SEVTHANDLER);
 bool SNetSetBasePlayer(int);
 bool SNetInitializeProvider(uint32_t provider, struct GameData *gameData);

Source/storm/storm_net.cpp

@@ -75,12 +75,12 @@ void SNetGetProviderCaps(struct _SNETCAPS *caps)
 	dvlnet_inst->SNetGetProviderCaps(caps);
 }
 
-bool SNetUnregisterEventHandler(event_type evtype, SEVTHANDLER func)
+bool SNetUnregisterEventHandler(event_type evtype)
 {
 #ifndef NONET
 	std::lock_guard<SdlMutex> lg(storm_net_mutex);
 #endif
-	return dvlnet_inst->SNetUnregisterEventHandler(evtype, func);
+	return dvlnet_inst->SNetUnregisterEventHandler(evtype);
 }
 
 bool SNetRegisterEventHandler(event_type evtype, SEVTHANDLER func)

Source/storm/storm_svid.cpp

@@ -134,7 +134,7 @@ bool SVidLoadNextFrame()
 
 } // namespace
 
-bool SVidPlayBegin(const char *filename, int flags, HANDLE *video)
+bool SVidPlayBegin(const char *filename, int flags)
 {
 	if ((flags & 0x10000) != 0 || (flags & 0x20000000) != 0) {
 		return false;
@@ -150,16 +150,16 @@ bool SVidPlayBegin(const char *filename, int flags, HANDLE *video)
 	//0x800000 // Edge detection
 	//0x200800 // Clear FB
 
-	SFileOpenFile(filename, video);
+	HANDLE video_stream;
+	SFileOpenFile(filename, &video_stream);
 #ifdef DEVILUTIONX_STORM_FILE_WRAPPER_AVAILABLE
-	FILE *file = FILE_FromStormHandle(*video);
+	FILE *file = FILE_FromStormHandle(video_stream);
 	SVidSMK = smk_open_filepointer(file, SMK_MODE_DISK);
 #else
-	int bytestoread = SFileGetFileSize(*video);
+	int bytestoread = SFileGetFileSize(video_stream);
 	SVidBuffer = std::unique_ptr<uint8_t[]> { new uint8_t[bytestoread] };
-	SFileReadFileThreadSafe(*video, SVidBuffer.get(), bytestoread);
-	SFileCloseFileThreadSafe(*video);
-	*video = nullptr;
+	SFileReadFileThreadSafe(video_stream, SVidBuffer.get(), bytestoread);
+	SFileCloseFileThreadSafe(video_stream);
 	SVidSMK = smk_open_memory(SVidBuffer.get(), bytestoread);
 #endif
 	if (SVidSMK == nullptr) {
@@ -357,7 +357,7 @@ bool SVidPlayContinue()
 	return SVidLoadNextFrame();
 }
 
-void SVidPlayEnd(HANDLE video)
+void SVidPlayEnd()
 {
 #ifndef NOSOUND
 	if (HaveAudio()) {

Source/storm/storm_svid.h

@@ -4,8 +4,8 @@
 
 namespace devilution {
 
-bool SVidPlayBegin(const char *filename, int flags, HANDLE *video);
+bool SVidPlayBegin(const char *filename, int flags);
 bool SVidPlayContinue();
-void SVidPlayEnd(HANDLE video);
+void SVidPlayEnd();
 
 } // namespace devilution

Source/town.cpp

@@ -66,7 +66,7 @@ void T_FillSector(const char *path, int xi, int yy)
  * @param yy upper left destination
  * @param t tile id
  */
-void T_FillTile(MegaTile *megas, int xx, int yy, int t)
+void T_FillTile(int xx, int yy, int t)
 {
 	MegaTile mega = pMegaTiles[t - 1];
 
@@ -171,15 +171,15 @@ void T_Pass3()
 
 	if (gbIsSpawn || !gbIsMultiplayer) {
 		if (gbIsSpawn || ((plr[myplr].pTownWarps & 1) == 0 && (!gbIsHellfire || plr[myplr]._pLevel < 10))) {
-			T_FillTile(pMegaTiles.get(), 48, 20, 320);
+			T_FillTile(48, 20, 320);
 		}
 		if (gbIsSpawn || ((plr[myplr].pTownWarps & 2) == 0 && (!gbIsHellfire || plr[myplr]._pLevel < 15))) {
-			T_FillTile(pMegaTiles.get(), 16, 68, 332);
-			T_FillTile(pMegaTiles.get(), 16, 70, 331);
+			T_FillTile(16, 68, 332);
+			T_FillTile(16, 70, 331);
 		}
 		if (gbIsSpawn || ((plr[myplr].pTownWarps & 4) == 0 && (!gbIsHellfire || plr[myplr]._pLevel < 20))) {
 			for (x = 36; x < 46; x++) {
-				T_FillTile(pMegaTiles.get(), x, 78, GenerateRnd(4) + 1);
+				T_FillTile(x, 78, GenerateRnd(4) + 1);
 			}
 		}
 	}
@@ -197,9 +197,9 @@ void T_Pass3()
 	}
 
 	if (quests[Q_PWATER]._qactive != QUEST_DONE && quests[Q_PWATER]._qactive != QUEST_NOTAVAIL) {
-		T_FillTile(pMegaTiles.get(), 60, 70, 342);
+		T_FillTile(60, 70, 342);
 	} else {
-		T_FillTile(pMegaTiles.get(), 60, 70, 71);
+		T_FillTile(60, 70, 71);
 	}
 }
 

Source/utils/soundsample.cpp

@@ -2,7 +2,7 @@
 
 #include <chrono>
 #include <cmath>
-#include <utility>
+#include <utility>
 
 #include <Aulib/DecoderDrwav.h>
 #include <Aulib/ResamplerSpeex.h>
@@ -88,7 +88,7 @@ bool SoundSample::IsPlaying()
 /**
  * @brief Start playing the sound
  */
-void SoundSample::Play(int logSoundVolume, int logUserVolume, int logPan, int channel)
+void SoundSample::Play(int logSoundVolume, int logUserVolume, int logPan)
 {
 	if (!stream_)
 		return;

Source/utils/soundsample.h

@@ -27,7 +27,7 @@ public:
 
 	void Release();
 	bool IsPlaying();
-	void Play(int logSoundVolume, int logUserVolume, int logPan, int channel = -1);
+	void Play(int logSoundVolume, int logUserVolume, int logPan);
 	void Stop();
 	int SetChunkStream(std::string filePath);