[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.135,1.136 simon.cpp,1.531,1.532

[kirben]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26254/simon

Modified Files:
	items.cpp simon.cpp 
Log Message:

Cleanup.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- items.cpp	10 Nov 2005 01:18:09 -0000	1.135
+++ items.cpp	11 Nov 2005 04:55:54 -0000	1.136
@@ -844,25 +844,25 @@
 
 		case 153:{									/* set bit */
 				uint bit = getVarOrByte();
-				_bitArray[bit >> 4] |= 1 << (bit & 15);
+				_bitArray[bit / 16] |= 1 << (bit & 15);
 				break;
 			}
 
 		case 154:{									/* clear bit */
 				uint bit = getVarOrByte();
-				_bitArray[bit >> 4] &= ~(1 << (bit & 15));
+				_bitArray[bit / 16] &= ~(1 << (bit & 15));
 				break;
 			}
 
-		case 155:{									/* is bit clear? */
+		case 155:{									/* is bit clear */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[bit >> 4] & (1 << (bit & 15))) == 0;
+				condition = (_bitArray[bit / 16] & (1 << (bit & 15))) == 0;
 			}
 			break;
 
-		case 156:{									/* is bit set? */
+		case 156:{									/* is bit set */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[bit >> 4] & (1 << (bit & 15))) != 0;
+				condition = (_bitArray[bit / 16] & (1 << (bit & 15))) != 0;
 			}
 			break;
 
@@ -932,25 +932,25 @@
 
 		case 166:{									/* set bit2 */
 				uint bit = getVarOrByte();
-				_bitArray[(bit >> 4) + 16] |= 1 << (bit & 15);
+				_bitArray[(bit / 16) + 16] |= 1 << (bit & 15);
 			}
 			break;
 
 		case 167:{									/* clear bit2 */
 				uint bit = getVarOrByte();
-				_bitArray[(bit >> 4) + 16] &= ~(1 << (bit & 15));
+				_bitArray[(bit / 16) + 16] &= ~(1 << (bit & 15));
 			}
 			break;
 
 		case 168:{									/* is bit2 clear */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[(bit >> 4) + 16] & (1 << (bit & 15))) == 0;
+				condition = (_bitArray[(bit / 16) + 16] & (1 << (bit & 15))) == 0;
 			}
 			break;
 
 		case 169:{									/* is bit2 set */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[(bit >> 4) + 16] & (1 << (bit & 15))) != 0;
+				condition = (_bitArray[(bit / 16) + 16] & (1 << (bit & 15))) != 0;
 			}
 			break;
 
@@ -1140,25 +1140,25 @@
 
 		case 196:{									/* set bit3 */
 				uint bit = getVarOrByte();
-				_bitArray[(bit >> 4) + 32] |= 1 << (bit & 15);
+				_bitArray[(bit / 16) + 32] |= 1 << (bit & 15);
 			}
 			break;
 
 		case 197:{									/* clear bit3 */
 				uint bit = getVarOrByte();
-				_bitArray[(bit >> 4) + 32] &= ~(1 << (bit & 15));
+				_bitArray[(bit / 16) + 32] &= ~(1 << (bit & 15));
 			}
 			break;
 
 		case 198:{									/* is bit3 clear */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[(bit >> 4) + 32] & (1 << (bit & 15))) == 0;
+				condition = (_bitArray[(bit / 16) + 32] & (1 << (bit & 15))) == 0;
 			}
 			break;
 
 		case 199:{									/* is bit3 set */
 				uint bit = getVarOrByte();
-				condition = (_bitArray[(bit >> 4) + 32] & (1 << (bit & 15))) != 0;
+				condition = (_bitArray[(bit / 16) + 32] & (1 << (bit & 15))) != 0;
 			}
 			break;
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -d -r1.531 -r1.532
--- simon.cpp	10 Nov 2005 05:33:31 -0000	1.531
+++ simon.cpp	11 Nov 2005 04:55:54 -0000	1.532
@@ -1065,7 +1065,7 @@
 	while (m != prop) {
 		if (child->avail_props & m)
 			offset++;
-		m <<= 1;
+		m *= 2;
 	}
 	return offset;
 }
@@ -1337,7 +1337,7 @@
 		filename[i] = 0;
 		p++;
 
-		base_max = (p[0] << 8) | p[1];
+		base_max = (p[0] * 256) | p[1];
 		p += 2;
 
 		if (string_id < base_max) {
@@ -1387,13 +1387,13 @@
 		p++;
 
 		for (;;) {
-			min_num = (p[0] << 8) | p[1];
+			min_num = (p[0] * 256) | p[1];
 			p += 2;
 
 			if (min_num == 0)
 				break;
 
-			max_num = (p[0] << 8) | p[1];
+			max_num = (p[0] * 256) | p[1];
 			p += 2;
 
 			if (subr_id >= min_num && subr_id <= max_num) {
@@ -1712,7 +1712,7 @@
 			handle_downarrow_hitarea(_lastHitArea->fcs);
 		} else if (_lastHitArea->item_ptr != NULL) {
 			_hitAreaObjectItem = _lastHitArea->item_ptr;
-			_variableArray[60] = (_lastHitArea->flags & 1) ? (_lastHitArea->flags >> 8) : 0xFFFF;
+			_variableArray[60] = (_lastHitArea->flags & 1) ? (_lastHitArea->flags / 256) : 0xFFFF;
 			break;
 		}
 	}
@@ -2053,16 +2053,16 @@
 				if (ha->y >= limit || ((_game & GF_SIMON2) && ha->y >= _vgaVar8))
 					continue;
 
-				y_ = (ha->height >> 1) - 4 + ha->y;
+				y_ = (ha->height / 2) - 4 + ha->y;
 
-				x_ = (ha->width >> 1) - 4 + ha->x - (_scrollX << 3);
+				x_ = (ha->width / 2) - 4 + ha->x - (_scrollX * 8);
 
 				if (x_ >= 0x137)
 					continue;
 
 				dst = dx_lock_attached();
 
-				dst += (((_dxSurfacePitch >> 2) * y_) << 2) + x_;
+				dst += (((_dxSurfacePitch / 4) * y_) * 4) + x_;
 
 				b = _dxSurfacePitch;
 				dst[4] = color;
@@ -2158,7 +2158,7 @@
 				_hitAreaSubjectItem = ha->item_ptr;
 				id = 0xFFFF;
 				if (ha->flags & 1)
-					id = ha->flags >> 8;
+					id = ha->flags / 256;
 				_variableArray[60] = id;
 				new_current_hitarea(ha);
 				if (_verbHitArea != 0)
@@ -3110,10 +3110,10 @@
 			y_diff = abs((int)(readUint16Wrapper(&p[1]) - 12 - y));
 
 			if (x_diff < y_diff) {
-				x_diff >>= 2;
-				y_diff <<= 2;
+				x_diff /= 4;
+				y_diff *= 4;
 			}
-			x_diff += y_diff >> 2;
+			x_diff += y_diff /= 4;
 
 			if (x_diff < best_dist || x_diff == best_dist && prev_i == i) {
 				best_dist = x_diff;
@@ -3803,11 +3803,11 @@
 		byte *dst;
 
 		if (_game == GAME_SIMON1CD32) {
-			sprintf(buf, "%.3d%d.out", id >> 1, (id & 1) + 1);
+			sprintf(buf, "%.3d%d.out", id / 2, (id & 1) + 1);
 		} else if (_game == GAME_SIMON1AMIGA) {
-			sprintf(buf, "%.3d%d.pkd", id >> 1, (id & 1) + 1);
+			sprintf(buf, "%.3d%d.pkd", id / 2, (id & 1) + 1);
 		} else {
-			sprintf(buf, "%.3d%d.VGA", id >> 1, (id & 1) + 1);
+			sprintf(buf, "%.3d%d.VGA", id / 2, (id & 1) + 1);
 		}
 
 		in.open(buf);