aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormd52011-03-02 20:07:46 +0200
committermd52011-03-02 20:07:46 +0200
commitba42c6ff7db37266062d8a03e83a2ff96714b8af (patch)
treef41245c91d70c11ece2b46066f22b8a6d805fc70
parent167ff5dd1b6a9670be5e712c36bff92d9d6a4bf0 (diff)
downloadscummvm-rg350-ba42c6ff7db37266062d8a03e83a2ff96714b8af.tar.gz
scummvm-rg350-ba42c6ff7db37266062d8a03e83a2ff96714b8af.tar.bz2
scummvm-rg350-ba42c6ff7db37266062d8a03e83a2ff96714b8af.zip
SCI: Fixed text positioning in the credits screen of Dr. Brain Amiga
The additional text positioning code in kDisplay was added in SCI1 middle, not SCI1 late. Also, did some slight cleanup
-rw-r--r--engines/sci/engine/vm_types.cpp2
-rw-r--r--engines/sci/graphics/paint16.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/engine/vm_types.cpp b/engines/sci/engine/vm_types.cpp
index 0fc8144da4..85c83bb238 100644
--- a/engines/sci/engine/vm_types.cpp
+++ b/engines/sci/engine/vm_types.cpp
@@ -31,8 +31,6 @@
namespace Sci {
-extern const char *opcodeNames[]; // from scriptdebug.cpp
-
reg_t reg_t::lookForWorkaround(const reg_t right) const {
SciTrackOriginReply originReply;
SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, arithmeticWorkarounds, &originReply);
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 20900c8f8d..774622476b 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -568,7 +568,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
// now drawing the text
_text16->Size(rect, text, -1, width);
rect.moveTo(_ports->getPort()->curLeft, _ports->getPort()->curTop);
- if (getSciVersion() >= SCI_VERSION_1_LATE) {
+ if (getSciVersion() >= SCI_VERSION_1_MIDDLE) {
int16 leftPos = rect.right <= _screen->getWidth() ? 0 : _screen->getWidth() - rect.right;
int16 topPos = rect.bottom <= _screen->getHeight() ? 0 : _screen->getHeight() - rect.bottom;
_ports->move(leftPos, topPos);