Merge remote-tracking branch 'devilution/master'

Source/scrollrt.cpp

@@ -999,7 +999,7 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
 	if ( v49 )
 	{
 		v16 = &item[v49-1];
-		if ( !v16->_iPostDraw && (unsigned char)v49 <= 0x7Fu )
+		if ( !v16->_iPostDraw && (unsigned char)v49 <= MAXITEMS )
 		{
 			v17 = (char *)v16->_iAnimData;
 			if ( v17 )
@@ -1048,7 +1048,7 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
 	{
 		v23 = -1 - v41;
 		draw_monster_num = -1 - v41;
-		if ( (unsigned int)(-1 - v41) < 0xC8 )
+		if ( (unsigned int)(-1 - v41) < MAXMONSTERS )
 		{
 			v24 = &monster[v23];
 			if ( !(v24->_mFlags & 1) )
@@ -1105,7 +1105,7 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
 	{
 		v31 = v40 - 1;
 		draw_monster_num = v40 - 1;
-		if ( (unsigned int)(v40 - 1) < 0xC8 )
+		if ( (unsigned int)(v40 - 1) < MAXMONSTERS )
 		{
 			v32 = &monster[v31];
 			if ( !(v32->_mFlags & 1) )
@@ -1136,7 +1136,7 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
 		v36 = &item[v49-1];
 		if ( v36->_iPostDraw )
 		{
-			if ( (unsigned char)v49 <= 0x7Fu )
+			if ( (unsigned char)v49 <= MAXITEMS )
 			{
 				v37 = (char *)v36->_iAnimData;
 				if ( v37 )
@@ -1183,7 +1183,7 @@ void __fastcall DrawClippedMonster(int x, int y, int a3, int a4, int mon_id, int
 	CMonster *v11; // eax
 	char mon_ida; // [esp+1Ch] [ebp+10h]
 
-	if ( (unsigned int)mon_id < 0xC8 )
+	if ( (unsigned int)mon_id < MAXMONSTERS )
 	{
 		v7 = mon_id;
 		v8 = (char *)monster[mon_id]._mAnimData;
@@ -1270,7 +1270,7 @@ void __fastcall DrawClippedObject(int x, int y, int a3, int a4, int pre_flag, in
 		v11 = a4;
 		v12 = a3 - object[v10]._oAnimWidth2;
 	}
-	if ( v9 < 0x7Fu )
+	if ( v9 < MAXOBJECTS )
 	{
 		v15 = (char *)object[v10]._oAnimData;
 		if ( v15 )
@@ -1672,7 +1672,7 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
 	if ( v52 )
 	{
 		v19 = &item[v52-1];
-		if ( !v19->_iPostDraw && (unsigned char)v52 <= 0x7Fu )
+		if ( !v19->_iPostDraw && (unsigned char)v52 <= MAXITEMS )
 		{
 			v20 = (char *)v19->_iAnimData;
 			if ( v20 )
@@ -1721,7 +1721,7 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
 	{
 		v26 = -1 - v44;
 		draw_monster_num = -1 - v44;
-		if ( (unsigned int)(-1 - v44) < 0xC8 )
+		if ( (unsigned int)(-1 - v44) < MAXMONSTERS )
 		{
 			v27 = &monster[v26];
 			if ( !(v27->_mFlags & 1) )
@@ -1779,7 +1779,7 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
 	{
 		v34 = v43 - 1;
 		draw_monster_num = v43 - 1;
-		if ( (unsigned int)(v43 - 1) < 0xC8 )
+		if ( (unsigned int)(v43 - 1) < MAXMONSTERS )
 		{
 			v35 = &monster[v34];
 			if ( !(v35->_mFlags & 1) )
@@ -1811,7 +1811,7 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
 		v39 = &item[v52-1];
 		if ( v39->_iPostDraw )
 		{
-			if ( (unsigned char)v52 <= 0x7Fu )
+			if ( (unsigned char)v52 <= MAXITEMS )
 			{
 				v40 = (char *)v39->_iAnimData;
 				if ( v40 )
@@ -2274,7 +2274,7 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
 	if ( v51 )
 	{
 		v18 = &item[v51-1];
-		if ( !v18->_iPostDraw && (unsigned char)v51 <= 0x7Fu )
+		if ( !v18->_iPostDraw && (unsigned char)v51 <= MAXITEMS )
 		{
 			v19 = (char *)v18->_iAnimData;
 			if ( v19 )
@@ -2323,7 +2323,7 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
 	{
 		v25 = -1 - v43;
 		draw_monster_num = -1 - v43;
-		if ( (unsigned int)(-1 - v43) < 0xC8 )
+		if ( (unsigned int)(-1 - v43) < MAXMONSTERS )
 		{
 			v26 = &monster[v25];
 			if ( !(v26->_mFlags & 1) )
@@ -2380,7 +2380,7 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
 	{
 		v33 = v42 - 1;
 		draw_monster_num = v42 - 1;
-		if ( (unsigned int)(v42 - 1) < 0xC8 )
+		if ( (unsigned int)(v42 - 1) < MAXMONSTERS )
 		{
 			v34 = &monster[v33];
 			if ( !(v34->_mFlags & 1) )
@@ -2411,7 +2411,7 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
 		v38 = &item[v51-1];
 		if ( v38->_iPostDraw )
 		{
-			if ( (unsigned char)v51 <= 0x7Fu )
+			if ( (unsigned char)v51 <= MAXITEMS )
 			{
 				v39 = (char *)v38->_iAnimData;
 				if ( v39 )
@@ -2458,7 +2458,7 @@ void __fastcall DrawMonster(int x, int y, int a3, int a4, int mon_id, int a6, in
 	CMonster *v11; // eax
 	char mon_ida; // [esp+1Ch] [ebp+10h]
 
-	if ( (unsigned int)mon_id < 0xC8 )
+	if ( (unsigned int)mon_id < MAXMONSTERS )
 	{
 		v7 = mon_id;
 		v8 = (char *)monster[mon_id]._mAnimData;
@@ -2543,7 +2543,7 @@ void __fastcall DrawObject(int x, int y, int a3, int a4, int pre_flag, int a6, i
 		v11 = a4;
 		v12 = a3 - object[v10]._oAnimWidth2;
 	}
-	if ( v9 < 0x7Fu )
+	if ( v9 < MAXOBJECTS )
 	{
 		v15 = (char *)object[v10]._oAnimData;
 		if ( v15 )