Stabalize clang-tidy runs

Source/diablo.cpp

@@ -1589,9 +1589,10 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
 				IncProgress();
 			}
 		} else {
-			for (int i = 0; i < MAXDUNX; i++) {
-				for (int j = 0; j < MAXDUNY; j++)
+			for (int i = 0; i < MAXDUNX; i++) { // NOLINT(modernize-loop-convert)
+				for (int j = 0; j < MAXDUNY; j++) {
 					dFlags[i][j] |= BFLAG_LIT;
+				}
 			}
 
 			InitTowners();

Source/drlg_l1.cpp

@@ -1090,7 +1090,7 @@ void DRLG_LPass3(int lv)
 	int yy = 16;
 	for (int j = 0; j < DMAXY; j++) {
 		int xx = 16;
-		for (int i = 0; i < DMAXX; i++) {
+		for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
 			v1 = 0;
 			v2 = 0;
 			v3 = 0;
@@ -1310,7 +1310,7 @@ static void InitL5Dungeon()
 static void L5ClearFlags()
 {
 	for (int j = 0; j < DMAXY; j++) {
-		for (int i = 0; i < DMAXX; i++) {
+		for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
 			L5dflags[i][j] &= ~DLRG_CHAMBER;
 		}
 	}

Source/drlg_l2.cpp

@@ -3256,7 +3256,7 @@ static void LoadL2DungeonData(const uint16_t *dunData)
 	}
 
 	for (int j = 0; j < DMAXY; j++) {
-		for (int i = 0; i < DMAXX; i++) {
+		for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
 			if (dungeon[i][j] == 0) {
 				dungeon[i][j] = 12;
 			}

Source/drlg_l3.cpp

@@ -2649,7 +2649,7 @@ void LoadL3Dungeon(const char *path, int vx, int vy)
 	}
 
 	for (int j = 0; j < DMAXY; j++) {
-		for (int i = 0; i < DMAXX; i++) {
+		for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
 			if (dungeon[i][j] == 0) {
 				dungeon[i][j] = 8;
 			}
@@ -2700,7 +2700,7 @@ void LoadPreL3Dungeon(const char *path)
 	}
 
 	for (int j = 0; j < DMAXY; j++) {
-		for (int i = 0; i < DMAXX; i++) {
+		for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
 			if (dungeon[i][j] == 0) {
 				dungeon[i][j] = 8;
 			}

Source/dvlnet/protocol_zt.cpp

@@ -103,7 +103,7 @@ bool protocol_zt::send_oob(const endpoint &peer, const buffer_t &data) const
 	return true;
 }
 
-bool protocol_zt::send_oob_mc(const buffer_t &data)
+bool protocol_zt::send_oob_mc(const buffer_t &data) const
 {
 	endpoint mc;
 	std::copy(dvl_multicast_addr, dvl_multicast_addr + 16, mc.addr.begin());

Source/dvlnet/protocol_zt.h

@@ -69,7 +69,7 @@ public:
 	void disconnect(const endpoint &peer);
 	bool send(const endpoint &peer, const buffer_t &data);
 	bool send_oob(const endpoint &peer, const buffer_t &data) const;
-	bool send_oob_mc(const buffer_t &data);
+	bool send_oob_mc(const buffer_t &data) const;
 	bool recv(endpoint &peer, buffer_t &data);
 	bool get_disconnected(endpoint &peer);
 	bool network_online();

Source/effects.cpp

@@ -1135,9 +1135,9 @@ void InitMonsterSND(int monst)
 void FreeMonsterSnd()
 {
 	for (int i = 0; i < nummtypes; i++) {
-		for (auto &Snd : Monsters[i].Snds) {
-			for (int k = 0; k < 2; ++k) {
-				Snd[k] = nullptr;
+		for (auto &variants : Monsters[i].Snds) {
+			for (auto & snd : variants) {
+				snd = nullptr;
 			}
 		}
 	}

Source/encrypt.cpp

@@ -60,7 +60,7 @@ void InitHash()
 	uint32_t seed = 0x00100001;
 
 	for (int i = 0; i < 256; i++) {
-		for (int j = 0; j < 5; j++) {
+		for (int j = 0; j < 5; j++) { // NOLINT(modernize-loop-convert)
 			seed = (125 * seed + 3) % 0x2AAAAB;
 			uint32_t ch = (seed & 0xFFFF);
 			seed = (125 * seed + 3) % 0x2AAAAB;

Source/items.cpp

@@ -1322,7 +1322,7 @@ static bool GetItemSpace(Point position, int8_t inum)
 
 	savail = false;
 	for (int j = 0; j < 3; j++) {
-		for (int i = 0; i < 3; i++) {
+		for (int i = 0; i < 3; i++) { // NOLINT(modernize-loop-convert)
 			if (itemhold[i][j])
 				savail = true;
 		}

Source/loadsave.cpp

@@ -1189,49 +1189,49 @@ void LoadGame(bool firstflag)
 		UniqueItemFlag = file.nextBool8();
 
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dLight[i][j] = file.nextLE<int8_t>();
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dFlags[i][j] = file.nextLE<int8_t>();
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dPlayer[i][j] = file.nextLE<int8_t>();
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dItem[i][j] = file.nextLE<int8_t>();
 	}
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dMonster[i][j] = file.nextBE<int32_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dDead[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dObject[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dLight[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dPreLight[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < DMAXY; j++) {
-			for (int i = 0; i < DMAXX; i++)
+			for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
 				AutomapView[i][j] = file.nextBool8();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dMissile[i][j] = file.nextLE<int8_t>();
 		}
 	}
@@ -1955,49 +1955,49 @@ void SaveGameData()
 		file.writeLE<uint8_t>(UniqueItemFlag ? 1 : 0);
 
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dLight[i][j]);
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dFlags[i][j] & ~(BFLAG_MISSILE | BFLAG_VISIBLE | BFLAG_DEAD_PLAYER));
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dPlayer[i][j]);
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dItem[i][j]);
 	}
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeBE<int32_t>(dMonster[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dDead[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dObject[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dLight[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dPreLight[i][j]);
 		}
 		for (int j = 0; j < DMAXY; j++) {
-			for (int i = 0; i < DMAXX; i++)
+			for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<uint8_t>(AutomapView[i][j] ? 1 : 0);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dMissile[i][j]);
 		}
 	}
@@ -2033,7 +2033,7 @@ void SaveLevel()
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dDead[i][j]);
 		}
 	}
@@ -2064,37 +2064,37 @@ void SaveLevel()
 		SaveItem(&file, &items[itemactive[i]]);
 
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dFlags[i][j] & ~(BFLAG_MISSILE | BFLAG_VISIBLE | BFLAG_DEAD_PLAYER));
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			file.writeLE<int8_t>(dItem[i][j]);
 	}
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeBE<int32_t>(dMonster[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dObject[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dLight[i][j]);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dPreLight[i][j]);
 		}
 		for (int j = 0; j < DMAXY; j++) {
-			for (int i = 0; i < DMAXX; i++)
+			for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<uint8_t>(AutomapView[i][j] ? 1 : 0);
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				file.writeLE<int8_t>(dMissile[i][j]);
 		}
 	}
@@ -2115,7 +2115,7 @@ void LoadLevel()
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dDead[i][j] = file.nextLE<int8_t>();
 		}
 		SetDead();
@@ -2150,37 +2150,37 @@ void LoadLevel()
 		LoadItem(&file, itemactive[i]);
 
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dFlags[i][j] = file.nextLE<int8_t>();
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++)
+		for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 			dItem[i][j] = file.nextLE<int8_t>();
 	}
 
 	if (leveltype != DTYPE_TOWN) {
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dMonster[i][j] = file.nextBE<int32_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dObject[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dLight[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dPreLight[i][j] = file.nextLE<int8_t>();
 		}
 		for (int j = 0; j < DMAXY; j++) {
-			for (int i = 0; i < DMAXX; i++)
+			for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
 				AutomapView[i][j] = file.nextBool8();
 		}
 		for (int j = 0; j < MAXDUNY; j++) {
-			for (int i = 0; i < MAXDUNX; i++)
+			for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
 				dMissile[i][j] = 0; /// BUGFIX: supposed to load saved missiles with "file.nextLE<int8_t>()"?
 		}
 	}

Source/missiles.cpp

@@ -1203,7 +1203,7 @@ void InitMissiles()
 		link._mirange = 0;
 	}
 	for (int j = 0; j < MAXDUNY; j++) {
-		for (int i = 0; i < MAXDUNX; i++) {
+		for (int i = 0; i < MAXDUNX; i++) { // NOLINT(modernize-loop-convert)
 			dFlags[i][j] &= ~BFLAG_MISSILE;
 		}
 	}