[Scummvm-git-logs] scummvm master -> eb7306286f124f1f9a2285e840a14bba589c2fac
dreammaster
dreammaster at scummvm.org
Tue Jul 11 03:41:04 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eb7306286f TITANIC: Fix rendering of conversation text input
Commit: eb7306286f124f1f9a2285e840a14bba589c2fac
https://github.com/scummvm/scummvm/commit/eb7306286f124f1f9a2285e840a14bba589c2fac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-10T21:40:55-04:00
Commit Message:
TITANIC: Fix rendering of conversation text input
Changed paths:
engines/titanic/pet_control/pet_control.cpp
engines/titanic/support/screen_manager.cpp
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 7ce2e98..94430c6 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -330,6 +330,7 @@ bool CPetControl::KeyCharMsg(CKeyCharMsg *msg) {
if (isInputLocked())
return false;
+ makeDirty();
return _sections[_currentArea]->KeyCharMsg(msg);
}
diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp
index 4e0f040..3082344 100644
--- a/engines/titanic/support/screen_manager.cpp
+++ b/engines/titanic/support/screen_manager.cpp
@@ -245,9 +245,9 @@ int OSScreenManager::writeString(int surfaceNum, const Rect &destRect,
if (surfaceNum >= 0 && surfaceNum < (int)_backSurfaces.size()) {
surface = _backSurfaces[surfaceNum]._surface;
bounds = _backSurfaces[surfaceNum]._bounds;
- } else if (surfaceNum == -1) {
+ } else if (surfaceNum == SURFACE_PRIMARY) {
surface = _frontRenderSurface;
- bounds = Rect(0, 0, surface->getWidth(), surface->getHeight());
+ bounds = _frontSurfaceBounds;
} else {
return -1;
}
More information about the Scummvm-git-logs
mailing list