From 730c0750e76e0f4fddd08abf019bed55595c2749 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 10 Jul 2021 00:24:35 +0200
Subject: [PATCH] Apply clang-tidy to code

---
 Source/DiabloUI/diabloui.cpp |  2 +-
 Source/dthread.cpp           |  8 ++++----
 Source/dx.cpp                | 11 +++++------
 Source/objects.cpp           | 18 +++++++++---------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
index 58f0e4ef6..253c5c804 100644
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -90,7 +90,7 @@ void UiInitList(int count, void (*fnFocus)(int value), void (*fnSelect)(int valu
 	gfnListEsc = fnEsc;
 	gfnListYesNo = fnYesNo;
 	gUiItems.clear();
-	for (auto &item : items)
+	for (const auto &item : items)
 		gUiItems.push_back(item.get());
 	UiItemsWraps = itemsWraps;
 	ListOffset = nullptr;
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index 111e45d01..22783506a 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -12,16 +12,16 @@ namespace devilution {
 
 namespace {
 
-static CCritSect sgMemCrit;
+CCritSect sgMemCrit;
 SDL_threadID glpDThreadId;
 TMegaPkt *sgpInfoHead; /* may not be right struct */
 bool dthread_running;
 event_emul *sghWorkToDoEvent;
 
 /* rdata */
-static SDL_Thread *sghThread = nullptr;
+SDL_Thread *sghThread = nullptr;
 
-static void DthreadHandler()
+void DthreadHandler()
 {
 	const char *errorBuf;
 	TMegaPkt *pkt;
@@ -57,7 +57,7 @@ static void DthreadHandler()
 	}
 }
 
-}
+} // namespace
 
 void dthread_remove_player(uint8_t pnum)
 {
diff --git a/Source/dx.cpp b/Source/dx.cpp
index c8846a031..285e29727 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -19,7 +19,6 @@
 
 namespace devilution {
 
-
 int refreshDelay;
 SDL_Renderer *renderer;
 SDL_Texture *texture;
@@ -43,7 +42,7 @@ int sgdwLockCount;
 #ifdef _DEBUG
 int locktbl[256];
 #endif
-static CCritSect sgMemCrit;
+CCritSect sgMemCrit;
 
 bool CanRenderDirectlyToOutputSurface()
 {
@@ -61,7 +60,7 @@ bool CanRenderDirectlyToOutputSurface()
 #endif
 }
 
-static void CreateBackBuffer()
+void CreateBackBuffer()
 {
 	if (CanRenderDirectlyToOutputSurface()) {
 		Log("{}", "Will render directly to the SDL output surface");
@@ -92,7 +91,7 @@ static void CreateBackBuffer()
 	pal_surface_palette_version = 1;
 }
 
-static void CreatePrimarySurface()
+void CreatePrimarySurface()
 {
 #ifndef USE_SDL1
 	if (renderer != nullptr) {
@@ -110,7 +109,7 @@ static void CreatePrimarySurface()
 	}
 }
 
-static void LockBufPriv()
+void LockBufPriv()
 {
 	sgMemCrit.Enter();
 	if (sgdwLockCount != 0) {
@@ -121,7 +120,7 @@ static void LockBufPriv()
 	sgdwLockCount++;
 }
 
-static void UnlockBufPriv()
+void UnlockBufPriv()
 {
 	if (sgdwLockCount == 0)
 		app_fatal("draw main unlock error");
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 0ccc29e3a..efbea27a2 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1697,7 +1697,7 @@ void AddCryptObject(int i, int a2)
 	Objects[i]._oVar4 = Objects[i]._oAnimFrame + 1;
 }
 
-void AddObject(_object_id ot, Point objPos)
+void AddObject(_object_id objType, Point objPos)
 {
 	if (ActiveObjectCount >= MAXOBJECTS)
 		return;
@@ -1706,8 +1706,8 @@ void AddObject(_object_id ot, Point objPos)
 	AvailableObjects[0] = AvailableObjects[MAXOBJECTS - 1 - ActiveObjectCount];
 	ActiveObjects[ActiveObjectCount] = oi;
 	dObject[objPos.x][objPos.y] = oi + 1;
-	SetupObject(oi, objPos, ot);
-	switch (ot) {
+	SetupObject(oi, objPos, objType);
+	switch (objType) {
 	case OBJ_L1LIGHT:
 	case OBJ_SKFIRE:
 	case OBJ_CANDLE1:
@@ -1726,15 +1726,15 @@ void AddObject(_object_id ot, Point objPos)
 		break;
 	case OBJ_L1LDOOR:
 	case OBJ_L1RDOOR:
-		AddL1Door(oi, objPos, ot);
+		AddL1Door(oi, objPos, objType);
 		break;
 	case OBJ_L2LDOOR:
 	case OBJ_L2RDOOR:
-		AddL2Door(oi, objPos, ot);
+		AddL2Door(oi, objPos, objType);
 		break;
 	case OBJ_L3LDOOR:
 	case OBJ_L3RDOOR:
-		AddL3Door(oi, objPos, ot);
+		AddL3Door(oi, objPos, objType);
 		break;
 	case OBJ_BOOK2R:
 		AddSCambBook(oi);
@@ -1742,12 +1742,12 @@ void AddObject(_object_id ot, Point objPos)
 	case OBJ_CHEST1:
 	case OBJ_CHEST2:
 	case OBJ_CHEST3:
-		AddChest(oi, ot);
+		AddChest(oi, objType);
 		break;
 	case OBJ_TCHEST1:
 	case OBJ_TCHEST2:
 	case OBJ_TCHEST3:
-		AddChest(oi, ot);
+		AddChest(oi, objType);
 		Objects[oi]._oTrapFlag = true;
 		if (leveltype == DTYPE_CATACOMBS) {
 			Objects[oi]._oVar4 = GenerateRnd(2);
@@ -1773,7 +1773,7 @@ void AddObject(_object_id ot, Point objPos)
 		break;
 	case OBJ_BARREL:
 	case OBJ_BARRELEX:
-		AddBarrel(oi, ot);
+		AddBarrel(oi, objType);
 		break;
 	case OBJ_SHRINEL:
 	case OBJ_SHRINER: