diff options
Diffstat (limited to 'engines/queen')
43 files changed, 609 insertions, 266 deletions
diff --git a/engines/queen/bankman.cpp b/engines/queen/bankman.cpp index ea823773dc..6d99874697 100644 --- a/engines/queen/bankman.cpp +++ b/engines/queen/bankman.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/bankman.h b/engines/queen/bankman.h index 9e1e726fbf..87c58022a1 100644 --- a/engines/queen/bankman.h +++ b/engines/queen/bankman.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp index 7876dbfae9..d9fafa3a1d 100644 --- a/engines/queen/command.cpp +++ b/engines/queen/command.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/command.h b/engines/queen/command.h index 6865aa80a2..1d49b134de 100644 --- a/engines/queen/command.h +++ b/engines/queen/command.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/credits.cpp b/engines/queen/credits.cpp index 43e3bc7c6a..b2f6a601bf 100644 --- a/engines/queen/credits.cpp +++ b/engines/queen/credits.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/credits.h b/engines/queen/credits.h index b89d029a59..56e0bdb882 100644 --- a/engines/queen/credits.h +++ b/engines/queen/credits.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp index 1e53c00564..0f54431acf 100644 --- a/engines/queen/cutaway.cpp +++ b/engines/queen/cutaway.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -552,7 +552,6 @@ void Cutaway::dumpCutawayAnim(CutawayAnim &anim) { const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) { // lines 1517-1770 in cutaway.c int frameCount = 0; - int header = 0; int i; CutawayAnim objAnim[56]; @@ -560,7 +559,7 @@ const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) { // Read animation frames for (;;) { - header = (int16)READ_BE_INT16(ptr); + int header = (int16)READ_BE_INT16(ptr); ptr += 2; if (-2 == header) diff --git a/engines/queen/cutaway.h b/engines/queen/cutaway.h index a7e3646a59..f6115c8023 100644 --- a/engines/queen/cutaway.h +++ b/engines/queen/cutaway.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/debug.cpp b/engines/queen/debug.cpp index d09c5d4469..96fa81488f 100644 --- a/engines/queen/debug.cpp +++ b/engines/queen/debug.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/debug.h b/engines/queen/debug.h index 01da4a35d6..19d77dffc0 100644 --- a/engines/queen/debug.h +++ b/engines/queen/debug.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/defs.h b/engines/queen/defs.h index 3d06485ef5..1904a390bc 100644 --- a/engines/queen/defs.h +++ b/engines/queen/defs.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp new file mode 100644 index 0000000000..5a7b4c6ad0 --- /dev/null +++ b/engines/queen/detection.cpp @@ -0,0 +1,508 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "base/plugins.h" + +#include "engines/advancedDetector.h" + +#include "common/config-manager.h" +#include "common/file.h" +#include "common/gui_options.h" +#include "common/savefile.h" +#include "common/system.h" +#include "common/translation.h" + +#include "queen/queen.h" +#include "queen/resource.h" + +namespace Queen { + +struct QueenGameDescription { + ADGameDescription desc; +}; + +} // End of namespace Queen + +static const PlainGameDescriptor queenGames[] = { + {"queen", "Flight of the Amazon Queen"}, + {0, 0} +}; + +#define GAMEOPTION_ALT_INTRO GUIO_GAMEOPTIONS1 + +static const ADExtraGuiOptionsMap optionsList[] = { + { + GAMEOPTION_ALT_INTRO, + { + _s("Alternative intro"), + _s("Use an alternative game intro (CD version only)"), + "alt_intro", + false + } + }, + + AD_EXTRA_GUI_OPTIONS_TERMINATOR +}; + +namespace Queen { + +static const QueenGameDescription gameDescriptions[] = { + // Amiga Demo - English + { + { + "queen", + "Demo", + AD_ENTRY1s("queen.1", "f7a1a37ac93bf763b1569231237cb4d8", 563335), + Common::EN_ANY, + Common::kPlatformAmiga, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // Amiga Interview Demo - English + { + { + "queen", + "Interview", + AD_ENTRY1s("queen.1", "f5d42a18d8f5689480413871410663d7", 597032), + Common::EN_ANY, + Common::kPlatformAmiga, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // DOS Demo - English + { + { + "queen", + "Demo", + AD_ENTRY1s("queen.1", "f39334d8133840aa3bcbd733c12937cf", 3732177), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // DOS Interview Demo - English + { + { + "queen", + "Interview", + AD_ENTRY1s("queen.1", "30b3291f37665bf24d9482b183cb2f67", 1915913), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // PCGAMES DOS Demo - English + { + { + "queen", + "Demo", + AD_ENTRY1s("queen.1", "f39334d8133840aa3bcbd733c12937cf", 3724538), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_DEMO, + GUIO1(GUIO_NOSPEECH) + }, + }, + +#if 0 + // Amiga Floppy - English + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", NULL, 351775), // TODO: Fill in correct MD5 + Common::EN_ANY, + Common::kPlatformAmiga, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, +#endif + + // DOS Floppy - English + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22677657), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // DOS CD - English + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", "b6302bccf70463de3d5faf0f0628f742", 190787021), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS Floppy - French + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", "f5e827645d3c887be3bdf4729d847756", 22157304), + Common::FR_FRA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, + + // DOS CD - French + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", "6fd5486a0db75bae2e023b575c3d6a5d", 186689095), + Common::FR_FRA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + +#if 0 + // DOS Floppy - German + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", NULL, 22240013), // TODO: Fill in correct MD5 + Common::DE_DEU, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, +#endif + +#if 0 + // DOS CD - German + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", NULL, 217648975), // TODO: Fill in correct MD5 + Common::DE_DEU, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, +#endif + +#if 0 + // DOS CD - Hebrew + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", NULL, 190705558), // TODO: Fill in correct MD5 + Common::HE_ISR, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, +#endif + +#if 0 + // DOS Floppy - Italian + { + { + "queen", + "Floppy", + AD_ENTRY1s("queen.1", NULL, 22461366), // TODO: Fill in correct MD5 + Common::IT_ITA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOSPEECH) + }, + }, +#endif + + // DOS CD - Italian + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", "b6302bccf70463de3d5faf0f0628f742", 190795582), + Common::IT_ITA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + +#if 0 + // DOS CD - Spanish + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1", NULL, 190730602), // TODO: Fill in correct MD5 + Common::ES_ESP, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, +#endif + + // DOS CD - English (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "a0749bb8b72e537ead1a63a3dde1443d", 54108887), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS CD - English (Compressed Freeware Release v1.1) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "21fd690b372f8a6289f6f33bc986276c", 51222412), + Common::EN_ANY, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS CD - French (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "67e3020f8a35e1df7b1c753b5aaa71e1", 97382620), + Common::FR_FRA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS CD - German (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "28f78dbec7e20f603a10c2f8ea889a5c", 108738717), + Common::DE_DEU, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS CD - Hebrew (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "4d52d8780613ef27a2b779caecb20a21", 99391805), + Common::HE_ISR, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // DOS CD - Italian (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", "2f72b715ed753cf905a37cdcc7ea611e", 98327801), + Common::IT_ITA, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, + + // TODO: Freeware Release for Spanish DOS CD is missing. +#if 0 + // DOS CD - Spanish (Compressed Freeware Release v1.0) + { + { + "queen", + "Talkie", + AD_ENTRY1s("queen.1c", NULL, ?), + Common::ES_ESP, + Common::kPlatformDOS, + ADGF_NO_FLAGS, + GUIO1(GAMEOPTION_ALT_INTRO) + }, + }, +#endif + + { AD_TABLE_END_MARKER } +}; + +} // End of namespace Queen + +class QueenMetaEngine : public AdvancedMetaEngine { +public: + QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { + _singleid = "queen"; + } + + virtual const char *getName() const { + return "Queen"; + } + + virtual const char *getOriginalCopyright() const { + return "Flight of the Amazon Queen (C) John Passfield and Steve Stamatiadis"; + } + + virtual bool hasFeature(MetaEngineFeature f) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; + virtual SaveStateList listSaves(const char *target) const; + virtual int getMaximumSaveSlot() const { return 99; } + virtual void removeSaveState(const char *target, int slot) const; + + const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; +}; + +bool QueenMetaEngine::hasFeature(MetaEngineFeature f) const { + return + (f == kSupportsListSaves) || + (f == kSupportsLoadingDuringStartup) || + (f == kSupportsDeleteSave); +} + +const ADGameDescription *QueenMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { + static ADGameDescription desc; + + // Iterate over all files in the given directory + for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { + if (file->isDirectory()) { + continue; + } + if (file->getName().equalsIgnoreCase("queen.1") || file->getName().equalsIgnoreCase("queen.1c")) { + Common::File dataFile; + if (!dataFile.open(*file)) { + continue; + } + Queen::DetectedGameVersion version; + if (Queen::Resource::detectVersion(&version, &dataFile)) { + desc.gameid = "queen"; + desc.language = version.language; + desc.platform = version.platform; + desc.flags = ADGF_NO_FLAGS; + desc.guioptions = GUIO0(); + if (version.features & Queen::GF_DEMO) { + desc.extra = "Demo"; + desc.flags = ADGF_DEMO; + desc.guioptions = GUIO_NOSPEECH; + } else if (version.features & Queen::GF_INTERVIEW) { + desc.extra = "Interview"; + desc.flags = ADGF_DEMO; + desc.guioptions = GUIO_NOSPEECH; + } else if (version.features & Queen::GF_FLOPPY) { + desc.extra = "Floppy"; + desc.guioptions = GUIO_NOSPEECH; + } else if (version.features & Queen::GF_TALKIE) { + desc.extra = "Talkie"; + desc.guioptions = GAMEOPTION_ALT_INTRO; + } + return (const ADGameDescription *)&desc; + } + } + } + return 0; +} + +SaveStateList QueenMetaEngine::listSaves(const char *target) const { + Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); + Common::StringArray filenames; + char saveDesc[32]; + Common::String pattern("queen.s??"); + + filenames = saveFileMan->listSavefiles(pattern); + sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) + + SaveStateList saveList; + for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { + // Obtain the last 2 digits of the filename, since they correspond to the save slot + int slotNum = atoi(file->c_str() + file->size() - 2); + + if (slotNum >= 0 && slotNum <= 99) { + Common::InSaveFile *in = saveFileMan->openForLoading(*file); + if (in) { + for (int i = 0; i < 4; i++) + in->readUint32BE(); + in->read(saveDesc, 32); + saveList.push_back(SaveStateDescriptor(slotNum, saveDesc)); + delete in; + } + } + } + + return saveList; +} + +void QueenMetaEngine::removeSaveState(const char *target, int slot) const { + Common::String filename = Common::String::format("queen.s%02d", slot); + + g_system->getSavefileManager()->removeSavefile(filename); +} + +bool QueenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { + const Queen::QueenGameDescription *gd = (const Queen::QueenGameDescription *)desc; + + if (gd) + *engine = new Queen::QueenEngine(syst); //FIXME , gd); + + return (gd != 0); +} + +#if PLUGIN_ENABLED_DYNAMIC(QUEEN) + REGISTER_PLUGIN_DYNAMIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); +#else + REGISTER_PLUGIN_STATIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); +#endif diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 7437bab974..b2213f7fee 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -29,8 +29,9 @@ #include "graphics/cursorman.h" #include "graphics/palette.h" #include "graphics/surface.h" -#include "graphics/decoders/iff.h" -#include "graphics/decoders/pcx.h" + +#include "image/iff.h" +#include "image/pcx.h" #include "queen/display.h" #include "queen/input.h" @@ -813,7 +814,7 @@ void Display::fill(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, uint16 w, void Display::decodePCX(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd) { Common::MemoryReadStream str(src, srcSize); - ::Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(str)) error("Error while reading PCX image"); @@ -832,7 +833,7 @@ void Display::decodePCX(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dst void Display::decodeIFF(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd, uint8 colorBase) { Common::MemoryReadStream str(src, srcSize); - ::Graphics::IFFDecoder iff; + Image::IFFDecoder iff; if (!iff.loadStream(str)) error("Error while reading IFF image"); diff --git a/engines/queen/display.h b/engines/queen/display.h index 8a8aaef5a6..7261d05b07 100644 --- a/engines/queen/display.h +++ b/engines/queen/display.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp index 70f7d7c94b..87236447e8 100644 --- a/engines/queen/graphics.cpp +++ b/engines/queen/graphics.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -522,7 +522,7 @@ void Graphics::setBobText(const BobSlot *pbs, const char *text, int textX, int t // Calc text position - short x, y, width, height; + short x, y, width; if (flags) { if (flags == 2) @@ -540,7 +540,7 @@ void Graphics::setBobText(const BobSlot *pbs, const char *text, int textX, int t BobFrame *pbf = _vm->bankMan()->fetchFrame(pbs->frameNum); width = (pbf->width * pbs->scale) / 100; - height = (pbf->height * pbs->scale) / 100; + short height = (pbf->height * pbs->scale) / 100; y = y - height - 16 - lineCount * 9; } diff --git a/engines/queen/graphics.h b/engines/queen/graphics.h index 9c719ba22c..2035b170d3 100644 --- a/engines/queen/graphics.h +++ b/engines/queen/graphics.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/grid.cpp b/engines/queen/grid.cpp index 82b98c0150..467f341c0b 100644 --- a/engines/queen/grid.cpp +++ b/engines/queen/grid.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/grid.h b/engines/queen/grid.h index f905e3f4fe..2e60c62b59 100644 --- a/engines/queen/grid.h +++ b/engines/queen/grid.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index dd10e7ad46..1cce9ad6d1 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/input.h b/engines/queen/input.h index f04ecb24f7..87f6b20e71 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 474f72eca5..db80775fc7 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/journal.h b/engines/queen/journal.h index a9b9ccb2b8..57907f0ff1 100644 --- a/engines/queen/journal.h +++ b/engines/queen/journal.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index ea13e5973e..d48bb8a498 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/logic.h b/engines/queen/logic.h index 608c19e71e..d597942257 100644 --- a/engines/queen/logic.h +++ b/engines/queen/logic.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/midiadlib.cpp b/engines/queen/midiadlib.cpp index 83853cba92..25175c21d7 100644 --- a/engines/queen/midiadlib.cpp +++ b/engines/queen/midiadlib.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/module.mk b/engines/queen/module.mk index 5e0602cae7..8ba49a301d 100644 --- a/engines/queen/module.mk +++ b/engines/queen/module.mk @@ -6,6 +6,7 @@ MODULE_OBJS := \ credits.o \ cutaway.o \ debug.o \ + detection.o \ display.o \ graphics.o \ grid.o \ diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index 2835954003..93d6527622 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/music.h b/engines/queen/music.h index ea6affcbe5..b475639f22 100644 --- a/engines/queen/music.h +++ b/engines/queen/music.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp index a046355446..57c28c90f4 100644 --- a/engines/queen/musicdata.cpp +++ b/engines/queen/musicdata.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 08fc594560..0aea6122ca 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -23,14 +23,12 @@ #include "base/plugins.h" #include "common/config-manager.h" +#include "common/events.h" #include "common/file.h" #include "common/fs.h" -#include "common/gui_options.h" #include "common/savefile.h" #include "common/system.h" -#include "common/events.h" #include "common/textconsole.h" -#include "common/translation.h" #include "engines/util.h" @@ -49,177 +47,6 @@ #include "queen/talk.h" #include "queen/walk.h" -#include "engines/metaengine.h" - -static const PlainGameDescriptor queenGameDescriptor = { - "queen", "Flight of the Amazon Queen" -}; - -static const ExtraGuiOption queenExtraGuiOption = { - _s("Alternative intro"), - _s("Use an alternative game intro (CD version only)"), - "alt_intro", - false -}; - -class QueenMetaEngine : public MetaEngine { -public: - virtual const char *getName() const; - virtual const char *getOriginalCopyright() const; - - virtual bool hasFeature(MetaEngineFeature f) const; - virtual GameList getSupportedGames() const; - virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; - virtual GameDescriptor findGame(const char *gameid) const; - virtual GameList detectGames(const Common::FSList &fslist) const; - virtual SaveStateList listSaves(const char *target) const; - virtual int getMaximumSaveSlot() const; - virtual void removeSaveState(const char *target, int slot) const; - - virtual Common::Error createInstance(OSystem *syst, Engine **engine) const; -}; - -const char *QueenMetaEngine::getName() const { - return "Queen"; -} - -const char *QueenMetaEngine::getOriginalCopyright() const { - return "Flight of the Amazon Queen (C) John Passfield and Steve Stamatiadis"; -} - -bool QueenMetaEngine::hasFeature(MetaEngineFeature f) const { - return - (f == kSupportsListSaves) || - (f == kSupportsLoadingDuringStartup) || - (f == kSupportsDeleteSave); -} - -bool Queen::QueenEngine::hasFeature(EngineFeature f) const { - return - (f == kSupportsRTL) || - (f == kSupportsLoadingDuringRuntime) || - (f == kSupportsSavingDuringRuntime) || - (f == kSupportsSubtitleOptions); -} - -GameList QueenMetaEngine::getSupportedGames() const { - GameList games; - games.push_back(queenGameDescriptor); - return games; -} - -int QueenMetaEngine::getMaximumSaveSlot() const { return 99; } - -const ExtraGuiOptions QueenMetaEngine::getExtraGuiOptions(const Common::String &target) const { - Common::String guiOptions; - ExtraGuiOptions options; - - if (target.empty()) { - options.push_back(queenExtraGuiOption); - return options; - } - - if (ConfMan.hasKey("guioptions", target)) { - guiOptions = ConfMan.get("guioptions", target); - guiOptions = parseGameGUIOptions(guiOptions); - } - - if (!guiOptions.contains(GUIO_NOSPEECH)) - options.push_back(queenExtraGuiOption); - return options; -} - -GameDescriptor QueenMetaEngine::findGame(const char *gameid) const { - if (0 == scumm_stricmp(gameid, queenGameDescriptor.gameid)) { - return queenGameDescriptor; - } - return GameDescriptor(); -} - -GameList QueenMetaEngine::detectGames(const Common::FSList &fslist) const { - GameList detectedGames; - - // Iterate over all files in the given directory - for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { - if (file->isDirectory()) { - continue; - } - if (file->getName().equalsIgnoreCase("queen.1") || file->getName().equalsIgnoreCase("queen.1c")) { - Common::File dataFile; - if (!dataFile.open(*file)) { - continue; - } - Queen::DetectedGameVersion version; - if (Queen::Resource::detectVersion(&version, &dataFile)) { - GameDescriptor dg(queenGameDescriptor.gameid, queenGameDescriptor.description, version.language, version.platform); - if (version.features & Queen::GF_DEMO) { - dg.updateDesc("Demo"); - dg.setGUIOptions(GUIO_NOSPEECH); - } else if (version.features & Queen::GF_INTERVIEW) { - dg.updateDesc("Interview"); - dg.setGUIOptions(GUIO_NOSPEECH); - } else if (version.features & Queen::GF_FLOPPY) { - dg.updateDesc("Floppy"); - dg.setGUIOptions(GUIO_NOSPEECH); - } else if (version.features & Queen::GF_TALKIE) { - dg.updateDesc("Talkie"); - } - detectedGames.push_back(dg); - break; - } - } - } - return detectedGames; -} - -SaveStateList QueenMetaEngine::listSaves(const char *target) const { - Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Common::StringArray filenames; - char saveDesc[32]; - Common::String pattern("queen.s??"); - - filenames = saveFileMan->listSavefiles(pattern); - sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) - - SaveStateList saveList; - for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { - // Obtain the last 2 digits of the filename, since they correspond to the save slot - int slotNum = atoi(file->c_str() + file->size() - 2); - - if (slotNum >= 0 && slotNum <= 99) { - Common::InSaveFile *in = saveFileMan->openForLoading(*file); - if (in) { - for (int i = 0; i < 4; i++) - in->readUint32BE(); - in->read(saveDesc, 32); - saveList.push_back(SaveStateDescriptor(slotNum, saveDesc)); - delete in; - } - } - } - - return saveList; -} - -void QueenMetaEngine::removeSaveState(const char *target, int slot) const { - Common::String filename = target; - filename += Common::String::format(".s%02d", slot); - - g_system->getSavefileManager()->removeSavefile(filename); -} - -Common::Error QueenMetaEngine::createInstance(OSystem *syst, Engine **engine) const { - assert(engine); - *engine = new Queen::QueenEngine(syst); - return Common::kNoError; -} - -#if PLUGIN_ENABLED_DYNAMIC(QUEEN) - REGISTER_PLUGIN_DYNAMIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); -#else - REGISTER_PLUGIN_STATIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); -#endif - namespace Queen { QueenEngine::QueenEngine(OSystem *syst) @@ -488,6 +315,14 @@ GUI::Debugger *QueenEngine::getDebugger() { return _debugger; } +bool Queen::QueenEngine::hasFeature(EngineFeature f) const { + return + (f == kSupportsRTL) || + (f == kSupportsLoadingDuringRuntime) || + (f == kSupportsSavingDuringRuntime) || + (f == kSupportsSubtitleOptions); +} + Common::Error QueenEngine::run() { initGraphics(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT, false); diff --git a/engines/queen/queen.h b/engines/queen/queen.h index a8b0e9f6ed..c00e1b3a70 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index 6a55929d65..714b3cef39 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/resource.h b/engines/queen/resource.h index 7317ec5134..e090dabbd3 100644 --- a/engines/queen/resource.h +++ b/engines/queen/resource.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/restables.cpp b/engines/queen/restables.cpp index bc828164b0..55e13b2135 100644 --- a/engines/queen/restables.cpp +++ b/engines/queen/restables.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 6731a51e04..63e24454c1 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/sound.h b/engines/queen/sound.h index 6a5dfc2c28..d06d93b9e1 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/state.cpp b/engines/queen/state.cpp index a07e68045b..09d2ccca47 100644 --- a/engines/queen/state.cpp +++ b/engines/queen/state.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/state.h b/engines/queen/state.h index 1a6725c800..786434156b 100644 --- a/engines/queen/state.h +++ b/engines/queen/state.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/structs.h b/engines/queen/structs.h index 6dd98fa1f5..4f413d8c6d 100644 --- a/engines/queen/structs.h +++ b/engines/queen/structs.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 1531510ba4..1b9d72babc 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -1252,7 +1252,6 @@ int16 Talk::selectSentence() { _vm->input()->clearKeyVerb(); if (sentenceCount > 0) { - int zone = 0; int oldZone = 0; while (0 == selectedSentence) { @@ -1263,7 +1262,7 @@ int16 Talk::selectSentence() { _vm->update(); Common::Point mouse = _vm->input()->getMousePos(); - zone = _vm->grid()->findZoneForPos(GS_PANEL, mouse.x, mouse.y); + int zone = _vm->grid()->findZoneForPos(GS_PANEL, mouse.x, mouse.y); int mouseButton = _vm->input()->mouseButton(); _vm->input()->clearMouseButton(); diff --git a/engines/queen/talk.h b/engines/queen/talk.h index cba77cc255..4dcf5ba52c 100644 --- a/engines/queen/talk.h +++ b/engines/queen/talk.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index b5c9b97ce0..dd7e46c765 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/engines/queen/walk.h b/engines/queen/walk.h index e5257b7afa..ce72607cbf 100644 --- a/engines/queen/walk.h +++ b/engines/queen/walk.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |