thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPERNOVA: Adds Outro image

Browse source 
msn_data.055 that stores the outro image was missed to be added
to imageInfo and thus not loaded during the engine init/
This commit is contained in:
Joseph-Eugene Winzer 2018-04-21 18:58:58 +02:00
parent c20b960d80
commit ebaa6739ec
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/supernova/imageid.h
View file

@ -647,7 +647,9 @@ enum ImageId {
kImageCellRobotSparks, kImageCellRobotSparks,
kImageCellRobotBroken, kImageCellRobotBroken,
kImageCellDoorClosed, kImageCellDoorClosed,
kImageCellDummy1 kImageCellDummy1,
// file 55
kImageOutroScreen
}; };
} }

11
engines/supernova/resman.cpp
View file

@ -163,10 +163,12 @@ void ResourceManager::initCursorGraphics() {
} }
void ResourceManager::initImages() { void ResourceManager::initImages() {
for (int i = 0; i < kNumImageFiles; ++i) { for (int i = 0; i < 44; ++i) {
if (!_images[i].init(i)) if (!_images[i].init(i))
error("Failed reading image file msn_data.%03d", i); error("Failed reading image file msn_data.%03d", i);
} }
if (!_images[44].init(55))
error("Failed reading image file msn_data.055");
} }
Audio::SeekableAudioStream *ResourceManager::getSoundStream(AudioId index) { Audio::SeekableAudioStream *ResourceManager::getSoundStream(AudioId index) {
@ -190,9 +192,12 @@ Audio::AudioStream *ResourceManager::getSoundStream(MusicId index) {
} }
const MSNImage *ResourceManager::getImage(int filenumber) const { const MSNImage *ResourceManager::getImage(int filenumber) const {
assert(filenumber < kNumImageFiles); if (filenumber < 44)
return &_images[filenumber]; return &_images[filenumber];
else if (filenumber == 55)
return &_images[44];
else
return nullptr;
} }
const byte *ResourceManager::getImage(CursorId id) const { const byte *ResourceManager::getImage(CursorId id) const {

2
engines/supernova/resman.h
View file

@ -44,7 +44,7 @@ public:
}; };
public: public:
static const int kNumImageFiles = 44; static const int kNumImageFiles = 45;
public: public:
ResourceManager(); ResourceManager();

3
engines/supernova/screenstatic.cpp
View file

@ -139,7 +139,8 @@ static const Screen::ImageInfo imageInfo[] = {
{43, 12}, {43, 13}, {43, 14}, {43, 15}, {43, 16}, {43, 17}, {43, 12}, {43, 13}, {43, 14}, {43, 15}, {43, 16}, {43, 17},
{43, 18}, {43, 19}, {43, 20}, {43, 21}, {43, 22}, {43, 23}, {43, 18}, {43, 19}, {43, 20}, {43, 21}, {43, 22}, {43, 23},
{43, 24}, {43, 25}, {43, 26}, {43, 27}, {43, 28}, {43, 29}, {43, 24}, {43, 25}, {43, 26}, {43, 27}, {43, 28}, {43, 29},
{43, 30}, {43, 31} {43, 30}, {43, 31},
{55, 0}
}; };
// Default palette // Default palette