libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Attempt to fix tile pattern origin. Still incorrect

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-06-15 17:21:31 +02:00
parent 131138b9a7
commit 1e082af6f8
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/director/graphics.cpp
View File

@ -28,6 +28,7 @@
#include "director/castmember.h"
#include "director/movie.h"
#include "director/images.h"
#include "director/window.h"
namespace Director {
@ -415,9 +416,17 @@ void DirectorPlotData::inkBlitShape(Common::Rect &srcRect) {
break;
}
Common::Point wpos;
Movie *movie = g_director->getCurrentMovie();
if (g_director->_wm->_mode & Graphics::kWMModeNoDesktop)
wpos = Common::Point(movie->getCast()->_movieRect.left, movie->getCast()->_movieRect.top);
else
wpos = movie->getWindow()->getAbsolutePos();
Common::Rect fillAreaRect((int)srcRect.width(), (int)srcRect.height());
fillAreaRect.moveTo(srcRect.left, srcRect.top);
Graphics::MacPlotData plotFill(dst, nullptr, &d->getPatterns(), ms->pattern, srcRect.left, srcRect.top, 1, ms->backColor);
Graphics::MacPlotData plotFill(dst, nullptr, &d->getPatterns(), ms->pattern, srcRect.left + wpos.x, srcRect.top + wpos.y, 1, ms->backColor);
uint strokePattern = 1;
@ -427,7 +436,7 @@ void DirectorPlotData::inkBlitShape(Common::Rect &srcRect) {
Common::Rect strokeRect(MAX((int)srcRect.width() - ms->lineSize, 0), MAX((int)srcRect.height() - ms->lineSize, 0));
strokeRect.moveTo(srcRect.left, srcRect.top);
Graphics::MacPlotData plotStroke(dst, nullptr, &d->getPatterns(), strokePattern, strokeRect.left, strokeRect.top, ms->lineSize, ms->backColor);
Graphics::MacPlotData plotStroke(dst, nullptr, &d->getPatterns(), strokePattern, strokeRect.left + wpos.x, strokeRect.top + wpos.y, ms->lineSize, ms->backColor);
switch (ms->spriteType) {
case kRectangleSprite: