aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui
diff options
context:
space:
mode:
authorstevenhoefel2017-01-13 12:17:36 +1100
committerstevenhoefel2017-01-13 12:17:36 +1100
commit6e04b361b242a8c50ad4e5c7f757a00b167e27e3 (patch)
tree1ac5759d1d57d4e51483cd5e1b69398c7a4c437a /graphics/macgui
parent457c8548a9fb0d88bb5dd92a2891438f309c5ec2 (diff)
downloadscummvm-rg350-6e04b361b242a8c50ad4e5c7f757a00b167e27e3.tar.gz
scummvm-rg350-6e04b361b242a8c50ad4e5c7f757a00b167e27e3.tar.bz2
scummvm-rg350-6e04b361b242a8c50ad4e5c7f757a00b167e27e3.zip
DIRECTOR: Implement Shape Patterns and Borders for D3.
Diffstat (limited to 'graphics/macgui')
-rw-r--r--graphics/macgui/macwindowmanager.cpp4
-rw-r--r--graphics/macgui/macwindowmanager.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index ebc2a8f76d..77f22a191d 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -232,7 +232,7 @@ void macDrawPixel(int x, int y, int color, void *data) {
*((byte *)p->surface->getBasePtr(xu, yu)) =
(pat[yu % 8] & (1 << (7 - xu % 8))) ?
- color : kColorWhite;
+ color : p->bgColor;
}
} else {
int x1 = x;
@@ -247,7 +247,7 @@ void macDrawPixel(int x, int y, int color, void *data) {
uint yu = (uint)y;
*((byte *)p->surface->getBasePtr(xu, yu)) =
(pat[yu % 8] & (1 << (7 - xu % 8))) ?
- color : kColorWhite;
+ color : p->bgColor;
}
}
}
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index d359369415..8f04861b68 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -70,9 +70,10 @@ struct MacPlotData {
MacPatterns *patterns;
uint fillType;
int thickness;
+ uint bgColor;
- MacPlotData(Graphics::ManagedSurface *s, MacPatterns *p, int f, int t) :
- surface(s), patterns(p), fillType(f), thickness(t) {
+ MacPlotData(Graphics::ManagedSurface *s, MacPatterns *p, int f, int t, uint bg = kColorWhite) :
+ surface(s), patterns(p), fillType(f), thickness(t), bgColor(bg) {
}
};