diff options
| -rw-r--r-- | devtools/create_supernova2/create_image/028/clickfield_info | 7 | ||||
| -rw-r--r-- | devtools/create_supernova2/create_image/028/image0.bmp | bin | 0 -> 64830 bytes | |||
| -rw-r--r-- | devtools/create_supernova2/create_image/028/palette | 179 | ||||
| -rw-r--r-- | devtools/create_supernova2/create_image/028/section_info | 9 | ||||
| -rwxr-xr-x | devtools/create_supernova2/create_image/create_ms2_data.028.sh | 1 | ||||
| -rw-r--r-- | devtools/create_supernova2/create_supernova2.cpp | 3 | ||||
| -rw-r--r-- | devtools/create_supernova2/ms2_data.028-en | bin | 0 -> 64558 bytes | |||
| -rw-r--r-- | engines/supernova/graphics.cpp | 9 | ||||
| -rw-r--r-- | engines/supernova/screen.cpp | 3 |
9 files changed, 203 insertions, 8 deletions
diff --git a/devtools/create_supernova2/create_image/028/clickfield_info b/devtools/create_supernova2/create_image/028/clickfield_info new file mode 100644 index 0000000000..620726975b --- /dev/null +++ b/devtools/create_supernova2/create_image/028/clickfield_info @@ -0,0 +1,7 @@ +1 + +0 +319 +0 +199 +0 diff --git a/devtools/create_supernova2/create_image/028/image0.bmp b/devtools/create_supernova2/create_image/028/image0.bmp Binary files differnew file mode 100644 index 0000000000..9333191bc3 --- /dev/null +++ b/devtools/create_supernova2/create_image/028/image0.bmp diff --git a/devtools/create_supernova2/create_image/028/palette b/devtools/create_supernova2/create_image/028/palette new file mode 100644 index 0000000000..18fcc1f6a3 --- /dev/null +++ b/devtools/create_supernova2/create_image/028/palette @@ -0,0 +1,179 @@ +177 + +0 0 0 +10 10 10 +10 10 10 +11 11 11 +11 11 11 +12 12 12 +13 13 13 +13 13 13 +13 13 13 +13 13 13 +14 14 14 +14 14 14 +14 14 14 +15 15 15 +15 15 15 +15 15 15 +15 15 15 +16 16 16 +16 16 16 +16 16 16 +16 16 16 +17 17 17 +17 17 17 +17 17 17 +17 17 17 +18 18 18 +18 18 18 +18 18 18 +18 18 18 +19 19 19 +19 19 19 +19 19 19 +19 19 19 +20 20 20 +20 20 20 +20 20 20 +20 20 20 +21 21 21 +21 21 21 +21 21 21 +21 21 21 +22 22 22 +22 22 22 +22 22 22 +22 22 22 +23 23 23 +23 23 23 +23 23 23 +23 23 23 +24 24 24 +24 24 24 +24 24 24 +24 24 24 +25 25 25 +25 25 25 +25 25 25 +25 25 25 +26 26 26 +26 26 26 +26 26 26 +26 26 26 +27 27 27 +27 27 27 +27 27 27 +27 27 27 +28 28 28 +28 28 28 +28 28 28 +28 28 28 +29 29 29 +29 29 29 +29 29 29 +29 29 29 +30 30 30 +30 30 30 +30 30 30 +30 30 30 +31 31 31 +31 31 31 +31 31 31 +31 31 31 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +33 33 33 +33 33 33 +33 33 33 +33 33 33 +34 34 34 +34 34 34 +34 34 34 +34 34 34 +35 35 35 +35 35 35 +35 35 35 +35 35 35 +36 36 36 +36 36 36 +36 36 36 +36 36 36 +37 37 37 +37 37 37 +37 37 37 +37 37 37 +38 38 38 +38 38 38 +38 38 38 +38 38 38 +39 39 39 +39 39 39 +39 39 39 +39 39 39 +40 40 40 +40 40 40 +40 40 40 +40 40 40 +41 41 41 +41 41 41 +41 41 41 +41 41 41 +42 42 42 +42 42 42 +42 42 42 +42 42 42 +43 43 43 +43 43 43 +43 43 43 +43 43 43 +44 44 44 +44 44 44 +44 44 44 +44 44 44 +45 45 45 +45 45 45 +45 45 45 +45 45 45 +46 46 46 +46 46 46 +46 46 46 +46 46 46 +47 47 47 +47 47 47 +47 47 47 +47 47 47 +48 48 48 +48 48 48 +48 48 48 +48 48 48 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +50 50 50 +50 50 50 +50 50 50 +50 50 50 +51 51 51 +51 51 51 +51 51 51 +51 51 51 +52 52 52 +52 52 52 +52 52 52 +52 52 52 +53 53 53 +53 53 53 +53 53 53 +53 53 53 +54 54 54 +54 54 54 +54 54 54 +54 54 54 +55 55 55 +55 55 55 +55 55 55 +55 55 55 diff --git a/devtools/create_supernova2/create_image/028/section_info b/devtools/create_supernova2/create_image/028/section_info new file mode 100644 index 0000000000..5ced3d303f --- /dev/null +++ b/devtools/create_supernova2/create_image/028/section_info @@ -0,0 +1,9 @@ +1 + +0 +319 +0 +199 +0 +0 +0 diff --git a/devtools/create_supernova2/create_image/create_ms2_data.028.sh b/devtools/create_supernova2/create_image/create_ms2_data.028.sh new file mode 100755 index 0000000000..66fda85204 --- /dev/null +++ b/devtools/create_supernova2/create_image/create_ms2_data.028.sh @@ -0,0 +1 @@ +./create_image ms2_data 28 829 diff --git a/devtools/create_supernova2/create_supernova2.cpp b/devtools/create_supernova2/create_supernova2.cpp index 009a743e22..24d79f1d76 100644 --- a/devtools/create_supernova2/create_supernova2.cpp +++ b/devtools/create_supernova2/create_supernova2.cpp @@ -284,8 +284,7 @@ int main(int argc, char *argv[]) { const char **l = &lang[0]; while(*l) { writeDatafile(outputFile, 15, *l); - writeImage(outputFile, "img1", *l); - // writeImage(outputFile, "img2", *l); + writeDatafile(outputFile, 28, *l); writeStrings(outputFile, *l); ++l; } diff --git a/devtools/create_supernova2/ms2_data.028-en b/devtools/create_supernova2/ms2_data.028-en Binary files differnew file mode 100644 index 0000000000..5ac4feded4 --- /dev/null +++ b/devtools/create_supernova2/ms2_data.028-en diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp index 479a12e3df..a85818160d 100644 --- a/engines/supernova/graphics.cpp +++ b/engines/supernova/graphics.cpp @@ -161,6 +161,8 @@ bool MSNImage::loadFromEngineDataFile() { } else if (_MSPart == 2) { if (_filenumber == 15) name = "M015"; + else if (_filenumber == 28) + name = "M028"; else return false; @@ -292,16 +294,15 @@ bool MSNImage::loadStream(Common::SeekableReadStream &stream) { bool MSNImage::loadSections() { bool isNewspaper = (_MSPart == 1 && (_filenumber == 1 || _filenumber == 2)) || (_MSPart == 2 && _filenumber == 38); - bool isCypheredText = _MSPart == 2 && _filenumber == 28 && ConfMan.get("language") == "en"; - int imageWidth = isNewspaper || isCypheredText ? 640 : 320; - int imageHeight = isNewspaper || isCypheredText ? 480 : 200; + int imageWidth = isNewspaper ? 640 : 320; + int imageHeight = isNewspaper ? 480 : 200; _pitch = imageWidth; for (int section = 0; section < _numSections; ++section) { Graphics::Surface *surface = new Graphics::Surface; _sectionSurfaces.push_back(surface); - if (isNewspaper || isCypheredText) { + if (isNewspaper) { Color color1 = isNewspaper ? kColorWhite63 : kColorWhite44; surface->create(imageWidth, imageHeight, g_system->getScreenFormat()); byte *surfacePixels = static_cast<byte *>(surface->getPixels()); diff --git a/engines/supernova/screen.cpp b/engines/supernova/screen.cpp index 5cdbb4ccff..6a76daca92 100644 --- a/engines/supernova/screen.cpp +++ b/engines/supernova/screen.cpp @@ -375,8 +375,7 @@ void Screen::renderImageSection(const MSNImage *image, int section, bool invert) if (_vm->_MSPart == 1) bigImage = image->_filenumber == 1 || image->_filenumber == 2; else if (_vm->_MSPart == 2) - bigImage = image->_filenumber == 38 || - (image->_filenumber == 28 && ConfMan.get("language") == "en"); + bigImage = image->_filenumber == 38; if (bigImage) { sectionRect.setWidth(640); sectionRect.setHeight(480); |
