aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-02-27 02:29:54 +0000
committerTravis Howell2005-02-27 02:29:54 +0000
commit4cb4f662c87144c858d6129b3a593129d777b031 (patch)
treecb2788e754bf94597da411dc61ebc49ce7523ef8 /scumm
parent8560e08940c6af95f48a983f3e2d7411ee2679cb (diff)
downloadscummvm-rg350-4cb4f662c87144c858d6129b3a593129d777b031.tar.gz
scummvm-rg350-4cb4f662c87144c858d6129b3a593129d777b031.tar.bz2
scummvm-rg350-4cb4f662c87144c858d6129b3a593129d777b031.zip
Rename vars
svn-id: r16944
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h4
-rw-r--r--scumm/script_v90he.cpp28
2 files changed, 16 insertions, 16 deletions
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);