From 5bad1a7c7fc14caaa8af7d51addc70c94804e435 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 6 Sep 2011 00:43:40 +0200
Subject: CGE: Take into account some of LordHoto's comments

---
 engines/cge/cge_main.cpp | 74 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 9 deletions(-)

(limited to 'engines/cge/cge_main.cpp')

diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 5970a3e339..a6fd08d396 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -84,10 +84,66 @@ const char *savegameStr = "SCUMMVM_CGE";
 
 //--------------------------------------------------------------------------
 
-static  bool _finis = false;
-int _offUseCount;
-
-extern Dac _stdPal[58];
+const Dac g_stdPal[] =  {// R    G   B
+	{   0,  60,  0},    // 198
+	{   0, 104,  0},    // 199
+	{  20, 172,  0},    // 200
+	{  82,  82,  0},    // 201
+	{   0, 132, 82},    // 202
+	{ 132, 173, 82},    // 203
+	{  82,   0,  0},    // 204
+	{ 206,   0, 24},    // 205
+	{ 255,  33, 33},    // 206
+	{ 123,  41,  0},    // 207
+	{   0,  41,  0},    // 208
+	{   0,   0, 82},    // 209
+	{ 132,   0,  0},    // 210
+	{ 255,   0,  0},    // 211
+	{ 255,  66, 66},    // 212
+	{ 148,  66, 16},    // 213
+	{   0,  82,  0},    // 214
+	{   0,   0, 132},   // 215
+	{ 173,   0,  0},    // 216
+	{ 255,  49,  0},    // 217
+	{ 255,  99, 99},    // 218
+	{ 181, 107, 49},    // 219
+	{   0, 132,  0},    // 220
+	{   0,   0, 255},   // 221
+	{ 173,  41,  0},    // 222
+	{ 255,  82,  0},    // 223
+	{ 255, 132, 132},   // 224
+	{ 214, 148, 74},    // 225
+	{  41, 214,  0},    // 226
+	{   0,  82, 173},   // 227
+	{ 255, 214,  0},    // 228
+	{ 247, 132, 49},    // 229
+	{ 255, 165, 165},   // 230
+	{ 239, 198, 123},   // 231
+	{ 173, 214,  0},    // 232
+	{   0, 132, 214},   // 233
+	{  57,  57, 57},    // 234
+	{ 247, 189, 74},    // 235
+	{ 255, 198, 198},   // 236
+	{ 255, 239, 173},   // 237
+	{ 214, 255, 173},   // 238
+	{  82, 173, 255},   // 239
+	{ 107, 107, 107},   // 240
+	{ 247, 222, 99},    // 241
+	{ 255,   0, 255},   // 242
+	{ 255, 132, 255},   // 243
+	{ 132, 132, 173},   // 244
+	{ 148, 247, 255},   // 245
+	{ 148, 148, 148},   // 246
+	{  82,   0, 82},    // 247
+	{ 112,  68, 112},   // 248
+	{ 176,  88, 144},   // 249
+	{ 214, 132, 173},   // 250
+	{ 206, 247, 255},   // 251
+	{ 198, 198, 198},   // 252
+	{   0, 214, 255},   // 253
+	{  96, 224, 96 },   // 254
+	{ 255, 255, 255},   // 255
+};
 
 void CGEEngine::syncHeader(Common::Serializer &s) {
 	debugC(1, kCGEDebugEngine, "CGEEngine::syncHeader(s)");
@@ -691,11 +747,11 @@ System::System(CGEEngine *vm) : Sprite(vm, NULL), _vm(vm) {
 }
 
 void System::setPal() {
-	Dac *p = _vga->_sysPal + 256 - ARRAYSIZE(_stdPal);
-	for (uint i = 0; i < ARRAYSIZE(_stdPal); i++) {
-		p[i]._r = _stdPal[i]._r >> 2;
-		p[i]._g = _stdPal[i]._g >> 2;
-		p[i]._b = _stdPal[i]._b >> 2;
+	Dac *p = _vga->_sysPal + 256 - ARRAYSIZE(g_stdPal);
+	for (uint i = 0; i < ARRAYSIZE(g_stdPal); i++) {
+		p[i]._r = g_stdPal[i]._r >> 2;
+		p[i]._g = g_stdPal[i]._g >> 2;
+		p[i]._b = g_stdPal[i]._b >> 2;
 	}
 }
 
-- 
cgit v1.2.3