[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.373,2.374 script_v90he.cpp,2.166,2.167

kirben kirben at users.sourceforge.net
Sat Feb 26 18:32:14 CET 2005


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

Modified Files:
	intern.h script_v90he.cpp 
Log Message:

Rename vars


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.373
retrieving revision 2.374
diff -u -d -r2.373 -r2.374
--- intern.h	27 Feb 2005 01:20:44 -0000	2.373
+++ intern.h	27 Feb 2005 02:29:54 -0000	2.374
@@ -846,7 +846,7 @@
 		const char *desc;
 	};
 
-	struct FloodState {
+	struct FloodStateParameters {
 		Common::Rect box;
 		int field_10;
 		int field_14;
@@ -858,7 +858,7 @@
 	int _hePaletteNum;
 	
 	const OpcodeEntryV90he *_opcodesV90he;
-	FloodState _floodState;
+	FloodStateParameters _floodStateParams;
 	WizParameters _wizParams;
 
 	int _curMaxSpriteId;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.166
retrieving revision 2.167
diff -u -d -r2.166 -r2.167
--- script_v90he.cpp	27 Feb 2005 01:23:50 -0000	2.166
+++ script_v90he.cpp	27 Feb 2005 02:29:54 -0000	2.167
@@ -1607,30 +1607,30 @@
 
 	switch (subOp) {
 	case 0:
-		_floodState.field_1C = pop();
+		_floodStateParams.field_1C = pop();
 		break;
 	case 3:
-		memset(&_floodState, 0, sizeof(_floodState));
-		_floodState.box.left = 0;
-		_floodState.box.top = 0;
-		_floodState.box.right = 640;
-		_floodState.box.bottom = 480;
+		memset(&_floodStateParams, 0, sizeof(_floodStateParams));
+		_floodStateParams.box.left = 0;
+		_floodStateParams.box.top = 0;
+		_floodStateParams.box.right = 640;
+		_floodStateParams.box.bottom = 480;
 		break;
 	case 11:
-		_floodState.field_14 = pop();
-		_floodState.field_10 = pop();
+		_floodStateParams.field_14 = pop();
+		_floodStateParams.field_10 = pop();
 		break;
 	case 12:
-		_floodState.field_18 = pop();
+		_floodStateParams.field_18 = pop();
 		break;
 	case 13:
-		_floodState.box.bottom = pop();
-		_floodState.box.right = pop();
-		_floodState.box.top = pop();
-		_floodState.box.left = pop();
+		_floodStateParams.box.bottom = pop();
+		_floodStateParams.box.right = pop();
+		_floodStateParams.box.top = pop();
+		_floodStateParams.box.left = pop();
 		break;
 	case 201:
-		//floodState(_floodState);
+		//floodState(_floodStateParams);
 		break;
 	default:
 		error("o90_floodState: Unknown case %d", subOp);





More information about the Scummvm-git-logs mailing list