WAGE: Fix border clipping

2 files changed, 6 insertions, 3 deletions

diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index f20f18c233..6914fdbf49 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -68,7 +68,7 @@ static const byte palette[] = {
 	0x80, 0x80, 0x80,  // Gray
 	0xff, 0xff, 0xff,  // White
 	0x00, 0xff, 0x00,  // Green
-	0x00, 0x7f, 0x00   // Green2
+	0x00, 0xcf, 0x00   // Green2
 };
 
 static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, // kPatternSolid
@@ -171,7 +171,7 @@ Gui::Gui(WageEngine *engine) {
 
 	_inputTextLineNum = 0;
 
-	g_system->getPaletteManager()->setPalette(palette, 0, 4);
+	g_system->getPaletteManager()->setPalette(palette, 0, ARRAYSIZE(palette) / 3);
 
 	CursorMan.replaceCursorPalette(palette, 0, 4);
 	CursorMan.replaceCursor(macCursorArrow, 11, 16, 1, 1, 3);
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp
index d1b65640aa..865bd2dab4 100644
--- a/engines/wage/macwindow.cpp
+++ b/engines/wage/macwindow.cpp
@@ -147,8 +147,11 @@ void MacWindow::drawBorder() {
 	int height = _borderSurface.h;
 	Graphics::ManagedSurface *g = &_borderSurface;
 
+	// We draw rect with outer kColorGreen2 and inner kColorGreen, so on 2 passes we cut out
+	// scene by external shape of the border
+	int sz = kBorderWidth / 2;
 	g->clear(kColorGreen2);
-	g->fillRect(Common::Rect(kBorderWidth, kBorderWidth, width - kBorderWidth, height - kBorderWidth), kColorGreen);
+	g->fillRect(Common::Rect(sz, sz, width - sz, height - sz), kColorGreen);
 
 	drawBox(g, x,                    y,                     size,                 size);
 	drawBox(g, x + width - size - 1, y,                     size,                 size);