Changed _oBreak and _oSelFlag to char (#95)

* Changed _oBreak and _oSelFlag to char
diasurgical · Jun 28, 2018 · 87ca655 · 87ca655
1 parent 0c01fc4
commit 87ca655
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 88 deletions.
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
@@ -933,7 +933,7 @@ void __cdecl CheckCursMove()
 			if ( !v62 )
 				goto LABEL_272;
 			v61 = v62 <= 0 ? -1 - v62 : v62 - 1;
-			if ( SLOBYTE(object[v61]._oSelFlag) < 2 )
+			if ( object[v61]._oSelFlag < 2 )
 				goto LABEL_272;
 			cursmx = v6;
 			cursmy = v8 + 1;
@@ -944,7 +944,7 @@ void __cdecl CheckCursMove()
 			if ( !v60 )
 				goto LABEL_272;
 			v61 = v60 <= 0 ? -1 - v60 : v60 - 1;
-			if ( SLOBYTE(object[v61]._oSelFlag) < 2 )
+			if ( object[v61]._oSelFlag < 2 )
 				goto LABEL_272;
 			cursmy = v8;
 			cursmx = v6 + 1;
@@ -964,7 +964,7 @@ void __cdecl CheckCursMove()
 			}
 		}
 		v66 = dObject[1][v27 + 1 + v8];
-		if ( !v66 || (v66 <= 0 ? (v67 = -1 - v66) : (v67 = v66 - 1), SLOBYTE(object[v67]._oSelFlag) < 2) )
+		if ( !v66 || (v66 <= 0 ? (v67 = -1 - v66) : (v67 = v66 - 1), object[v67]._oSelFlag < 2) )
 		{
 LABEL_286:
 			if ( pcursobj != -1 || pcursmonst != -1 )

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -948,10 +948,9 @@ bool __fastcall LeftMouseDown(int a1)
 		}
 		if ( pcursobj != -1 )
 		{
-			if ( v1 != 5 || v7 && (v7 = 120 * pcursobj, *((_BYTE *)&object[0]._oBreak + v7) == 1) )
+			if ( v1 != 5 || v7 && object[pcursobj]._oBreak == 1 )
 			{
-				_LOWORD(v7) = pcursobj;
-				NetSendCmdLocParam1(1u, (pcurs == 5) + CMD_OPOBJXY, cursmx, cursmy, v7);
+				NetSendCmdLocParam1(1u, (pcurs == 5) + CMD_OPOBJXY, cursmx, cursmy, pcursobj);
 				goto LABEL_95;
 			}
 		}

diff --git a/Source/inv.cpp b/Source/inv.cpp
@@ -2505,17 +2505,17 @@ int __fastcall CanPut(int i, int j)
 	v7 = v6 < 0;
 	if ( v6 > 0 )
 	{
-		if ( _LOBYTE(object[v6-1]._oSelFlag) ) /* check */
+		if ( object[v6-1]._oSelFlag ) /* check */
 			return 0;
 		v7 = v6 < 0;
 	}
-	if ( v7 && _LOBYTE(object[-(v6 + 1)]._oSelFlag) )
+	if ( v7 && object[-(v6 + 1)]._oSelFlag )
 		return 0;
 	v8 = dObject[v2 + 1][j];
 	if ( v8 > 0 )
 	{
 		v9 = dObject[v2][j + 1];
-		if ( v9 > 0 && _LOBYTE(object[v8-1]._oSelFlag) && _LOBYTE(object[v9-1]._oSelFlag) )
+		if ( v9 > 0 && object[v8-1]._oSelFlag && object[v9-1]._oSelFlag )
 			return 0;
 	}
 	if ( !currlevel && (dMonster[0][v3] || dMonster[1][v3 + 1]) )

diff --git a/Source/items.cpp b/Source/items.cpp
@@ -1608,17 +1608,17 @@ bool __fastcall ItemSpaceOk(int i, int j)
 	v7 = v6 < 0;
 	if ( v6 > 0 )
 	{
-		if ( _LOBYTE(object[v6-1]._oSelFlag) ) /* check */
+		if ( object[v6-1]._oSelFlag ) /* check */
 			return 0;
 		v7 = v6 < 0;
 	}
-	if ( !v7 || !_LOBYTE(object[-(v6 + 1)]._oSelFlag) )
+	if ( !v7 || !object[-(v6 + 1)]._oSelFlag )
 	{
 		v8 = dObject[v2 + 1][j];
 		if ( v8 <= 0 )
 			return nSolidTable[dPiece[0][v3]] == 0;
 		v9 = dObject[v2][j + 1];
-		if ( v9 <= 0 || !_LOBYTE(object[v8-1]._oSelFlag) || !_LOBYTE(object[v9-1]._oSelFlag) )
+		if ( v9 <= 0 || !object[v8-1]._oSelFlag || !object[v9-1]._oSelFlag )
 			return nSolidTable[dPiece[0][v3]] == 0;
 	}
 	return 0;

diff --git a/Source/missiles.cpp b/Source/missiles.cpp
@@ -2070,7 +2070,7 @@ void __fastcall CheckMissileCol(int i, int mindam, int maxdam, bool shift, int m
 		v25 = v24 <= 0 ? -1 - v24 : v24 - 1;
 		if ( !object[v25]._oMissFlag )
 		{
-			if ( _LOBYTE(object[v25]._oBreak) == 1 )
+			if ( object[v25]._oBreak == 1 )
 				BreakObject(-1, v25);
 			if ( !(_BYTE)nodel )
 				missile[v8]._mirange = 0;