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

Source/drlg_l1.cpp

@@ -1347,9 +1347,9 @@ static void L5makeDmt()
 	for (j = 0, dmty = 1; dmty <= 77; j++, dmty += 2) {
 		for (i = 0, dmtx = 1; dmtx <= 77; i++, dmtx += 2) {
 			val = 8 * L5dungeon[dmtx + 1][dmty + 1]
-			+ 4 * L5dungeon[dmtx][dmty + 1]
-			+ 2 * L5dungeon[dmtx + 1][dmty]
-			+ L5dungeon[dmtx][dmty];
+			    + 4 * L5dungeon[dmtx][dmty + 1]
+			    + 2 * L5dungeon[dmtx + 1][dmty]
+			    + L5dungeon[dmtx][dmty];
 			idx = L5ConvTbl[val];
 			dungeon[i][j] = idx;
 		}

Source/drlg_l4.cpp

@@ -389,9 +389,9 @@ static void L4makeDmt()
 	for (j = 0, dmty = 1; dmty <= 77; j++, dmty += 2) {
 		for (i = 0, dmtx = 1; dmtx <= 77; i++, dmtx += 2) {
 			val = 8 * L4dungeon[dmtx + 1][dmty + 1]
-			+ 4 * L4dungeon[dmtx][dmty + 1]
-			+ 2 * L4dungeon[dmtx + 1][dmty]
-			+ L4dungeon[dmtx][dmty];
+			    + 4 * L4dungeon[dmtx][dmty + 1]
+			    + 2 * L4dungeon[dmtx + 1][dmty]
+			    + L4dungeon[dmtx][dmty];
 			idx = L4ConvTbl[val];
 			dungeon[i][j] = idx;
 		}

Source/inv.cpp

@@ -436,8 +436,8 @@ void DrawInv()
 				cel_transparency_active = 1;
 
 				pBuff = frame_width == INV_SLOT_SIZE_PX
-					? &gpBuffer[SCREENXY(RIGHT_PANEL_X + 197, SCREEN_Y)]
-					: &gpBuffer[SCREENXY(RIGHT_PANEL_X + 183, SCREEN_Y)];
+				    ? &gpBuffer[SCREENXY(RIGHT_PANEL_X + 197, SCREEN_Y)]
+				    : &gpBuffer[SCREENXY(RIGHT_PANEL_X + 183, SCREEN_Y)];
 #ifdef HELLFIRE
 				if (frame <= 179) {
 #endif

Source/itemdat.cpp

@@ -527,7 +527,7 @@ const UItemStruct UniqueItemList[] = {
 	{  "The Protector",           UITYPE_SHORTSTAFF,  16,       6,   17240, IPL_VIT,             5,        5, IPL_GETHIT,           5,        5, IPL_SETAC,           40,       40, IPL_SPELL,            2,       86, IPL_THORNS,           1,         3, IPL_INVCURS,         162,         0 },
 	{  "Naj's Puzzler",           UITYPE_LONGSTAFF,   18,       5,   34000, IPL_MAG,            20,       20, IPL_DEX,             10,       10, IPL_ALLRES,          20,       20, IPL_SPELL,           23,       57, IPL_LIFE_CURSE,      25,        25, IPL_TOHIT,             0,         0 },
 	{  "Mindcry",                 UITYPE_QUARSTAFF,   20,       4,   41500, IPL_MAG,            15,       15, IPL_SPELL,           13,       69, IPL_ALLRES,          15,       15, IPL_SPLLVLADD,        1,        1, IPL_TOHIT,            0,         0, IPL_TOHIT,             0,         0 },
-	{  "Rod of Onan",             UITYPE_WARSTAFF,    22,       3,   44167, IPL_SPELL,          21,       50,  IPL_DAMP,          100,      100, IPL_ATTRIBS,          5,        5, IPL_TOHIT,            0,        0, IPL_TOHIT,            0,         0, IPL_TOHIT,             0,         0 },
+	{  "Rod of Onan",             UITYPE_WARSTAFF,    22,       3,   44167, IPL_SPELL,          21,       50, IPL_DAMP,           100,      100, IPL_ATTRIBS,          5,        5, IPL_TOHIT,            0,        0, IPL_TOHIT,            0,         0, IPL_TOHIT,             0,         0 },
 	{  "Helm of Sprits",          UITYPE_HELM,         1,       2,    7525, IPL_STEALLIFE,       5,        5, IPL_INVCURS,         77,        0, IPL_TOHIT,            0,        0, IPL_TOHIT,            0,        0, IPL_TOHIT,            0,         0, IPL_TOHIT,             0,         0 },
 	{  "Thinking Cap",            UITYPE_SKULLCAP,     6,       5,    2020, IPL_MANA,           30,       30, IPL_SPLLVLADD,        2,        2, IPL_ALLRES,          20,       20, IPL_SETDUR,           1,        1, IPL_INVCURS,         93,         0, IPL_TOHIT,             0,         0 },
 	{  "OverLord's Helm",         UITYPE_HELM,         7,       6,   12500, IPL_STR,            20,       20, IPL_DEX,             15,       15, IPL_VIT,              5,        5, IPL_MAG_CURSE,       20,       20, IPL_SETDUR,          15,        15, IPL_INVCURS,          99,         0 },

Source/missiles.cpp

@@ -4499,7 +4499,6 @@ void MI_Manashield(int i)
 				plr[id]._pMana -= diff;
 				plr[id]._pManaBase -= diff;
 			} else {
-
 #ifdef HELLFIRE
 				plr[id]._pHitPoints += plr[id]._pMana - diff;
 				plr[id]._pHPBase += plr[id]._pMana - diff;

Source/stores.cpp

@@ -1893,8 +1893,8 @@ void SmithBuyItem()
 		plr[myplr].HoldItem._iIdentified = FALSE;
 	StoreAutoPlace();
 	idx = stextvhold + ((stextlhold - stextup) >> 2);
-	if (idx == SMITH_ITEMS-1) {
-		smithitem[SMITH_ITEMS-1]._itype = ITYPE_NONE;
+	if (idx == SMITH_ITEMS - 1) {
+		smithitem[SMITH_ITEMS - 1]._itype = ITYPE_NONE;
 	} else {
 		for (; smithitem[idx + 1]._itype != ITYPE_NONE; idx++) {
 			smithitem[idx] = smithitem[idx + 1];

Source/trigs.cpp

@@ -676,8 +676,8 @@ BOOL ForceL3Trig()
 		}
 		for (i = 0; L3DownList[i] != -1; i++) {
 			if (dPiece[cursmx][cursmy] == L3DownList[i]
-			|| dPiece[cursmx + 1][cursmy] == L3DownList[i]
-			|| dPiece[cursmx + 2][cursmy] == L3DownList[i]) {
+			    || dPiece[cursmx + 1][cursmy] == L3DownList[i]
+			    || dPiece[cursmx + 2][cursmy] == L3DownList[i]) {
 				sprintf(infostr, "Down to level %i", currlevel + 1);
 				for (j = 0; j < numtrigs; j++) {
 					if (trigs[j]._tmsg == WM_DIABNEXTLVL) {
@@ -704,8 +704,8 @@ BOOL ForceL3Trig()
 		}
 		for (i = 0; L6DownList[i] != -1; i++) {
 			if (dPiece[cursmx][cursmy] == L6DownList[i]
-			|| dPiece[cursmx + 1][cursmy] == L6DownList[i]
-			|| dPiece[cursmx + 2][cursmy] == L6DownList[i]) {
+			    || dPiece[cursmx + 1][cursmy] == L6DownList[i]
+			    || dPiece[cursmx + 2][cursmy] == L6DownList[i]) {
 				sprintf(infostr, "Down to level %i", currlevel - 15);
 				for (j = 0; j < numtrigs; j++) {
 					if (trigs[j]._tmsg == WM_DIABNEXTLVL) {