[Scummvm-cvs-logs] scummvm master -> 8f40a18146a1a16a5a1d3932e08c2f45e53ea000
clone2727
clone2727 at gmail.com
Mon Mar 14 23:49:34 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6864a6084d SCI: Fix the screen height of SQ1 Mac
8f40a18146 SCI: Remove a space at the end of a warning
Commit: 6864a6084d15bc31cd805c0506427efa742be823
https://github.com/scummvm/scummvm/commit/6864a6084d15bc31cd805c0506427efa742be823
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-14T15:48:43-07:00
Commit Message:
SCI: Fix the screen height of SQ1 Mac
Changed paths:
engines/sci/graphics/screen.cpp
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 48f0cc2..89463ba 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -742,6 +742,7 @@ uint16 GfxScreen::getLowResScreenHeight() {
case GID_FREDDYPHARKAS:
case GID_KQ5:
case GID_KQ6:
+ case GID_SQ1:
return 190;
default:
break;
Commit: 8f40a18146a1a16a5a1d3932e08c2f45e53ea000
https://github.com/scummvm/scummvm/commit/8f40a18146a1a16a5a1d3932e08c2f45e53ea000
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-14T15:48:43-07:00
Commit Message:
SCI: Remove a space at the end of a warning
Changed paths:
engines/sci/engine/object.cpp
diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index 0b2abf1..267ba35 100644
--- a/engines/sci/engine/object.cpp
+++ b/engines/sci/engine/object.cpp
@@ -206,7 +206,7 @@ bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClas
}
warning("Object %04x:%04x (name %s, script %d) varnum doesn't "
- "match baseObj's: obj %d, base %d ", PRINT_REG(_pos),
+ "match baseObj's: obj %d, base %d", PRINT_REG(_pos),
name, objScript, originalVarCount, baseObj->getVarCount());
#if 0
More information about the Scummvm-git-logs
mailing list