diff options
Diffstat (limited to 'engines/toltecs')
32 files changed, 111 insertions, 135 deletions
diff --git a/engines/toltecs/animation.cpp b/engines/toltecs/animation.cpp index 084332cf83..1f776bbc02 100644 --- a/engines/toltecs/animation.cpp +++ b/engines/toltecs/animation.cpp @@ -8,17 +8,16 @@ * 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 "toltecs/toltecs.h" diff --git a/engines/toltecs/animation.h b/engines/toltecs/animation.h index 54ec5d8afa..728142cacb 100644 --- a/engines/toltecs/animation.h +++ b/engines/toltecs/animation.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_ANIMATION_H diff --git a/engines/toltecs/configure.engine b/engines/toltecs/configure.engine new file mode 100644 index 0000000000..be5533efa2 --- /dev/null +++ b/engines/toltecs/configure.engine @@ -0,0 +1,3 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine toltecs "3 Skulls of the Toltecs" yes diff --git a/engines/toltecs/console.cpp b/engines/toltecs/console.cpp index f3394909ed..5a0c66c7b0 100644 --- a/engines/toltecs/console.cpp +++ b/engines/toltecs/console.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. @@ -31,8 +31,8 @@ namespace Toltecs { Console::Console(ToltecsEngine *vm) : GUI::Debugger(), _vm(vm) { - DCmd_Register("room", WRAP_METHOD(Console, Cmd_Room)); - DCmd_Register("dump", WRAP_METHOD(Console, Cmd_Dump)); + registerCmd("room", WRAP_METHOD(Console, Cmd_Room)); + registerCmd("dump", WRAP_METHOD(Console, Cmd_Dump)); } Console::~Console() { @@ -40,10 +40,10 @@ Console::~Console() { bool Console::Cmd_Room(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Current room number is %d\n", _vm->_sceneResIndex); + debugPrintf("Current room number is %d\n", _vm->_sceneResIndex); #if 0 - DebugPrintf("Calling this command with the room number changes the room\n"); - DebugPrintf("WARNING: It's a bad idea to warp to rooms with this, as the room object scripts are not loaded\n"); + debugPrintf("Calling this command with the room number changes the room\n"); + debugPrintf("WARNING: It's a bad idea to warp to rooms with this, as the room object scripts are not loaded\n"); #endif return true; #if 0 @@ -65,13 +65,13 @@ bool Console::Cmd_Room(int argc, const char **argv) { bool Console::Cmd_Dump(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: dump <resource number>\n"); + debugPrintf("Usage: dump <resource number>\n"); return true; } int resNum = atoi(argv[1]); _vm->_arc->dump(resNum); - DebugPrintf("Resource %d has been dumped to disk\n", resNum); + debugPrintf("Resource %d has been dumped to disk\n", resNum); return true; } diff --git a/engines/toltecs/console.h b/engines/toltecs/console.h index bcdfd0cf04..5e786d527e 100644 --- a/engines/toltecs/console.h +++ b/engines/toltecs/console.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/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 380f4a3a26..b6c7ad3d2b 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -8,17 +8,16 @@ * 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" @@ -256,7 +255,7 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const { Common::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++) { + for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { // Obtain the last 3 digits of the filename, since they correspond to the save slot int slotNum = atoi(file->c_str() + file->size() - 3); diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp index 0850630c43..a58771433e 100644 --- a/engines/toltecs/menu.cpp +++ b/engines/toltecs/menu.cpp @@ -8,17 +8,16 @@ * 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 "audio/mixer.h" @@ -196,7 +195,7 @@ void MenuSystem::handleKeyDown(const Common::KeyState& kbd) { } ItemID MenuSystem::findItemAt(int x, int y) { - for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); iter++) { + for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); ++iter) { if ((*iter).enabled && (*iter).rect.contains(x, y - _top)) return (*iter).id; } @@ -204,7 +203,7 @@ ItemID MenuSystem::findItemAt(int x, int y) { } MenuSystem::Item *MenuSystem::getItem(ItemID id) { - for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); iter++) { + for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); ++iter) { if ((*iter).id == id) return &(*iter); } @@ -225,8 +224,6 @@ void MenuSystem::setItemCaption(Item *item, const char *caption) { } void MenuSystem::initMenu(MenuID menuID) { - int newSlotNum; - _items.clear(); memcpy(_vm->_screen->_frontScreen, _background->getPixels(), 640 * 400); @@ -277,7 +274,7 @@ void MenuSystem::initMenu(MenuID menuID) { Common::String saveDesc = Common::String::format("SAVEGAME %d", i); addClickTextItem((ItemID)(kItemIdSavegame1 + i - 1), 0, 116 + 20 * (i - 1), 300, 0, saveDesc.c_str(), 231, 234); } - newSlotNum = loadSavegamesList() + 1; + int newSlotNum = loadSavegamesList() + 1; _savegames.push_back(SavegameItem(newSlotNum, Common::String::format("GAME %04d", _savegames.size()))); setSavegameCaptions(true); } else { @@ -324,7 +321,7 @@ void MenuSystem::initMenu(MenuID menuID) { break; } - for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); iter++) { + for (Common::Array<Item>::iterator iter = _items.begin(); iter != _items.end(); ++iter) { if ((*iter).enabled) drawItem((*iter).id, false); } @@ -509,7 +506,7 @@ int MenuSystem::loadSavegamesList() { filenames = saveFileMan->listSavefiles(pattern.c_str()); Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) - for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) { + for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { // Obtain the last 3 digits of the filename, since they correspond to the save slot int slotNum = atoi(file->c_str() + file->size() - 3); if (slotNum > maxSlotNum) diff --git a/engines/toltecs/menu.h b/engines/toltecs/menu.h index a5eca7c8ff..476eefe142 100644 --- a/engines/toltecs/menu.h +++ b/engines/toltecs/menu.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_MENU_H diff --git a/engines/toltecs/microtiles.cpp b/engines/toltecs/microtiles.cpp index 9181480351..0ac04905cb 100644 --- a/engines/toltecs/microtiles.cpp +++ b/engines/toltecs/microtiles.cpp @@ -8,17 +8,16 @@ * 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 "toltecs/microtiles.h" @@ -119,10 +118,7 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ for (y = 0; y < _tilesH; ++y) { for (x = 0; x < _tilesW; ++x) { - int finish = 0; - BoundingBox boundingBox; - - boundingBox = _tiles[i]; + BoundingBox boundingBox = _tiles[i]; if (isBoundingBoxEmpty(boundingBox)) { ++i; @@ -140,6 +136,7 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ // FIXME: Why is the following code in an #if block? #if 1 if (TileX1(boundingBox) == TileSize - 1 && x != _tilesW - 1) { // check if the tile continues + bool finish = false; while (!finish) { ++x; ++i; @@ -151,13 +148,12 @@ Common::Rect * MicroTileArray::getRectangles(int *num_rects, int min_x, int min_ { --x; --i; - finish = 1; + finish = true; } } } #endif x1 = (x * TileSize) + TileX1(_tiles[i]); - x1 = CLIP (x1, min_x, max_x); // FIXME: Why is the following code in an #if block? diff --git a/engines/toltecs/microtiles.h b/engines/toltecs/microtiles.h index 53933621a9..3714887fd7 100644 --- a/engines/toltecs/microtiles.h +++ b/engines/toltecs/microtiles.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_MICROTILES_H diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp index 341da7e5f3..0aa0a99a36 100644 --- a/engines/toltecs/movie.cpp +++ b/engines/toltecs/movie.cpp @@ -8,17 +8,16 @@ * 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 "audio/mixer.h" diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h index aa28c83fef..9404e5f639 100644 --- a/engines/toltecs/movie.h +++ b/engines/toltecs/movie.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_MOVIE_H diff --git a/engines/toltecs/music.cpp b/engines/toltecs/music.cpp index 830e4a97da..e4e067de39 100644 --- a/engines/toltecs/music.cpp +++ b/engines/toltecs/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/toltecs/music.h b/engines/toltecs/music.h index 8d364dbb9f..e6dc3dd146 100644 --- a/engines/toltecs/music.h +++ b/engines/toltecs/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/toltecs/palette.cpp b/engines/toltecs/palette.cpp index b93bb8b510..ab66e60c9d 100644 --- a/engines/toltecs/palette.cpp +++ b/engines/toltecs/palette.cpp @@ -8,17 +8,16 @@ * 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 "graphics/palette.h" @@ -121,7 +120,7 @@ uint16 Palette::findFragment(int16 id) { debug(0, "Palette::findFragment(%d)", id); uint16 result = 0; - for (PaletteFragmentArray::iterator iter = _fragments.begin(); iter != _fragments.end(); iter++) { + for (PaletteFragmentArray::iterator iter = _fragments.begin(); iter != _fragments.end(); ++iter) { PaletteFragment fragment = *iter; if (fragment.id == id) { result = (fragment.count << 8) | fragment.index; @@ -194,7 +193,7 @@ void Palette::saveState(Common::WriteStream *out) { uint16 fragmentCount = _fragments.size(); out->writeUint16LE(fragmentCount); - for (PaletteFragmentArray::iterator iter = _fragments.begin(); iter != _fragments.end(); iter++) { + for (PaletteFragmentArray::iterator iter = _fragments.begin(); iter != _fragments.end(); ++iter) { PaletteFragment fragment = *iter; out->writeUint16LE(fragment.id); out->writeByte(fragment.index); diff --git a/engines/toltecs/palette.h b/engines/toltecs/palette.h index 4777a82699..d16a32b10a 100644 --- a/engines/toltecs/palette.h +++ b/engines/toltecs/palette.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_PALETTE_H diff --git a/engines/toltecs/render.cpp b/engines/toltecs/render.cpp index 4c41e6ce00..bf68eee94c 100644 --- a/engines/toltecs/render.cpp +++ b/engines/toltecs/render.cpp @@ -8,17 +8,16 @@ * 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 "common/system.h" @@ -65,7 +64,7 @@ void RenderQueue::addSprite(SpriteDrawItem &sprite) { // Add sprite sorted by priority RenderQueueArray::iterator iter = _currQueue->begin(); while (iter != _currQueue->end() && (*iter).priority <= item.priority) { - iter++; + ++iter; } _currQueue->insert(iter, item); @@ -104,7 +103,7 @@ void RenderQueue::addMask(SegmapMaskRect &mask) { if (rectIntersectsItem(item.rect)) { RenderQueueArray::iterator iter = _currQueue->begin(); while (iter != _currQueue->end() && (*iter).priority <= item.priority) { - iter++; + ++iter; } _currQueue->insert(iter, item); } @@ -119,7 +118,7 @@ void RenderQueue::update() { if (!doFullRefresh) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *item = &(*iter); RenderQueueItem *prevItem = findItemInQueue(_prevQueue, *item); if (prevItem) { @@ -134,7 +133,7 @@ void RenderQueue::update() { } } - for (RenderQueueArray::iterator iter = _prevQueue->begin(); iter != _prevQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _prevQueue->begin(); iter != _prevQueue->end(); ++iter) { RenderQueueItem *prevItem = &(*iter); RenderQueueItem *item = findItemInQueue(_currQueue, *prevItem); if (!item) { @@ -145,7 +144,7 @@ void RenderQueue::update() { restoreDirtyBackground(); - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *item = &(*iter); if (item->flags != kUnchanged) invalidateItemsByRect(item->rect, item); @@ -156,7 +155,7 @@ void RenderQueue::update() { byte *srcp = _vm->_screen->_backScreen + _vm->_cameraX + _vm->_cameraY * _vm->_sceneWidth; int16 w = MIN<int16>(640, _vm->_sceneWidth); int16 h = MIN<int16>(400, _vm->_cameraHeight); - while (h--) { + while (h--) { memcpy(destp, srcp, w); destp += 640; srcp += _vm->_sceneWidth; @@ -164,7 +163,7 @@ void RenderQueue::update() { _vm->_screen->_fullRefresh = false; } - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { const RenderQueueItem *item = &(*iter); if (item->flags == kRefresh || doFullRefresh) { @@ -209,7 +208,7 @@ void RenderQueue::clear() { } bool RenderQueue::rectIntersectsItem(const Common::Rect &rect) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { const RenderQueueItem *item = &(*iter); if (rect.intersects(item->rect)) return true; @@ -221,7 +220,7 @@ RenderQueueItem *RenderQueue::findItemInQueue(RenderQueueArray *queue, const Ren /* This checks if the given item also exists in the previously drawn frame. The state of the item (position, color etc) is handled elsewhere. */ - for (RenderQueueArray::iterator iter = queue->begin(); iter != queue->end(); iter++) { + for (RenderQueueArray::iterator iter = queue->begin(); iter != queue->end(); ++iter) { RenderQueueItem *prevItem = &(*iter); if (prevItem->type == item.type) { switch (item.type) { @@ -263,7 +262,7 @@ bool RenderQueue::hasItemChanged(const RenderQueueItem &item1, const RenderQueue } void RenderQueue::invalidateItemsByRect(const Common::Rect &rect, const RenderQueueItem *item) { - for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); iter++) { + for (RenderQueueArray::iterator iter = _currQueue->begin(); iter != _currQueue->end(); ++iter) { RenderQueueItem *subItem = &(*iter); if (item != subItem && subItem->flags == kUnchanged && diff --git a/engines/toltecs/render.h b/engines/toltecs/render.h index 59d7a3ddb9..5150903146 100644 --- a/engines/toltecs/render.h +++ b/engines/toltecs/render.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_RENDER_H diff --git a/engines/toltecs/resource.cpp b/engines/toltecs/resource.cpp index d66075004b..468ae0272f 100644 --- a/engines/toltecs/resource.cpp +++ b/engines/toltecs/resource.cpp @@ -8,17 +8,16 @@ * 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 "common/file.h" diff --git a/engines/toltecs/resource.h b/engines/toltecs/resource.h index 3d45d9fb1b..d8e8ad9a5d 100644 --- a/engines/toltecs/resource.h +++ b/engines/toltecs/resource.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_RESOURCE_H diff --git a/engines/toltecs/saveload.cpp b/engines/toltecs/saveload.cpp index 6c195a34c2..409fc97076 100644 --- a/engines/toltecs/saveload.cpp +++ b/engines/toltecs/saveload.cpp @@ -8,17 +8,16 @@ * 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 "common/savefile.h" @@ -183,7 +182,7 @@ void ToltecsEngine::loadgame(const char *filename) { _mouseDisabled = in->readUint16LE(); _system->warpMouse(_mouseX, _mouseY); - _system->showMouse(_mouseDisabled == 0); + _system->showMouse(_mouseDisabled == 0); _palette->loadState(in); _script->loadState(in); diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp index 1eb2f41fd2..6bacc5dff7 100644 --- a/engines/toltecs/screen.cpp +++ b/engines/toltecs/screen.cpp @@ -8,17 +8,16 @@ * 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 "graphics/cursorman.h" @@ -599,7 +598,7 @@ int16 Screen::drawString(int16 x, int16 y, byte color, uint fontResIndex, const if (ywobble) yadd = *ywobble; - while (len--) { + while (len--) { byte ch = *text++; if (ch <= 0x20) { x += font.getWidth(); @@ -634,7 +633,7 @@ void Screen::drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, b byte flags = charData[0] & 0xF0; charData++; if ((flags & 0x80) == 0) { - if (flags & 0x10) { + if (flags & 0x10) { memset(dest, color, count); } else if (outline) { memset(dest, 0, count); diff --git a/engines/toltecs/screen.h b/engines/toltecs/screen.h index 7b2149fded..980865f65f 100644 --- a/engines/toltecs/screen.h +++ b/engines/toltecs/screen.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_SCREEN_H diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp index 476c3a4fcf..01149a14b7 100644 --- a/engines/toltecs/script.cpp +++ b/engines/toltecs/script.cpp @@ -8,17 +8,16 @@ * 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. * - * */ // TODO: Clean up game variable handling and move it to ToltecsEngine @@ -65,7 +64,7 @@ ScriptInterpreter::ScriptInterpreter(ToltecsEngine *vm) : _vm(vm) { _savedSp = 0; _slots[kMaxScriptSlots - 1].size = 1024; - _slots[kMaxScriptSlots - 1].data = new byte[_slots[kMaxScriptSlots - 1].size]; + _slots[kMaxScriptSlots - 1].data = new byte[_slots[kMaxScriptSlots - 1].size]; setupScriptFunctions(); @@ -184,11 +183,11 @@ void ScriptInterpreter::loadScript(uint resIndex, uint slotIndex) { delete[] _slots[slotIndex].data; - _slots[slotIndex].resIndex = resIndex; + _slots[slotIndex].resIndex = resIndex; Resource *scriptResource = _vm->_res->load(resIndex); _slots[slotIndex].size = scriptResource->size; - _slots[slotIndex].data = new byte[_slots[slotIndex].size]; - memcpy(_slots[slotIndex].data, scriptResource->data, _slots[slotIndex].size); + _slots[slotIndex].data = new byte[_slots[slotIndex].size]; + memcpy(_slots[slotIndex].data, scriptResource->data, _slots[slotIndex].size); } void ScriptInterpreter::setMainScript(uint slotIndex) { @@ -852,7 +851,7 @@ void ScriptInterpreter::sfFindMouseInRectIndex2() { } void ScriptInterpreter::sfDrawGuiImage() { - _vm->_screen->drawGuiImage(arg16(5), arg16(3), arg16(7)); + _vm->_screen->drawGuiImage(arg16(5), arg16(3), arg16(7)); } void ScriptInterpreter::sfAddAnimatedSpriteNoLoop() { diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h index 4c880dfef5..e77dcf4352 100644 --- a/engines/toltecs/script.h +++ b/engines/toltecs/script.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_SCRIPT_H diff --git a/engines/toltecs/segmap.cpp b/engines/toltecs/segmap.cpp index fea40f3277..b27e0c8e11 100644 --- a/engines/toltecs/segmap.cpp +++ b/engines/toltecs/segmap.cpp @@ -8,17 +8,16 @@ * 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 "toltecs/toltecs.h" diff --git a/engines/toltecs/segmap.h b/engines/toltecs/segmap.h index dda0edeb88..c1ad293162 100644 --- a/engines/toltecs/segmap.h +++ b/engines/toltecs/segmap.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_SEGMAP_H diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp index 8afc0e7890..fb14dd15ee 100644 --- a/engines/toltecs/sound.cpp +++ b/engines/toltecs/sound.cpp @@ -8,17 +8,16 @@ * 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 "audio/audiostream.h" diff --git a/engines/toltecs/sound.h b/engines/toltecs/sound.h index 48a6cd1318..13e943e9e3 100644 --- a/engines/toltecs/sound.h +++ b/engines/toltecs/sound.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_SOUND_H diff --git a/engines/toltecs/sprite.cpp b/engines/toltecs/sprite.cpp index 6101eb7d85..f29f64dcfe 100644 --- a/engines/toltecs/sprite.cpp +++ b/engines/toltecs/sprite.cpp @@ -8,17 +8,16 @@ * 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 "toltecs/toltecs.h" diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index 188facd63c..d3b69e7f21 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -8,17 +8,16 @@ * 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 "common/config-manager.h" @@ -235,7 +234,7 @@ void ToltecsEngine::loadScene(uint resIndex) { byte *source = scene + 392; byte *destp = _screen->_backScreen; byte *destEnd = destp + _sceneWidth * _sceneHeight; - while (destp < destEnd) { + while (destp < destEnd) { int count = 1; byte pixel = *source++; if (pixel & 0x80) { @@ -250,7 +249,7 @@ void ToltecsEngine::loadScene(uint resIndex) { debug(0, "_sceneWidth = %d; _sceneHeight = %d", _sceneWidth, _sceneHeight); // Load scene segmap - _segmap->load(scene + imageSize + 4); + _segmap->load(scene + imageSize + 4); _screen->_fullRefresh = true; _screen->_renderQueue->clear(); @@ -574,9 +573,9 @@ void ToltecsEngine::walk(byte *walkData) { if (ydelta > ABS(walkInfo.x1 - walkInfo.x2) * _walkSpeedX) { v10 = 100 - walkInfo.scaling; v11 = v8; - } else { + } else { v10 = v8; - v11 = 100 - walkInfo.scaling; + v11 = 100 - walkInfo.scaling; } walkInfo.yerror += walkInfo.mulValue * v10; diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h index 0be2d2a646..7a04f6e8da 100644 --- a/engines/toltecs/toltecs.h +++ b/engines/toltecs/toltecs.h @@ -8,17 +8,16 @@ * 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. * - * */ #ifndef TOLTECS_H @@ -36,13 +35,16 @@ #include "graphics/surface.h" +#include "gui/debugger.h" + +#include "toltecs/console.h" + namespace Toltecs { struct ToltecsGameDescription; class AnimationPlayer; class ArchiveReader; -class Console; class Input; class MenuSystem; class MoviePlayer; @@ -110,6 +112,8 @@ public: const Common::String& getTargetName() const { return _targetName; } void syncSoundSettings(); + GUI::Debugger *getDebugger() { return _console; } + void setupSysStrings(); void requestSavegame(int slotNum, Common::String &description); void requestLoadgame(int slotNum); |