[Scummvm-cvs-logs] CVS: scummvm/scumm verbs.cpp,1.112,1.113 script_v5.cpp,1.265,1.266 script_v72he.cpp,2.141,2.142

Max Horn fingolfin at users.sourceforge.net
Thu Sep 30 15:40:03 CEST 2004


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

Modified Files:
	verbs.cpp script_v5.cpp script_v72he.cpp 
Log Message:
Whitespace

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- verbs.cpp	26 Sep 2004 07:30:29 -0000	1.112
+++ verbs.cpp	30 Sep 2004 22:39:12 -0000	1.113
@@ -248,7 +248,7 @@
 	if (_inventoryOffset > 0) {
 		_string[1].xpos = v2_mouseover_boxes[kInventoryUpArrow].rect.left;
 		_string[1].ypos = v2_mouseover_boxes[kInventoryUpArrow].rect.top + vs->topline;
-	        _string[1].color = v2_mouseover_boxes[kInventoryUpArrow].color;
+		_string[1].color = v2_mouseover_boxes[kInventoryUpArrow].color;
 		drawString(1, (const byte *)" \1\2");
 	}
 
@@ -256,7 +256,7 @@
 	if (_inventoryOffset + 4 < getInventoryCount(_scummVars[VAR_EGO])) {
 		_string[1].xpos = v2_mouseover_boxes[kInventoryDownArrow].rect.left;
 		_string[1].ypos = v2_mouseover_boxes[kInventoryDownArrow].rect.top + vs->topline;
-	        _string[1].color = v2_mouseover_boxes[kInventoryDownArrow].color;
+		_string[1].color = v2_mouseover_boxes[kInventoryDownArrow].color;
 		drawString(1, (const byte *)" \3\4");
 	}
 }

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- script_v5.cpp	29 Sep 2004 09:47:37 -0000	1.265
+++ script_v5.cpp	30 Sep 2004 22:39:13 -0000	1.266
@@ -883,9 +883,9 @@
 		switch (_opcode & 0x1F) {
 		case 0x01: // write a range of variables
 			getResultPos();
-		        a = _resultVarNumber;
+			a = _resultVarNumber;
 			getResultPos();
-		        b = _resultVarNumber;
+			b = _resultVarNumber;
 			warning("stub saveVars: vars %d -> %d", a, b);
 			break;
 		case 0x02: // write a range of string variables
@@ -917,9 +917,9 @@
 		switch (_opcode & 0x1F) {
 		case 0x01: // read a range of variables
 			getResultPos();
-		        a = _resultVarNumber;
+			a = _resultVarNumber;
 			getResultPos();
-		        b = _resultVarNumber;
+			b = _resultVarNumber;
 			warning("stub loadVars: vars %d -> %d", a, b);
 			break;
 		case 0x02: // read a range of string variables
@@ -1398,8 +1398,8 @@
 	if (_gameId == GID_INDY3 && (_features & GF_FMTOWNS) &&
 	    (vm.slot[_currentScript].number == 200 || vm.slot[_currentScript].number == 203) &&
 	    _currentRoom == 70 && b == -256) {
-	    o5_jumpRelative();
-	    return;
+		o5_jumpRelative();
+		return;
 	}
 
 	if (b <= a)
@@ -2755,7 +2755,7 @@
 					// calls yet another sub (which also reads byte_2FCCF):
 
 					byte_2FCCF = 0;
-					//call    sub_0BB3
+					//call sub_0BB3
 					
 					
 					// Now sub_085C is called. This is quite simply: it sets 
@@ -2771,12 +2771,12 @@
 					// the above sub_1C44, only it sets byte_2FCCF to 1:
 					
 					byte_2FCCF = 1;
-					// call    sub_0BB3
+					// call sub_0BB3
 
 				} else {
 					// Here only sub_085C is called (see comment above) 
 
-					// call    sub_085C
+					// call sub_085C
 				}
 			return;
 			}

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.141
retrieving revision 2.142
diff -u -d -r2.141 -r2.142
--- script_v72he.cpp	30 Sep 2004 11:56:59 -0000	2.141
+++ script_v72he.cpp	30 Sep 2004 22:39:13 -0000	2.142
@@ -1598,7 +1598,7 @@
 			ch = pvs->h;
 		}
 		Common::Rect rScreen(cw, ch);
-		if (pwi->flags & 0x80) {    
+		if (pwi->flags & 0x80) {
 //  		drawWizImageHelper2(p, wizd, cw, ch, x1, y1, width, height, &rScreen, 0, 2);
 			warning("drawWizImage() unhandled flag 0x80");
 		} else if (pwi->flags & 0x100) {





More information about the Scummvm-git-logs mailing list