[Scummvm-git-logs] scummvm master -> 13b4225e06a2caf5e56ebf4fd4728b07cf1f5a1b

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
13b4225e06 GLK: FROTZ: Hopefully fix Amiga compilation


Commit: 13b4225e06a2caf5e56ebf4fd4728b07cf1f5a1b
    https://github.com/scummvm/scummvm/commit/13b4225e06a2caf5e56ebf4fd4728b07cf1f5a1b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-09T10:14:42-08:00

Commit Message:
GLK: FROTZ: Hopefully fix Amiga compilation

Changed paths:
    engines/glk/frotz/pics.cpp
    engines/glk/frotz/pics.h
    engines/glk/frotz/pics_decoder.cpp


diff --git a/engines/glk/frotz/pics.cpp b/engines/glk/frotz/pics.cpp
index 2d05fc9..bda24ac 100644
--- a/engines/glk/frotz/pics.cpp
+++ b/engines/glk/frotz/pics.cpp
@@ -151,7 +151,7 @@ Common::SeekableReadStream *Pics::createReadStreamForMember(const Common::String
 				f.read(&palette[0], palette.size());
 
 				Common::SeekableReadStream *src = f.readStream(e._dataSize);
-				dest = decoder.decode(*src, e._flags, palette, MCGA, e._width, e._height);
+				dest = decoder.decode(*src, e._flags, palette, kMCGA, e._width, e._height);
 				delete src;
 			} else {
 				byte *rect = (byte *)malloc(2 * sizeof(uint16));
diff --git a/engines/glk/frotz/pics.h b/engines/glk/frotz/pics.h
index 2c6d17a..ab2204f 100644
--- a/engines/glk/frotz/pics.h
+++ b/engines/glk/frotz/pics.h
@@ -30,12 +30,12 @@ namespace Glk {
 namespace Frotz {
 
 enum PicturesMode {
-	MONO  = 0,
-	TEXT  = 1,
-	CGA   = 2,
-	MCGA  = 3,
-	EGA   = 4,
-	AMIGA = 5
+	kMONO  = 0,
+	kTEXT  = 1,
+	kCGA   = 2,
+	kMCGA  = 3,
+	kEGA   = 4,
+	kAmiga = 5
 };
 
 /**
diff --git a/engines/glk/frotz/pics_decoder.cpp b/engines/glk/frotz/pics_decoder.cpp
index 6dde910..0e82878 100644
--- a/engines/glk/frotz/pics_decoder.cpp
+++ b/engines/glk/frotz/pics_decoder.cpp
@@ -67,17 +67,17 @@ Common::SeekableReadStream *PictureDecoder::decode(Common::ReadStream &src, uint
 	 */
 
 	switch (display) {
-	case CGA:
+	case kCGA:
 		colour_shift = -2;
 		break;
-	case EGA:
+	case kEGA:
 		colour_shift = 0;
 		break;
-	case MCGA:
+	case kMCGA:
 		colour_shift = 32;
 		first_colour = 34;
 		break;
-	case AMIGA:
+	case kAmiga:
 		colour_shift = -1;
 		first_colour = 65;
 		break;
@@ -221,7 +221,7 @@ reverse_buffer:
 	 * respectively. The pixel may have to be painted several times if the scaling
 	 * factor is greater than one.
 	 */
-    if (display == CGA && transparent == 0xff) {
+    if (display == kCGA && transparent == 0xff) {
 		// TODO
     } else {
 		byte v = code;
@@ -229,7 +229,7 @@ reverse_buffer:
 		if (v != transparent) {
 			v += colour_shift;
 
-			if (display != MCGA) {
+			if (display != kMCGA) {
 				// TODO
 			} else {
 				// position shift
@@ -237,7 +237,7 @@ reverse_buffer:
 
 			out.writeByte(v);
 
-			if (display == AMIGA) {
+			if (display == kAmiga) {
 				// TODO
 			}
 		}