libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Getting it to compile after merging master

Browse Source
This commit is contained in:
Eric Fry 2018-04-16 23:09:10 +10:00 committed by Eugene Sandulenko
parent 5e919fd308
commit 02063f60d0
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/illusions/detection.cpp
View File

@ -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 {

2
engines/illusions/menusystem.cpp
View File

@ -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;

2
engines/illusions/saveload.cpp
View File

@ -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);
}

7
engines/illusions/screen.cpp
View File

@ -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() {