From f0e5bd819b6a421bfef910a4e665096982c77c91 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sun, 27 Jun 2021 17:34:32 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20Fix=20debug=20builds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This the change from 8e07ef8fe5ffc0937cd1ae26b549b5292c206c86.
---
 Source/capture.cpp  |  4 ++--
 Source/dx.cpp       |  4 ++--
 Source/dx.h         |  4 ++--
 Source/interfac.cpp |  4 ++--
 Source/msg.cpp      |  8 ++++----
 Source/scrollrt.cpp | 16 ++++++++--------
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Source/capture.cpp b/Source/capture.cpp
index 97414b9ce..cd7fdc37c 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -174,7 +174,7 @@ void CaptureScreen()
 	PaletteGetEntries(256, palette);
 	RedPalette();
 
-	lock_buf();
+	lock_buf(2);
 	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();
+	unlock_buf(2);
 	outStream->close();
 
 	if (!success) {
diff --git a/Source/dx.cpp b/Source/dx.cpp
index 91eb0f205..e248f8565 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -132,7 +132,7 @@ static void lock_buf_priv()
 	sgdwLockCount++;
 }
 
-void lock_buf()
+void lock_buf(int idx) // NOLINT(misc-unused-parameters)
 {
 #ifdef _DEBUG
 	++locktbl[idx];
@@ -149,7 +149,7 @@ static void unlock_buf_priv()
 	sgMemCrit.Leave();
 }
 
-void unlock_buf()
+void unlock_buf(int idx) // NOLINT(misc-unused-parameters)
 {
 #ifdef _DEBUG
 	if (locktbl[idx] == 0)
diff --git a/Source/dx.h b/Source/dx.h
index bd1bb079b..c815b4484 100644
--- a/Source/dx.h
+++ b/Source/dx.h
@@ -15,8 +15,8 @@ extern bool RenderDirectlyToOutputSurface;
 CelOutputBuffer GlobalBackBuffer();
 
 void dx_init();
-void lock_buf();
-void unlock_buf();
+void lock_buf(int idx);
+void unlock_buf(int idx);
 void dx_cleanup();
 void dx_reinit();
 void InitPalette();
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 19f232947..08a985935 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -168,7 +168,7 @@ static void InitCutscene(interface_mode uMsg)
 
 static void DrawCutscene()
 {
-	lock_buf();
+	lock_buf(1);
 	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();
+	unlock_buf(1);
 
 	BltFast(&rect, &rect);
 	RenderPresent();
diff --git a/Source/msg.cpp b/Source/msg.cpp
index be1833120..9b9367a37 100644
--- a/Source/msg.cpp
+++ b/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)
+static DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
 {
 #ifdef _DEBUG
 	if (gbBufferMsgs == 1)
@@ -2416,7 +2416,7 @@ static DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd)
 	return sizeof(*pCmd);
 }
 
-static DWORD On_CHEAT_SPELL_LEVEL(TCmd *pCmd)
+static DWORD On_CHEAT_SPELL_LEVEL(TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
 {
 #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);
+		return On_CHEAT_EXPERIENCE(pCmd, pnum);
 	case CMD_CHEAT_SPELL_LEVEL:
-		return On_CHEAT_SPELL_LEVEL(pCmd);
+		return On_CHEAT_SPELL_LEVEL(pCmd, pnum);
 	case CMD_NOVA:
 		return On_NOVA(pCmd, pnum);
 	case CMD_SETSHIELD:
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 5bb80426a..4499fd295 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -1328,12 +1328,12 @@ extern SDL_Surface *pal_surface;
  */
 void ClearScreenBuffer()
 {
-	lock_buf();
+	lock_buf(3);
 
 	assert(pal_surface != nullptr);
 	SDL_FillRect(pal_surface, nullptr, 0);
 
-	unlock_buf();
+	unlock_buf(3);
 }
 
 #ifdef _DEBUG
@@ -1537,9 +1537,9 @@ void scrollrt_draw_game_screen()
 	if (IsHardwareCursor()) {
 		SetHardwareCursorVisible(ShouldShowCursor());
 	} else {
-		lock_buf();
+		lock_buf(0);
 		DrawCursor(GlobalBackBuffer());
-		unlock_buf();
+		unlock_buf(0);
 	}
 
 	DrawMain(hgt, false, false, false, false, false);
@@ -1547,9 +1547,9 @@ void scrollrt_draw_game_screen()
 	RenderPresent();
 
 	if (!IsHardwareCursor()) {
-		lock_buf();
+		lock_buf(0);
 		UndrawCursor(GlobalBackBuffer());
-		unlock_buf();
+		unlock_buf(0);
 	}
 }
 
@@ -1582,7 +1582,7 @@ void DrawAndBlit()
 
 	force_redraw = 0;
 
-	lock_buf();
+	lock_buf(0);
 	const CelOutputBuffer &out = GlobalBackBuffer();
 	UndrawCursor(out);
 
@@ -1618,7 +1618,7 @@ void DrawAndBlit()
 
 	DrawFPS(out);
 
-	unlock_buf();
+	unlock_buf(0);
 
 	DrawMain(hgt, ddsdesc, drawhpflag, drawmanaflag, drawsbarflag, drawbtnflag);