Rename vars

svn-id: r16944

3 files changed, 17 insertions, 17 deletions

diff --git a/TODO b/TODO
index 8f9774b298..4ecabd4c3f 100644
--- a/TODO
+++ b/TODO
@@ -275,7 +275,7 @@ SCUMM
   - Fix cursor transparency in puzzle of pajama2
   - Fix sprites graphical glitches
   - Fix inventory background/items disappearing in puttzoo/zoodemo/putttime/timedemo
-  - Add support for o90_unknown2F (For puzzle in pajama2)
+  - Add support for floodState (For puzzle in pajama2)
   - Add support for o80_unknownE0 (For binoculars in pajama2 and black board in freddi2)
   - Add support for various new opcodes
 
diff --git a/scumm/intern.h b/scumm/intern.h
index 96344ed64e..79475ca3ce 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -846,7 +846,7 @@ protected:
 		const char *desc;
 	};
 
-	struct FloodState {
+	struct FloodStateParameters {
 		Common::Rect box;
 		int field_10;
 		int field_14;
@@ -858,7 +858,7 @@ protected:
 	int _hePaletteNum;
 	
 	const OpcodeEntryV90he *_opcodesV90he;
-	FloodState _floodState;
+	FloodStateParameters _floodStateParams;
 	WizParameters _wizParams;
 
 	int _curMaxSpriteId;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 98232ad66d..358f772f45 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -1607,30 +1607,30 @@ void ScummEngine_v90he::o90_floodState() {
 
 	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);