diff options
author | Thierry Crozat | 2017-09-24 17:53:01 +0100 |
---|---|---|
committer | Thierry Crozat | 2018-01-23 02:15:32 +0000 |
commit | d1bdfd2bde41732e9c2eaf374ff88b56727c9013 (patch) | |
tree | 1caed043200b48c41a7ae06592f07a76de7ae38d | |
parent | 4c9fc3cdbc0ff8a90a9af267fc63e8cf92e0f671 (diff) | |
download | scummvm-rg350-d1bdfd2bde41732e9c2eaf374ff88b56727c9013.tar.gz scummvm-rg350-d1bdfd2bde41732e9c2eaf374ff88b56727c9013.tar.bz2 scummvm-rg350-d1bdfd2bde41732e9c2eaf374ff88b56727c9013.zip |
SUPERNOVA: Clean indentations
-rw-r--r-- | engines/supernova/graphics.cpp | 4 | ||||
-rw-r--r-- | engines/supernova/msn_def.h | 448 | ||||
-rw-r--r-- | engines/supernova/rooms.cpp | 2 | ||||
-rw-r--r-- | engines/supernova/state.cpp | 16 | ||||
-rw-r--r-- | engines/supernova/supernova.cpp | 72 | ||||
-rw-r--r-- | engines/supernova/supernova.h | 12 |
6 files changed, 277 insertions, 277 deletions
diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp index 657f27d50c..70f05903ea 100644 --- a/engines/supernova/graphics.cpp +++ b/engines/supernova/graphics.cpp @@ -33,8 +33,8 @@ namespace Supernova { MSNImageDecoder::MSNImageDecoder() { - _palette = nullptr; - _encodedImage = nullptr; + _palette = nullptr; + _encodedImage = nullptr; _filenumber = -1; _pitch = 0; _numSections = 0; diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index a532a2baed..a02df72593 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -106,210 +106,210 @@ const int kColorLightRed = 15; const int kColorCursorTransparent = kColorWhite25; const byte mouseNormal[64] = { - 0xff,0x3f,0xff,0x1f,0xff,0x0f,0xff,0x07, - 0xff,0x03,0xff,0x01,0xff,0x00,0x7f,0x00, - 0x3f,0x00,0x1f,0x00,0x0f,0x00,0x0f,0x00, - 0xff,0x00,0x7f,0x18,0x7f,0x38,0x7f,0xfc, - - 0x00,0x00,0x00,0x40,0x00,0x60,0x00,0x70, - 0x00,0x78,0x00,0x7c,0x00,0x7e,0x00,0x7f, - 0x80,0x7f,0xc0,0x7f,0xe0,0x7f,0x00,0x7e, - 0x00,0x66,0x00,0x43,0x00,0x03,0x00,0x00 + 0xff,0x3f,0xff,0x1f,0xff,0x0f,0xff,0x07, + 0xff,0x03,0xff,0x01,0xff,0x00,0x7f,0x00, + 0x3f,0x00,0x1f,0x00,0x0f,0x00,0x0f,0x00, + 0xff,0x00,0x7f,0x18,0x7f,0x38,0x7f,0xfc, + + 0x00,0x00,0x00,0x40,0x00,0x60,0x00,0x70, + 0x00,0x78,0x00,0x7c,0x00,0x7e,0x00,0x7f, + 0x80,0x7f,0xc0,0x7f,0xe0,0x7f,0x00,0x7e, + 0x00,0x66,0x00,0x43,0x00,0x03,0x00,0x00 }; const byte mouseWait[64] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80, - 0x01,0x80,0x01,0x80,0x11,0x88,0x31,0x8c, - 0x31,0x8c,0x11,0x88,0x01,0x80,0x01,0x80, - 0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00, - - 0x00,0x00,0xfe,0x7f,0xf4,0x2f,0xf4,0x2f, - 0x14,0x28,0x24,0x24,0x44,0x22,0x84,0x21, - 0x84,0x21,0xc4,0x23,0xe4,0x27,0x74,0x2e, - 0x34,0x2c,0x14,0x28,0xfe,0x7f,0x00,0x00 + 0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80, + 0x01,0x80,0x01,0x80,0x11,0x88,0x31,0x8c, + 0x31,0x8c,0x11,0x88,0x01,0x80,0x01,0x80, + 0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0xfe,0x7f,0xf4,0x2f,0xf4,0x2f, + 0x14,0x28,0x24,0x24,0x44,0x22,0x84,0x21, + 0x84,0x21,0xc4,0x23,0xe4,0x27,0x74,0x2e, + 0x34,0x2c,0x14,0x28,0xfe,0x7f,0x00,0x00 }; const byte font[][5] = { - {0x00,0x00,0x00,0xff,0x00}, - {0x5f,0xff,0x00,0x00,0x00}, - {0x03,0x00,0x03,0xff,0x00}, - {0x14,0x7f,0x14,0x7f,0x14}, - {0x24,0x2a,0x7f,0x2a,0x12}, - {0x61,0x10,0x08,0x04,0x43}, - {0x38,0x4e,0x59,0x26,0x50}, - {0x03,0xff,0x00,0x00,0x00}, - {0x3e,0x41,0xff,0x00,0x00}, - {0x41,0x3e,0xff,0x00,0x00}, - {0x10,0x54,0x38,0x54,0x10}, - {0x10,0x10,0x7c,0x10,0x10}, - {0x80,0x40,0xff,0x00,0x00}, - {0x10,0x10,0x10,0x10,0x10}, - {0x40,0xff,0x00,0x00,0x00}, - {0x60,0x10,0x08,0x04,0x03}, - - {0x3e,0x41,0x41,0x41,0x3e}, /* digits */ - {0x04,0x02,0x7f,0xff,0x00}, - {0x42,0x61,0x51,0x49,0x46}, - {0x22,0x41,0x49,0x49,0x36}, - {0x18,0x14,0x12,0x7f,0x10}, - {0x27,0x45,0x45,0x45,0x39}, - {0x3e,0x49,0x49,0x49,0x32}, - {0x01,0x61,0x19,0x07,0x01}, - {0x36,0x49,0x49,0x49,0x36}, - {0x26,0x49,0x49,0x49,0x3e}, - - {0x44,0xff,0x00,0x00,0x00}, - {0x80,0x44,0xff,0x00,0x00}, - {0x10,0x28,0x44,0xff,0x00}, - {0x28,0x28,0x28,0x28,0x28}, - {0x44,0x28,0x10,0xff,0x00}, - {0x02,0x01,0x51,0x09,0x06}, - {0x3e,0x41,0x5d,0x5d,0x1e}, - - {0x7c,0x12,0x11,0x12,0x7c}, /* uppercase letters*/ - {0x7f,0x49,0x49,0x49,0x36}, - {0x3e,0x41,0x41,0x41,0x22}, - {0x7f,0x41,0x41,0x22,0x1c}, - {0x7f,0x49,0x49,0x49,0xff}, - {0x7f,0x09,0x09,0x09,0xff}, - {0x3e,0x41,0x41,0x49,0x3a}, - {0x7f,0x08,0x08,0x08,0x7f}, - {0x41,0x7f,0x41,0xff,0x00}, - {0x20,0x40,0x40,0x3f,0xff}, - {0x7f,0x08,0x14,0x22,0x41}, - {0x7f,0x40,0x40,0x40,0xff}, - {0x7f,0x02,0x04,0x02,0x7f}, - {0x7f,0x02,0x0c,0x10,0x7f}, - {0x3e,0x41,0x41,0x41,0x3e}, - {0x7f,0x09,0x09,0x09,0x06}, - {0x3e,0x41,0x51,0x21,0x5e}, - {0x7f,0x09,0x19,0x29,0x46}, - {0x26,0x49,0x49,0x49,0x32}, - {0x01,0x01,0x7f,0x01,0x01}, - {0x3f,0x40,0x40,0x40,0x3f}, - {0x07,0x18,0x60,0x18,0x07}, - {0x1f,0x60,0x18,0x60,0x1f}, - {0x63,0x14,0x08,0x14,0x63}, - {0x03,0x04,0x78,0x04,0x03}, - {0x61,0x51,0x49,0x45,0x43}, - - {0x7f,0x41,0x41,0xff,0x00}, - {0x03,0x04,0x08,0x10,0x60}, - {0x41,0x41,0x7f,0xff,0x00}, - {0x02,0x01,0x02,0xff,0x00}, - {0x80,0x80,0x80,0x80,0x80}, - {0x01,0x02,0xff,0x00,0x00}, - - {0x38,0x44,0x44,0x44,0x7c}, /* lowercase letters */ - {0x7f,0x44,0x44,0x44,0x38}, - {0x38,0x44,0x44,0x44,0x44}, - {0x38,0x44,0x44,0x44,0x7f}, - {0x38,0x54,0x54,0x54,0x58}, - {0x04,0x7e,0x05,0x01,0xff}, - {0x98,0xa4,0xa4,0xa4,0x7c}, - {0x7f,0x04,0x04,0x04,0x78}, - {0x7d,0xff,0x00,0x00,0x00}, - {0x80,0x80,0x7d,0xff,0x00}, - {0x7f,0x10,0x28,0x44,0xff}, - {0x7f,0xff,0x00,0x00,0x00}, - {0x7c,0x04,0x7c,0x04,0x78}, - {0x7c,0x04,0x04,0x04,0x78}, - {0x38,0x44,0x44,0x44,0x38}, - {0xfc,0x24,0x24,0x24,0x18}, - {0x18,0x24,0x24,0x24,0xfc}, - {0x7c,0x08,0x04,0x04,0xff}, - {0x48,0x54,0x54,0x54,0x24}, - {0x04,0x3e,0x44,0x40,0xff}, - {0x7c,0x40,0x40,0x40,0x3c}, - {0x0c,0x30,0x40,0x30,0x0c}, - {0x3c,0x40,0x3c,0x40,0x3c}, - {0x44,0x28,0x10,0x28,0x44}, - {0x9c,0xa0,0xa0,0xa0,0x7c}, - {0x44,0x64,0x54,0x4c,0x44}, - - {0x08,0x36,0x41,0xff,0x00}, - {0x77,0xff,0x00,0x00,0x00}, - {0x41,0x36,0x08,0xff,0x00}, - {0x02,0x01,0x02,0x01,0xff}, - {0xff,0x00,0x00,0x00,0x00}, - - {0xfe,0x49,0x49,0x4e,0x30}, /* sharp S */ - - {0x7c,0x41,0x40,0x41,0x3c}, /* umlauts */ - - {0x04,0x06,0x7f,0x06,0x04}, /* arrows */ - {0x20,0x60,0xfe,0x60,0x20}, - - {0x38,0x45,0x44,0x45,0x7c}, /* umlauts */ - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0x79,0x14,0x12,0x14,0x79}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0x38,0x45,0x44,0x45,0x38}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0xff,0x00,0x00,0x00,0x00}, - {0x3d,0x42,0x42,0x42,0x3d}, - {0x3d,0x40,0x40,0x40,0x3d}, + {0x00,0x00,0x00,0xff,0x00}, + {0x5f,0xff,0x00,0x00,0x00}, + {0x03,0x00,0x03,0xff,0x00}, + {0x14,0x7f,0x14,0x7f,0x14}, + {0x24,0x2a,0x7f,0x2a,0x12}, + {0x61,0x10,0x08,0x04,0x43}, + {0x38,0x4e,0x59,0x26,0x50}, + {0x03,0xff,0x00,0x00,0x00}, + {0x3e,0x41,0xff,0x00,0x00}, + {0x41,0x3e,0xff,0x00,0x00}, + {0x10,0x54,0x38,0x54,0x10}, + {0x10,0x10,0x7c,0x10,0x10}, + {0x80,0x40,0xff,0x00,0x00}, + {0x10,0x10,0x10,0x10,0x10}, + {0x40,0xff,0x00,0x00,0x00}, + {0x60,0x10,0x08,0x04,0x03}, + + {0x3e,0x41,0x41,0x41,0x3e}, /* digits */ + {0x04,0x02,0x7f,0xff,0x00}, + {0x42,0x61,0x51,0x49,0x46}, + {0x22,0x41,0x49,0x49,0x36}, + {0x18,0x14,0x12,0x7f,0x10}, + {0x27,0x45,0x45,0x45,0x39}, + {0x3e,0x49,0x49,0x49,0x32}, + {0x01,0x61,0x19,0x07,0x01}, + {0x36,0x49,0x49,0x49,0x36}, + {0x26,0x49,0x49,0x49,0x3e}, + + {0x44,0xff,0x00,0x00,0x00}, + {0x80,0x44,0xff,0x00,0x00}, + {0x10,0x28,0x44,0xff,0x00}, + {0x28,0x28,0x28,0x28,0x28}, + {0x44,0x28,0x10,0xff,0x00}, + {0x02,0x01,0x51,0x09,0x06}, + {0x3e,0x41,0x5d,0x5d,0x1e}, + + {0x7c,0x12,0x11,0x12,0x7c}, /* uppercase letters*/ + {0x7f,0x49,0x49,0x49,0x36}, + {0x3e,0x41,0x41,0x41,0x22}, + {0x7f,0x41,0x41,0x22,0x1c}, + {0x7f,0x49,0x49,0x49,0xff}, + {0x7f,0x09,0x09,0x09,0xff}, + {0x3e,0x41,0x41,0x49,0x3a}, + {0x7f,0x08,0x08,0x08,0x7f}, + {0x41,0x7f,0x41,0xff,0x00}, + {0x20,0x40,0x40,0x3f,0xff}, + {0x7f,0x08,0x14,0x22,0x41}, + {0x7f,0x40,0x40,0x40,0xff}, + {0x7f,0x02,0x04,0x02,0x7f}, + {0x7f,0x02,0x0c,0x10,0x7f}, + {0x3e,0x41,0x41,0x41,0x3e}, + {0x7f,0x09,0x09,0x09,0x06}, + {0x3e,0x41,0x51,0x21,0x5e}, + {0x7f,0x09,0x19,0x29,0x46}, + {0x26,0x49,0x49,0x49,0x32}, + {0x01,0x01,0x7f,0x01,0x01}, + {0x3f,0x40,0x40,0x40,0x3f}, + {0x07,0x18,0x60,0x18,0x07}, + {0x1f,0x60,0x18,0x60,0x1f}, + {0x63,0x14,0x08,0x14,0x63}, + {0x03,0x04,0x78,0x04,0x03}, + {0x61,0x51,0x49,0x45,0x43}, + + {0x7f,0x41,0x41,0xff,0x00}, + {0x03,0x04,0x08,0x10,0x60}, + {0x41,0x41,0x7f,0xff,0x00}, + {0x02,0x01,0x02,0xff,0x00}, + {0x80,0x80,0x80,0x80,0x80}, + {0x01,0x02,0xff,0x00,0x00}, + + {0x38,0x44,0x44,0x44,0x7c}, /* lowercase letters */ + {0x7f,0x44,0x44,0x44,0x38}, + {0x38,0x44,0x44,0x44,0x44}, + {0x38,0x44,0x44,0x44,0x7f}, + {0x38,0x54,0x54,0x54,0x58}, + {0x04,0x7e,0x05,0x01,0xff}, + {0x98,0xa4,0xa4,0xa4,0x7c}, + {0x7f,0x04,0x04,0x04,0x78}, + {0x7d,0xff,0x00,0x00,0x00}, + {0x80,0x80,0x7d,0xff,0x00}, + {0x7f,0x10,0x28,0x44,0xff}, + {0x7f,0xff,0x00,0x00,0x00}, + {0x7c,0x04,0x7c,0x04,0x78}, + {0x7c,0x04,0x04,0x04,0x78}, + {0x38,0x44,0x44,0x44,0x38}, + {0xfc,0x24,0x24,0x24,0x18}, + {0x18,0x24,0x24,0x24,0xfc}, + {0x7c,0x08,0x04,0x04,0xff}, + {0x48,0x54,0x54,0x54,0x24}, + {0x04,0x3e,0x44,0x40,0xff}, + {0x7c,0x40,0x40,0x40,0x3c}, + {0x0c,0x30,0x40,0x30,0x0c}, + {0x3c,0x40,0x3c,0x40,0x3c}, + {0x44,0x28,0x10,0x28,0x44}, + {0x9c,0xa0,0xa0,0xa0,0x7c}, + {0x44,0x64,0x54,0x4c,0x44}, + + {0x08,0x36,0x41,0xff,0x00}, + {0x77,0xff,0x00,0x00,0x00}, + {0x41,0x36,0x08,0xff,0x00}, + {0x02,0x01,0x02,0x01,0xff}, + {0xff,0x00,0x00,0x00,0x00}, + + {0xfe,0x49,0x49,0x4e,0x30}, /* sharp S */ + + {0x7c,0x41,0x40,0x41,0x3c}, /* umlauts */ + + {0x04,0x06,0x7f,0x06,0x04}, /* arrows */ + {0x20,0x60,0xfe,0x60,0x20}, + + {0x38,0x45,0x44,0x45,0x7c}, /* umlauts */ + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0x79,0x14,0x12,0x14,0x79}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0x38,0x45,0x44,0x45,0x38}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0xff,0x00,0x00,0x00,0x00}, + {0x3d,0x42,0x42,0x42,0x3d}, + {0x3d,0x40,0x40,0x40,0x3d}, }; // Default palette const byte initVGAPalette[768] = { - 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x58, 0x58, 0x58, 0x70, 0x70, 0x70, 0xfc, 0xfc, 0xfc, 0x00, 0xd0, 0x00, - 0x00, 0xfc, 0x00, 0xd8, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0xb0, 0xa0, 0xa0, 0xa0, - 0x50, 0xc8, 0xfc, 0x28, 0xfc, 0x28, 0xf0, 0xf0, 0x00, 0xfc, 0x28, 0x28, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, - 0x20, 0x20, 0x20, 0x2c, 0x2c, 0x2c, 0x38, 0x38, 0x38, 0x44, 0x44, 0x44, 0x50, 0x50, 0x50, 0x60, 0x60, 0x60, - 0x70, 0x70, 0x70, 0x80, 0x80, 0x80, 0x90, 0x90, 0x90, 0xa0, 0xa0, 0xa0, 0xb4, 0xb4, 0xb4, 0xc8, 0xc8, 0xc8, - 0xe0, 0xe0, 0xe0, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, - 0xfc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, - 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x00, - 0x00, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, - 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, - 0xfc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, - 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0x7c, - 0x7c, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, - 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, - 0xfc, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, - 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0xb4, - 0xb4, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, - 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, - 0x70, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x00, 0x00, 0x70, 0x1c, 0x00, - 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x00, - 0x00, 0x70, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, - 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, - 0x70, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, - 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x38, - 0x38, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, - 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, - 0x70, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, - 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x50, - 0x50, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, - 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x00, 0x00, 0x40, 0x10, 0x00, 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, - 0x40, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x00, 0x00, 0x40, 0x10, 0x00, - 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x40, 0x10, 0x00, 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, - 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, - 0x40, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, - 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x20, - 0x20, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, - 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, - 0x40, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, - 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x2c, - 0x2c, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, - 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x58, 0x58, 0x58, 0x70, 0x70, 0x70, 0xfc, 0xfc, 0xfc, 0x00, 0xd0, 0x00, + 0x00, 0xfc, 0x00, 0xd8, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0xb0, 0xa0, 0xa0, 0xa0, + 0x50, 0xc8, 0xfc, 0x28, 0xfc, 0x28, 0xf0, 0xf0, 0x00, 0xfc, 0x28, 0x28, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, + 0x20, 0x20, 0x20, 0x2c, 0x2c, 0x2c, 0x38, 0x38, 0x38, 0x44, 0x44, 0x44, 0x50, 0x50, 0x50, 0x60, 0x60, 0x60, + 0x70, 0x70, 0x70, 0x80, 0x80, 0x80, 0x90, 0x90, 0x90, 0xa0, 0xa0, 0xa0, 0xb4, 0xb4, 0xb4, 0xc8, 0xc8, 0xc8, + 0xe0, 0xe0, 0xe0, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, + 0xfc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, + 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x00, + 0x00, 0xfc, 0x00, 0x00, 0xfc, 0x40, 0x00, 0xfc, 0x7c, 0x00, 0xfc, 0xbc, 0x00, 0xfc, 0xfc, 0x00, 0xbc, 0xfc, + 0x00, 0x7c, 0xfc, 0x00, 0x40, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, + 0xfc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, + 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0x7c, + 0x7c, 0xfc, 0x7c, 0x7c, 0xfc, 0x9c, 0x7c, 0xfc, 0xbc, 0x7c, 0xfc, 0xdc, 0x7c, 0xfc, 0xfc, 0x7c, 0xdc, 0xfc, + 0x7c, 0xbc, 0xfc, 0x7c, 0x9c, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, + 0xfc, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, + 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0xb4, + 0xb4, 0xfc, 0xb4, 0xb4, 0xfc, 0xc4, 0xb4, 0xfc, 0xd8, 0xb4, 0xfc, 0xe8, 0xb4, 0xfc, 0xfc, 0xb4, 0xe8, 0xfc, + 0xb4, 0xd8, 0xfc, 0xb4, 0xc4, 0xfc, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, + 0x70, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x00, 0x00, 0x70, 0x1c, 0x00, + 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x00, + 0x00, 0x70, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x70, 0x38, 0x00, 0x70, 0x54, 0x00, 0x70, 0x70, 0x00, 0x54, 0x70, + 0x00, 0x38, 0x70, 0x00, 0x1c, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, + 0x70, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, + 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x38, + 0x38, 0x70, 0x38, 0x38, 0x70, 0x44, 0x38, 0x70, 0x54, 0x38, 0x70, 0x60, 0x38, 0x70, 0x70, 0x38, 0x60, 0x70, + 0x38, 0x54, 0x70, 0x38, 0x44, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, + 0x70, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, + 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x50, + 0x50, 0x70, 0x50, 0x50, 0x70, 0x58, 0x50, 0x70, 0x60, 0x50, 0x70, 0x68, 0x50, 0x70, 0x70, 0x50, 0x68, 0x70, + 0x50, 0x60, 0x70, 0x50, 0x58, 0x70, 0x00, 0x00, 0x40, 0x10, 0x00, 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, + 0x40, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x00, 0x00, 0x40, 0x10, 0x00, + 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x40, 0x10, 0x00, 0x40, 0x20, 0x00, 0x40, 0x30, 0x00, 0x40, 0x40, 0x00, 0x30, 0x40, + 0x00, 0x20, 0x40, 0x00, 0x10, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, + 0x40, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, + 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x20, + 0x20, 0x40, 0x20, 0x20, 0x40, 0x28, 0x20, 0x40, 0x30, 0x20, 0x40, 0x38, 0x20, 0x40, 0x40, 0x20, 0x38, 0x40, + 0x20, 0x30, 0x40, 0x20, 0x28, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, + 0x40, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, + 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x2c, + 0x2c, 0x40, 0x2c, 0x2c, 0x40, 0x30, 0x2c, 0x40, 0x34, 0x2c, 0x40, 0x3c, 0x2c, 0x40, 0x40, 0x2c, 0x3c, 0x40, + 0x2c, 0x34, 0x40, 0x2c, 0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; enum ObjectType { @@ -405,16 +405,16 @@ static const char *const broken_DE = "Hmm, er scheint kaputt zu sein."; static const char *const broken_EN = "Hmm, it seems to be broken."; static const char *const guiCommand_DE[] = { - "Gehe", - "Schau", - "Nimm", - "\231ffne", - "Schlie\341e", - "Dr\201cke", - "Ziehe", - "Benutze", - "Rede", - "Gib" + "Gehe", + "Schau", + "Nimm", + "\231ffne", + "Schlie\341e", + "Dr\201cke", + "Ziehe", + "Benutze", + "Rede", + "Gib" }; static const char *const guiStatusCommand_DE[10] = @@ -435,29 +435,29 @@ struct Object { static const Object nullObject; Object() - : _name("") - , _description(Object::defaultDescription) - , _id(INVALIDOBJECT) - , _roomId(NULLROOM) - , _type(NULLTYPE) - , _click(0) - , _click2(0) - , _section(0) - , _exitRoom(NULLROOM) - , _direction(0) + : _name("") + , _description(Object::defaultDescription) + , _id(INVALIDOBJECT) + , _roomId(NULLROOM) + , _type(NULLTYPE) + , _click(0) + , _click2(0) + , _section(0) + , _exitRoom(NULLROOM) + , _direction(0) {} Object(byte roomId, const char *name, const char *description, ObjectID id, ObjectType type, byte click, byte click2, byte section = 0, RoomID exitRoom = NULLROOM, byte direction = 0) - : _name(name) - , _description(description) - , _id(id) - , _roomId(roomId) - , _type(type) - , _click(click) - , _click2(click2) - , _section(section) - , _exitRoom(exitRoom) - , _direction(direction) + : _name(name) + , _description(description) + , _id(id) + , _roomId(roomId) + , _type(type) + , _click(click) + , _click2(click2) + , _section(section) + , _exitRoom(exitRoom) + , _direction(direction) {} static void setObjectNull(Object *&obj) { diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 3835932e51..4214a1178d 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -214,7 +214,7 @@ void Intro::cutscene() { #define exitOnEscape(X) do { \ _gm->wait2(X); \ if (_gm->keyPressed(Common::KEYCODE_ESCAPE, true)) \ - return; \ + return; \ } while (0); _vm->_system->fillScreen(kColorBlack); diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index 6a586df466..4c54cbe952 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -122,7 +122,7 @@ bool GameManager::deserialize(Common::ReadStream *in) { } Inventory::Inventory() - : _numObjects(0) + : _numObjects(0) {} // TODO: Update Inventory surface for scrolling @@ -170,13 +170,13 @@ Object *Inventory::get(ObjectID id) const { GuiElement::GuiElement() - : _isHighlighted(false) - , _bgColorNormal(kColorWhite25) - , _bgColorHighlighted(kColorWhite44) - , _bgColor(kColorWhite25) - , _textColorNormal(kColorGreen) - , _textColorHighlighted(kColorLightGreen) - , _textColor(kColorGreen) + : _isHighlighted(false) + , _bgColorNormal(kColorWhite25) + , _bgColorHighlighted(kColorWhite44) + , _bgColor(kColorWhite25) + , _textColorNormal(kColorGreen) + , _textColorHighlighted(kColorLightGreen) + , _textColor(kColorGreen) { _text[0] = '\0'; } diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index 73ce543618..3b703cfef7 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -47,26 +47,26 @@ namespace Supernova { const AudioInfo audioInfo[kAudioNumSamples] = { - {44, 0, -1}, - {45, 0, -1}, - {46, 0, 2510}, - {46, 2510, 4020}, - {46, 4020, -1}, - {47, 0, 24010}, - {47, 24010, -1}, - {48, 0, 2510}, - {48, 2510, 10520}, - {48, 10520, 13530}, - {48, 13530, -1}, - {50, 0, 12786}, - {50, 12786, -1}, - {51, 0, -1}, - {53, 0, -1}, - {54, 0, 8010}, - {54, 8010, 24020}, - {54, 24020, 30030}, - {54, 30030, 31040}, - {54, 31040, -1} + {44, 0, -1}, + {45, 0, -1}, + {46, 0, 2510}, + {46, 2510, 4020}, + {46, 4020, -1}, + {47, 0, 24010}, + {47, 24010, -1}, + {48, 0, 2510}, + {48, 2510, 10520}, + {48, 10520, 13530}, + {48, 13530, -1}, + {50, 0, 12786}, + {50, 12786, -1}, + {51, 0, -1}, + {53, 0, -1}, + {54, 0, 8010}, + {54, 8010, 24020}, + {54, 24020, 30030}, + {54, 30030, 31040}, + {54, 31040, -1} }; const char *const Object::defaultDescription = "Es ist nichts Besonderes daran."; @@ -98,21 +98,21 @@ ObjectType &operator^=(ObjectType &a, ObjectType b) { } SupernovaEngine::SupernovaEngine(OSystem *syst) - : Engine(syst) - , _console(NULL) - , _gm(NULL) - , _currentImage(_images) - , _brightness(255) - , _menuBrightness(255) - , _imageIndex(0) - , _sectionIndex(0) - , _delay(33) - , _textSpeed(kTextSpeed[2]) - , _screenWidth(320) - , _screenHeight(200) - , _messageDisplayed(false) - , _allowLoadGame(true) - , _allowSaveGame(true) + : Engine(syst) + , _console(NULL) + , _gm(NULL) + , _currentImage(_images) + , _brightness(255) + , _menuBrightness(255) + , _imageIndex(0) + , _sectionIndex(0) + , _delay(33) + , _textSpeed(kTextSpeed[2]) + , _screenWidth(320) + , _screenHeight(200) + , _messageDisplayed(false) + , _allowLoadGame(true) + , _allowSaveGame(true) { // const Common::FSNode gameDataDir(ConfMan.get("path")); // SearchMan.addSubDirectoryMatching(gameDataDir, "sound"); @@ -892,7 +892,7 @@ bool SupernovaEngine::saveGame(int slot, const Common::String &description) { ScreenBufferStack::ScreenBufferStack() - : _last(_buffer) { + : _last(_buffer) { } void ScreenBufferStack::push(int x, int y, int width, int height, int pitch) { diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h index df9108ec6e..91dc5a1b5f 100644 --- a/engines/supernova/supernova.h +++ b/engines/supernova/supernova.h @@ -48,12 +48,12 @@ namespace Supernova { struct ScreenBuffer { ScreenBuffer() - : _x(0) - , _y(0) - , _width(0) - , _height(0) - , _pitch(0) - , _pixels(NULL) + : _x(0) + , _y(0) + , _width(0) + , _height(0) + , _pitch(0) + , _pixels(NULL) {} byte *_pixels; |