diff options
Diffstat (limited to 'engines/toon/toon.cpp')
| -rw-r--r-- | engines/toon/toon.cpp | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 72cf57af8a..14e7d104d2 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1,24 +1,24 @@ /* 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. -* -*/ + * + * 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 "common/system.h" #include "common/events.h" @@ -634,7 +634,6 @@ bool ToonEngine::showMainmenu(bool &loadedGame) { bool doExit = false; bool exitGame = false; - int clickingOn, clickRelease; int menuMask = MAINMENUMASK_BASE; Common::SeekableReadStream *mainmenuMusicFile = NULL; AudioStreamInstance *mainmenuMusic = NULL; @@ -644,8 +643,8 @@ bool ToonEngine::showMainmenu(bool &loadedGame) { dirtyAllScreen(); while (!doExit) { - clickingOn = MAINMENUHOTSPOT_NONE; - clickRelease = false; + int clickingOn = MAINMENUHOTSPOT_NONE; + int clickRelease = false; if (!musicPlaying) { mainmenuMusicFile = resources()->openFile("BR091013.MUS"); @@ -3615,7 +3614,7 @@ int32 ToonEngine::handleInventoryOnInventory(int32 itemDest, int32 itemSrc) { createMouseItem(21); rearrangeInventory(); return 1; - } else if (itemSrc == 0x6b || itemSrc == 0x6c || itemSrc == 0x6f || itemSrc == 108 || itemSrc == 112) { + } else if (itemSrc == 0x6b || itemSrc == 0x6c || itemSrc == 0x6f || itemSrc == 0x70) { sayLines(2, 1292); return 1; } @@ -4617,15 +4616,13 @@ void ToonEngine::unloadToonDat() { } char **ToonEngine::loadTextsVariants(Common::File &in) { - int numTexts; - int entryLen; int len; char **res = 0; char *pos = 0; for (int varnt = 0; varnt < _numVariant; varnt++) { - numTexts = in.readUint16BE(); - entryLen = in.readUint16BE(); + int numTexts = in.readUint16BE(); + int entryLen = in.readUint16BE(); pos = (char *)malloc(entryLen); if (varnt == _gameVariant) { res = (char **)malloc(sizeof(char *) * numTexts); |