Merge branch 'master' of github.com:diasurgical/devilution

Source/all.h

@@ -1,7 +1,7 @@
 /**
  * @file all.h
  *
- * Include all aplication headers.
+ * Include all application headers.
  */
 #ifndef __ALL_H__
 #define __ALL_H__

Source/appfat.cpp

@@ -9,7 +9,7 @@
 
 DEVILUTION_BEGIN_NAMESPACE
 
-/** 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;

Source/drlg_l3.cpp

@@ -352,7 +352,7 @@ const BYTE L3ISLE1[] = {
 
 	5, 14, // search
 	4,  9,
-	3, 12,
+	13, 12,
 
 	7, 7, // replace
 	7, 7,
@@ -384,8 +384,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

Source/inv.cpp

@@ -1563,7 +1563,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);

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__

Source/scrollrt.cpp

@@ -769,7 +769,7 @@ static void scrollrt_draw_dungeon(int sx, int sy, int dx, int dy)
 }
 
 /**
- * @brief Render a row of floor tiles
+ * @brief Render a row of tiles
  * @param x dPiece coordinate
  * @param y dPiece coordinate
  * @param sx Back buffer coordinate
@@ -1382,10 +1382,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

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__

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__