WAGE: Simplified default pattern setting

scummvm · Feb 14, 2016 · d9c3cd1 · d9c3cd1
1 parent ee89992
commit d9c3cd1
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
@@ -67,10 +67,11 @@ static const byte palette[] = {
 	0x00, 0xff, 0x00   // Green
 };
 
-static byte fillPattern[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-static byte fillPatternStripes[8] = { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 };
-static byte fillPatternCheckers[8] = { 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 };
-static byte fillPatternCheckers2[8] = { 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa };
+static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, // kPatternSolid
+								  { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 }, // kPatternStripes
+								  { 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 }, // kPatternCheckers
+								  { 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa }  // kPatternCheckers2
+};
 
 static const byte macCursorArrow[] = {
 	2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -161,10 +162,8 @@ Gui::Gui(WageEngine *engine) {
 	_cursorIsArrow = true;
 	CursorMan.showMouse(true);
 
-	_patterns.push_back(fillPattern);
-	_patterns.push_back(fillPatternStripes);
-	_patterns.push_back(fillPatternCheckers);
-	_patterns.push_back(fillPatternCheckers2);
+	for (int i = 0; i < ARRAYSIZE(fillPatterns); i++)
+		_patterns.push_back(fillPatterns[i]);
 
 	loadFonts();