[Scummvm-git-logs] scummvm master -> 796abef91b2117bd6e49d7e1538a2ba11f4dbffc
dreammaster
paulfgilbert at gmail.com
Wed Jan 16 06:03:11 CET 2019
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:
796abef91b GLK: FROTZ: Route pictures drawn in window 0 to the text buffer window
Commit: 796abef91b2117bd6e49d7e1538a2ba11f4dbffc
https://github.com/scummvm/scummvm/commit/796abef91b2117bd6e49d7e1538a2ba11f4dbffc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-01-15T21:03:02-08:00
Commit Message:
GLK: FROTZ: Route pictures drawn in window 0 to the text buffer window
Changed paths:
engines/glk/frotz/glk_interface.cpp
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 46a6caa..14047f1 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -496,9 +496,14 @@ void GlkInterface::showBeyondZorkTitle() {
}
void GlkInterface::os_draw_picture(int picture, const Common::Point &pos) {
- glk_image_draw(_wp._background, picture,
- (pos.x - 1) * g_conf->_monoInfo._cellW,
- (pos.y - 1) * g_conf->_monoInfo._cellH);
+ if (cwin == 0) {
+ // Picture embedded within the lower text area
+ glk_image_draw(_wp._lower, picture, 0, 0);
+ } else {
+ glk_image_draw(_wp._background, picture,
+ (pos.x - 1) * g_conf->_monoInfo._cellW,
+ (pos.y - 1) * g_conf->_monoInfo._cellH);
+ }
}
void GlkInterface::os_draw_picture(int picture, const Common::Rect &r) {
More information about the Scummvm-git-logs
mailing list