diff options
| -rw-r--r-- | engines/glk/frotz/pics.cpp | 2 | ||||
| -rw-r--r-- | engines/glk/frotz/pics.h | 12 | ||||
| -rw-r--r-- | engines/glk/frotz/pics_decoder.cpp | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/engines/glk/frotz/pics.cpp b/engines/glk/frotz/pics.cpp index 2d05fc95a2..bda24acf52 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 2c6d17a49e..ab2204f414 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 6dde910508..0e8287851a 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 } } |