aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fry2018-04-16 23:09:10 +1000
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commit02063f60d0eed3ba4131643adad3058f760542ff (patch)
treeaaedcc133d73ea53aae9bb8e12cc7a840c0b5413
parent5e919fd3084d12f1d9ff9c9921e5993b8ae318eb (diff)
downloadscummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.tar.gz
scummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.tar.bz2
scummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.zip
Getting it to compile after merging master
-rw-r--r--engines/illusions/detection.cpp4
-rw-r--r--engines/illusions/menusystem.cpp2
-rw-r--r--engines/illusions/saveload.cpp2
-rw-r--r--engines/illusions/screen.cpp7
4 files changed, 7 insertions, 8 deletions
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index a0e24886cc..db6090bb81 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -80,13 +80,13 @@ static const char * const directoryGlobs[] = {
class IllusionsMetaEngine : public AdvancedMetaEngine {
public:
IllusionsMetaEngine() : AdvancedMetaEngine(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) {
- _singleid = "illusions";
+ _singleId = "illusions";
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
virtual const char *getName() const {
- return "Illusions Engine";
+ return "Illusions";
}
virtual const char *getOriginalCopyright() const {
diff --git a/engines/illusions/menusystem.cpp b/engines/illusions/menusystem.cpp
index cb82e3343d..829756cf2f 100644
--- a/engines/illusions/menusystem.cpp
+++ b/engines/illusions/menusystem.cpp
@@ -603,7 +603,7 @@ MenuActionLoadGame::MenuActionLoadGame(BaseMenuSystem *menuSystem, uint choiceIn
}
void MenuActionLoadGame::execute() {
- const EnginePlugin *plugin = NULL;
+ const Plugin *plugin = NULL;
EngineMan.findGame(ConfMan.get("gameid"), &plugin);
GUI::SaveLoadChooser *dialog;
Common::String desc;
diff --git a/engines/illusions/saveload.cpp b/engines/illusions/saveload.cpp
index 751f6a600e..f3fae99d77 100644
--- a/engines/illusions/saveload.cpp
+++ b/engines/illusions/saveload.cpp
@@ -43,7 +43,7 @@ IllusionsEngine::kReadSaveHeaderError IllusionsEngine::readSaveHeader(Common::Se
header.description += (char)in->readByte();
if (loadThumbnail) {
- header.thumbnail = Graphics::loadThumbnail(*in);
+ Graphics::loadThumbnail(*in, header.thumbnail);
} else {
Graphics::skipThumbnail(*in);
}
diff --git a/engines/illusions/screen.cpp b/engines/illusions/screen.cpp
index 0b04c2a1d9..c234cde3ae 100644
--- a/engines/illusions/screen.cpp
+++ b/engines/illusions/screen.cpp
@@ -272,7 +272,7 @@ void ScreenPalette::shiftPalette(int16 fromIndex, int16 toIndex) {
r = _mainPalette[3 * toIndex + 0];
g = _mainPalette[3 * toIndex + 1];
b = _mainPalette[3 * toIndex + 2];
- for (int16 i = toIndex + 1; i < fromIndex; +i) {
+ for (int16 i = toIndex + 1; i < fromIndex; +i) { //TODO fix this. +i
byte *dst = &_mainPalette[3 * i];
byte *src = &_mainPalette[3 * (i + 1)];
dst[0] = src[0];
@@ -371,16 +371,15 @@ Screen::Screen(IllusionsEngine *vm, int16 width, int16 height, int bpp)
_decompressQueue = new SpriteDecompressQueue(this);
_drawQueue = new SpriteDrawQueue(this);
if (bpp == 8) {
- initGraphics(width, height, false);
+ initGraphics(width, height);
} else {
Graphics::PixelFormat pixelFormat16(2, 5, 6, 5, 0, 11, 5, 0, 0);
- initGraphics(width, height, true, &pixelFormat16);
+ initGraphics(width, height, &pixelFormat16);
}
_backSurface = allocSurface(width, height);
_isScreenOffsetActive = false;
-
}
Screen::~Screen() {