From cf53a03585a8d75f90eef2ed9a9ce6e6caff3b70 Mon Sep 17 00:00:00 2001
From: Juliano Goncalves <julealgon@gmail.com>
Date: Wed, 30 Sep 2020 21:47:11 -0300
Subject: [PATCH 1/3] Use 'MAXBELTITEMS' in belt traversal logic.

---
 Source/inv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/inv.cpp b/Source/inv.cpp
index dfe5502d8..55057b4ee 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1575,7 +1575,7 @@ void AutoGetItem(int pnum, int ii)
 			if (w == 1 && h == 1) {
 				idx = plr[pnum].HoldItem.IDidx;
 				if (plr[pnum].HoldItem._iStatFlag && AllItemsList[idx].iUsable) {
-					for (i = 0; i < 8 && !done; i++) {
+					for (i = 0; i < MAXBELTITEMS && !done; i++) {
 						if (plr[pnum].SpdList[i]._itype == ITYPE_NONE) {
 							plr[pnum].SpdList[i] = plr[pnum].HoldItem;
 							CalcPlrScrolls(pnum);

From 0ea1b81772a931cf366a3d0ab1f4a826e83f3924 Mon Sep 17 00:00:00 2001
From: Colin Pitrat <colin.pitrat@gmail.com>
Date: Sun, 4 Oct 2020 11:12:10 +0100
Subject: [PATCH 2/3] Fix typos

---
 Source/all.h        | 2 +-
 Source/appfat.cpp   | 2 +-
 Source/multi.h      | 2 +-
 Source/scrollrt.cpp | 6 +++---
 Source/setmaps.h    | 2 +-
 Source/wave.h       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/all.h b/Source/all.h
index 24693dbaa..669758365 100644
--- a/Source/all.h
+++ b/Source/all.h
@@ -1,7 +1,7 @@
 /**
  * @file all.h
  *
- * Include all aplication headers.
+ * Include all application headers.
  */
 #ifndef __ALL_H__
 #define __ALL_H__
diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index e7a4cfb02..5caf279d1 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -6,7 +6,7 @@
 #include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
-/** Buffer used by GetErrorStr for it's return value */
+/** Buffer used by GetErrorStr for its return value */
 char sz_error_buf[256];
 /** Set to true when a fatal error is encountered and the application should shut down. */
 BOOL terminating;
diff --git a/Source/multi.h b/Source/multi.h
index 73cae2807..15a765d2f 100644
--- a/Source/multi.h
+++ b/Source/multi.h
@@ -1,7 +1,7 @@
 /**
  * @file multi.h
  *
- * Interface of functions for keeping multiplaye games in sync.
+ * Interface of functions for keeping multiplayer games in sync.
  */
 #ifndef __MULTI_H__
 #define __MULTI_H__
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 6134bf935..f57842a10 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -1102,7 +1102,7 @@ static void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, i
 }
 
 /**
- * @brief Render a row of tile
+ * @brief Render a row of tiles
  * @param x dPiece coordinate
  * @param y dPiece coordinate
  * @param sx Back buffer coordinate
@@ -2696,10 +2696,10 @@ static void DoBlitScreen(DWORD dwX, DWORD dwY, DWORD dwWdt, DWORD dwHgt)
 }
 
 /**
- * @brief Check render pipline and blit indivudal screen parts
+ * @brief Check render pipeline and blit individual screen parts
  * @param dwHgt Section of screen to update from top to bottom
  * @param draw_desc Render info box
- * @param draw_hp Render halth bar
+ * @param draw_hp Render health bar
  * @param draw_mana Render mana bar
  * @param draw_sbar Render belt
  * @param draw_btn Render panel buttons
diff --git a/Source/setmaps.h b/Source/setmaps.h
index b9499670a..6ca2dd236 100644
--- a/Source/setmaps.h
+++ b/Source/setmaps.h
@@ -1,7 +1,7 @@
 /**
  * @file setmaps.cpp
  *
- * Interface of functionality the special quest dungeons.
+ * Interface of functionality for the special quest dungeons.
  */
 #ifndef __SETMAPS_H__
 #define __SETMAPS_H__
diff --git a/Source/wave.h b/Source/wave.h
index c499576bb..da21f9925 100644
--- a/Source/wave.h
+++ b/Source/wave.h
@@ -1,7 +1,7 @@
 /**
  * @file wave.h
  *
- * Interface of functionality for loading fies and processing wave files.
+ * Interface of functionality for loading files and processing wave files.
  */
 #ifndef __WAVE_H__
 #define __WAVE_H__

From 05552f7df1b86b58fddb34e08c6b9b17288e6802 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Tue, 6 Oct 2020 17:24:27 +0200
Subject: [PATCH 3/3] Correct cave replace pattern

---
 Source/drlg_l3.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index e4e1ae758..72c30ef85 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -348,7 +348,7 @@ const BYTE L3ISLE1[] = {
 
 	5, 14, // search
 	4,  9,
-	3, 12,
+	13, 12,
 
 	7, 7, // replace
 	7, 7,
@@ -380,8 +380,8 @@ const BYTE L3ISLE3[] = {
 	25, 28,
 	31, 32,
 	// clang-format on
-};/** Miniset: Replace small wall with lava 2. */
-
+};
+/** Miniset: Replace small wall with lava 2. */
 const BYTE L3ISLE4[] = {
 	// clang-format off
 	3, 2, // width, height