diff options
author | Torbjörn Andersson | 2005-08-06 14:34:40 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-08-06 14:34:40 +0000 |
commit | 510c6f9595d88b6a768828645833607a2fdcaf07 (patch) | |
tree | 9ddd29c4a989368e5a125e12207eb66f87773e40 /scumm | |
parent | 6886f7865ca1f440612a7e04c64f2c23ff309af8 (diff) | |
download | scummvm-rg350-510c6f9595d88b6a768828645833607a2fdcaf07.tar.gz scummvm-rg350-510c6f9595d88b6a768828645833607a2fdcaf07.tar.bz2 scummvm-rg350-510c6f9595d88b6a768828645833607a2fdcaf07.zip |
Cleanup.
svn-id: r18621
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/debugger.cpp | 10 | ||||
-rw-r--r-- | scumm/gfx.cpp | 12 | ||||
-rw-r--r-- | scumm/script_c64.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v2.cpp | 4 | ||||
-rw-r--r-- | scumm/script_v5.cpp | 6 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 6 | ||||
-rw-r--r-- | scumm/script_v7he.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v90he.cpp | 2 |
8 files changed, 22 insertions, 22 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 7ee1252de0..524158d207 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -205,7 +205,7 @@ bool ScummDebugger::Cmd_Room(int argc, const char **argv) { _vm->_actors[_vm->VAR(_vm->VAR_EGO)]._room = room; _vm->_sound->stopAllSounds(); _vm->startScene(room, 0, 0); - _vm->_fullRedraw = 1; + _vm->_fullRedraw = true; return false; } else { DebugPrintf("Current room: %d [%d] - use 'room <roomnum>' to switch\n", _vm->_currentRoom, _vm->_roomResource); @@ -397,21 +397,21 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) { } else if (!strcmp(argv[2], "x")) { a->putActor(value, a->_pos.y, a->_room); DebugPrintf("Actor[%d].x = %d\n", actnum, a->_pos.x); - _vm->_fullRedraw = 1; + _vm->_fullRedraw = true; } else if (!strcmp(argv[2], "y")) { a->putActor(a->_pos.x, value, a->_room); DebugPrintf("Actor[%d].y = %d\n", actnum, a->_pos.y); - _vm->_fullRedraw = 1; + _vm->_fullRedraw = true; } else if (!strcmp(argv[2], "_elevation")) { a->setElevation(value); DebugPrintf("Actor[%d]._elevation = %d\n", actnum, a->getElevation()); - _vm->_fullRedraw = 1; + _vm->_fullRedraw = true; } else if (!strcmp(argv[2], "costume")) { if (value >= _vm->res.num[rtCostume]) DebugPrintf("Costume not changed as %d exceeds max of %d\n", value, _vm->res.num[rtCostume]); else { a->setActorCostume(value); - _vm->_fullRedraw = 1; + _vm->_fullRedraw = true; DebugPrintf("Actor[%d].costume = %d\n", actnum, a->_costume); } } else if (!strcmp(argv[2], "name")) { diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 78524566df..0a51aef884 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -772,24 +772,24 @@ void ScummEngine::redrawBGAreas() { if (_features & GF_NEW_CAMERA) { diff = camera._cur.x / 8 - camera._last.x / 8; - if (_fullRedraw == 0 && diff == 1) { + if (!_fullRedraw && diff == 1) { val = 2; redrawBGStrip(gdi._numStrips - 1, 1); - } else if (_fullRedraw == 0 && diff == -1) { + } else if (!_fullRedraw && diff == -1) { val = 1; redrawBGStrip(0, 1); - } else if (_fullRedraw != 0 || diff != 0) { + } else if (_fullRedraw || diff != 0) { _bgNeedsRedraw = false; redrawBGStrip(0, gdi._numStrips); } } else { - if (_fullRedraw == 0 && camera._cur.x - camera._last.x == 8) { + if (!_fullRedraw && camera._cur.x - camera._last.x == 8) { val = 2; redrawBGStrip(gdi._numStrips - 1, 1); - } else if (_fullRedraw == 0 && camera._cur.x - camera._last.x == -8) { + } else if (!_fullRedraw && camera._cur.x - camera._last.x == -8) { val = 1; redrawBGStrip(0, 1); - } else if (_fullRedraw != 0 || camera._cur.x != camera._last.x) { + } else if (_fullRedraw || camera._cur.x != camera._last.x) { _bgNeedsRedraw = false; _flashlight.isDrawn = false; redrawBGStrip(0, gdi._numStrips); diff --git a/scumm/script_c64.cpp b/scumm/script_c64.cpp index c0c5fc2e51..ad98c025f3 100644 --- a/scumm/script_c64.cpp +++ b/scumm/script_c64.cpp @@ -563,7 +563,7 @@ void ScummEngine_c64::o_lights() { else VAR(VAR_CURRENT_LIGHTS) = 0; - _fullRedraw = 1; + _fullRedraw = true; } void ScummEngine_c64::o_getObjectOwner() { diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index a5b371929f..4d911fd0f2 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -1318,7 +1318,7 @@ void ScummEngine_v2::o2_lights() { _flashlight.xStrips = a; _flashlight.yStrips = b; } - _fullRedraw = 1; + _fullRedraw = true; } void ScummEngine_v2::o2_loadRoomWithEgo() { @@ -1346,7 +1346,7 @@ void ScummEngine_v2::o2_loadRoomWithEgo() { setCameraAt(a->_pos.x, a->_pos.y); setCameraFollows(a); - _fullRedraw = 1; + _fullRedraw = true; resetSentence(); diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 83336c924e..a5dfd1f5c1 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1470,7 +1470,7 @@ void ScummEngine_v5::o5_lights() { _flashlight.xStrips = a; _flashlight.yStrips = b; } - _fullRedraw = 1; + _fullRedraw = true; } void ScummEngine_v5::o5_loadRoom() { @@ -1492,7 +1492,7 @@ void ScummEngine_v5::o5_loadRoom() { if (!(_features & GF_SMALL_HEADER) || room != _currentRoom) startScene(room, 0, 0); - _fullRedraw = 1; + _fullRedraw = true; } void ScummEngine_v5::o5_loadRoomWithEgo() { @@ -1532,7 +1532,7 @@ void ScummEngine_v5::o5_loadRoomWithEgo() { camera._cur.x = camera._dest.x = a->_pos.x; setCameraFollows(a); - _fullRedraw = 1; + _fullRedraw = true; if (x != -1) { a->startWalkActor(x, y, -1); diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 38b41bb668..6a203df093 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1149,7 +1149,7 @@ void ScummEngine_v6::o6_loadRoom() { if (_heversion >= 61) { setCameraAt(camera._cur.x, 0); } - _fullRedraw = 1; + _fullRedraw = true; } void ScummEngine_v6::o6_stopScript() { @@ -1336,7 +1336,7 @@ void ScummEngine_v6::o6_loadRoomWithEgo() { setCameraFollows(a); } - _fullRedraw = 1; + _fullRedraw = true; if (x != -1 && x != 0x7FFFFFFF) { a->startWalkActor(x, y, -1); @@ -2588,7 +2588,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() { fadeOut(args[1]); break; case 6: - _fullRedraw = 1; + _fullRedraw = true; redrawBGAreas(); setActorRedrawFlags(); processActors(); diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index da2eef65e0..8e53334a88 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -800,7 +800,7 @@ void ScummEngine_v70he::o70_kernelSetFunctions() { break; case 23: _charset->clearCharsetMask(); - _fullRedraw = 1; + _fullRedraw = true; break; case 24: _skipProcessActors = 1; diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index cd48980d64..de01794d46 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -2599,7 +2599,7 @@ void ScummEngine_v90he::o90_kernelSetFunctions() { break; case 23: _charset->clearCharsetMask(); - _fullRedraw = 1; + _fullRedraw = true; break; case 24: _skipProcessActors = 1; |