aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/gfx.cpp10
-rw-r--r--engines/scumm/he/animation_he.cpp4
-rw-r--r--engines/scumm/he/animation_he.h2
-rw-r--r--engines/scumm/he/cup_player_he.cpp3
-rw-r--r--engines/scumm/he/floodfill_he.cpp4
-rw-r--r--engines/scumm/he/logic_he.cpp4
-rw-r--r--engines/scumm/he/logic_he.h2
-rw-r--r--engines/scumm/he/palette_he.cpp4
-rw-r--r--engines/scumm/he/script_v100he.cpp4
-rw-r--r--engines/scumm/he/script_v71he.cpp4
-rw-r--r--engines/scumm/he/script_v72he.cpp4
-rw-r--r--engines/scumm/he/script_v80he.cpp4
-rw-r--r--engines/scumm/he/script_v90he.cpp4
-rw-r--r--engines/scumm/he/sound_he.cpp1
-rw-r--r--engines/scumm/he/sprite_he.cpp4
-rw-r--r--engines/scumm/he/wiz_he.cpp4
16 files changed, 53 insertions, 9 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 3839a75261..1802d0d39c 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -687,6 +687,16 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
width -= 16;
if (width <= 0)
return;
+
+ // HACK: In this way we won't get a screen with dirty side strips when
+ // loading a narrow room in a full screen room.
+ if (width == 224 && height == 240 && x == 16) {
+ char blackbuf[16 * 240];
+ memset(blackbuf, 0, 16 * 240); // Prepare a buffer 16px wide and 240px high, to fit on a lateral strip
+
+ width = 240; // Fix right strip
+ _system->copyRectToScreen((const byte *)blackbuf, 16, 0, 0, 16, 240); // Fix left strip
+ }
}
}
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 92b72bd9be..47b25c57d1 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#ifdef ENABLE_HE
#include "scumm/he/animation_he.h"
#include "scumm/he/intern_he.h"
@@ -129,3 +129,5 @@ void MoviePlayer::setPalette(byte *pal) {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index e2fc1d04b7..0adba35d53 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -23,7 +23,7 @@
*
*/
-#ifndef SCUMM_HE_ANIMATION_H
+#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE)
#define SCUMM_HE_ANIMATION_H
#include "common/file.h"
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 39615edb6a..a284632fb1 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -23,6 +23,7 @@
*
*/
+#ifdef ENABLE_HE
#include "common/system.h"
#include "sound/audiostream.h"
@@ -521,3 +522,5 @@ void CUP_Player::handleTOIL(Common::SeekableReadStream &dataStream, uint32 dataS
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp
index d3578e2189..491b91c17e 100644
--- a/engines/scumm/he/floodfill_he.cpp
+++ b/engines/scumm/he/floodfill_he.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#ifdef ENABLE_HE
#include "scumm/he/floodfill_he.h"
#include "scumm/he/intern_he.h"
@@ -293,3 +293,5 @@ void Wiz::fillWizFlood(const WizParameters *params) {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp
index a24f4d4665..b7d2c9264c 100644
--- a/engines/scumm/he/logic_he.cpp
+++ b/engines/scumm/he/logic_he.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#ifdef ENABLE_HE
#include "scumm/he/intern_he.h"
#include "scumm/he/logic_he.h"
@@ -1058,3 +1058,5 @@ int LogicHEmoonbase::versionID() {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h
index 29304b7468..f5ecdd429a 100644
--- a/engines/scumm/he/logic_he.h
+++ b/engines/scumm/he/logic_he.h
@@ -26,8 +26,6 @@
#if !defined(SCUMM_HE_LOGIC_HE_H) && defined(ENABLE_HE)
#define SCUMM_HE_LOGIC_HE_H
-
-
namespace Scumm {
class ScummEngine_v90he;
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp
index 812c39d173..02f3f3fc5c 100644
--- a/engines/scumm/he/palette_he.cpp
+++ b/engines/scumm/he/palette_he.cpp
@@ -8,6 +8,7 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
+
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -22,6 +23,7 @@
*
*/
+#ifdef ENABLE_HE
#include "common/system.h"
#include "scumm/scumm.h"
@@ -420,3 +422,5 @@ void ScummEngine_v99he::updatePalette() {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 2748633bdc..49e490a8ec 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/system.h"
#include "scumm/actor.h"
@@ -3028,3 +3030,5 @@ void ScummEngine_v100he::decodeParseString(int m, int n) {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/script_v71he.cpp b/engines/scumm/he/script_v71he.cpp
index c832d64316..46a8868949 100644
--- a/engines/scumm/he/script_v71he.cpp
+++ b/engines/scumm/he/script_v71he.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "scumm/actor.h"
#include "scumm/he/intern_he.h"
#include "scumm/scumm.h"
@@ -446,3 +448,5 @@ void ScummEngine_v71he::o71_polygonHit() {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index c6489004d7..0c2c01d419 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -2048,3 +2050,5 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index fb63568e9f..dd44180fa0 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "common/config-file.h"
#include "common/config-manager.h"
#include "common/savefile.h"
@@ -529,3 +531,5 @@ void ScummEngine_v80he::o80_pickVarRandom() {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 8c50dfecc3..e302af1144 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_HE
+
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/he/animation_he.h"
@@ -2365,3 +2367,5 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 67248f4c22..01f29d5db9 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -23,7 +23,6 @@
*
*/
-
#include "scumm/actor.h"
#include "scumm/file.h"
#include "scumm/imuse/imuse.h"
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index aed03f746b..5f751d8285 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#ifdef ENABLE_HE
#include "scumm/he/intern_he.h"
#include "scumm/resource.h"
@@ -1442,3 +1442,5 @@ void Sprite::saveOrLoadSpriteData(Serializer *s) {
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index b79c35740e..b00294cb96 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#ifdef ENABLE_HE
#include "common/system.h"
#include "graphics/cursorman.h"
@@ -2679,3 +2679,5 @@ int ScummEngine_v90he::computeWizHistogram(int resNum, int state, int x, int y,
}
} // End of namespace Scumm
+
+#endif // ENABLE_HE
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 17:00:10 +0000