aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2003-02-07 19:24:34 +0000
committerJames Brown2003-02-07 19:24:34 +0000
commit270e95a65575164466ebf9f2a59de696772d9625 (patch)
tree1704117047cb6bdbfda5b68df775b21083095a92
parenta6cbfebf6dd743a6c4e25c3326ed7e10d3037413 (diff)
downloadscummvm-rg350-270e95a65575164466ebf9f2a59de696772d9625.tar.gz
scummvm-rg350-270e95a65575164466ebf9f2a59de696772d9625.tar.bz2
scummvm-rg350-270e95a65575164466ebf9f2a59de696772d9625.zip
Patch 679354: ComI actor redraw patch
svn-id: r6590
-rw-r--r--Makefile4
-rw-r--r--scumm/gfx.cpp1
-rw-r--r--scumm/script_v6.cpp4
3 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 73783df55d..758ba2d491 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ OBJS :=
#######################################################################
# Uncomment this to activate the MAD lib for compressed sound files
-DEFINES += -DUSE_MAD
-LIBS += -lmad
+#DEFINES += -DUSE_MAD
+#LIBS += -lmad
# Uncomment this to activate the Ogg Vorbis lib for compressed sound files
# DEFINES += -DUSE_VORBIS
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 14438616b8..4295d01fad 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -693,7 +693,6 @@ void Scumm::redrawBGAreas()
redrawBGStrip(0, 1);
} else if (_fullRedraw != 0 || diff != 0) {
_BgNeedsRedraw = false;
- _fullRedraw = false;
redrawBGStrip(0, gdi._numStrips);
}
} else {
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 423ea13229..3fca8f3e66 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2466,7 +2466,6 @@ void Scumm_v6::o6_setBlastObjectWindow()
void Scumm_v6::o6_kernelSetFunctions()
{
int args[30];
- int i;
Actor *a;
getStackList(args, sizeof(args) / sizeof(args[0]));
@@ -2657,8 +2656,7 @@ void Scumm_v6::o6_kernelSetFunctions()
case 6:
_fullRedraw = 1;
redrawBGAreas();
- for (i = 1; i < NUM_ACTORS; i++)
- derefActor(i)->needRedraw = true;
+ setActorRedrawFlags(true, false);
processActors();
fadeIn(args[1]);
break;