diff options
Diffstat (limited to 'engines/lastexpress')
148 files changed, 1462 insertions, 1450 deletions
diff --git a/engines/lastexpress/configure.engine b/engines/lastexpress/configure.engine new file mode 100644 index 0000000000..807b1a088b --- /dev/null +++ b/engines/lastexpress/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 lastexpress "The Last Express" no "" "" "16bit" diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp index 832bcc2e26..148854e04d 100644 --- a/engines/lastexpress/data/animation.cpp +++ b/engines/lastexpress/data/animation.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. @@ -39,7 +39,7 @@ namespace LastExpress { -Animation::Animation() : _stream(NULL), _currentChunk(NULL), _overlay(NULL), _background1(NULL), _background2(NULL), _backgroundCurrent(0), _audio(NULL), _startTime(0), _changed(false), _flag(0) { +Animation::Animation() : _stream(NULL), _currentChunk(NULL), _overlay(NULL), _background1(NULL), _background2(NULL), _backgroundCurrent(0), _audio(NULL), _startTime(0), _changed(false) { } Animation::~Animation() { diff --git a/engines/lastexpress/data/animation.h b/engines/lastexpress/data/animation.h index 293511b266..9523cddb78 100644 --- a/engines/lastexpress/data/animation.h +++ b/engines/lastexpress/data/animation.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. @@ -113,7 +113,6 @@ private: uint32 _startTime; bool _changed; - int _flag; }; } // End of namespace LastExpress diff --git a/engines/lastexpress/data/archive.cpp b/engines/lastexpress/data/archive.cpp index 908d58254a..f667da9e1c 100644 --- a/engines/lastexpress/data/archive.cpp +++ b/engines/lastexpress/data/archive.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/lastexpress/data/archive.h b/engines/lastexpress/data/archive.h index 011c830668..421220e6c7 100644 --- a/engines/lastexpress/data/archive.h +++ b/engines/lastexpress/data/archive.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/lastexpress/data/background.cpp b/engines/lastexpress/data/background.cpp index 60379251a3..e1626213e0 100644 --- a/engines/lastexpress/data/background.cpp +++ b/engines/lastexpress/data/background.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/lastexpress/data/background.h b/engines/lastexpress/data/background.h index 74dad541aa..c4a3216171 100644 --- a/engines/lastexpress/data/background.h +++ b/engines/lastexpress/data/background.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/lastexpress/data/cursor.cpp b/engines/lastexpress/data/cursor.cpp index d176d963d1..fe1092a7ef 100644 --- a/engines/lastexpress/data/cursor.cpp +++ b/engines/lastexpress/data/cursor.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/lastexpress/data/cursor.h b/engines/lastexpress/data/cursor.h index 0e11ec04b8..63932b3d7e 100644 --- a/engines/lastexpress/data/cursor.h +++ b/engines/lastexpress/data/cursor.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/lastexpress/data/font.cpp b/engines/lastexpress/data/font.cpp index 8ac1afce9a..fb1b26582e 100644 --- a/engines/lastexpress/data/font.cpp +++ b/engines/lastexpress/data/font.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/lastexpress/data/font.h b/engines/lastexpress/data/font.h index 7696829b3b..cc6f8e03e0 100644 --- a/engines/lastexpress/data/font.h +++ b/engines/lastexpress/data/font.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/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp index fdb1ac6d46..4e20e219d5 100644 --- a/engines/lastexpress/data/scene.cpp +++ b/engines/lastexpress/data/scene.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/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h index b99e56a74c..b9aff4da6b 100644 --- a/engines/lastexpress/data/scene.h +++ b/engines/lastexpress/data/scene.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/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp index c7073b560c..f43e2afdef 100644 --- a/engines/lastexpress/data/sequence.cpp +++ b/engines/lastexpress/data/sequence.cpp @@ -76,7 +76,7 @@ void FrameInfo::read(Common::SeekableReadStream *in, bool isSequence) { // AnimFrame -AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f, bool ignoreSubtype) : _palette(NULL), _ignoreSubtype(ignoreSubtype) { +AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f, bool /* ignoreSubtype */) : _palette(NULL) { _palSize = 1; // TODO: use just the needed rectangle _image.create(640, 480, Graphics::PixelFormat::createFormatCLUT8()); diff --git a/engines/lastexpress/data/sequence.h b/engines/lastexpress/data/sequence.h index 610a55cebf..fd8b3cd27b 100644 --- a/engines/lastexpress/data/sequence.h +++ b/engines/lastexpress/data/sequence.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. @@ -147,7 +147,6 @@ private: uint16 _palSize; uint16 *_palette; Common::Rect _rect; - bool _ignoreSubtype; }; class Sequence { diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index a77e4a06c6..2a221afadc 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.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/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h index 7111d939e7..f489304ff3 100644 --- a/engines/lastexpress/data/snd.h +++ b/engines/lastexpress/data/snd.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/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp index 4d19c02aa7..3e0da8cb55 100644 --- a/engines/lastexpress/data/subtitle.cpp +++ b/engines/lastexpress/data/subtitle.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/lastexpress/data/subtitle.h b/engines/lastexpress/data/subtitle.h index 435408e4bd..40f6c11634 100644 --- a/engines/lastexpress/data/subtitle.h +++ b/engines/lastexpress/data/subtitle.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/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp index 7c83aff93d..57943f9a8d 100644 --- a/engines/lastexpress/debug.cpp +++ b/engines/lastexpress/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. @@ -60,33 +60,33 @@ Debugger::Debugger(LastExpressEngine *engine) : _engine(engine), _command(NULL), // Register the debugger commands // General - DCmd_Register("help", WRAP_METHOD(Debugger, cmdHelp)); + registerCmd("help", WRAP_METHOD(Debugger, cmdHelp)); // Data - DCmd_Register("ls", WRAP_METHOD(Debugger, cmdListFiles)); - DCmd_Register("dump", WRAP_METHOD(Debugger, cmdDumpFiles)); + registerCmd("ls", WRAP_METHOD(Debugger, cmdListFiles)); + registerCmd("dump", WRAP_METHOD(Debugger, cmdDumpFiles)); - DCmd_Register("showframe", WRAP_METHOD(Debugger, cmdShowFrame)); - DCmd_Register("showbg", WRAP_METHOD(Debugger, cmdShowBg)); - DCmd_Register("playseq", WRAP_METHOD(Debugger, cmdPlaySeq)); - DCmd_Register("playsnd", WRAP_METHOD(Debugger, cmdPlaySnd)); - DCmd_Register("playsbe", WRAP_METHOD(Debugger, cmdPlaySbe)); - DCmd_Register("playnis", WRAP_METHOD(Debugger, cmdPlayNis)); + registerCmd("showframe", WRAP_METHOD(Debugger, cmdShowFrame)); + registerCmd("showbg", WRAP_METHOD(Debugger, cmdShowBg)); + registerCmd("playseq", WRAP_METHOD(Debugger, cmdPlaySeq)); + registerCmd("playsnd", WRAP_METHOD(Debugger, cmdPlaySnd)); + registerCmd("playsbe", WRAP_METHOD(Debugger, cmdPlaySbe)); + registerCmd("playnis", WRAP_METHOD(Debugger, cmdPlayNis)); // Scene & interaction - DCmd_Register("loadscene", WRAP_METHOD(Debugger, cmdLoadScene)); - DCmd_Register("fight", WRAP_METHOD(Debugger, cmdFight)); - DCmd_Register("beetle", WRAP_METHOD(Debugger, cmdBeetle)); + registerCmd("loadscene", WRAP_METHOD(Debugger, cmdLoadScene)); + registerCmd("fight", WRAP_METHOD(Debugger, cmdFight)); + registerCmd("beetle", WRAP_METHOD(Debugger, cmdBeetle)); // Game - DCmd_Register("delta", WRAP_METHOD(Debugger, cmdTimeDelta)); - DCmd_Register("time", WRAP_METHOD(Debugger, cmdTime)); - DCmd_Register("show", WRAP_METHOD(Debugger, cmdShow)); - DCmd_Register("entity", WRAP_METHOD(Debugger, cmdEntity)); + registerCmd("delta", WRAP_METHOD(Debugger, cmdTimeDelta)); + registerCmd("time", WRAP_METHOD(Debugger, cmdTime)); + registerCmd("show", WRAP_METHOD(Debugger, cmdShow)); + registerCmd("entity", WRAP_METHOD(Debugger, cmdEntity)); // Misc - DCmd_Register("chapter", WRAP_METHOD(Debugger, cmdSwitchChapter)); - DCmd_Register("clear", WRAP_METHOD(Debugger, cmdClear)); + registerCmd("chapter", WRAP_METHOD(Debugger, cmdSwitchChapter)); + registerCmd("clear", WRAP_METHOD(Debugger, cmdClear)); resetCommand(); @@ -146,7 +146,7 @@ void Debugger::copyCommand(int argc, const char **argv) { } // Exit the debugger! - Cmd_Exit(0, 0); + cmdExit(0, 0); } void Debugger::callCommand() { @@ -156,7 +156,7 @@ void Debugger::callCommand() { bool Debugger::loadArchive(int index) { if (index < 1 || index > 3) { - DebugPrintf("Invalid cd number (was: %d, valid: [1-3])\n", index); + debugPrintf("Invalid cd number (was: %d, valid: [1-3])\n", index); return false; } @@ -198,36 +198,36 @@ void Debugger::restoreArchive() const { // Debugger commands ////////////////////////////////////////////////////////////////////////// bool Debugger::cmdHelp(int, const char **) { - DebugPrintf("Debug flags\n"); - DebugPrintf("-----------\n"); - DebugPrintf(" debugflag_list - Lists the available debug flags and their status\n"); - DebugPrintf(" debugflag_enable - Enables a debug flag\n"); - DebugPrintf(" debugflag_disable - Disables a debug flag\n"); - DebugPrintf("\n"); - DebugPrintf("Commands\n"); - DebugPrintf("--------\n"); - DebugPrintf(" ls - list files in the archive\n"); - DebugPrintf(" dump - dump a list of files in all archives\n"); - DebugPrintf("\n"); - DebugPrintf(" showframe - show a frame from a sequence\n"); - DebugPrintf(" showbg - show a background\n"); - DebugPrintf(" playseq - play a sequence\n"); - DebugPrintf(" playsnd - play a sound\n"); - DebugPrintf(" playsbe - play a subtitle\n"); - DebugPrintf(" playnis - play an animation\n"); - DebugPrintf("\n"); - DebugPrintf(" loadscene - load a scene\n"); - DebugPrintf(" fight - start a fight\n"); - DebugPrintf(" beetle - start the beetle game\n"); - DebugPrintf("\n"); - DebugPrintf(" delta - Adjust the time delta\n"); - DebugPrintf(" show - show game data\n"); - DebugPrintf(" entity - show entity data\n"); - DebugPrintf("\n"); - DebugPrintf(" loadgame - load a saved game\n"); - DebugPrintf(" chapter - switch to a specific chapter\n"); - DebugPrintf(" clear - clear the screen\n"); - DebugPrintf("\n"); + debugPrintf("Debug flags\n"); + debugPrintf("-----------\n"); + debugPrintf(" debugflag_list - Lists the available debug flags and their status\n"); + debugPrintf(" debugflag_enable - Enables a debug flag\n"); + debugPrintf(" debugflag_disable - Disables a debug flag\n"); + debugPrintf("\n"); + debugPrintf("Commands\n"); + debugPrintf("--------\n"); + debugPrintf(" ls - list files in the archive\n"); + debugPrintf(" dump - dump a list of files in all archives\n"); + debugPrintf("\n"); + debugPrintf(" showframe - show a frame from a sequence\n"); + debugPrintf(" showbg - show a background\n"); + debugPrintf(" playseq - play a sequence\n"); + debugPrintf(" playsnd - play a sound\n"); + debugPrintf(" playsbe - play a subtitle\n"); + debugPrintf(" playnis - play an animation\n"); + debugPrintf("\n"); + debugPrintf(" loadscene - load a scene\n"); + debugPrintf(" fight - start a fight\n"); + debugPrintf(" beetle - start the beetle game\n"); + debugPrintf("\n"); + debugPrintf(" delta - Adjust the time delta\n"); + debugPrintf(" show - show game data\n"); + debugPrintf(" entity - show entity data\n"); + debugPrintf("\n"); + debugPrintf(" loadgame - load a saved game\n"); + debugPrintf(" chapter - switch to a specific chapter\n"); + debugPrintf(" clear - clear the screen\n"); + debugPrintf("\n"); return true; } @@ -252,15 +252,15 @@ bool Debugger::cmdListFiles(int argc, const char **argv) { Common::ArchiveMemberList list; int count = _engine->getResourceManager()->listMatchingMembers(list, filter); - DebugPrintf("Number of matches: %d\n", count); + debugPrintf("Number of matches: %d\n", count); for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) - DebugPrintf(" %s\n", (*it)->getName().c_str()); + debugPrintf(" %s\n", (*it)->getName().c_str()); // Restore archive if (argc == 3) restoreArchive(); } else { - DebugPrintf("Syntax: ls <filter> (use * for all) (<cd number>)\n"); + debugPrintf("Syntax: ls <filter> (use * for all) (<cd number>)\n"); } return true; @@ -287,7 +287,7 @@ bool Debugger::cmdDumpFiles(int argc, const char **) { for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) { \ Common::SeekableReadStream *stream = getArchive((*it)->getName()); \ if (!stream) { \ - DebugPrintf("ERROR: Cannot create stream for file: %s\n", (*it)->getName().c_str()); \ + debugPrintf("ERROR: Cannot create stream for file: %s\n", (*it)->getName().c_str()); \ restoreArchive(); \ return true; \ } \ @@ -311,7 +311,7 @@ bool Debugger::cmdDumpFiles(int argc, const char **) { // Restore current loaded archive restoreArchive(); } else { - DebugPrintf("Syntax: dump"); + debugPrintf("Syntax: dump"); } return true; @@ -336,7 +336,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -345,7 +345,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdShowFrame); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { Sequence sequence(filename); if (sequence.load(getArchive(filename))) { @@ -354,7 +354,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { AnimFrame *frame = sequence.getFrame((uint16)getNumber(argv[2])); if (!frame) { - DebugPrintf("Invalid frame index '%s'\n", argv[2]); + debugPrintf("Invalid frame index '%s'\n", argv[2]); resetCommand(); return true; } @@ -375,7 +375,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { restoreArchive(); } } else { - DebugPrintf("Syntax: cmd_showframe <seqname> <index> (<cd number>)\n"); + debugPrintf("Syntax: cmd_showframe <seqname> <index> (<cd number>)\n"); } return true; } @@ -398,7 +398,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename + ".BG")) { - DebugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str()); + debugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str()); return true; } @@ -407,7 +407,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdShowBg); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { clearBg(GraphicsManager::kBackgroundC); @@ -429,7 +429,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: showbg <bgname> (<cd number>)\n"); + debugPrintf("Syntax: showbg <bgname> (<cd number>)\n"); } return true; } @@ -453,7 +453,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -462,7 +462,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdPlaySeq); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { Sequence *sequence = new Sequence(filename); if (sequence->load(getArchive(filename))) { @@ -510,7 +510,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) { restoreArchive(); } } else { - DebugPrintf("Syntax: playseq <seqname> (<cd number>)\n"); + debugPrintf("Syntax: playseq <seqname> (<cd number>)\n"); } return true; } @@ -537,7 +537,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) { name += ".SND"; if (!_engine->getResourceManager()->hasFile(name)) { - DebugPrintf("Cannot find file: %s\n", name.c_str()); + debugPrintf("Cannot find file: %s\n", name.c_str()); return true; } @@ -548,7 +548,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) { if (argc == 3) restoreArchive(); } else { - DebugPrintf("Syntax: playsnd <sndname> (<cd number>)\n"); + debugPrintf("Syntax: playsnd <sndname> (<cd number>)\n"); } return true; } @@ -573,7 +573,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) { filename += ".sbe"; if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -582,7 +582,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdPlaySbe); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { SubtitleManager subtitle(_engine->getFont()); if (subtitle.load(getArchive(filename))) { @@ -615,7 +615,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: playsbe <sbename> (<cd number>)\n"); + debugPrintf("Syntax: playsbe <sbename> (<cd number>)\n"); } return true; } @@ -639,7 +639,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) { // If we got a nis filename, check that the file exists if (name.contains('.') && !_engine->getResourceManager()->hasFile(name)) { - DebugPrintf("Cannot find file: %s\n", name.c_str()); + debugPrintf("Cannot find file: %s\n", name.c_str()); return true; } @@ -648,7 +648,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdPlayNis); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { // Make sure we are not called in a loop _numParams = 0; @@ -672,7 +672,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: playnis <nisname.nis or animation index> (<cd number>)\n"); + debugPrintf("Syntax: playnis <nisname.nis or animation index> (<cd number>)\n"); } return true; } @@ -697,7 +697,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { } if (index > 2500) { - DebugPrintf("Error: invalid index value (0-2500)"); + debugPrintf("Error: invalid index value (0-2500)"); return true; } @@ -706,7 +706,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { _command = WRAP_METHOD(Debugger, cmdLoadScene); copyCommand(argc, argv); - return Cmd_Exit(0, 0); + return cmdExit(0, 0); } else { clearBg(GraphicsManager::kBackgroundAll); @@ -718,7 +718,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { // loadSceneObject(scene, i); // if (scene.getHeader() && scene.getHeader()->car == 5 && scene.getHeader()->position == 81) { - // DebugPrintf("Found scene: %d", i); + // debugPrintf("Found scene: %d", i); // // Draw scene found // _engine->getGraphicsManager()->draw(&scene, GraphicsManager::kBackgroundC); @@ -738,7 +738,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { /*********************************************/ Scene *scene = getScenes()->get(index); if (!scene) { - DebugPrintf("Cannot load scene %i from CD %i", index, cd); + debugPrintf("Cannot load scene %i from CD %i", index, cd); resetCommand(); return true; @@ -758,7 +758,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: loadscene <scene index> (<cd number>)\n"); + debugPrintf("Syntax: loadscene <scene index> (<cd number>)\n"); } return true; } @@ -814,7 +814,7 @@ bool Debugger::cmdFight(int argc, const char **argv) { SceneIndex lastScene = getState()->scene; - getFight()->setup(type) ? DebugPrintf("Lost fight!\n") : DebugPrintf("Won fight!\n"); + getFight()->setup(type) ? debugPrintf("Lost fight!\n") : debugPrintf("Won fight!\n"); // Pause for a second to be able to see the final scene _engine->_system->delayMillis(1000); @@ -837,7 +837,7 @@ bool Debugger::cmdFight(int argc, const char **argv) { } } else { error: - DebugPrintf("Syntax: fight <id> (id=2001-2005)\n"); + debugPrintf("Syntax: fight <id> (id=2001-2005)\n"); } return true; @@ -968,7 +968,7 @@ bool Debugger::cmdBeetle(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: beetle\n"); + debugPrintf("Syntax: beetle\n"); } return true; @@ -992,7 +992,7 @@ bool Debugger::cmdTimeDelta(int argc, const char **argv) { getState()->timeDelta = (uint)delta; } else { label_error: - DebugPrintf("Syntax: delta <time delta> (delta=1-500)\n"); + debugPrintf("Syntax: delta <time delta> (delta=1-500)\n"); } return true; @@ -1018,10 +1018,10 @@ bool Debugger::cmdTime(int argc, const char **argv) { uint8 minutes = 0; State::getHourMinutes((uint32)time, &hours, &minutes); - DebugPrintf("%02d:%02d\n", hours, minutes); + debugPrintf("%02d:%02d\n", hours, minutes); } else { label_error: - DebugPrintf("Syntax: time <time to convert> (time=0-INT_MAX)\n"); + debugPrintf("Syntax: time <time to convert> (time=0-INT_MAX)\n"); } return true; @@ -1037,10 +1037,10 @@ label_error: */ bool Debugger::cmdShow(int argc, const char **argv) { #define OUTPUT_DUMP(name, text) \ - DebugPrintf(#name "\n"); \ - DebugPrintf("--------------------------------------------------------------------\n\n"); \ - DebugPrintf("%s", text); \ - DebugPrintf("\n"); + debugPrintf(#name "\n"); \ + debugPrintf("--------------------------------------------------------------------\n\n"); \ + debugPrintf("%s", text); \ + debugPrintf("\n"); if (argc == 2) { @@ -1066,14 +1066,14 @@ bool Debugger::cmdShow(int argc, const char **argv) { } else { label_error: - DebugPrintf("Syntax: state <option>\n"); - DebugPrintf(" state / st\n"); - DebugPrintf(" progress / pr\n"); - DebugPrintf(" flags / fl\n"); - DebugPrintf(" inventory / inv\n"); - DebugPrintf(" objects / obj\n"); - DebugPrintf(" savepoints / pt\n"); - DebugPrintf(" scene / sc\n"); + debugPrintf("Syntax: state <option>\n"); + debugPrintf(" state / st\n"); + debugPrintf(" progress / pr\n"); + debugPrintf(" flags / fl\n"); + debugPrintf(" inventory / inv\n"); + debugPrintf(" objects / obj\n"); + debugPrintf(" savepoints / pt\n"); + debugPrintf(" scene / sc\n"); } return true; @@ -1096,26 +1096,26 @@ bool Debugger::cmdEntity(int argc, const char **argv) { if (index > 39) goto label_error; - DebugPrintf("Entity %s\n", ENTITY_NAME(index)); - DebugPrintf("--------------------------------------------------------------------\n\n"); - DebugPrintf("%s", getEntities()->getData(index)->toString().c_str()); + debugPrintf("Entity %s\n", ENTITY_NAME(index)); + debugPrintf("--------------------------------------------------------------------\n\n"); + debugPrintf("%s", getEntities()->getData(index)->toString().c_str()); // The Player entity does not have any callback data if (index != kEntityPlayer) { EntityData *data = getEntities()->get(index)->getParamData(); for (uint callback = 0; callback < 9; callback++) { - DebugPrintf("Call parameters %d:\n", callback); + debugPrintf("Call parameters %d:\n", callback); for (byte ix = 0; ix < 4; ix++) - DebugPrintf(" %s", data->getParameters(callback, ix)->toString().c_str()); + debugPrintf(" %s", data->getParameters(callback, ix)->toString().c_str()); } } - DebugPrintf("\n"); + debugPrintf("\n"); } else { label_error: - DebugPrintf("Syntax: entity <index>\n"); + debugPrintf("Syntax: entity <index>\n"); for (int i = 0; i < 40; i += 4) - DebugPrintf(" %s - %d %s - %d %s - %d %s - %d\n", ENTITY_NAME(i), i, ENTITY_NAME(i+1), i+1, ENTITY_NAME(i+2), i+2, ENTITY_NAME(i+3), i+3); + debugPrintf(" %s - %d %s - %d %s - %d %s - %d\n", ENTITY_NAME(i), i, ENTITY_NAME(i+1), i+1, ENTITY_NAME(i+2), i+2, ENTITY_NAME(i+3), i+3); } return true; @@ -1152,7 +1152,7 @@ bool Debugger::cmdSwitchChapter(int argc, const char **argv) { } } else { error: - DebugPrintf("Syntax: chapter <id> (id=2-6)\n"); + debugPrintf("Syntax: chapter <id> (id=2-6)\n"); } return true; @@ -1172,7 +1172,7 @@ bool Debugger::cmdClear(int argc, const char **) { askForRedraw(); redrawScreen(); } else { - DebugPrintf("Syntax: clear - clear the screen\n"); + debugPrintf("Syntax: clear - clear the screen\n"); } return true; diff --git a/engines/lastexpress/debug.h b/engines/lastexpress/debug.h index 532cb83717..7a1e2648fb 100644 --- a/engines/lastexpress/debug.h +++ b/engines/lastexpress/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/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 2fdeef910a..d790582104 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.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/lastexpress/drawable.h b/engines/lastexpress/drawable.h index 5e77b0343a..8e844124f9 100644 --- a/engines/lastexpress/drawable.h +++ b/engines/lastexpress/drawable.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/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp index 406b017d3a..5393410add 100644 --- a/engines/lastexpress/entities/abbot.cpp +++ b/engines/lastexpress/entities/abbot.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. @@ -57,42 +57,42 @@ Abbot::Abbot(LastExpressEngine *engine) : Entity(engine, kEntityAbbot) { ADD_CALLBACK_FUNCTION(Abbot, chapter1); ADD_CALLBACK_FUNCTION(Abbot, chapter2); ADD_CALLBACK_FUNCTION(Abbot, chapter3); - ADD_CALLBACK_FUNCTION(Abbot, chapter3Handler); - ADD_CALLBACK_FUNCTION(Abbot, conversationWithBoutarel); + ADD_CALLBACK_FUNCTION(Abbot, inKitchen); + ADD_CALLBACK_FUNCTION(Abbot, openCompartment); ADD_CALLBACK_FUNCTION(Abbot, readPaper); ADD_CALLBACK_FUNCTION(Abbot, goToLunch); ADD_CALLBACK_FUNCTION(Abbot, haveLunch); - ADD_CALLBACK_FUNCTION(Abbot, function23); - ADD_CALLBACK_FUNCTION(Abbot, function24); - ADD_CALLBACK_FUNCTION(Abbot, function25); - ADD_CALLBACK_FUNCTION(Abbot, function26); - ADD_CALLBACK_FUNCTION(Abbot, function27); - ADD_CALLBACK_FUNCTION(Abbot, function28); - ADD_CALLBACK_FUNCTION(Abbot, function29); - ADD_CALLBACK_FUNCTION(Abbot, function30); - ADD_CALLBACK_FUNCTION(Abbot, function31); - ADD_CALLBACK_FUNCTION(Abbot, function32); - ADD_CALLBACK_FUNCTION(Abbot, function33); - ADD_CALLBACK_FUNCTION(Abbot, function34); - ADD_CALLBACK_FUNCTION(Abbot, function35); - ADD_CALLBACK_FUNCTION(Abbot, function36); - ADD_CALLBACK_FUNCTION(Abbot, function37); - ADD_CALLBACK_FUNCTION(Abbot, function38); + ADD_CALLBACK_FUNCTION(Abbot, leaveLunch); + ADD_CALLBACK_FUNCTION(Abbot, closedCompartment); + ADD_CALLBACK_FUNCTION(Abbot, goSalon1); + ADD_CALLBACK_FUNCTION(Abbot, inSalon1); + ADD_CALLBACK_FUNCTION(Abbot, goCompartment); + ADD_CALLBACK_FUNCTION(Abbot, openCompartment2); + ADD_CALLBACK_FUNCTION(Abbot, goWander); + ADD_CALLBACK_FUNCTION(Abbot, goSalon2); + ADD_CALLBACK_FUNCTION(Abbot, inSalon2); + ADD_CALLBACK_FUNCTION(Abbot, goCompartment3); + ADD_CALLBACK_FUNCTION(Abbot, openCompartment3); + ADD_CALLBACK_FUNCTION(Abbot, goSalon3); + ADD_CALLBACK_FUNCTION(Abbot, inSalon3); + ADD_CALLBACK_FUNCTION(Abbot, withAugust); + ADD_CALLBACK_FUNCTION(Abbot, goCompartment4); + ADD_CALLBACK_FUNCTION(Abbot, inCompartment4); ADD_CALLBACK_FUNCTION(Abbot, chapter4); - ADD_CALLBACK_FUNCTION(Abbot, function40); + ADD_CALLBACK_FUNCTION(Abbot, doWalkSearchingForCath); ADD_CALLBACK_FUNCTION(Abbot, chapter4Handler); - ADD_CALLBACK_FUNCTION(Abbot, function42); - ADD_CALLBACK_FUNCTION(Abbot, function43); + ADD_CALLBACK_FUNCTION(Abbot, leaveDinner); + ADD_CALLBACK_FUNCTION(Abbot, inCompartment); ADD_CALLBACK_FUNCTION(Abbot, function44); - ADD_CALLBACK_FUNCTION(Abbot, function45); - ADD_CALLBACK_FUNCTION(Abbot, function46); - ADD_CALLBACK_FUNCTION(Abbot, drinkAfterDefuse); - ADD_CALLBACK_FUNCTION(Abbot, function48); - ADD_CALLBACK_FUNCTION(Abbot, pickBomb); + ADD_CALLBACK_FUNCTION(Abbot, conferring); + ADD_CALLBACK_FUNCTION(Abbot, goSalon4); + ADD_CALLBACK_FUNCTION(Abbot, beforeBomb); + ADD_CALLBACK_FUNCTION(Abbot, afterBomb); + ADD_CALLBACK_FUNCTION(Abbot, catchCath); ADD_CALLBACK_FUNCTION(Abbot, chapter5); ADD_CALLBACK_FUNCTION(Abbot, chapter5Handler); ADD_CALLBACK_FUNCTION(Abbot, function52); - ADD_CALLBACK_FUNCTION(Abbot, function53); + ADD_CALLBACK_FUNCTION(Abbot, runningTrain); } ////////////////////////////////////////////////////////////////////////// @@ -196,7 +196,7 @@ IMPLEMENT_FUNCTION(17, Abbot, chapter3) break; case kActionNone: - setup_chapter3Handler(); + setup_inKitchen(); break; case kActionDefault: @@ -213,7 +213,7 @@ IMPLEMENT_FUNCTION(17, Abbot, chapter3) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler) +IMPLEMENT_FUNCTION(18, Abbot, inKitchen) switch (savepoint.action) { default: break; @@ -259,7 +259,7 @@ IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler) getData()->entityPosition = kPosition_6470; getData()->location = kLocationInsideCompartment; - setup_conversationWithBoutarel(); + setup_openCompartment(); break; } break; @@ -272,7 +272,7 @@ IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(19, Abbot, conversationWithBoutarel) +IMPLEMENT_FUNCTION(19, Abbot, openCompartment) switch (savepoint.action) { default: break; @@ -419,7 +419,7 @@ IMPLEMENT_FUNCTION(22, Abbot, haveLunch) if (getState()->time > kTime1989000 && getEntities()->isSomebodyInsideRestaurantOrSalon()) { getData()->inventoryItem = kItemNone; - setup_function23(); + setup_leaveLunch(); } break; @@ -456,7 +456,7 @@ IMPLEMENT_FUNCTION(22, Abbot, haveLunch) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(23, Abbot, function23) +IMPLEMENT_FUNCTION(23, Abbot, leaveLunch) switch (savepoint.action) { default: break; @@ -500,7 +500,7 @@ IMPLEMENT_FUNCTION(23, Abbot, function23) case 4: getData()->location = kLocationInsideCompartment; - setup_function24(); + setup_closedCompartment(); break; } break; @@ -508,7 +508,7 @@ IMPLEMENT_FUNCTION(23, Abbot, function23) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(24, Abbot, function24) +IMPLEMENT_FUNCTION(24, Abbot, closedCompartment) switch (savepoint.action) { default: break; @@ -517,7 +517,7 @@ IMPLEMENT_FUNCTION(24, Abbot, function24) if (!Entity::updateParameter(params->param1, getState()->time, 900)) break; - setup_function25(); + setup_goSalon1(); break; case kActionKnock: @@ -561,7 +561,7 @@ IMPLEMENT_FUNCTION(24, Abbot, function24) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(25, Abbot, function25) +IMPLEMENT_FUNCTION(25, Abbot, goSalon1) switch (savepoint.action) { default: break; @@ -602,7 +602,7 @@ IMPLEMENT_FUNCTION(25, Abbot, function25) getData()->location = kLocationInsideCompartment; getScenes()->loadSceneFromItemPosition(kItem3); - setup_function26(); + setup_inSalon1(); break; } break; @@ -610,7 +610,7 @@ IMPLEMENT_FUNCTION(25, Abbot, function25) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(26, Abbot, function26) +IMPLEMENT_FUNCTION(26, Abbot, inSalon1) switch (savepoint.action) { default: break; @@ -620,7 +620,7 @@ IMPLEMENT_FUNCTION(26, Abbot, function26) break; if (getEntities()->isSomebodyInsideRestaurantOrSalon()) - setup_function27(); + setup_goCompartment(); break; case kActionDefault: @@ -636,7 +636,7 @@ IMPLEMENT_FUNCTION(26, Abbot, function26) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(27, Abbot, function27) +IMPLEMENT_FUNCTION(27, Abbot, goCompartment) switch (savepoint.action) { default: break; @@ -677,7 +677,7 @@ IMPLEMENT_FUNCTION(27, Abbot, function27) getData()->entityPosition = kPosition_6470; getData()->location = kLocationInsideCompartment; - setup_function28(); + setup_openCompartment2(); break; } break; @@ -685,13 +685,13 @@ IMPLEMENT_FUNCTION(27, Abbot, function27) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(28, Abbot, function28) +IMPLEMENT_FUNCTION(28, Abbot, openCompartment2) switch (savepoint.action) { default: break; case kActionNone: - Entity::timeCheckCallback(kTime2052000, params->param1, 1, WRAP_SETUP_FUNCTION(Abbot, setup_function29)); + Entity::timeCheckCallback(kTime2052000, params->param1, 1, WRAP_SETUP_FUNCTION(Abbot, setup_goWander)); break; case kActionDefault: @@ -708,12 +708,12 @@ IMPLEMENT_FUNCTION(28, Abbot, function28) break; case kAction222609266: - setup_function30(); + setup_goSalon2(); } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(29, Abbot, function29) +IMPLEMENT_FUNCTION(29, Abbot, goWander) switch (savepoint.action) { default: break; @@ -778,7 +778,7 @@ IMPLEMENT_FUNCTION(29, Abbot, function29) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(30, Abbot, function30) +IMPLEMENT_FUNCTION(30, Abbot, goSalon2) switch (savepoint.action) { default: break; @@ -826,7 +826,7 @@ switch (savepoint.action) { getScenes()->loadSceneFromItemPosition(kItem3); getData()->location = kLocationInsideCompartment; - setup_function31(); + setup_inSalon2(); break; } break; @@ -834,7 +834,7 @@ switch (savepoint.action) { IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(31, Abbot, function31) +IMPLEMENT_FUNCTION(31, Abbot, inSalon2) switch (savepoint.action) { default: break; @@ -936,7 +936,7 @@ IMPLEMENT_FUNCTION(31, Abbot, function31) break; case 7: - setup_function32(); + setup_goCompartment3(); break; } break; @@ -944,7 +944,7 @@ IMPLEMENT_FUNCTION(31, Abbot, function31) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(32, Abbot, function32) +IMPLEMENT_FUNCTION(32, Abbot, goCompartment3) switch (savepoint.action) { default: break; @@ -972,7 +972,7 @@ IMPLEMENT_FUNCTION(32, Abbot, function32) getData()->location = kLocationInsideCompartment; getSavePoints()->push(kEntityAbbot, kEntityBoutarel, kAction122358304); - setup_function33(); + setup_openCompartment3(); break; } break; @@ -980,7 +980,7 @@ IMPLEMENT_FUNCTION(32, Abbot, function32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(33, Abbot, function33) +IMPLEMENT_FUNCTION(33, Abbot, openCompartment3) switch (savepoint.action) { default: break; @@ -1012,13 +1012,13 @@ IMPLEMENT_FUNCTION(33, Abbot, function33) break; case kAction123712592: - setup_function34(); + setup_goSalon3(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(34, Abbot, function34) +IMPLEMENT_FUNCTION(34, Abbot, goSalon3) switch (savepoint.action) { default: break; @@ -1066,7 +1066,7 @@ IMPLEMENT_FUNCTION(34, Abbot, function34) getScenes()->loadSceneFromItemPosition(kItem3); getData()->location = kLocationInsideCompartment; - setup_function35(); + setup_inSalon3(); break; } break; @@ -1074,7 +1074,7 @@ IMPLEMENT_FUNCTION(34, Abbot, function34) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(35, Abbot, function35) +IMPLEMENT_FUNCTION(35, Abbot, inSalon3) switch (savepoint.action) { default: break; @@ -1128,7 +1128,7 @@ IMPLEMENT_FUNCTION(35, Abbot, function35) getInventory()->setLocationAndProcess(kItem3, kObjectLocation1); getData()->location = kLocationInsideCompartment; - setup_function36(); + setup_withAugust(); break; } break; @@ -1136,7 +1136,7 @@ IMPLEMENT_FUNCTION(35, Abbot, function35) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(36, Abbot, function36) +IMPLEMENT_FUNCTION(36, Abbot, withAugust) switch (savepoint.action) { default: break; @@ -1198,14 +1198,14 @@ IMPLEMENT_FUNCTION(36, Abbot, function36) case kActionCallback: if (getCallback() == 1) { getEntities()->updatePositionExit(kEntityAbbot, kCarRestaurant, 57); - setup_function37(); + setup_goCompartment4(); } break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(37, Abbot, function37) +IMPLEMENT_FUNCTION(37, Abbot, goCompartment4) switch (savepoint.action) { default: break; @@ -1233,7 +1233,7 @@ IMPLEMENT_FUNCTION(37, Abbot, function37) getData()->location = kLocationInsideCompartment; getSavePoints()->push(kEntityAbbot, kEntityBoutarel, kAction122358304); - setup_function38(); + setup_inCompartment4(); break; } break; @@ -1241,7 +1241,7 @@ IMPLEMENT_FUNCTION(37, Abbot, function37) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(38, Abbot, function38) +IMPLEMENT_FUNCTION(38, Abbot, inCompartment4) switch (savepoint.action) { default: break; @@ -1283,7 +1283,7 @@ IMPLEMENT_FUNCTION(39, Abbot, chapter4) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_II(40, Abbot, function40, CarIndex, EntityPosition) +IMPLEMENT_FUNCTION_II(40, Abbot, doWalkSearchingForCath, CarIndex, EntityPosition) switch (savepoint.action) { default: break; @@ -1327,7 +1327,7 @@ IMPLEMENT_FUNCTION(41, Abbot, chapter4Handler) Entity::timeCheckSavepoint(kTime2358000, params->param1, kEntityAbbot, kEntityServers0, kAction218128129); if (getState()->time > kTime2389500 && getEntities()->isSomebodyInsideRestaurantOrSalon()) - setup_function42(); + setup_leaveDinner(); break; @@ -1348,7 +1348,7 @@ IMPLEMENT_FUNCTION(41, Abbot, chapter4Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(42, Abbot, function42) +IMPLEMENT_FUNCTION(42, Abbot, leaveDinner) switch (savepoint.action) { default: break; @@ -1392,7 +1392,7 @@ IMPLEMENT_FUNCTION(42, Abbot, function42) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityAbbot); - setup_function43(); + setup_inCompartment(); break; } break; @@ -1400,7 +1400,7 @@ IMPLEMENT_FUNCTION(42, Abbot, function42) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(43, Abbot, function43) +IMPLEMENT_FUNCTION(43, Abbot, inCompartment) switch (savepoint.action) { default: break; @@ -1531,13 +1531,13 @@ IMPLEMENT_FUNCTION(44, Abbot, function44) break; case kAction104060776: - setup_function45(); + setup_conferring(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(45, Abbot, function45) +IMPLEMENT_FUNCTION(45, Abbot, conferring) switch (savepoint.action) { default: break; @@ -1570,7 +1570,7 @@ IMPLEMENT_FUNCTION(45, Abbot, function45) getEntities()->exitCompartment(kEntityAbbot, kObjectCompartmentC, true); getSavePoints()->push(kEntityAbbot, kEntityVerges, kAction125233040); - setup_function46(); + setup_goSalon4(); break; } break; @@ -1578,7 +1578,7 @@ IMPLEMENT_FUNCTION(45, Abbot, function45) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(46, Abbot, function46) +IMPLEMENT_FUNCTION(46, Abbot, goSalon4) switch (savepoint.action) { default: break; @@ -1587,18 +1587,18 @@ IMPLEMENT_FUNCTION(46, Abbot, function46) getData()->entityPosition = kPosition_6471; setCallback(1); - setup_function40(kCarRestaurant, kPosition_850); + setup_doWalkSearchingForCath(kCarRestaurant, kPosition_850); break; case kActionCallback: if (getCallback() == 1) - setup_drinkAfterDefuse(); + setup_beforeBomb(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(47, Abbot, drinkAfterDefuse) +IMPLEMENT_FUNCTION(47, Abbot, beforeBomb) switch (savepoint.action) { default: break; @@ -1642,7 +1642,7 @@ IMPLEMENT_FUNCTION(47, Abbot, drinkAfterDefuse) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(48, Abbot, function48) +IMPLEMENT_FUNCTION(48, Abbot, afterBomb) switch (savepoint.action) { default: break; @@ -1749,7 +1749,7 @@ IMPLEMENT_FUNCTION(48, Abbot, function48) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(49, Abbot, pickBomb) +IMPLEMENT_FUNCTION(49, Abbot, catchCath) switch (savepoint.action) { default: break; @@ -1791,7 +1791,7 @@ IMPLEMENT_FUNCTION(49, Abbot, pickBomb) break; case 1: - getAction()->playAnimation(getObjects()->get(kObjectCompartment2).location2 < kObjectLocation2 ? kEventAbbotWrongCompartmentBed : kEventAbbotWrongCompartment); + getAction()->playAnimation(getObjects()->get(kObjectCompartment2).model < kObjectModel2 ? kEventAbbotWrongCompartmentBed : kEventAbbotWrongCompartment); getEntities()->updateEntity(kEntityAbbot, kCarRedSleeping, kPosition_6470); getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadSceneFromObject(kObjectCompartment2, true); @@ -1810,7 +1810,7 @@ IMPLEMENT_FUNCTION(49, Abbot, pickBomb) getEntities()->clearSequences(kEntityAbbot); getObjects()->update(kObjectCompartmentC, kEntityAbbot, kObjectLocation1, kCursorHandKnock, kCursorHand); - setup_function43(); + setup_inCompartment(); break; } break; @@ -1860,13 +1860,13 @@ IMPLEMENT_FUNCTION(52, Abbot, function52) break; case kAction135600432: - setup_function53(); + setup_runningTrain(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(53, Abbot, function53) +IMPLEMENT_FUNCTION(53, Abbot, runningTrain) switch (savepoint.action) { default: break; diff --git a/engines/lastexpress/entities/abbot.h b/engines/lastexpress/entities/abbot.h index dc3e86db54..c4a68f6ecb 100644 --- a/engines/lastexpress/entities/abbot.h +++ b/engines/lastexpress/entities/abbot.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. @@ -155,27 +155,27 @@ public: /** * Handle Chapter 3 events */ - DECLARE_FUNCTION(chapter3Handler) - DECLARE_FUNCTION(conversationWithBoutarel) + DECLARE_FUNCTION(inKitchen) + DECLARE_FUNCTION(openCompartment) DECLARE_FUNCTION(readPaper) DECLARE_FUNCTION(goToLunch) DECLARE_FUNCTION(haveLunch) - DECLARE_FUNCTION(function23) - DECLARE_FUNCTION(function24) - DECLARE_FUNCTION(function25) - DECLARE_FUNCTION(function26) - DECLARE_FUNCTION(function27) - DECLARE_FUNCTION(function28) - DECLARE_FUNCTION(function29) - DECLARE_FUNCTION(function30) - DECLARE_FUNCTION(function31) - DECLARE_FUNCTION(function32) - DECLARE_FUNCTION(function33) - DECLARE_FUNCTION(function34) - DECLARE_FUNCTION(function35) - DECLARE_FUNCTION(function36) - DECLARE_FUNCTION(function37) - DECLARE_FUNCTION(function38) + DECLARE_FUNCTION(leaveLunch) + DECLARE_FUNCTION(closedCompartment) + DECLARE_FUNCTION(goSalon1) + DECLARE_FUNCTION(inSalon1) + DECLARE_FUNCTION(goCompartment) + DECLARE_FUNCTION(openCompartment2) + DECLARE_FUNCTION(goWander) + DECLARE_FUNCTION(goSalon2) + DECLARE_FUNCTION(inSalon2) + DECLARE_FUNCTION(goCompartment3) + DECLARE_FUNCTION(openCompartment3) + DECLARE_FUNCTION(goSalon3) + DECLARE_FUNCTION(inSalon3) + DECLARE_FUNCTION(withAugust) + DECLARE_FUNCTION(goCompartment4) + DECLARE_FUNCTION(inCompartment4) /** * Setup Chapter 4 @@ -183,25 +183,25 @@ public: DECLARE_FUNCTION(chapter4) /** - * ??? + * Search Cath by walking around * * @param car The car * @param entityPosition The entity position */ - DECLARE_FUNCTION_2(function40, CarIndex car, EntityPosition position) + DECLARE_FUNCTION_2(doWalkSearchingForCath, CarIndex car, EntityPosition position) /** * Handle Chapter 4 events */ DECLARE_FUNCTION(chapter4Handler) - DECLARE_FUNCTION(function42) - DECLARE_FUNCTION(function43) + DECLARE_FUNCTION(leaveDinner) + DECLARE_FUNCTION(inCompartment) DECLARE_FUNCTION(function44) - DECLARE_FUNCTION(function45) - DECLARE_FUNCTION(function46) - DECLARE_FUNCTION(drinkAfterDefuse) - DECLARE_FUNCTION(function48) - DECLARE_FUNCTION(pickBomb) + DECLARE_FUNCTION(conferring) + DECLARE_FUNCTION(goSalon4) + DECLARE_FUNCTION(beforeBomb) + DECLARE_FUNCTION(afterBomb) + DECLARE_FUNCTION(catchCath) /** * Setup Chapter 5 @@ -213,7 +213,7 @@ public: */ DECLARE_FUNCTION(chapter5Handler) DECLARE_FUNCTION(function52) - DECLARE_FUNCTION(function53) + DECLARE_FUNCTION(runningTrain) }; } // End of namespace LastExpress diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index 115c890f6f..9b56fca39f 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.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. @@ -48,40 +48,40 @@ Alexei::Alexei(LastExpressEngine *engine) : Entity(engine, kEntityAlexei) { ADD_CALLBACK_FUNCTION(Alexei, updateEntity); ADD_CALLBACK_FUNCTION(Alexei, draw2); ADD_CALLBACK_FUNCTION(Alexei, callbackActionRestaurantOrSalon); - ADD_CALLBACK_FUNCTION(Alexei, function13); - ADD_CALLBACK_FUNCTION(Alexei, function14); - ADD_CALLBACK_FUNCTION(Alexei, function15); - ADD_CALLBACK_FUNCTION(Alexei, function16); + ADD_CALLBACK_FUNCTION(Alexei, enterComparment); + ADD_CALLBACK_FUNCTION(Alexei, exitCompartment); + ADD_CALLBACK_FUNCTION(Alexei, pacingAtWindow); + ADD_CALLBACK_FUNCTION(Alexei, compartmentLogic); ADD_CALLBACK_FUNCTION(Alexei, chapter1); - ADD_CALLBACK_FUNCTION(Alexei, chapter1Handler); - ADD_CALLBACK_FUNCTION(Alexei, function19); - ADD_CALLBACK_FUNCTION(Alexei, function20); - ADD_CALLBACK_FUNCTION(Alexei, function21); - ADD_CALLBACK_FUNCTION(Alexei, function22); - ADD_CALLBACK_FUNCTION(Alexei, function23); - ADD_CALLBACK_FUNCTION(Alexei, function24); - ADD_CALLBACK_FUNCTION(Alexei, function25); + ADD_CALLBACK_FUNCTION(Alexei, atDinner); + ADD_CALLBACK_FUNCTION(Alexei, returnCompartment); + ADD_CALLBACK_FUNCTION(Alexei, goSalon); + ADD_CALLBACK_FUNCTION(Alexei, sitting); + ADD_CALLBACK_FUNCTION(Alexei, standingAtWindow); + ADD_CALLBACK_FUNCTION(Alexei, waitingForTatiana); + ADD_CALLBACK_FUNCTION(Alexei, upset); + ADD_CALLBACK_FUNCTION(Alexei, returnCompartmentNight); ADD_CALLBACK_FUNCTION(Alexei, function26); ADD_CALLBACK_FUNCTION(Alexei, function27); ADD_CALLBACK_FUNCTION(Alexei, chapter2); - ADD_CALLBACK_FUNCTION(Alexei, chapter2Handler); - ADD_CALLBACK_FUNCTION(Alexei, function30); - ADD_CALLBACK_FUNCTION(Alexei, function31); + ADD_CALLBACK_FUNCTION(Alexei, inCompartment2); + ADD_CALLBACK_FUNCTION(Alexei, atBreakfast); + ADD_CALLBACK_FUNCTION(Alexei, returnCompartment2); ADD_CALLBACK_FUNCTION(Alexei, chapter3); - ADD_CALLBACK_FUNCTION(Alexei, chapter3Handler); - ADD_CALLBACK_FUNCTION(Alexei, function34); - ADD_CALLBACK_FUNCTION(Alexei, function35); - ADD_CALLBACK_FUNCTION(Alexei, function36); + ADD_CALLBACK_FUNCTION(Alexei, playingChess); + ADD_CALLBACK_FUNCTION(Alexei, inPart3); + ADD_CALLBACK_FUNCTION(Alexei, pacing3); + ADD_CALLBACK_FUNCTION(Alexei, goSalon3); ADD_CALLBACK_FUNCTION(Alexei, chapter4); - ADD_CALLBACK_FUNCTION(Alexei, chapter4Handler); - ADD_CALLBACK_FUNCTION(Alexei, function39); - ADD_CALLBACK_FUNCTION(Alexei, function40); - ADD_CALLBACK_FUNCTION(Alexei, function41); - ADD_CALLBACK_FUNCTION(Alexei, function42); - ADD_CALLBACK_FUNCTION(Alexei, function43); - ADD_CALLBACK_FUNCTION(Alexei, function44); - ADD_CALLBACK_FUNCTION(Alexei, function45); - ADD_CALLBACK_FUNCTION(Alexei, function46); + ADD_CALLBACK_FUNCTION(Alexei, inCompartment4); + ADD_CALLBACK_FUNCTION(Alexei, meetTatiana); + ADD_CALLBACK_FUNCTION(Alexei, leavePlatform); + ADD_CALLBACK_FUNCTION(Alexei, inCompartmentAgain); + ADD_CALLBACK_FUNCTION(Alexei, goSalon4); + ADD_CALLBACK_FUNCTION(Alexei, pacing); + ADD_CALLBACK_FUNCTION(Alexei, goToPlatform); + ADD_CALLBACK_FUNCTION(Alexei, returnCompartment4); + ADD_CALLBACK_FUNCTION(Alexei, bombPlanB); ADD_CALLBACK_FUNCTION(Alexei, function47); ADD_CALLBACK_FUNCTION(Alexei, chapter5); } @@ -169,7 +169,7 @@ IMPLEMENT_FUNCTION(12, Alexei, callbackActionRestaurantOrSalon) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(13, Alexei, function13) +IMPLEMENT_FUNCTION(13, Alexei, enterComparment) switch (savepoint.action) { default: break; @@ -216,7 +216,7 @@ IMPLEMENT_FUNCTION(13, Alexei, function13) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(14, Alexei, function14) +IMPLEMENT_FUNCTION(14, Alexei, exitCompartment) switch (savepoint.action) { default: break; @@ -245,7 +245,7 @@ IMPLEMENT_FUNCTION(14, Alexei, function14) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(15, Alexei, function15) +IMPLEMENT_FUNCTION(15, Alexei, pacingAtWindow) switch (savepoint.action) { default: break; @@ -297,7 +297,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue) +IMPLEMENT_FUNCTION_IS(16, Alexei, compartmentLogic, TimeValue) switch (savepoint.action) { default: break; @@ -446,7 +446,7 @@ IMPLEMENT_FUNCTION(17, Alexei, chapter1) break; case kActionNone: - Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_chapter1Handler)); + Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_atDinner)); break; case kActionDefault: @@ -462,7 +462,7 @@ IMPLEMENT_FUNCTION(17, Alexei, chapter1) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler) +IMPLEMENT_FUNCTION(18, Alexei, atDinner) switch (savepoint.action) { default: break; @@ -519,7 +519,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler) case 1: getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63); - setup_function19(); + setup_returnCompartment(); break; case 2: @@ -533,7 +533,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler) getInventory()->get(kItem17)->location = kObjectLocation1; getScenes()->loadSceneFromPosition(kCarRestaurant, 63); - setup_function19(); + setup_returnCompartment(); break; } break; @@ -553,7 +553,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(19, Alexei, function19) +IMPLEMENT_FUNCTION(19, Alexei, returnCompartment) switch (savepoint.action) { default: break; @@ -620,7 +620,7 @@ IMPLEMENT_FUNCTION(19, Alexei, function19) case 9: setCallback(10); - setup_function13(); + setup_enterComparment(); break; case 10: @@ -628,11 +628,11 @@ IMPLEMENT_FUNCTION(19, Alexei, function19) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(11); - setup_function16(kTime1098000, "411"); + setup_compartmentLogic(kTime1098000, "411"); break; case 11: - setup_function20(); + setup_goSalon(); break; } break; @@ -640,14 +640,14 @@ IMPLEMENT_FUNCTION(19, Alexei, function19) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(20, Alexei, function20) +IMPLEMENT_FUNCTION(20, Alexei, goSalon) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function14(); + setup_exitCompartment(); break; case kActionCallback: @@ -683,7 +683,7 @@ IMPLEMENT_FUNCTION(20, Alexei, function20) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(21, Alexei, function21) +IMPLEMENT_FUNCTION(21, Alexei, sitting) switch (savepoint.action) { default: break; @@ -720,7 +720,7 @@ IMPLEMENT_FUNCTION(21, Alexei, function21) case 1: getData()->location = kLocationInsideCompartment; - setup_function22(); + setup_standingAtWindow(); break; case 2: @@ -745,7 +745,7 @@ IMPLEMENT_FUNCTION(21, Alexei, function21) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(22, Alexei, function22) +IMPLEMENT_FUNCTION(22, Alexei, standingAtWindow) switch (savepoint.action) { default: break; @@ -779,7 +779,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22) getData()->inventoryItem = kItemNone; - setup_function23(); + setup_waitingForTatiana(); break; case kAction1: @@ -801,7 +801,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22) case 1: getData()->location = kLocationInsideCompartment; - setup_function21(); + setup_sitting(); break; case 2: @@ -821,7 +821,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22) getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 52); getData()->location = kLocationInsideCompartment; - setup_function21(); + setup_standingAtWindow(); break; } break; @@ -829,7 +829,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(23, Alexei, function23) +IMPLEMENT_FUNCTION(23, Alexei, waitingForTatiana) switch (savepoint.action) { default: break; @@ -861,7 +861,7 @@ IMPLEMENT_FUNCTION(23, Alexei, function23) getEntities()->drawSequenceLeft(kEntityAlexei, "103F"); getScenes()->processScene(); - setup_function24(); + setup_upset(); break; case 2: @@ -879,18 +879,18 @@ IMPLEMENT_FUNCTION(23, Alexei, function23) setCallback(1); setup_savegame(kSavegameTypeEvent, kEventAlexeiSalonVassili); } else { - setup_function24(); + setup_upset(); } break; case kAction188784532: - setup_function24(); + setup_upset(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(24, Alexei, function24) +IMPLEMENT_FUNCTION(24, Alexei, upset) switch (savepoint.action) { default: break; @@ -917,11 +917,11 @@ IMPLEMENT_FUNCTION(24, Alexei, function24) getData()->entityPosition = kPosition_9460; getEntities()->clearSequences(kEntityAlexei); getScenes()->loadSceneFromPosition(kCarRestaurant, 55); - setup_function25(); + setup_returnCompartmentNight(); break; case 2: - setup_function25(); + setup_returnCompartmentNight(); break; } break; @@ -935,14 +935,14 @@ IMPLEMENT_FUNCTION(24, Alexei, function24) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(25, Alexei, function25) +IMPLEMENT_FUNCTION(25, Alexei, returnCompartmentNight) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function13(); + setup_enterComparment(); break; case kActionCallback: @@ -955,12 +955,12 @@ IMPLEMENT_FUNCTION(25, Alexei, function25) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(2); - setup_function16(kTime1179000, "411"); + setup_compartmentLogic(kTime1179000, "411"); break; case 2: setCallback(3); - setup_function16(kTime1323000, "412"); + setup_compartmentLogic(kTime1323000, "412"); break; case 3: @@ -1017,7 +1017,7 @@ IMPLEMENT_FUNCTION(28, Alexei, chapter2) break; case kActionNone: - setup_chapter2Handler(); + setup_inCompartment2(); break; case kActionDefault: @@ -1037,14 +1037,14 @@ IMPLEMENT_FUNCTION(28, Alexei, chapter2) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler) +IMPLEMENT_FUNCTION(29, Alexei, inCompartment2) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function16(kTime1791000, "411"); + setup_compartmentLogic(kTime1791000, "411"); break; case kActionCallback: @@ -1054,7 +1054,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler) case 1: setCallback(2); - setup_function14(); + setup_exitCompartment(); break; case 2: @@ -1085,7 +1085,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler) case 6: getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63); getSavePoints()->push(kEntityAlexei, kEntityTatiana, kAction290869168); - setup_function30(); + setup_atBreakfast(); break; } break; @@ -1093,7 +1093,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(30, Alexei, function30) +IMPLEMENT_FUNCTION(30, Alexei, atBreakfast) switch (savepoint.action) { default: break; @@ -1134,7 +1134,7 @@ IMPLEMENT_FUNCTION(30, Alexei, function30) case 3: getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63); - setup_function31(); + setup_returnCompartment2(); break; } break; @@ -1154,7 +1154,7 @@ IMPLEMENT_FUNCTION(30, Alexei, function30) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(31, Alexei, function31) +IMPLEMENT_FUNCTION(31, Alexei, returnCompartment2) switch (savepoint.action) { default: break; @@ -1175,7 +1175,7 @@ IMPLEMENT_FUNCTION(31, Alexei, function31) case 1: setCallback(2); - setup_function13(); + setup_enterComparment(); break; case 2: @@ -1183,7 +1183,7 @@ IMPLEMENT_FUNCTION(31, Alexei, function31) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(3); - setup_function16(kTimeEnd, "411"); + setup_compartmentLogic(kTimeEnd, "411"); break; } break; @@ -1197,7 +1197,7 @@ IMPLEMENT_FUNCTION(32, Alexei, chapter3) break; case kActionNone: - setup_chapter3Handler(); + setup_playingChess(); break; case kActionDefault: @@ -1216,14 +1216,14 @@ IMPLEMENT_FUNCTION(32, Alexei, chapter3) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler) +IMPLEMENT_FUNCTION(33, Alexei, playingChess) switch (savepoint.action) { default: break; case kActionCallback: if (getCallback() == 1) - setup_function34(); + setup_inPart3(); break; case kAction122288808: @@ -1232,7 +1232,7 @@ IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler) getData()->car = kCarRedSleeping; setCallback(1); - setup_function13(); + setup_enterComparment(); break; case kAction122358304: @@ -1242,7 +1242,7 @@ IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(34, Alexei, function34) +IMPLEMENT_FUNCTION(34, Alexei, inPart3) switch (savepoint.action) { default: break; @@ -1252,7 +1252,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(1); - setup_function16(kTime2083500, "411"); + setup_compartmentLogic(kTime2083500, "411"); break; case kActionCallback: @@ -1262,7 +1262,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) case 1: setCallback(2); - setup_function14(); + setup_exitCompartment(); break; case 2: @@ -1285,12 +1285,12 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) case 5: setCallback(6); - setup_function35(); + setup_pacing3(); break; case 6: setCallback(7); - setup_function13(); + setup_enterComparment(); break; case 7: @@ -1299,17 +1299,17 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 66); setCallback(8); - setup_function16(kTime2124000, "NONE"); + setup_compartmentLogic(kTime2124000, "NONE"); break; case 8: setCallback(9); - setup_function14(); + setup_exitCompartment(); break; case 9: setCallback(10); - setup_function36(); + setup_goSalon3(); break; case 10: @@ -1318,7 +1318,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(11); - setup_function16(kTime16451100, "411"); + setup_compartmentLogic(kTime16451100, "411"); break; } break; @@ -1326,7 +1326,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(35, Alexei, function35) +IMPLEMENT_FUNCTION(35, Alexei, pacing3) switch (savepoint.action) { default: break; @@ -1345,7 +1345,7 @@ IMPLEMENT_FUNCTION(35, Alexei, function35) if (Entity::updateParameter(params->param3, getState()->time, params->param1)) { if (getEntities()->isSomebodyInsideRestaurantOrSalon()) { setCallback(3); - setup_function15(); + setup_pacingAtWindow(); break; } } @@ -1392,7 +1392,7 @@ label_callback_3: IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(36, Alexei, function36) +IMPLEMENT_FUNCTION(36, Alexei, goSalon3) switch (savepoint.action) { default: break; @@ -1457,7 +1457,7 @@ IMPLEMENT_FUNCTION(36, Alexei, function36) case kAction122288808: setCallback(4); - setup_function13(); + setup_enterComparment(); break; case kAction122358304: @@ -1474,7 +1474,7 @@ IMPLEMENT_FUNCTION(37, Alexei, chapter4) break; case kActionNone: - setup_chapter4Handler(); + setup_inCompartment4(); break; case kActionDefault: @@ -1493,25 +1493,25 @@ IMPLEMENT_FUNCTION(37, Alexei, chapter4) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(38, Alexei, chapter4Handler) +IMPLEMENT_FUNCTION(38, Alexei, inCompartment4) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function16(kTime2354400, "411"); + setup_compartmentLogic(kTime2354400, "411"); break; case kActionCallback: if (getCallback() == 1) - setup_function39(); + setup_meetTatiana(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(39, Alexei, function39) +IMPLEMENT_FUNCTION(39, Alexei, meetTatiana) switch (savepoint.action) { default: break; @@ -1547,7 +1547,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 72); } - setup_function40(); + setup_leavePlatform(); } break; @@ -1571,7 +1571,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39) break; } - setup_function40(); + setup_leavePlatform(); } break; @@ -1616,7 +1616,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(40, Alexei, function40) +IMPLEMENT_FUNCTION(40, Alexei, leavePlatform) switch (savepoint.action) { default: break; @@ -1653,7 +1653,7 @@ IMPLEMENT_FUNCTION(40, Alexei, function40) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityAlexei); - setup_function41(); + setup_inCompartmentAgain(); break; } break; @@ -1661,7 +1661,7 @@ IMPLEMENT_FUNCTION(40, Alexei, function40) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(41, Alexei, function41) +IMPLEMENT_FUNCTION(41, Alexei, inCompartmentAgain) switch (savepoint.action) { default: break; @@ -1671,25 +1671,25 @@ IMPLEMENT_FUNCTION(41, Alexei, function41) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(1); - setup_function16(kTime2403000, "411"); + setup_compartmentLogic(kTime2403000, "411"); break; case kActionCallback: if (getCallback() == 1) - setup_function42(); + setup_goSalon4(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(42, Alexei, function42) +IMPLEMENT_FUNCTION(42, Alexei, goSalon4) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function14(); + setup_exitCompartment(); break; case kActionCallback: @@ -1711,7 +1711,7 @@ IMPLEMENT_FUNCTION(42, Alexei, function42) case 3: getData()->location = kLocationInsideCompartment; - setup_function43(); + setup_pacing(); break; } break; @@ -1719,7 +1719,7 @@ IMPLEMENT_FUNCTION(42, Alexei, function42) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(43, Alexei, function43) +IMPLEMENT_FUNCTION(43, Alexei, pacing) switch (savepoint.action) { default: break; @@ -1731,7 +1731,7 @@ IMPLEMENT_FUNCTION(43, Alexei, function43) if (getEntities()->isSomebodyInsideRestaurantOrSalon()) { setCallback(1); - setup_function15(); + setup_pacingAtWindow(); break; } } @@ -1768,7 +1768,7 @@ label_callback_1: break; case 3: - setup_function44(); + setup_goToPlatform(); break; } break; @@ -1776,7 +1776,7 @@ label_callback_1: IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(44, Alexei, function44) +IMPLEMENT_FUNCTION(44, Alexei, goToPlatform) switch (savepoint.action) { default: break; @@ -1794,7 +1794,7 @@ IMPLEMENT_FUNCTION(44, Alexei, function44) if (getEntities()->isPlayerPosition(kCarGreenSleeping, 62)) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 72); - setup_function45(); + setup_returnCompartment4(); } } break; @@ -1843,14 +1843,14 @@ IMPLEMENT_FUNCTION(44, Alexei, function44) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(45, Alexei, function45) +IMPLEMENT_FUNCTION(45, Alexei, returnCompartment4) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function13(); + setup_enterComparment(); break; case kActionCallback: @@ -1859,10 +1859,10 @@ IMPLEMENT_FUNCTION(45, Alexei, function45) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); if (getInventory()->hasItem(kItemBomb)) { - setup_function46(); + setup_bombPlanB(); } else { setCallback(2); - setup_function16(kTimeEnd, "412"); + setup_compartmentLogic(kTimeEnd, "412"); } } break; @@ -1870,7 +1870,7 @@ IMPLEMENT_FUNCTION(45, Alexei, function45) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(46, Alexei, function46) +IMPLEMENT_FUNCTION(46, Alexei, bombPlanB) switch (savepoint.action) { default: break; @@ -1899,12 +1899,12 @@ IMPLEMENT_FUNCTION(46, Alexei, function46) } setCallback(4); - setup_function13(); + setup_enterComparment(); break; case kActionDefault: setCallback(1); - setup_function16(kTime2488500, "411"); + setup_compartmentLogic(kTime2488500, "411"); break; case kActionCallback: @@ -1914,7 +1914,7 @@ IMPLEMENT_FUNCTION(46, Alexei, function46) case 1: setCallback(2); - setup_function14(); + setup_exitCompartment(); break; case 2: @@ -1927,7 +1927,7 @@ IMPLEMENT_FUNCTION(46, Alexei, function46) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); setCallback(5); - setup_function16(kTime2507400, "412"); + setup_compartmentLogic(kTime2507400, "412"); break; case 5: diff --git a/engines/lastexpress/entities/alexei.h b/engines/lastexpress/entities/alexei.h index 9792385863..5e14039a35 100644 --- a/engines/lastexpress/entities/alexei.h +++ b/engines/lastexpress/entities/alexei.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. @@ -123,9 +123,9 @@ public: */ DECLARE_FUNCTION(callbackActionRestaurantOrSalon) - DECLARE_FUNCTION(function13) - DECLARE_FUNCTION(function14) - DECLARE_FUNCTION(function15) + DECLARE_FUNCTION(enterComparment) + DECLARE_FUNCTION(exitCompartment) + DECLARE_FUNCTION(pacingAtWindow) /** * ??? @@ -133,7 +133,7 @@ public: * @param timeValue The time value * @param sequence The sequence to draw */ - DECLARE_FUNCTION_2(function16, TimeValue timeValue, const char *sequence) + DECLARE_FUNCTION_2(compartmentLogic, TimeValue timeValue, const char *sequence) /** * Setup Chapter 1 @@ -143,14 +143,14 @@ public: /** * Handle Chapter 1 events */ - DECLARE_FUNCTION(chapter1Handler) - DECLARE_FUNCTION(function19) - DECLARE_FUNCTION(function20) - DECLARE_FUNCTION(function21) - DECLARE_FUNCTION(function22) - DECLARE_FUNCTION(function23) - DECLARE_FUNCTION(function24) - DECLARE_FUNCTION(function25) + DECLARE_FUNCTION(atDinner) + DECLARE_FUNCTION(returnCompartment) + DECLARE_FUNCTION(goSalon) + DECLARE_FUNCTION(sitting) + DECLARE_FUNCTION(standingAtWindow) + DECLARE_FUNCTION(waitingForTatiana) + DECLARE_FUNCTION(upset) + DECLARE_FUNCTION(returnCompartmentNight) DECLARE_FUNCTION(function26) DECLARE_FUNCTION(function27) @@ -162,9 +162,9 @@ public: /** * Handle Chapter 2 events */ - DECLARE_FUNCTION(chapter2Handler) - DECLARE_FUNCTION(function30) - DECLARE_FUNCTION(function31) + DECLARE_FUNCTION(inCompartment2) + DECLARE_FUNCTION(atBreakfast) + DECLARE_FUNCTION(returnCompartment2) /** * Setup Chapter 3 @@ -174,10 +174,10 @@ public: /** * Handle Chapter 3 events */ - DECLARE_FUNCTION(chapter3Handler) - DECLARE_FUNCTION(function34) - DECLARE_FUNCTION(function35) - DECLARE_FUNCTION(function36) + DECLARE_FUNCTION(playingChess) + DECLARE_FUNCTION(inPart3) + DECLARE_FUNCTION(pacing3) + DECLARE_FUNCTION(goSalon3) /** * Setup Chapter 4 @@ -187,15 +187,15 @@ public: /** * Handle Chapter 4 events */ - DECLARE_FUNCTION(chapter4Handler) - DECLARE_FUNCTION(function39) - DECLARE_FUNCTION(function40) - DECLARE_FUNCTION(function41) - DECLARE_FUNCTION(function42) - DECLARE_FUNCTION(function43) - DECLARE_FUNCTION(function44) - DECLARE_FUNCTION(function45) - DECLARE_FUNCTION(function46) + DECLARE_FUNCTION(inCompartment4) + DECLARE_FUNCTION(meetTatiana) + DECLARE_FUNCTION(leavePlatform) + DECLARE_FUNCTION(inCompartmentAgain) + DECLARE_FUNCTION(goSalon4) + DECLARE_FUNCTION(pacing) + DECLARE_FUNCTION(goToPlatform) + DECLARE_FUNCTION(returnCompartment4) + DECLARE_FUNCTION(bombPlanB) DECLARE_FUNCTION(function47) /** diff --git a/engines/lastexpress/entities/alouan.cpp b/engines/lastexpress/entities/alouan.cpp index e834e1f7cb..0667d11697 100644 --- a/engines/lastexpress/entities/alouan.cpp +++ b/engines/lastexpress/entities/alouan.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. @@ -38,10 +38,10 @@ Alouan::Alouan(LastExpressEngine *engine) : Entity(engine, kEntityAlouan) { ADD_CALLBACK_FUNCTION(Alouan, playSound); ADD_CALLBACK_FUNCTION(Alouan, updateFromTime); ADD_CALLBACK_FUNCTION(Alouan, updateEntity); - ADD_CALLBACK_FUNCTION(Alouan, compartment6); - ADD_CALLBACK_FUNCTION(Alouan, compartment8); - ADD_CALLBACK_FUNCTION(Alouan, compartment6to8); - ADD_CALLBACK_FUNCTION(Alouan, compartment8to6); + ADD_CALLBACK_FUNCTION(Alouan, peekF); + ADD_CALLBACK_FUNCTION(Alouan, peekH); + ADD_CALLBACK_FUNCTION(Alouan, goFtoH); + ADD_CALLBACK_FUNCTION(Alouan, goHtoF); ADD_CALLBACK_FUNCTION(Alouan, chapter1); ADD_CALLBACK_FUNCTION(Alouan, chapter1Handler); ADD_CALLBACK_FUNCTION(Alouan, function12); @@ -55,7 +55,7 @@ Alouan::Alouan(LastExpressEngine *engine) : Entity(engine, kEntityAlouan) { ADD_CALLBACK_FUNCTION(Alouan, chapter5); ADD_CALLBACK_FUNCTION(Alouan, chapter5Handler); ADD_CALLBACK_FUNCTION(Alouan, function22); - ADD_CALLBACK_FUNCTION(Alouan, function23); + ADD_CALLBACK_FUNCTION(Alouan, hiding); ADD_NULL_FUNCTION(); } @@ -85,22 +85,22 @@ IMPLEMENT_FUNCTION_II(5, Alouan, updateEntity, CarIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(6, Alouan, compartment6) +IMPLEMENT_FUNCTION(6, Alouan, peekF) Entity::goToCompartment(savepoint, kObjectCompartment6, kPosition_4070, "621Cf", "621Df"); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(7, Alouan, compartment8) +IMPLEMENT_FUNCTION(7, Alouan, peekH) Entity::goToCompartment(savepoint, kObjectCompartment8, kPosition_2740, "621Ch", "621Dh"); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(8, Alouan, compartment6to8) +IMPLEMENT_FUNCTION(8, Alouan, goFtoH) Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment6, kPosition_4070, "621Bf", kObjectCompartment8, kPosition_2740, "621Ah"); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(9, Alouan, compartment8to6) +IMPLEMENT_FUNCTION(9, Alouan, goHtoF) Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment8, kPosition_2740, "621Bh", kObjectCompartment6, kPosition_4070, "621Af"); IMPLEMENT_FUNCTION_END @@ -131,7 +131,7 @@ IMPLEMENT_FUNCTION(11, Alouan, chapter1Handler) case kActionNone: - if (Entity::timeCheckCallback(kTime1096200, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6))) + if (Entity::timeCheckCallback(kTime1096200, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_goHtoF))) break; label_callback1: @@ -146,7 +146,7 @@ label_callback1: getSavePoints()->push(kEntityAlouan, kEntityTrain, kAction191070912, kPosition_4840); setCallback(2); - setup_compartment6to8(); + setup_goFtoH(); } break; @@ -215,9 +215,9 @@ IMPLEMENT_FUNCTION(14, Alouan, chapter2Handler) setCallback(params->param1 ? 1 : 2); if (params->param1) - setup_compartment8(); + setup_peekH(); else - setup_compartment6(); + setup_peekF(); break; case kActionDefault: @@ -249,7 +249,7 @@ IMPLEMENT_FUNCTION(14, Alouan, chapter2Handler) case kAction189489753: setCallback(3); - setup_compartment8to6(); + setup_goHtoF(); break; } IMPLEMENT_FUNCTION_END @@ -282,12 +282,12 @@ IMPLEMENT_FUNCTION(16, Alouan, chapter3Handler) break; case kActionNone: - if (Entity::timeCheckCallback(kTimeCitySalzbourg, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6))) + if (Entity::timeCheckCallback(kTimeCitySalzbourg, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_goHtoF))) break; label_callback1: if (params->param2 != kTimeInvalid && getState()->time > kTime1989000) { - if (Entity::timeCheckCar(kTime2119500, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8))) + if (Entity::timeCheckCar(kTime2119500, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_peekH))) break; } @@ -296,12 +296,12 @@ label_callback2: break; label_callback3: - if (Entity::timeCheckCallback(kTime2133000, params->param4, 4, WRAP_SETUP_FUNCTION(Alouan, setup_compartment6to8))) + if (Entity::timeCheckCallback(kTime2133000, params->param4, 4, WRAP_SETUP_FUNCTION(Alouan, setup_goFtoH))) break; label_callback4: if (params->param5 != kTimeInvalid && getState()->time > kTime2151000) { - if (Entity::timeCheckCar(kTime2241000, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8))) + if (Entity::timeCheckCar(kTime2241000, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_peekH))) break; } break; @@ -361,12 +361,12 @@ IMPLEMENT_FUNCTION(18, Alouan, chapter4Handler) case kActionNone: if (params->param1 != kTimeInvalid) { - if (Entity::timeCheckCar(kTime2443500, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8))) + if (Entity::timeCheckCar(kTime2443500, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_peekH))) break; } label_callback1: - if (Entity::timeCheckCallback(kTime2455200, params->param2, 2, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6))) + if (Entity::timeCheckCallback(kTime2455200, params->param2, 2, WRAP_SETUP_FUNCTION(Alouan, setup_goHtoF))) break; label_callback2: @@ -375,7 +375,7 @@ label_callback2: getSavePoints()->push(kEntityAlouan, kEntityTrain, kAction191070912, kPosition_4840); setCallback(3); - setup_compartment6to8(); + setup_goFtoH(); } break; @@ -452,7 +452,7 @@ IMPLEMENT_FUNCTION(22, Alouan, function22) if (!Entity::updateParameter(params->param1, getState()->time, 2700)) break; - setup_function23(); + setup_hiding(); break; case kActionDefault: @@ -463,13 +463,13 @@ IMPLEMENT_FUNCTION(22, Alouan, function22) case kActionDrawScene: if (getEntities()->isInsideTrainCar(kEntityPlayer, kCarGreenSleeping)) - setup_function23(); + setup_hiding(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(23, Alouan, function23) +IMPLEMENT_FUNCTION(23, Alouan, hiding) switch (savepoint.action) { default: break; diff --git a/engines/lastexpress/entities/alouan.h b/engines/lastexpress/entities/alouan.h index 91254a449a..c84cf1a745 100644 --- a/engines/lastexpress/entities/alouan.h +++ b/engines/lastexpress/entities/alouan.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. @@ -69,10 +69,10 @@ public: */ DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition) - DECLARE_FUNCTION(compartment6) - DECLARE_FUNCTION(compartment8) - DECLARE_FUNCTION(compartment6to8) - DECLARE_FUNCTION(compartment8to6) + DECLARE_FUNCTION(peekF) + DECLARE_FUNCTION(peekH) + DECLARE_FUNCTION(goFtoH) + DECLARE_FUNCTION(goHtoF) /** * Setup Chapter 1 @@ -126,7 +126,7 @@ public: */ DECLARE_FUNCTION(chapter5Handler) DECLARE_FUNCTION(function22) - DECLARE_FUNCTION(function23) + DECLARE_FUNCTION(hiding) DECLARE_NULL_FUNCTION() }; diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp index f8768032b5..ff65be9772 100644 --- a/engines/lastexpress/entities/anna.cpp +++ b/engines/lastexpress/entities/anna.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 + * 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. @@ -51,76 +51,76 @@ Anna::Anna(LastExpressEngine *engine) : Entity(engine, kEntityAnna) { ADD_CALLBACK_FUNCTION(Anna, savegame); ADD_CALLBACK_FUNCTION(Anna, updateEntity); ADD_CALLBACK_FUNCTION(Anna, updateFromTime); - ADD_CALLBACK_FUNCTION(Anna, function12); + ADD_CALLBACK_FUNCTION(Anna, practiceMusic); ADD_CALLBACK_FUNCTION(Anna, draw2); ADD_CALLBACK_FUNCTION(Anna, updateFromTicks); - ADD_CALLBACK_FUNCTION(Anna, function15); + ADD_CALLBACK_FUNCTION(Anna, compartmentLogic); ADD_CALLBACK_FUNCTION(Anna, chapter1); - ADD_CALLBACK_FUNCTION(Anna, function17); - ADD_CALLBACK_FUNCTION(Anna, function18); - ADD_CALLBACK_FUNCTION(Anna, chapter1Handler); - ADD_CALLBACK_FUNCTION(Anna, function20); - ADD_CALLBACK_FUNCTION(Anna, function21); + ADD_CALLBACK_FUNCTION(Anna, doWalkP1); + ADD_CALLBACK_FUNCTION(Anna, diningLogic); + ADD_CALLBACK_FUNCTION(Anna, fleeTyler); + ADD_CALLBACK_FUNCTION(Anna, waitDinner); + ADD_CALLBACK_FUNCTION(Anna, goDinner); ADD_CALLBACK_FUNCTION(Anna, function22); - ADD_CALLBACK_FUNCTION(Anna, function23); - ADD_CALLBACK_FUNCTION(Anna, function24); - ADD_CALLBACK_FUNCTION(Anna, function25); - ADD_CALLBACK_FUNCTION(Anna, function26); - ADD_CALLBACK_FUNCTION(Anna, function27); - ADD_CALLBACK_FUNCTION(Anna, function28); - ADD_CALLBACK_FUNCTION(Anna, function29); + ADD_CALLBACK_FUNCTION(Anna, waitingDinner); + ADD_CALLBACK_FUNCTION(Anna, waitingDinner2); + ADD_CALLBACK_FUNCTION(Anna, eatingDinner); + ADD_CALLBACK_FUNCTION(Anna, leaveDinner); + ADD_CALLBACK_FUNCTION(Anna, freshenUp); + ADD_CALLBACK_FUNCTION(Anna, goSalon); + ADD_CALLBACK_FUNCTION(Anna, waitAugust); ADD_CALLBACK_FUNCTION(Anna, function30); - ADD_CALLBACK_FUNCTION(Anna, function31); - ADD_CALLBACK_FUNCTION(Anna, function32); - ADD_CALLBACK_FUNCTION(Anna, function33); - ADD_CALLBACK_FUNCTION(Anna, function34); - ADD_CALLBACK_FUNCTION(Anna, function35); - ADD_CALLBACK_FUNCTION(Anna, function36); + ADD_CALLBACK_FUNCTION(Anna, leaveAugust); + ADD_CALLBACK_FUNCTION(Anna, returnCompartment); + ADD_CALLBACK_FUNCTION(Anna, readyForBed); + ADD_CALLBACK_FUNCTION(Anna, asleep); + ADD_CALLBACK_FUNCTION(Anna, wakeNight); + ADD_CALLBACK_FUNCTION(Anna, goVassili); ADD_CALLBACK_FUNCTION(Anna, function37); - ADD_CALLBACK_FUNCTION(Anna, function38); - ADD_CALLBACK_FUNCTION(Anna, function39); - ADD_CALLBACK_FUNCTION(Anna, function40); - ADD_CALLBACK_FUNCTION(Anna, function41); + ADD_CALLBACK_FUNCTION(Anna, speakTatiana); + ADD_CALLBACK_FUNCTION(Anna, doWalk1019); + ADD_CALLBACK_FUNCTION(Anna, leaveTatiana); + ADD_CALLBACK_FUNCTION(Anna, goBackToSleep); ADD_CALLBACK_FUNCTION(Anna, chapter2); - ADD_CALLBACK_FUNCTION(Anna, chapter2Handler); + ADD_CALLBACK_FUNCTION(Anna, inPart2); ADD_CALLBACK_FUNCTION(Anna, chapter3); - ADD_CALLBACK_FUNCTION(Anna, function45); - ADD_CALLBACK_FUNCTION(Anna, chapter3Handler); - ADD_CALLBACK_FUNCTION(Anna, function47); - ADD_CALLBACK_FUNCTION(Anna, function48); + ADD_CALLBACK_FUNCTION(Anna, exitCompartment); + ADD_CALLBACK_FUNCTION(Anna, practicing); + ADD_CALLBACK_FUNCTION(Anna, goLunch); + ADD_CALLBACK_FUNCTION(Anna, lunch); ADD_CALLBACK_FUNCTION(Anna, leaveTableWithAugust); - ADD_CALLBACK_FUNCTION(Anna, function50); - ADD_CALLBACK_FUNCTION(Anna, function51); - ADD_CALLBACK_FUNCTION(Anna, function52); - ADD_CALLBACK_FUNCTION(Anna, function53); - ADD_CALLBACK_FUNCTION(Anna, function54); - ADD_CALLBACK_FUNCTION(Anna, function55); - ADD_CALLBACK_FUNCTION(Anna, function56); - ADD_CALLBACK_FUNCTION(Anna, function57); - ADD_CALLBACK_FUNCTION(Anna, function58); - ADD_CALLBACK_FUNCTION(Anna, function59); - ADD_CALLBACK_FUNCTION(Anna, function60); - ADD_CALLBACK_FUNCTION(Anna, function61); + ADD_CALLBACK_FUNCTION(Anna, leaveLunch); + ADD_CALLBACK_FUNCTION(Anna, afterLunch); + ADD_CALLBACK_FUNCTION(Anna, returnCompartment3); + ADD_CALLBACK_FUNCTION(Anna, dressing); + ADD_CALLBACK_FUNCTION(Anna, giveMaxToConductor2); + ADD_CALLBACK_FUNCTION(Anna, goConcert); + ADD_CALLBACK_FUNCTION(Anna, concert); + ADD_CALLBACK_FUNCTION(Anna, leaveConcert); + ADD_CALLBACK_FUNCTION(Anna, leaveConcertCathInCompartment); + ADD_CALLBACK_FUNCTION(Anna, afterConcert); + ADD_CALLBACK_FUNCTION(Anna, giveMaxBack); + ADD_CALLBACK_FUNCTION(Anna, goBaggageCompartment); ADD_CALLBACK_FUNCTION(Anna, function62); - ADD_CALLBACK_FUNCTION(Anna, function63); - ADD_CALLBACK_FUNCTION(Anna, baggage); - ADD_CALLBACK_FUNCTION(Anna, function65); + ADD_CALLBACK_FUNCTION(Anna, deadBaggageCompartment); + ADD_CALLBACK_FUNCTION(Anna, baggageFight); + ADD_CALLBACK_FUNCTION(Anna, prepareVienna); ADD_CALLBACK_FUNCTION(Anna, chapter4); - ADD_CALLBACK_FUNCTION(Anna, chapter4Handler); - ADD_CALLBACK_FUNCTION(Anna, function68); - ADD_CALLBACK_FUNCTION(Anna, function69); - ADD_CALLBACK_FUNCTION(Anna, function70); - ADD_CALLBACK_FUNCTION(Anna, function71); - ADD_CALLBACK_FUNCTION(Anna, function72); - ADD_CALLBACK_FUNCTION(Anna, function73); + ADD_CALLBACK_FUNCTION(Anna, reading); + ADD_CALLBACK_FUNCTION(Anna, sulking); + ADD_CALLBACK_FUNCTION(Anna, goSalon4); + ADD_CALLBACK_FUNCTION(Anna, returnCompartment4); + ADD_CALLBACK_FUNCTION(Anna, enterCompartmentCathFollowsAnna); + ADD_CALLBACK_FUNCTION(Anna, doWalkCathFollowsAnna); + ADD_CALLBACK_FUNCTION(Anna, letDownHair); ADD_CALLBACK_FUNCTION(Anna, chapter5); - ADD_CALLBACK_FUNCTION(Anna, chapter5Handler); + ADD_CALLBACK_FUNCTION(Anna, tiedUp); ADD_CALLBACK_FUNCTION(Anna, function76); - ADD_CALLBACK_FUNCTION(Anna, function77); - ADD_CALLBACK_FUNCTION(Anna, function78); - ADD_CALLBACK_FUNCTION(Anna, function79); - ADD_CALLBACK_FUNCTION(Anna, function80); + ADD_CALLBACK_FUNCTION(Anna, readyToScore); + ADD_CALLBACK_FUNCTION(Anna, kidnapped); + ADD_CALLBACK_FUNCTION(Anna, waiting); ADD_CALLBACK_FUNCTION(Anna, finalSequence); + ADD_CALLBACK_FUNCTION(Anna, openFirebird); } ////////////////////////////////////////////////////////////////////////// @@ -188,7 +188,7 @@ IMPLEMENT_FUNCTION_I(11, Anna, updateFromTime, uint32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(12, Anna, function12) +IMPLEMENT_FUNCTION(12, Anna, practiceMusic) switch (savepoint.action) { default: break; @@ -411,7 +411,7 @@ IMPLEMENT_FUNCTION_I(14, Anna, updateFromTicks, uint32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_IS(15, Anna, function15, TimeValue) +IMPLEMENT_FUNCTION_IS(15, Anna, compartmentLogic, TimeValue) switch (savepoint.action) { default: break; @@ -547,7 +547,7 @@ IMPLEMENT_FUNCTION(16, Anna, chapter1) break; case kActionNone: - Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Anna, setup_chapter1Handler)); + Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Anna, setup_fleeTyler)); break; case kActionDefault: @@ -567,7 +567,7 @@ IMPLEMENT_FUNCTION(16, Anna, chapter1) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32) +IMPLEMENT_FUNCTION_II(17, Anna, doWalkP1, uint32, uint32) switch (savepoint.action) { default: break; @@ -656,7 +656,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) +IMPLEMENT_FUNCTION_I(18, Anna, diningLogic, TimeValue) switch (savepoint.action) { default: break; @@ -764,7 +764,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(19, Anna, chapter1Handler) +IMPLEMENT_FUNCTION(19, Anna, fleeTyler) switch (savepoint.action) { default: break; @@ -797,7 +797,7 @@ IMPLEMENT_FUNCTION(19, Anna, chapter1Handler) getData()->entityPosition = kPosition_4070; getData()->location = kLocationInsideCompartment; - setup_function20(); + setup_waitDinner(); break; } break; @@ -805,14 +805,14 @@ IMPLEMENT_FUNCTION(19, Anna, chapter1Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(20, Anna, function20) +IMPLEMENT_FUNCTION(20, Anna, waitDinner) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function15(kTime1093500, "NONE"); + setup_compartmentLogic(kTime1093500, "NONE"); break; case kActionCallback: @@ -828,7 +828,7 @@ IMPLEMENT_FUNCTION(20, Anna, function20) case 2: getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityAnna, kEntityMax, kAction71277948); - setup_function21(); + setup_goDinner(); break; } break; @@ -836,14 +836,14 @@ IMPLEMENT_FUNCTION(20, Anna, function20) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(21, Anna, function21) +IMPLEMENT_FUNCTION(21, Anna, goDinner) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function17(kCarRestaurant, kPosition_850); + setup_doWalkP1(kCarRestaurant, kPosition_850); break; case kActionCallback: @@ -894,13 +894,13 @@ IMPLEMENT_FUNCTION(22, Anna, function22) case kAction157370960: getData()->location = kLocationInsideCompartment; - setup_function23(); + setup_waitingDinner(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(23, Anna, function23) +IMPLEMENT_FUNCTION(23, Anna, waitingDinner) switch (savepoint.action) { default: break; @@ -911,7 +911,7 @@ IMPLEMENT_FUNCTION(23, Anna, function23) getSavePoints()->push(kEntityAnna, kEntityTables0, kAction136455232); setCallback(1); - setup_function18(kTimeNone); + setup_diningLogic(kTimeNone); break; case kActionCallback: @@ -932,7 +932,7 @@ IMPLEMENT_FUNCTION(23, Anna, function23) case 3: getSavePoints()->push(kEntityAnna, kEntityServers0, kAction203859488); - setup_function24(); + setup_waitingDinner2(); break; } break; @@ -940,7 +940,7 @@ IMPLEMENT_FUNCTION(23, Anna, function23) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(24, Anna, function24) +IMPLEMENT_FUNCTION(24, Anna, waitingDinner2) switch (savepoint.action) { default: break; @@ -949,7 +949,7 @@ IMPLEMENT_FUNCTION(24, Anna, function24) getEntities()->drawSequenceLeft(kEntityAnna, "001G"); setCallback(1); - setup_function18(kTimeNone); + setup_diningLogic(kTimeNone); break; case kActionCallback: @@ -965,7 +965,7 @@ IMPLEMENT_FUNCTION(24, Anna, function24) case 2: getSavePoints()->push(kEntityAnna, kEntityServers0, kAction136702400); - setup_function25(); + setup_eatingDinner(); break; } break; @@ -973,7 +973,7 @@ IMPLEMENT_FUNCTION(24, Anna, function24) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(25, Anna, function25) +IMPLEMENT_FUNCTION(25, Anna, eatingDinner) switch (savepoint.action) { default: break; @@ -983,7 +983,7 @@ IMPLEMENT_FUNCTION(25, Anna, function25) getProgress().field_28 = 1; setCallback(1); - setup_function18(kTimeNone); + setup_diningLogic(kTimeNone); break; case kActionCallback: @@ -996,7 +996,7 @@ IMPLEMENT_FUNCTION(25, Anna, function25) break; case 3: - setup_function26(); + setup_leaveDinner(); break; } break; @@ -1008,13 +1008,13 @@ IMPLEMENT_FUNCTION(25, Anna, function25) case kAction201437056: getEntities()->drawSequenceLeft(kEntityAnna, "001J"); setCallback(2); - setup_function18(kTime1138500); + setup_diningLogic(kTime1138500); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(26, Anna, function26) +IMPLEMENT_FUNCTION(26, Anna, leaveDinner) switch (savepoint.action) { default: break; @@ -1046,7 +1046,7 @@ IMPLEMENT_FUNCTION(26, Anna, function26) case 2: setCallback(3); - setup_function17(kCarRedSleeping, kPosition_4070); + setup_doWalkP1(kCarRedSleeping, kPosition_4070); break; case 3: @@ -1059,7 +1059,7 @@ IMPLEMENT_FUNCTION(26, Anna, function26) getData()->entityPosition = kPosition_4070; getData()->location = kLocationInsideCompartment; - setup_function27(); + setup_freshenUp(); break; } break; @@ -1067,7 +1067,7 @@ IMPLEMENT_FUNCTION(26, Anna, function26) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(27, Anna, function27) +IMPLEMENT_FUNCTION(27, Anna, freshenUp) switch (savepoint.action) { default: break; @@ -1075,7 +1075,7 @@ IMPLEMENT_FUNCTION(27, Anna, function27) case kActionDefault: getSavePoints()->push(kEntityAnna, kEntityMax, kAction101687594); setCallback(1); - setup_function15(kTime1156500, "NONE"); + setup_compartmentLogic(kTime1156500, "NONE"); break; case kActionCallback: @@ -1088,7 +1088,7 @@ IMPLEMENT_FUNCTION(27, Anna, function27) if (getProgress().field_14 == 29) { params->param1 = (uint)(getState()->time + 900); setCallback(2); - setup_function15((TimeValue)params->param1, "NONE"); + setup_compartmentLogic((TimeValue)params->param1, "NONE"); } else { setCallback(3); setup_enterExitCompartment("618Bf", kObjectCompartmentF); @@ -1098,7 +1098,7 @@ IMPLEMENT_FUNCTION(27, Anna, function27) case 3: getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityAnna, kEntityMax, kAction71277948); - setup_function28(); + setup_goSalon(); break; } break; @@ -1106,14 +1106,14 @@ IMPLEMENT_FUNCTION(27, Anna, function27) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(28, Anna, function28) +IMPLEMENT_FUNCTION(28, Anna, goSalon) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function17(kCarRestaurant, kPosition_850); + setup_doWalkP1(kCarRestaurant, kPosition_850); break; case kActionCallback: @@ -1137,7 +1137,7 @@ IMPLEMENT_FUNCTION(28, Anna, function28) case 3: getData()->location = kLocationInsideCompartment; - setup_function29(); + setup_waitAugust(); break; } break; @@ -1145,7 +1145,7 @@ IMPLEMENT_FUNCTION(28, Anna, function28) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(29, Anna, function29) +IMPLEMENT_FUNCTION(29, Anna, waitAugust) switch (savepoint.action) { default: break; @@ -1268,7 +1268,7 @@ IMPLEMENT_FUNCTION(30, Anna, function30) if (getState()->time > kTime1192500) { params->param4 = kTimeInvalid; - setup_function30(); + setup_leaveAugust(); break; } @@ -1277,7 +1277,7 @@ IMPLEMENT_FUNCTION(30, Anna, function30) if (params->param4 < getState()->time) { params->param4 = kTimeInvalid; - setup_function30(); + setup_leaveAugust(); break; } } @@ -1308,7 +1308,7 @@ IMPLEMENT_FUNCTION(30, Anna, function30) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(31, Anna, function31) +IMPLEMENT_FUNCTION(31, Anna, leaveAugust) switch (savepoint.action) { default: break; @@ -1343,7 +1343,7 @@ IMPLEMENT_FUNCTION(31, Anna, function31) getInventory()->setLocationAndProcess(kItem3, kObjectLocation1); getSavePoints()->push(kEntityAnna, kEntityAugust, kAction159332865); - setup_function32(); + setup_returnCompartment(); break; } break; @@ -1351,14 +1351,14 @@ IMPLEMENT_FUNCTION(31, Anna, function31) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(32, Anna, function32) +IMPLEMENT_FUNCTION(32, Anna, returnCompartment) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function17(kCarRedSleeping, kPosition_4070); + setup_doWalkP1(kCarRedSleeping, kPosition_4070); break; case kActionCallback: @@ -1377,7 +1377,7 @@ IMPLEMENT_FUNCTION(32, Anna, function32) getData()->entityPosition = kPosition_4070; getData()->location = kLocationInsideCompartment; - setup_function33(); + setup_readyForBed(); break; } break; @@ -1385,7 +1385,7 @@ IMPLEMENT_FUNCTION(32, Anna, function32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(33, Anna, function33) +IMPLEMENT_FUNCTION(33, Anna, readyForBed) switch (savepoint.action) { default: break; @@ -1395,20 +1395,20 @@ IMPLEMENT_FUNCTION(33, Anna, function33) params->param1 = (uint)(getState()->time + 4500); setCallback(1); - setup_function15((TimeValue)params->param1, "NONE"); + setup_compartmentLogic((TimeValue)params->param1, "NONE"); break; case kActionCallback: if (getCallback() == 1) { - getObjects()->updateLocation2(kObjectCompartmentF, kObjectLocation1); - setup_function34(); + getObjects()->updateModel(kObjectCompartmentF, kObjectModel1); + setup_asleep(); } break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(34, Anna, function34) +IMPLEMENT_FUNCTION(34, Anna, asleep) switch (savepoint.action) { default: break; @@ -1423,7 +1423,7 @@ IMPLEMENT_FUNCTION(34, Anna, function34) } label_callback_1: - Entity::timeCheck(kTime1489500, params->param3, WRAP_SETUP_FUNCTION(Anna, setup_function35)); + Entity::timeCheck(kTime1489500, params->param3, WRAP_SETUP_FUNCTION(Anna, setup_wakeNight)); break; case kActionKnock: @@ -1480,7 +1480,7 @@ label_callback_1: IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(35, Anna, function35) +IMPLEMENT_FUNCTION(35, Anna, wakeNight) switch (savepoint.action) { default: break; @@ -1561,11 +1561,11 @@ IMPLEMENT_FUNCTION(35, Anna, function35) getSavePoints()->push(kEntityAnna, kEntityCoudert, kAction339669520); getSavePoints()->push(kEntityAnna, kEntityMax, kAction71277948); - setup_function36(); + setup_goVassili(); break; case 2: - setup_function36(); + setup_goVassili(); break; } break; @@ -1585,7 +1585,7 @@ IMPLEMENT_FUNCTION(35, Anna, function35) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(36, Anna, function36) +IMPLEMENT_FUNCTION(36, Anna, goVassili) switch (savepoint.action) { default: break; @@ -1634,13 +1634,13 @@ IMPLEMENT_FUNCTION(37, Anna, function37) break; case kAction191477936: - setup_function38(); + setup_speakTatiana(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(38, Anna, function38) +IMPLEMENT_FUNCTION(38, Anna, speakTatiana) switch (savepoint.action) { default: break; @@ -1655,14 +1655,14 @@ IMPLEMENT_FUNCTION(38, Anna, function38) case kActionCallback: if (getCallback() == 1) { getSound()->playSound(kEntityPlayer, "MUS043"); - setup_function40(); + setup_leaveTatiana(); } break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition) +IMPLEMENT_FUNCTION_II(39, Anna, doWalk1019, CarIndex, EntityPosition) switch (savepoint.action) { default: break; @@ -1708,7 +1708,7 @@ IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(40, Anna, function40) +IMPLEMENT_FUNCTION(40, Anna, leaveTatiana) switch (savepoint.action) { default: break; @@ -1727,7 +1727,7 @@ IMPLEMENT_FUNCTION(40, Anna, function40) getData()->location = kLocationOutsideCompartment; setCallback(2); - setup_function39(kCarRedSleeping, kPosition_4070); + setup_doWalk1019(kCarRedSleeping, kPosition_4070); break; case 2: @@ -1752,7 +1752,7 @@ IMPLEMENT_FUNCTION(40, Anna, function40) getData()->location = kLocationOutsideCompartment; setCallback(6); - setup_function39(kCarRedSleeping, kPosition_7500); + setup_doWalk1019(kCarRedSleeping, kPosition_7500); break; case 6: @@ -1777,7 +1777,7 @@ IMPLEMENT_FUNCTION(40, Anna, function40) getData()->location = kLocationOutsideCompartment; setCallback(10); - setup_function39(kCarRedSleeping, kPosition_4070); + setup_doWalk1019(kCarRedSleeping, kPosition_4070); break; case 10: @@ -1790,7 +1790,7 @@ IMPLEMENT_FUNCTION(40, Anna, function40) getData()->location = kLocationInsideCompartment; getData()->entityPosition = kPosition_4070; - setup_function41(); + setup_goBackToSleep(); break; } break; @@ -1798,7 +1798,7 @@ IMPLEMENT_FUNCTION(40, Anna, function40) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(41, Anna, function41) +IMPLEMENT_FUNCTION(41, Anna, goBackToSleep) switch (savepoint.action) { default: break; @@ -1875,7 +1875,7 @@ IMPLEMENT_FUNCTION(42, Anna, chapter2) break; case kActionNone: - setup_chapter2Handler(); + setup_inPart2(); break; case kActionDefault: @@ -1892,7 +1892,7 @@ IMPLEMENT_FUNCTION(42, Anna, chapter2) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(43, Anna, chapter2Handler) +IMPLEMENT_FUNCTION(43, Anna, inPart2) switch (savepoint.action) { default: break; @@ -1901,7 +1901,7 @@ IMPLEMENT_FUNCTION(43, Anna, chapter2Handler) getObjects()->update(kObjectOutsideAnnaCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); setCallback(1); - setup_function12(); + setup_practiceMusic(); break; case kActionCallback: @@ -1911,27 +1911,27 @@ IMPLEMENT_FUNCTION(43, Anna, chapter2Handler) case 1: setCallback(2); - setup_function15(kTime1786500, "418C"); + setup_compartmentLogic(kTime1786500, "418C"); break; case 2: setCallback(3); - setup_function12(); + setup_practiceMusic(); break; case 3: setCallback(4); - setup_function15(kTime1818000, "418C"); + setup_compartmentLogic(kTime1818000, "418C"); break; case 4: setCallback(5); - setup_function12(); + setup_practiceMusic(); break; case 5: setCallback(6); - setup_function15(kTimeEnd, "418C"); + setup_compartmentLogic(kTimeEnd, "418C"); break; } break; @@ -1945,7 +1945,7 @@ IMPLEMENT_FUNCTION(44, Anna, chapter3) break; case kActionNone: - setup_chapter3Handler(); + setup_practicing(); break; case kActionDefault: @@ -1965,7 +1965,7 @@ IMPLEMENT_FUNCTION(44, Anna, chapter3) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_I(45, Anna, function45, bool) +IMPLEMENT_FUNCTION_I(45, Anna, exitCompartment, bool) switch (savepoint.action) { default: break; @@ -2004,7 +2004,7 @@ IMPLEMENT_FUNCTION_I(45, Anna, function45, bool) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(46, Anna, chapter3Handler) +IMPLEMENT_FUNCTION(46, Anna, practicing) switch (savepoint.action) { default: break; @@ -2014,16 +2014,16 @@ IMPLEMENT_FUNCTION(46, Anna, chapter3Handler) getScenes()->loadSceneFromPosition(kCarRedSleeping, 49); setCallback(1); - setup_function12(); + setup_practiceMusic(); break; case kActionCallback: if (getCallback() == 1 || getCallback() == 2) { if (ENTITY_PARAM(0, 1)) { - setup_function47(); + setup_goLunch(); } else { setCallback(2); - setup_function15((TimeValue)(getState()->time + 4500), "418C"); + setup_compartmentLogic((TimeValue) (getState()->time + 4500), "418C"); } } break; @@ -2031,7 +2031,7 @@ IMPLEMENT_FUNCTION(46, Anna, chapter3Handler) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(47, Anna, function47) +IMPLEMENT_FUNCTION(47, Anna, goLunch) switch (savepoint.action) { default: break; @@ -2080,7 +2080,7 @@ IMPLEMENT_FUNCTION(47, Anna, function47) case 5: getEntities()->drawSequenceLeft(kEntityAugust, "BLANK"); - setup_function48(); + setup_lunch(); break; } break; @@ -2088,7 +2088,7 @@ IMPLEMENT_FUNCTION(47, Anna, function47) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(48, Anna, function48) +IMPLEMENT_FUNCTION(48, Anna, lunch) switch (savepoint.action) { default: break; @@ -2121,7 +2121,7 @@ label_callback_4: params->param4 = kTimeInvalid; - setup_function50(); + setup_leaveLunch(); } } break; @@ -2213,7 +2213,7 @@ IMPLEMENT_FUNCTION(49, Anna, leaveTableWithAugust) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(50, Anna, function50) +IMPLEMENT_FUNCTION(50, Anna, leaveLunch) switch (savepoint.action) { default: break; @@ -2240,7 +2240,7 @@ IMPLEMENT_FUNCTION(50, Anna, function50) break; case 3: - setup_function51(); + setup_afterLunch(); break; } break; @@ -2248,7 +2248,7 @@ IMPLEMENT_FUNCTION(50, Anna, function50) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(51, Anna, function51) +IMPLEMENT_FUNCTION(51, Anna, afterLunch) switch (savepoint.action) { default: break; @@ -2291,7 +2291,7 @@ IMPLEMENT_FUNCTION(51, Anna, function51) case 2: getSavePoints()->push(kEntityAnna, kEntityAugust, kAction122288808); - setup_function52(); + setup_returnCompartment3(); break; case 3: @@ -2348,7 +2348,7 @@ IMPLEMENT_FUNCTION(51, Anna, function51) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(52, Anna, function52) +IMPLEMENT_FUNCTION(52, Anna, returnCompartment3) switch (savepoint.action) { default: break; @@ -2360,7 +2360,7 @@ IMPLEMENT_FUNCTION(52, Anna, function52) getEntities()->clearSequences(kEntityAnna); - setup_function53(); + setup_dressing(); break; case kActionDefault: @@ -2385,7 +2385,7 @@ IMPLEMENT_FUNCTION(52, Anna, function52) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(53, Anna, function53) +IMPLEMENT_FUNCTION(53, Anna, dressing) switch (savepoint.action) { default: break; @@ -2393,7 +2393,7 @@ IMPLEMENT_FUNCTION(53, Anna, function53) case kActionNone: if (getProgress().field_48 && params->param5 != kTimeInvalid) { if (Entity::updateParameterTime(kTime2065500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param5, 150)) { - setup_function54(); + setup_giveMaxToConductor2(); break; } } @@ -2537,14 +2537,14 @@ IMPLEMENT_FUNCTION(53, Anna, function53) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(54, Anna, function54) +IMPLEMENT_FUNCTION(54, Anna, giveMaxToConductor2) switch (savepoint.action) { default: break; case kActionNone: if (params->param3) { - if (Entity::timeCheck(kTime2079000, params->param5, WRAP_SETUP_FUNCTION(Anna, setup_function55))) + if (Entity::timeCheck(kTime2079000, params->param5, WRAP_SETUP_FUNCTION(Anna, setup_goConcert))) break; if (Entity::updateParameter(params->param6, getState()->time, 9000)) { @@ -2702,7 +2702,7 @@ IMPLEMENT_FUNCTION(54, Anna, function54) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(55, Anna, function55) +IMPLEMENT_FUNCTION(55, Anna, goConcert) switch (savepoint.action) { default: break; @@ -2718,7 +2718,7 @@ IMPLEMENT_FUNCTION(55, Anna, function55) getInventory()->setLocationAndProcess(kItemKey, kObjectLocation1); setCallback(1); - setup_function45(true); + setup_exitCompartment(true); break; case kActionCallback: @@ -2733,7 +2733,7 @@ IMPLEMENT_FUNCTION(55, Anna, function55) break; case 2: - setup_function56(); + setup_concert(); break; } break; @@ -2741,7 +2741,7 @@ IMPLEMENT_FUNCTION(55, Anna, function55) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(56, Anna, function56) +IMPLEMENT_FUNCTION(56, Anna, concert) switch (savepoint.action) { default: break; @@ -2754,13 +2754,13 @@ IMPLEMENT_FUNCTION(56, Anna, function56) break; case kAction191668032: - setup_function57(); + setup_leaveConcert(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(57, Anna, function57) +IMPLEMENT_FUNCTION(57, Anna, leaveConcert) switch (savepoint.action) { default: break; @@ -2820,7 +2820,7 @@ IMPLEMENT_FUNCTION(57, Anna, function57) getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF, true); getSavePoints()->push(kEntityAnna, kEntityAugust, kAction122288808); - setup_function59(); + setup_afterConcert(); break; } break; @@ -2841,7 +2841,7 @@ IMPLEMENT_FUNCTION(57, Anna, function57) if (getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_4070) || getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_4455)) { getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF, true); - setup_function58(); + setup_leaveConcertCathInCompartment(); } else { setCallback(3); setup_enterExitCompartment("625Ff", kObjectCompartmentF); @@ -2851,7 +2851,7 @@ IMPLEMENT_FUNCTION(57, Anna, function57) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(58, Anna, function58) +IMPLEMENT_FUNCTION(58, Anna, leaveConcertCathInCompartment) switch (savepoint.action) { default: break; @@ -2868,14 +2868,14 @@ IMPLEMENT_FUNCTION(58, Anna, function58) getScenes()->loadSceneFromPosition(kCarRedSleeping, 8); getSound()->playSound(kEntityAnna, "lib015"); getSavePoints()->push(kEntityAnna, kEntityAugust, kAction122288808); - setup_function59(); + setup_afterConcert(); } break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(59, Anna, function59) +IMPLEMENT_FUNCTION(59, Anna, afterConcert) switch (savepoint.action) { default: break; @@ -2884,7 +2884,7 @@ IMPLEMENT_FUNCTION(59, Anna, function59) if (getInventory()->hasItem(kItemKey) && params->param4 != kTimeInvalid && getState()->time > kTime2218500) { if (getState()->time > kTime2248200) { params->param4 = kTimeInvalid; - setup_function61(); + setup_goBaggageCompartment(); break; } @@ -2897,7 +2897,7 @@ IMPLEMENT_FUNCTION(59, Anna, function59) if (params->param4 < getState()->time) { params->param4 = kTimeInvalid; - setup_function61(); + setup_goBaggageCompartment(); break; } } @@ -2996,7 +2996,7 @@ IMPLEMENT_FUNCTION(59, Anna, function59) case kAction156622016: if (params->param3) { setCallback(8); - setup_function60(); + setup_giveMaxBack(); } break; @@ -3017,7 +3017,7 @@ IMPLEMENT_FUNCTION(59, Anna, function59) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(60, Anna, function60) +IMPLEMENT_FUNCTION(60, Anna, giveMaxBack) switch (savepoint.action) { default: break; @@ -3063,7 +3063,7 @@ IMPLEMENT_FUNCTION(60, Anna, function60) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(61, Anna, function61) +IMPLEMENT_FUNCTION(61, Anna, goBaggageCompartment) switch (savepoint.action) { default: break; @@ -3084,7 +3084,7 @@ IMPLEMENT_FUNCTION(61, Anna, function61) getObjects()->update(kObject53, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); setCallback(2); - setup_function45(false); + setup_exitCompartment(false); break; case 2: @@ -3135,7 +3135,7 @@ IMPLEMENT_FUNCTION(62, Anna, function62) if (getState()->time > kTime2259000 && !params->param2) { params->param2 = 1; getSavePoints()->push(kEntityAnna, kEntityVesna, kAction189299008); - setup_function63(); + setup_deadBaggageCompartment(); } break; @@ -3151,7 +3151,7 @@ IMPLEMENT_FUNCTION(62, Anna, function62) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(63, Anna, function63) +IMPLEMENT_FUNCTION(63, Anna, deadBaggageCompartment) switch (savepoint.action) { default: break; @@ -3180,7 +3180,7 @@ IMPLEMENT_FUNCTION(63, Anna, function63) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(64, Anna, baggage) +IMPLEMENT_FUNCTION(64, Anna, baggageFight) switch (savepoint.action) { default: break; @@ -3224,7 +3224,7 @@ IMPLEMENT_FUNCTION(64, Anna, baggage) getProgress().field_54 = 0; getState()->time = kTime2266200; - setup_function65(); + setup_prepareVienna(); break; } break; @@ -3232,7 +3232,7 @@ IMPLEMENT_FUNCTION(64, Anna, baggage) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(65, Anna, function65) +IMPLEMENT_FUNCTION(65, Anna, prepareVienna) if (savepoint.action == kActionDefault) { getData()->entityPosition = kPosition_4070; getData()->location = kLocationInsideCompartment; @@ -3243,7 +3243,7 @@ IMPLEMENT_FUNCTION(65, Anna, function65) getObjects()->update(kObjectOutsideAnnaCompartment, kEntityPlayer, kObjectLocation1, kCursorKeepValue, kCursorKeepValue); setCallback(1); - setup_function15(kTimeEnd, "NONE"); + setup_compartmentLogic(kTimeEnd, "NONE"); } IMPLEMENT_FUNCTION_END @@ -3254,7 +3254,7 @@ IMPLEMENT_FUNCTION(66, Anna, chapter4) break; case kActionNone: - setup_chapter4Handler(); + setup_reading(); break; case kActionDefault: @@ -3271,7 +3271,7 @@ IMPLEMENT_FUNCTION(66, Anna, chapter4) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(67, Anna, chapter4Handler) +IMPLEMENT_FUNCTION(67, Anna, reading) switch (savepoint.action) { default: break; @@ -3344,7 +3344,7 @@ label_next: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadSceneFromPosition(kCarRedSleeping, 8); - setup_function68(); + setup_sulking(); break; case 2: @@ -3369,7 +3369,7 @@ label_next: getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getData()->inventoryItem = kItemNone; - setup_function69(); + setup_goSalon4(); break; case kAction219971920: @@ -3379,7 +3379,7 @@ label_next: IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(68, Anna, function68) +IMPLEMENT_FUNCTION(68, Anna, sulking) switch (savepoint.action) { default: break; @@ -3387,7 +3387,7 @@ IMPLEMENT_FUNCTION(68, Anna, function68) case kActionNone: if (!params->param1) { setCallback(1); - setup_function15(kTime2511900, "NONE"); + setup_compartmentLogic(kTime2511900, "NONE"); } break; @@ -3402,7 +3402,7 @@ IMPLEMENT_FUNCTION(68, Anna, function68) case kAction191001984: getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - setup_function69(); + setup_goSalon4(); break; case kAction201431954: @@ -3412,7 +3412,7 @@ IMPLEMENT_FUNCTION(68, Anna, function68) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(69, Anna, function69) +IMPLEMENT_FUNCTION(69, Anna, goSalon4) switch (savepoint.action) { default: break; @@ -3426,7 +3426,7 @@ IMPLEMENT_FUNCTION(69, Anna, function69) getData()->entityPosition = kPosition_9270; getData()->location = kLocationOutsideCompartment; - setup_function70(); + setup_returnCompartment4(); break; } @@ -3448,7 +3448,7 @@ IMPLEMENT_FUNCTION(69, Anna, function69) getData()->entityPosition = kPosition_8200; getData()->location = kLocationOutsideCompartment; - setup_function70(); + setup_returnCompartment4(); } break; @@ -3484,7 +3484,7 @@ IMPLEMENT_FUNCTION(69, Anna, function69) break; case 5: - setup_function70(); + setup_returnCompartment4(); break; } break; @@ -3506,14 +3506,14 @@ IMPLEMENT_FUNCTION(69, Anna, function69) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(70, Anna, function70) +IMPLEMENT_FUNCTION(70, Anna, returnCompartment4) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function72(kCarRedSleeping, kPosition_4070); + setup_doWalkCathFollowsAnna(kCarRedSleeping, kPosition_4070); break; case kActionCallback: @@ -3523,13 +3523,13 @@ IMPLEMENT_FUNCTION(70, Anna, function70) case 1: setCallback(2); - setup_function71(); + setup_enterCompartmentCathFollowsAnna(); break; case 2: getData()->location = kLocationOutsideCompartment; getEntities()->clearSequences(kEntityAnna); - setup_function73(); + setup_letDownHair(); break; } break; @@ -3537,7 +3537,7 @@ IMPLEMENT_FUNCTION(70, Anna, function70) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(71, Anna, function71) +IMPLEMENT_FUNCTION(71, Anna, enterCompartmentCathFollowsAnna) switch (savepoint.action) { default: break; @@ -3589,7 +3589,7 @@ IMPLEMENT_FUNCTION(71, Anna, function71) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition) +IMPLEMENT_FUNCTION_II(72, Anna, doWalkCathFollowsAnna, CarIndex, EntityPosition) switch (savepoint.action) { default: break; @@ -3631,7 +3631,7 @@ IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(73, Anna, function73) +IMPLEMENT_FUNCTION(73, Anna, letDownHair) switch (savepoint.action) { default: break; @@ -3712,7 +3712,7 @@ IMPLEMENT_FUNCTION(74, Anna, chapter5) break; case kActionNone: - setup_chapter5Handler(); + setup_tiedUp(); break; case kActionDefault: @@ -3731,7 +3731,7 @@ IMPLEMENT_FUNCTION(74, Anna, chapter5) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(75, Anna, chapter5Handler) +IMPLEMENT_FUNCTION(75, Anna, tiedUp) switch (savepoint.action) { default: break; @@ -3758,11 +3758,11 @@ IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// IMPLEMENT_FUNCTION(76, Anna, function76) if (savepoint.action == kAction158480160) - setup_function77(); + setup_readyToScore(); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(77, Anna, function77) +IMPLEMENT_FUNCTION(77, Anna, readyToScore) switch (savepoint.action) { default: break; @@ -3818,7 +3818,7 @@ IMPLEMENT_FUNCTION(77, Anna, function77) break; case 3: - setup_function78(); + setup_kidnapped(); break; } break; @@ -3826,14 +3826,14 @@ IMPLEMENT_FUNCTION(77, Anna, function77) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(78, Anna, function78) +IMPLEMENT_FUNCTION(78, Anna, kidnapped) switch (savepoint.action) { default: break; case kActionDrawScene: if ((getEntities()->isInRestaurant(kEntityPlayer) || getEntities()->isInSalon(kEntityPlayer)) && getInventory()->hasItem(kItemFirebird)) { - setup_function80(); + setup_finalSequence(); break; } @@ -3857,7 +3857,7 @@ IMPLEMENT_FUNCTION(78, Anna, function78) getAction()->playAnimation(kEventKronosHostageAnna); getScenes()->loadSceneFromPosition(kCarRestaurant, 61); getSound()->playSound(kEntityAnna, "Mus024", kFlagDefault); - setup_function79(); + setup_waiting(); break; } break; @@ -3865,7 +3865,7 @@ IMPLEMENT_FUNCTION(78, Anna, function78) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(79, Anna, function79) +IMPLEMENT_FUNCTION(79, Anna, waiting) switch (savepoint.action) { default: break; @@ -3878,7 +3878,7 @@ IMPLEMENT_FUNCTION(79, Anna, function79) case kActionDrawScene: if (getEntities()->isInRestaurant(kEntityPlayer) && getInventory()->hasItem(kItemFirebird)) { - setup_function80(); + setup_finalSequence(); break; } @@ -3918,7 +3918,7 @@ IMPLEMENT_FUNCTION(79, Anna, function79) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(80, Anna, function80) +IMPLEMENT_FUNCTION(80, Anna, finalSequence) switch (savepoint.action) { default: break; @@ -3973,7 +3973,7 @@ IMPLEMENT_FUNCTION(80, Anna, function80) getAction()->playAnimation(kEventKronosOpenFirebird); getScenes()->loadSceneFromPosition(kCarRestaurant, 3); - setup_finalSequence(); + setup_openFirebird(); break; } break; @@ -3988,7 +3988,7 @@ IMPLEMENT_FUNCTION(80, Anna, function80) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(81, Anna, finalSequence) +IMPLEMENT_FUNCTION(81, Anna, openFirebird) switch (savepoint.action) { default: break; diff --git a/engines/lastexpress/entities/anna.h b/engines/lastexpress/entities/anna.h index 205ff9d42c..89a397a6d0 100644 --- a/engines/lastexpress/entities/anna.h +++ b/engines/lastexpress/entities/anna.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. @@ -113,7 +113,7 @@ public: */ DECLARE_FUNCTION_1(updateFromTime, uint32 time) - DECLARE_FUNCTION(function12) + DECLARE_FUNCTION(practiceMusic) /** * Draws the entity along with another one @@ -131,43 +131,43 @@ public: */ DECLARE_FUNCTION_1(updateFromTicks, uint32 ticks) - DECLARE_FUNCTION_2(function15, TimeValue timeValue, const char *sequence) + DECLARE_FUNCTION_2(compartmentLogic, TimeValue timeValue, const char *sequence) /** * Setup Chapter 1 */ DECLARE_FUNCTION(chapter1) - DECLARE_FUNCTION_2(function17, uint32, uint32) + DECLARE_FUNCTION_2(doWalkP1, uint32, uint32) - DECLARE_FUNCTION_1(function18, TimeValue timeValue) + DECLARE_FUNCTION_1(diningLogic, TimeValue timeValue) /** * Handle Chapter 1 events */ - DECLARE_FUNCTION(chapter1Handler) - DECLARE_FUNCTION(function20) - DECLARE_FUNCTION(function21) + DECLARE_FUNCTION(fleeTyler) + DECLARE_FUNCTION(waitDinner) + DECLARE_FUNCTION(goDinner) DECLARE_FUNCTION(function22) - DECLARE_FUNCTION(function23) - DECLARE_FUNCTION(function24) - DECLARE_FUNCTION(function25) - DECLARE_FUNCTION(function26) - DECLARE_FUNCTION(function27) - DECLARE_FUNCTION(function28) - DECLARE_FUNCTION(function29) + DECLARE_FUNCTION(waitingDinner) + DECLARE_FUNCTION(waitingDinner2) + DECLARE_FUNCTION(eatingDinner) + DECLARE_FUNCTION(leaveDinner) + DECLARE_FUNCTION(freshenUp) + DECLARE_FUNCTION(goSalon) + DECLARE_FUNCTION(waitAugust) DECLARE_FUNCTION(function30) - DECLARE_FUNCTION(function31) - DECLARE_FUNCTION(function32) - DECLARE_FUNCTION(function33) - DECLARE_FUNCTION(function34) - DECLARE_FUNCTION(function35) - DECLARE_FUNCTION(function36) + DECLARE_FUNCTION(leaveAugust) + DECLARE_FUNCTION(returnCompartment) + DECLARE_FUNCTION(readyForBed) + DECLARE_FUNCTION(asleep) + DECLARE_FUNCTION(wakeNight) + DECLARE_FUNCTION(goVassili) DECLARE_FUNCTION(function37) - DECLARE_FUNCTION(function38) - DECLARE_FUNCTION_2(function39, CarIndex car, EntityPosition entityPosition) - DECLARE_FUNCTION(function40) - DECLARE_FUNCTION(function41) + DECLARE_FUNCTION(speakTatiana) + DECLARE_FUNCTION_2(doWalk1019, CarIndex car, EntityPosition entityPosition) + DECLARE_FUNCTION(leaveTatiana) + DECLARE_FUNCTION(goBackToSleep) /** * Setup Chapter 2 @@ -177,37 +177,37 @@ public: /** * Handle Chapter 2 events */ - DECLARE_FUNCTION(chapter2Handler) + DECLARE_FUNCTION(inPart2) /** * Setup Chapter 3 */ DECLARE_FUNCTION(chapter3) - DECLARE_FUNCTION_1(function45, bool useAction1) /** * Handle Chapter 3 events */ - DECLARE_FUNCTION(chapter3Handler) - DECLARE_FUNCTION(function47) - DECLARE_FUNCTION(function48) + DECLARE_FUNCTION_1(exitCompartment, bool useAction1) + DECLARE_FUNCTION(practicing) + DECLARE_FUNCTION(goLunch) + DECLARE_FUNCTION(lunch) DECLARE_FUNCTION(leaveTableWithAugust) - DECLARE_FUNCTION(function50) - DECLARE_FUNCTION(function51) - DECLARE_FUNCTION(function52) - DECLARE_FUNCTION(function53) - DECLARE_FUNCTION(function54) - DECLARE_FUNCTION(function55) - DECLARE_FUNCTION(function56) - DECLARE_FUNCTION(function57) - DECLARE_FUNCTION(function58) - DECLARE_FUNCTION(function59) - DECLARE_FUNCTION(function60) - DECLARE_FUNCTION(function61) + DECLARE_FUNCTION(leaveLunch) + DECLARE_FUNCTION(afterLunch) + DECLARE_FUNCTION(returnCompartment3) + DECLARE_FUNCTION(dressing) + DECLARE_FUNCTION(giveMaxToConductor2) + DECLARE_FUNCTION(goConcert) + DECLARE_FUNCTION(concert) + DECLARE_FUNCTION(leaveConcert) + DECLARE_FUNCTION(leaveConcertCathInCompartment) + DECLARE_FUNCTION(afterConcert) + DECLARE_FUNCTION(giveMaxBack) + DECLARE_FUNCTION(goBaggageCompartment) DECLARE_FUNCTION(function62) - DECLARE_FUNCTION(function63) - DECLARE_FUNCTION(baggage) - DECLARE_FUNCTION(function65) + DECLARE_FUNCTION(deadBaggageCompartment) + DECLARE_FUNCTION(baggageFight) + DECLARE_FUNCTION(prepareVienna) /** * Setup Chapter 4 @@ -217,14 +217,13 @@ public: /** * Handle Chapter 4 events */ - DECLARE_FUNCTION(chapter4Handler) - - DECLARE_FUNCTION(function68) - DECLARE_FUNCTION(function69) - DECLARE_FUNCTION(function70) - DECLARE_FUNCTION(function71) - DECLARE_FUNCTION_2(function72, CarIndex car, EntityPosition entityPosition) - DECLARE_FUNCTION(function73) + DECLARE_FUNCTION(reading) + DECLARE_FUNCTION(sulking) + DECLARE_FUNCTION(goSalon4) + DECLARE_FUNCTION(returnCompartment4) + DECLARE_FUNCTION(enterCompartmentCathFollowsAnna) + DECLARE_FUNCTION_2(doWalkCathFollowsAnna, CarIndex car, EntityPosition entityPosition) + DECLARE_FUNCTION(letDownHair) /** * Setup Chapter 5 @@ -234,13 +233,13 @@ public: /** * Handle Chapter 5 events */ - DECLARE_FUNCTION(chapter5Handler) + DECLARE_FUNCTION(tiedUp) DECLARE_FUNCTION(function76) - DECLARE_FUNCTION(function77) - DECLARE_FUNCTION(function78) - DECLARE_FUNCTION(function79) - DECLARE_FUNCTION(function80) + DECLARE_FUNCTION(readyToScore) + DECLARE_FUNCTION(kidnapped) + DECLARE_FUNCTION(waiting) DECLARE_FUNCTION(finalSequence) + DECLARE_FUNCTION(openFirebird) }; } // End of namespace LastExpress diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index b0bc0732d4..c5029537ad 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.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. @@ -640,7 +640,7 @@ label_continue: break; case 6: - getAction()->playAnimation(getObjects()->get(kObjectCompartment3).location2 == kObjectLocation1 ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment); + getAction()->playAnimation(getObjects()->get(kObjectCompartment3).model == kObjectModel1 ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment); getProgress().eventMetAugust = true; getObjects()->update(kObjectCompartment3, kEntityAugust, kObjectLocation1, kCursorNormal, kCursorNormal); @@ -840,11 +840,11 @@ label_callback_9: if (CURRENT_PARAM(1, 1) >= getState()->timeTicks) break; - if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) { + if (getObjects()->get(kObjectCompartment1).status == kObjectLocation1) { if (!Entity::updateParameter(CURRENT_PARAM(1, 2), getState()->timeTicks, 75)) break; - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); params->param6++; @@ -866,7 +866,7 @@ label_callback_9: params->param8++; if (params->param8 >= 3) { - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; } @@ -874,12 +874,12 @@ label_callback_9: params->param6 = 0; } - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, params->param4 ? kCursorNormal : kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, params->param4 ? kCursorNormal : kCursorTalk, kCursorHand); CURRENT_PARAM(1, 2) = 0; } else { if (getProgress().eventCorpseMovedFromFloor && getProgress().jacket != kJacketBlood) { - params->param7 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? 8 : 7; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? 8 : 7; getObjects()->update(kObjectOutsideTylerCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); setCallback(4); @@ -900,7 +900,7 @@ label_callback_9: setCallback(15); setup_playSound("LIB012"); } else if (!params->param4) { - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); setCallback(17); setup_playSound("AUG1002A"); @@ -912,9 +912,9 @@ label_callback_9: if (params->param3) { getData()->location = kLocationInsideCompartment; - params->param7 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment; } else { - params->param7 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? kEventMeetAugustTylerCompartmentBed : kEventMeetAugustTylerCompartment; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMeetAugustTylerCompartmentBed : kEventMeetAugustTylerCompartment; } setCallback(14); @@ -931,14 +931,14 @@ label_callback_9: if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_8200) || getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_7850) || getEntities()->isOutsideAlexeiWindow()) { - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); if (getEntities()->isOutsideAlexeiWindow()) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); getSound()->playSound(kEntityPlayer, "LIB012"); - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, kCursorTalk, kCursorHand); params->param2 = 1; } else { @@ -996,7 +996,7 @@ label_callback_9: case 6: case 7: - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, params->param4 ? kCursorNormal : kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, params->param4 ? kCursorNormal : kCursorTalk, kCursorHand); ENTITY_PARAM(1, 2) = 0; break; @@ -1032,7 +1032,7 @@ label_callback_9: break; case 13: - getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).location == kObjectLocation1 ? "LIB032" : "LIB014"); + getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).status == kObjectLocation1 ? "LIB032" : "LIB014"); getAction()->playAnimation(kEventAugustFindCorpse); if (getEvent(kEventDinerAugustOriginalJacket)) @@ -1045,7 +1045,7 @@ label_callback_9: case 14: if (!params->param2) - getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).location == kObjectLocation1 ? "LIB032" : "LIB014"); + getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).status == kObjectLocation1 ? "LIB032" : "LIB014"); getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectOutsideTylerCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); @@ -1070,7 +1070,7 @@ label_callback_9: case 17: params->param4 = 1; - getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorHand); break; } break; @@ -3249,7 +3249,7 @@ IMPLEMENT_FUNCTION(63, August, function63) case kAction1: if (getEntities()->isInSalon(kEntityAlexei)) { - RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function44); + RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_goToPlatform); } getData()->inventoryItem = kItemNone; diff --git a/engines/lastexpress/entities/august.h b/engines/lastexpress/entities/august.h index 606321955b..f8eee1036b 100644 --- a/engines/lastexpress/entities/august.h +++ b/engines/lastexpress/entities/august.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/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp index 219ddf901b..979381afb0 100644 --- a/engines/lastexpress/entities/boutarel.cpp +++ b/engines/lastexpress/entities/boutarel.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/lastexpress/entities/boutarel.h b/engines/lastexpress/entities/boutarel.h index 04838f6527..8612566dc4 100644 --- a/engines/lastexpress/entities/boutarel.h +++ b/engines/lastexpress/entities/boutarel.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/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index d373432710..fe977a577f 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.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. @@ -221,7 +221,7 @@ IMPLEMENT_FUNCTION(6, Chapters, chapter1End) RESET_ENTITY_STATE(kEntityKronos, Kronos, setup_function10); RESET_ENTITY_STATE(kEntityKahina, Kahina, setup_function13); - RESET_ENTITY_STATE(kEntityAnna, Anna, setup_function34); + RESET_ENTITY_STATE(kEntityAnna, Anna, setup_asleep); RESET_ENTITY_STATE(kEntityAugust, August, setup_function34); RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_function24); RESET_ENTITY_STATE(kEntityVassili, Vassili, setup_function7); @@ -349,19 +349,19 @@ IMPLEMENT_FUNCTION(7, Chapters, chapter1Init) getObjects()->update(kObjectOutsideTylerCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); for (uint i = kObjectCompartment1; i <= kObjectCompartment8; i++) { - getObjects()->updateLocation2((ObjectIndex)i, kObjectLocation2); + getObjects()->updateModel((ObjectIndex) i, kObjectModel2); } for (uint i = kObjectCompartmentA; i <= kObjectCompartmentH; i++) { - getObjects()->updateLocation2((ObjectIndex)i, kObjectLocation2); + getObjects()->updateModel((ObjectIndex) i, kObjectModel2); } params->param1 = 40; - getObjects()->updateLocation2(kObject25, kObjectLocation1); - getObjects()->updateLocation2(kObjectTrainTimeTable, kObjectLocation1); - getObjects()->updateLocation2(kObject98, kObjectLocation1); - getObjects()->updateLocation2(kObjectRestaurantCar, kObjectLocation1); + getObjects()->updateModel(kObject25, kObjectModel1); + getObjects()->updateModel(kObjectTrainTimeTable, kObjectModel1); + getObjects()->updateModel(kObject98, kObjectModel1); + getObjects()->updateModel(kObjectRestaurantCar, kObjectModel1); getObjects()->update(kObject25, kEntityPlayer, kObjectLocationNone, kCursorNormal, kCursorForward); getObjects()->update(kObjectTrainTimeTable, kEntityPlayer, kObjectLocationNone, kCursorNormal, kCursorForward); @@ -792,11 +792,11 @@ IMPLEMENT_FUNCTION(11, Chapters, chapter2Init) getInventory()->setLocationAndProcess(kItem3, kObjectLocation1); for (uint i = 1; i < 9; i++) { - getObjects()->updateLocation2((ObjectIndex)i, kObjectLocation2); + getObjects()->updateModel((ObjectIndex) i, kObjectModel2); } for (uint i = 33; i < 40; i++) { - getObjects()->updateLocation2((ObjectIndex)i, kObjectLocation2); + getObjects()->updateModel((ObjectIndex) i, kObjectModel2); } params->param1 = 40; @@ -893,7 +893,7 @@ IMPLEMENT_FUNCTION(14, Chapters, chapter3Init) getObjects()->update(kObjectHandleOutsideRight, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorHand); getInventory()->setLocationAndProcess(kItemBriefcase, kObjectLocation1); getInventory()->setLocationAndProcess(kItem3, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartment1, kObjectLocation2); + getObjects()->updateModel(kObjectCompartment1, kObjectModel2); getObjects()->update(kObject107, kEntityPlayer, kObjectLocation3, kCursorKeepValue, kCursorKeepValue); if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) { @@ -1204,7 +1204,7 @@ IMPLEMENT_FUNCTION(18, Chapters, chapter4Init) if (getInventory()->get(kItemBeetle)->location == kObjectLocation3) getScenes()->loadSceneFromItemPosition(kItemBeetle); - getObjects()->updateLocation2(kObject25, kObjectLocation2); + getObjects()->updateModel(kObject25, kObjectModel2); getObjects()->update(kObject107, kEntityPlayer, kObjectLocation3, kCursorKeepValue, kCursorKeepValue); if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) { @@ -1265,7 +1265,7 @@ label_exitPozsony: break; label_enterGalanta: - if (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) { + if (getObjects()->get(kObjectCompartment1).model == kObjectModel1) { if (getState()->time > kTime2403000 && !CURRENT_PARAM(1, 2)) { CURRENT_PARAM(1, 2) = 1; getProgress().field_18 = 2; @@ -1440,7 +1440,7 @@ label_callback_4: case 10: getAction()->playAnimation(kEventDefuseBomb); - RESET_ENTITY_STATE(kEntityAbbot, Abbot, setup_function48); + RESET_ENTITY_STATE(kEntityAbbot, Abbot, setup_afterBomb); getSavePoints()->push(kEntityChapters, kEntityAnna, kAction191001984); getSavePoints()->push(kEntityChapters, kEntityCoudert, kAction191001984); getScenes()->loadSceneFromItemPosition(kItem2); @@ -1514,7 +1514,7 @@ label_callback_4: if (getInventory()->hasItem(kItemBomb)) { RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function47); - RESET_ENTITY_STATE(kEntityAnna, Anna, setup_function68); + RESET_ENTITY_STATE(kEntityAnna, Anna, setup_sulking); RESET_ENTITY_STATE(kEntityAugust, August, setup_function65); RESET_ENTITY_STATE(kEntityMertens, Mertens, setup_function48); RESET_ENTITY_STATE(kEntityCoudert, Coudert, setup_function53); @@ -1675,8 +1675,8 @@ IMPLEMENT_FUNCTION(21, Chapters, chapter5Init) getObjects()->update(kObject94, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); getObjects()->update(kObject101, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - getObjects()->updateLocation2(kObject98, kObjectLocation2); - getObjects()->updateLocation2(kObjectRestaurantCar, kObjectLocation2); + getObjects()->updateModel(kObject98, kObjectModel2); + getObjects()->updateModel(kObjectRestaurantCar, kObjectModel2); if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) { getSoundQueue()->removeFromQueue(kEntityChapters); diff --git a/engines/lastexpress/entities/chapters.h b/engines/lastexpress/entities/chapters.h index fb52ea3ee4..39739aa92e 100644 --- a/engines/lastexpress/entities/chapters.h +++ b/engines/lastexpress/entities/chapters.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/lastexpress/entities/cooks.cpp b/engines/lastexpress/entities/cooks.cpp index 5e8a2df8cb..e24180e58d 100644 --- a/engines/lastexpress/entities/cooks.cpp +++ b/engines/lastexpress/entities/cooks.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/lastexpress/entities/cooks.h b/engines/lastexpress/entities/cooks.h index f01d0b2ca0..79addb0a02 100644 --- a/engines/lastexpress/entities/cooks.h +++ b/engines/lastexpress/entities/cooks.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/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp index b604277903..80d93d8a87 100644 --- a/engines/lastexpress/entities/coudert.cpp +++ b/engines/lastexpress/entities/coudert.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. @@ -915,7 +915,7 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) if (!Entity::updateParameter(CURRENT_PARAM(1, 4), getState()->time, 900)) break; - getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1); + getObjects()->updateModel((ObjectIndex) params->param1, kObjectModel1); if (params->param4 != kObjectLocation2) getObjects()->update((ObjectIndex)params->param1, (EntityIndex)params->param3, (ObjectLocation)params->param4, (CursorStyle)params->param5, (CursorStyle)params->param6); @@ -938,15 +938,15 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) case kActionDefault: params->param3 = getObjects()->get((ObjectIndex)params->param1).entity; - params->param4 = getObjects()->get((ObjectIndex)params->param1).location; - params->param5 = getObjects()->get((ObjectIndex)params->param1).cursor; - params->param6 = getObjects()->get((ObjectIndex)params->param1).cursor2; + params->param4 = getObjects()->get((ObjectIndex)params->param1).status; + params->param5 = getObjects()->get((ObjectIndex)params->param1).windowCursor; + params->param6 = getObjects()->get((ObjectIndex)params->param1).handleCursor; if (params->param2) { params->param7 = getObjects()->get((ObjectIndex)params->param2).entity; - params->param8 = getObjects()->get((ObjectIndex)params->param2).location; - CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).cursor; - CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor2; + params->param8 = getObjects()->get((ObjectIndex)params->param2).status; + CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).windowCursor; + CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).handleCursor; getObjects()->update((ObjectIndex)params->param2, kEntityCoudert, kObjectLocation1, kCursorHandKnock, kCursorHand); } @@ -1580,7 +1580,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex) case 2: if (getEntities()->checkFields19(kEntityPlayer, kCarRedSleeping, (EntityPosition)parameters->param3) || ((parameters->param1 == kObjectCompartmentE || parameters->param1 == kObjectCompartmentF) && getEntities()->isOutsideAnnaWindow())) { - getObjects()->update((ObjectIndex)parameters->param1, kEntityPlayer, getObjects()->get((ObjectIndex)parameters->param1).location, kCursorNormal, kCursorNormal); + getObjects()->update((ObjectIndex)parameters->param1, kEntityPlayer, getObjects()->get((ObjectIndex)parameters->param1).status, kCursorNormal, kCursorNormal); parameters->param5 = true; } @@ -1598,7 +1598,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex) case 4: if (parameters->param5) - getObjects()->update((ObjectIndex)parameters->param1, kEntityPlayer, getObjects()->get((ObjectIndex)parameters->param1).location, kCursorHandKnock, kCursorHand); + getObjects()->update((ObjectIndex)parameters->param1, kEntityPlayer, getObjects()->get((ObjectIndex)parameters->param1).status, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityCoudert, (ObjectIndex)parameters->param1, true); @@ -1991,7 +1991,7 @@ IMPLEMENT_FUNCTION(36, Coudert, chapter1) getData()->location = kLocationOutsideCompartment; getData()->car = kCarRedSleeping; - getObjects()->updateLocation2(kObject111, kObjectLocation1); + getObjects()->updateModel(kObject111, kObjectModel1); break; case kActionCallback: @@ -2294,9 +2294,9 @@ label_callback_10: if (!ENTITY_PARAM(0, 2)) break; - timeCheckObject(kTime1107000, params->param4, kObject111, kObjectLocation2); - timeCheckObject(kTime1161000, params->param5, kObject111, kObjectLocation3); - timeCheckObject(kTime1206000, params->param6, kObject111, kObjectLocation4); + timeCheckObject(kTime1107000, params->param4, kObject111, kObjectModel2); + timeCheckObject(kTime1161000, params->param5, kObject111, kObjectModel3); + timeCheckObject(kTime1206000, params->param6, kObject111, kObjectModel4); break; case kAction1: @@ -2577,7 +2577,7 @@ IMPLEMENT_FUNCTION(42, Coudert, chapter2) ENTITY_PARAM(2, 4) = 0; - getObjects()->updateLocation2(kObject111, kObjectLocation5); + getObjects()->updateModel(kObject111, kObjectModel5); break; case kActionCallback: @@ -2716,7 +2716,7 @@ IMPLEMENT_FUNCTION(44, Coudert, chapter3) ENTITY_PARAM(2, 4) = 0; ENTITY_PARAM(2, 5) = 0; - getObjects()->updateLocation2(kObject111, kObjectLocation6); + getObjects()->updateModel(kObject111, kObjectModel6); break; case kActionCallback: @@ -2850,9 +2850,9 @@ label_callback_18: label_callback_19: if (ENTITY_PARAM(0, 2)) { - timeCheckObject(kTime2025000, params->param7, kObject111, kObjectLocation7); - timeCheckObject(kTime2133000, params->param8, kObject111, kObjectLocation8); - timeCheckObject(kTime2173500, CURRENT_PARAM(1, 1), kObject111, kObjectLocation9); + timeCheckObject(kTime2025000, params->param7, kObject111, kObjectModel7); + timeCheckObject(kTime2133000, params->param8, kObject111, kObjectModel8); + timeCheckObject(kTime2173500, CURRENT_PARAM(1, 1), kObject111, kObjectModel9); } break; @@ -3498,7 +3498,7 @@ IMPLEMENT_FUNCTION(52, Coudert, chapter4) ENTITY_PARAM(2, 3) = 0; ENTITY_PARAM(2, 4) = 0; - getObjects()->updateLocation2(kObject111, kObjectLocation10); + getObjects()->updateModel(kObject111, kObjectModel10); break; case kActionCallback: @@ -3523,14 +3523,14 @@ IMPLEMENT_FUNCTION(53, Coudert, function53) params->param1 = 1; - getObjects()->updateLocation2(kObjectCompartmentA, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentB, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentC, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentD, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentE, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentF, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentG, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartmentH, kObjectLocation1); + getObjects()->updateModel(kObjectCompartmentA, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentB, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentC, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentD, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentE, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentF, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentG, kObjectModel1); + getObjects()->updateModel(kObjectCompartmentH, kObjectModel1); ENTITY_PARAM(2, 3) = 0; diff --git a/engines/lastexpress/entities/coudert.h b/engines/lastexpress/entities/coudert.h index 8303c80a32..a40f31e510 100644 --- a/engines/lastexpress/entities/coudert.h +++ b/engines/lastexpress/entities/coudert.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/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index dad5e67392..07e82d296e 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.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. @@ -943,10 +943,10 @@ void Entity::timeCheckSavepoint(TimeValue timeValue, uint ¶meter, EntityInde } } -void Entity::timeCheckObject(TimeValue timeValue, uint ¶meter, ObjectIndex object, ObjectLocation location) const { +void Entity::timeCheckObject(TimeValue timeValue, uint ¶meter, ObjectIndex object, ObjectModel model) const { if (getState()->time > timeValue && !parameter) { parameter = 1; - getObjects()->updateLocation2(object, location); + getObjects()->updateModel(object, model); } } diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index 5aa7c1be5a..25c481c5cf 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.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. @@ -818,9 +818,9 @@ public: /** * Synchronizes a string. * - * @param s The Common::Serializer to use. - * @param string The string. - * @param length Length of the string. + * @param s The Common::Serializer to use. + * @param string The string. + * @param length Length of the string. */ void syncString(Common::Serializer &s, Common::String &string, uint length) const; @@ -921,7 +921,7 @@ protected: /** * Play sound * - * @param savepoint The savepoint + * @param savepoint The savepoint * - Sound filename * @param resetItem true to reset item. * @param flag sound flag @@ -931,9 +931,9 @@ protected: /** * Draws the entity * - * @param savepoint The savepoint - * - Sequence - * - ExcuseMe flag + * @param savepoint The savepoint + * - Sequence + * - ExcuseMe flag * @param handleExcuseMe true to handle excuseMeCath action */ void draw(const SavePoint &savepoint, bool handleExcuseMe = false); @@ -941,7 +941,7 @@ protected: /** * Draws the entity along with another one * - * @param savepoint The savepoint. + * @param savepoint The savepoint. * - Sequence 1 * - Sequence 2 * - EntityIndex @@ -976,23 +976,23 @@ protected: /** * Process callback action when the entity direction is not kDirectionRight * - * @param savepoint The savepoint. + * @param savepoint The savepoint. */ void callbackActionOnDirection(const SavePoint &savepoint); /** * Process callback action when somebody is standing in the restaurant or salon. * - * @param savepoint The savepoint. + * @param savepoint The savepoint. */ void callbackActionRestaurantOrSalon(const SavePoint &savepoint); /** * Updates the entity * - * @param savepoint The savepoint. - * - CarIndex - * - EntityPosition + * @param savepoint The savepoint. + * - CarIndex + * - EntityPosition * @param handleExcuseMe true to handle the kActionExcuseMe/kActionExcuseMeCath actions. */ void updateEntity(const SavePoint &savepoint, bool handleExcuseMe = false); @@ -1000,11 +1000,11 @@ protected: /** * Call a specific savepoint (or draw sequence in default case) * - * @param savepoint The savepoint. - * - Sequence to draw in default case - * - EntityIndex - * - ActionIndex - * - Sequence for the savepoint + * @param savepoint The savepoint. + * - Sequence to draw in default case + * - EntityIndex + * - ActionIndex + * - Sequence for the savepoint * @param handleExcuseMe true to handle excuse me. */ void callSavepoint(const SavePoint &savepoint, bool handleExcuseMe = false); @@ -1012,36 +1012,36 @@ protected: /** * Handles entering/exiting a compartment. * - * @param savepoint The savepoint. - * @param position1 The first position. - * @param position2 The second position. - * @param car The car. - * @param compartment The compartment. - * @param alternate true to use the alternate version of SceneManager::loadSceneFromObject() + * @param savepoint The savepoint. + * @param position1 The first position. + * @param position2 The second position. + * @param car The car. + * @param compartment The compartment. + * @param alternate true to use the alternate version of SceneManager::loadSceneFromObject() */ void enterExitCompartment(const SavePoint &savepoint, EntityPosition position1 = kPositionNone, EntityPosition position2 = kPositionNone, CarIndex car = kCarNone, ObjectIndex compartment = kObjectNone, bool alternate = false, bool updateLocation = false); /** * Go to compartment. * - * @param savepoint The savepoint. - * @param compartmentFrom The compartment from. - * @param positionFrom The position from. - * @param sequenceFrom The sequence from. - * @param sequenceTo The sequence to. + * @param savepoint The savepoint. + * @param compartmentFrom The compartment from. + * @param positionFrom The position from. + * @param sequenceFrom The sequence from. + * @param sequenceTo The sequence to. */ void goToCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, Common::String sequenceTo); /** * Go to compartment from compartment. * - * @param savepoint The savepoint. - * @param compartmentFrom The compartment from. - * @param positionFrom The position from. - * @param sequenceFrom The sequence from. - * @param compartmentTo The compartment to. - * @param positionTo The position to. - * @param sequenceTo The sequence to. + * @param savepoint The savepoint. + * @param compartmentFrom The compartment from. + * @param positionFrom The position from. + * @param sequenceFrom The sequence from. + * @param compartmentTo The compartment to. + * @param positionTo The position to. + * @param sequenceTo The sequence to. */ void goToCompartmentFromCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, ObjectIndex compartmentTo, EntityPosition positionTo, Common::String sequenceTo); @@ -1095,7 +1095,7 @@ protected: bool timeCheckCallbackInventory(TimeValue timeValue, uint ¶meter, byte callback, Common::Functor0<void> *function); bool timeCheckCar(TimeValue timeValue, uint ¶meter, byte callback, Common::Functor0<void> *function); void timeCheckSavepoint(TimeValue timeValue, uint ¶meter, EntityIndex entity1, EntityIndex entity2, ActionIndex action) const; - void timeCheckObject(TimeValue timeValue, uint ¶meter, ObjectIndex index, ObjectLocation location) const; + void timeCheckObject(TimeValue timeValue, uint ¶meter, ObjectIndex index, ObjectModel model) const; bool timeCheckCallbackAction(TimeValue timeValue, uint ¶meter); bool timeCheckPlaySoundUpdatePosition(TimeValue timeValue, uint ¶meter, byte callback, const char* sound, EntityPosition position); diff --git a/engines/lastexpress/entities/entity39.cpp b/engines/lastexpress/entities/entity39.cpp index 1786cd2201..d1f20d6114 100644 --- a/engines/lastexpress/entities/entity39.cpp +++ b/engines/lastexpress/entities/entity39.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/lastexpress/entities/entity39.h b/engines/lastexpress/entities/entity39.h index 54b65408c7..b6abcc2cc8 100644 --- a/engines/lastexpress/entities/entity39.h +++ b/engines/lastexpress/entities/entity39.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/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index fd803676a9..2c2d132b07 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.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/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp index d2bbc9854c..8ef27cbe92 100644 --- a/engines/lastexpress/entities/francois.cpp +++ b/engines/lastexpress/entities/francois.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. @@ -44,22 +44,22 @@ Francois::Francois(LastExpressEngine *engine) : Entity(engine, kEntityFrancois) ADD_CALLBACK_FUNCTION(Francois, enterExitCompartment2); ADD_CALLBACK_FUNCTION(Francois, playSound); ADD_CALLBACK_FUNCTION(Francois, savegame); - ADD_CALLBACK_FUNCTION(Francois, updateEntity); - ADD_CALLBACK_FUNCTION(Francois, function9); - ADD_CALLBACK_FUNCTION(Francois, function10); - ADD_CALLBACK_FUNCTION(Francois, function11); - ADD_CALLBACK_FUNCTION(Francois, function12); - ADD_CALLBACK_FUNCTION(Francois, function13); - ADD_CALLBACK_FUNCTION(Francois, function14); - ADD_CALLBACK_FUNCTION(Francois, function15); - ADD_CALLBACK_FUNCTION(Francois, function16); + ADD_CALLBACK_FUNCTION(Francois, doWalk); + ADD_CALLBACK_FUNCTION(Francois, exitCompartment); + ADD_CALLBACK_FUNCTION(Francois, enterCompartment); + ADD_CALLBACK_FUNCTION(Francois, rampage); + ADD_CALLBACK_FUNCTION(Francois, takeWalk); + ADD_CALLBACK_FUNCTION(Francois, haremVisit); + ADD_CALLBACK_FUNCTION(Francois, chaseBeetle); + ADD_CALLBACK_FUNCTION(Francois, findCath); + ADD_CALLBACK_FUNCTION(Francois, letsGo); ADD_CALLBACK_FUNCTION(Francois, chapter1); ADD_CALLBACK_FUNCTION(Francois, chapter1Handler); - ADD_CALLBACK_FUNCTION(Francois, function19); + ADD_CALLBACK_FUNCTION(Francois, inCompartment); ADD_CALLBACK_FUNCTION(Francois, function20); ADD_CALLBACK_FUNCTION(Francois, chapter2); - ADD_CALLBACK_FUNCTION(Francois, chapter2Handler); - ADD_CALLBACK_FUNCTION(Francois, function23); + ADD_CALLBACK_FUNCTION(Francois, atBreakfast); + ADD_CALLBACK_FUNCTION(Francois, withMama); ADD_CALLBACK_FUNCTION(Francois, chapter3); ADD_CALLBACK_FUNCTION(Francois, chapter3Handler); ADD_CALLBACK_FUNCTION(Francois, chapter4); @@ -106,7 +106,7 @@ IMPLEMENT_FUNCTION_II(7, Francois, savegame, SavegameType, uint32) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition) +IMPLEMENT_FUNCTION_II(8, Francois, doWalk, CarIndex, EntityPosition) switch (savepoint.action) { default: break; @@ -196,13 +196,13 @@ IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(9, Francois, function9) +IMPLEMENT_FUNCTION(9, Francois, exitCompartment) switch (savepoint.action) { default: break; case kActionDefault: - if (getObjects()->get(kObjectCompartmentD).location == kObjectLocation2) { + if (getObjects()->get(kObjectCompartmentD).status == kObjectLocation2) { getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); getSavePoints()->push(kEntityFrancois, kEntityMmeBoutarel, kAction134289824); setCallback(1); @@ -232,13 +232,13 @@ IMPLEMENT_FUNCTION(9, Francois, function9) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(10, Francois, function10) +IMPLEMENT_FUNCTION(10, Francois, enterCompartment) switch (savepoint.action) { default: break; case kActionDefault: - if (getObjects()->get(kObjectCompartmentD).location == kObjectLocation2) { + if (getObjects()->get(kObjectCompartmentD).status == kObjectLocation2) { getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); setCallback(1); setup_enterExitCompartment2("605Bd", kObjectCompartmentD); @@ -270,7 +270,7 @@ IMPLEMENT_FUNCTION(10, Francois, function10) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue) +IMPLEMENT_FUNCTION_I(11, Francois, rampage, TimeValue) switch (savepoint.action) { default: break; @@ -375,7 +375,7 @@ label_callback: getSoundQueue()->processEntry(kEntityFrancois); setCallback(4); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); } break; @@ -400,7 +400,7 @@ label_callback: case kActionDefault: setCallback(1); - setup_function9(); + setup_exitCompartment(); break; case kActionCallback: @@ -437,7 +437,7 @@ label_callback: case 4: setCallback(5); - setup_function10(); + setup_enterCompartment(); break; case 5: @@ -477,14 +477,14 @@ label_callback: IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(12, Francois, function12) +IMPLEMENT_FUNCTION(12, Francois, takeWalk) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function9(); + setup_exitCompartment(); break; case kActionCallback: @@ -494,7 +494,7 @@ IMPLEMENT_FUNCTION(12, Francois, function12) case 1: setCallback(2); - setup_updateEntity(kCarRedSleeping, kPosition_9460); + setup_doWalk(kCarRedSleeping, kPosition_9460); break; case 2: @@ -504,7 +504,7 @@ IMPLEMENT_FUNCTION(12, Francois, function12) case 3: setCallback(4); - setup_updateEntity(kCarRedSleeping, kPosition_540); + setup_doWalk(kCarRedSleeping, kPosition_540); break; case 4: @@ -514,12 +514,12 @@ IMPLEMENT_FUNCTION(12, Francois, function12) case 5: setCallback(6); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); break; case 6: setCallback(7); - setup_function10(); + setup_enterCompartment(); break; case 7: @@ -531,14 +531,14 @@ IMPLEMENT_FUNCTION(12, Francois, function12) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(13, Francois, function13) +IMPLEMENT_FUNCTION(13, Francois, haremVisit) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function9(); + setup_exitCompartment(); break; case kActionCallback: @@ -548,12 +548,12 @@ IMPLEMENT_FUNCTION(13, Francois, function13) case 1: setCallback(2); - setup_updateEntity(kCarRedSleeping, kPosition_540); + setup_doWalk(kCarRedSleeping, kPosition_540); break; case 2: setCallback(3); - setup_updateEntity(kCarGreenSleeping, kPosition_4070); + setup_doWalk(kCarGreenSleeping, kPosition_4070); break; case 3: @@ -577,13 +577,13 @@ IMPLEMENT_FUNCTION(13, Francois, function13) getData()->location = kLocationOutsideCompartment; setCallback(7); - setup_updateEntity(kCarGreenSleeping, kPosition_4840); + setup_doWalk(kCarGreenSleeping, kPosition_4840); break; case 7: if (getInventory()->hasItem(kItemWhistle) || getInventory()->get(kItemWhistle)->location == kObjectLocation3) { setCallback(10); - setup_updateEntity(kCarGreenSleeping, kPosition_5790); + setup_doWalk(kCarGreenSleeping, kPosition_5790); break; } @@ -599,12 +599,12 @@ IMPLEMENT_FUNCTION(13, Francois, function13) getEntities()->exitCompartment(kEntityFrancois, kObjectCompartmentE, true); setCallback(10); - setup_updateEntity(kCarGreenSleeping, kPosition_5790); + setup_doWalk(kCarGreenSleeping, kPosition_5790); break; case 10: setCallback(11); - setup_function10(); + setup_enterCompartment(); break; case 11: @@ -621,7 +621,7 @@ IMPLEMENT_FUNCTION(13, Francois, function13) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) +IMPLEMENT_FUNCTION_IIS(14, Francois, chaseBeetle, ObjectIndex, EntityPosition) // Expose parameters as IISS and ignore the default exposed parameters EntityData::EntityParametersIISS *parameters = (EntityData::EntityParametersIISS*)_data->getCurrentParameters(); @@ -634,7 +634,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) strcat((char *)¶meters->seq2, (char *)¶meters->seq1); setCallback(1); - setup_function9(); + setup_exitCompartment(); break; case kActionCallback: @@ -644,7 +644,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) case 1: setCallback(2); - setup_updateEntity(kCarRedSleeping, (EntityPosition)parameters->param2); + setup_doWalk(kCarRedSleeping, (EntityPosition)parameters->param2); break; case 2: @@ -657,10 +657,10 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) } else { if (parameters->param2 >= kPosition_5790) { setCallback(10); - setup_updateEntity(kCarRedSleeping, kPosition_9460); + setup_doWalk(kCarRedSleeping, kPosition_9460); } else { setCallback(9); - setup_updateEntity(kCarRedSleeping, kPosition_540); + setup_doWalk(kCarRedSleeping, kPosition_540); } } break; @@ -688,7 +688,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) case 9: setCallback(10); - setup_updateEntity(kCarRedSleeping, kPosition_9460); + setup_doWalk(kCarRedSleeping, kPosition_9460); break; case 10: @@ -698,12 +698,12 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) case 11: setCallback(12); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); break; case 12: setCallback(13); - setup_function10(); + setup_enterCompartment(); break; case 13: @@ -715,14 +715,14 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(15, Francois, function15) +IMPLEMENT_FUNCTION(15, Francois, findCath) switch (savepoint.action) { default: break; case kActionDefault: setCallback(1); - setup_function9(); + setup_exitCompartment(); break; case kActionCallback: @@ -733,10 +733,10 @@ IMPLEMENT_FUNCTION(15, Francois, function15) case 1: if (getData()->entityPosition >= getEntityData(kEntityPlayer)->entityPosition) { setCallback(3); - setup_updateEntity(kCarRedSleeping, kPosition_540); + setup_doWalk(kCarRedSleeping, kPosition_540); } else { setCallback(2); - setup_updateEntity(kCarRedSleeping, kPosition_9460); + setup_doWalk(kCarRedSleeping, kPosition_9460); } break; @@ -748,12 +748,12 @@ IMPLEMENT_FUNCTION(15, Francois, function15) case 4: setCallback(5); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); break; case 5: setCallback(6); - setup_function10(); + setup_enterCompartment(); break; case 6: @@ -780,7 +780,7 @@ IMPLEMENT_FUNCTION(15, Francois, function15) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(16, Francois, function16) +IMPLEMENT_FUNCTION(16, Francois, letsGo) switch (savepoint.action) { default: break; @@ -809,7 +809,7 @@ IMPLEMENT_FUNCTION(16, Francois, function16) getSavePoints()->push(kEntityFrancois, kEntityMmeBoutarel, kAction101107728); setCallback(2); - setup_updateEntity(kCarRestaurant, kPosition_850); + setup_doWalk(kCarRestaurant, kPosition_850); break; case 2: @@ -836,7 +836,7 @@ IMPLEMENT_FUNCTION(16, Francois, function16) case kAction100901266: setCallback(3); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); break; } IMPLEMENT_FUNCTION_END @@ -871,24 +871,24 @@ IMPLEMENT_FUNCTION(18, Francois, chapter1Handler) case kActionCallback: if (getCallback() == 1) - setup_function19(); + setup_inCompartment(); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(19, Francois, function19) +IMPLEMENT_FUNCTION(19, Francois, inCompartment) switch (savepoint.action) { default: break; case kActionNone: - Entity::timeCheckCallback(kTime1161000, params->param1, 2, WRAP_SETUP_FUNCTION(Francois, setup_function12)); + Entity::timeCheckCallback(kTime1161000, params->param1, 2, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk)); break; case kAction101107728: setCallback(1); - setup_function16(); + setup_letsGo(); break; } IMPLEMENT_FUNCTION_END @@ -911,7 +911,7 @@ IMPLEMENT_FUNCTION(21, Francois, chapter2) break; case kActionNone: - setup_chapter2Handler(); + setup_atBreakfast(); break; case kActionDefault: @@ -927,7 +927,7 @@ IMPLEMENT_FUNCTION(21, Francois, chapter2) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(22, Francois, chapter2Handler) +IMPLEMENT_FUNCTION(22, Francois, atBreakfast) switch (savepoint.action) { default: break; @@ -948,20 +948,20 @@ IMPLEMENT_FUNCTION(22, Francois, chapter2Handler) getData()->entityPosition = kPosition_5790; getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityFrancois); - setup_function23(); + setup_withMama(); break; } break; case kAction100901266: setCallback(1); - setup_updateEntity(kCarRedSleeping, kPosition_5790); + setup_doWalk(kCarRedSleeping, kPosition_5790); break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(23, Francois, function23) +IMPLEMENT_FUNCTION(23, Francois, withMama) switch (savepoint.action) { default: break; @@ -973,7 +973,7 @@ IMPLEMENT_FUNCTION(23, Francois, function23) if (ENTITY_PARAM(0, 1) && getEntities()->isPlayerInCar(kCarRedSleeping)) { setCallback(1); - setup_function15(); + setup_findCath(); break; } @@ -982,7 +982,7 @@ label_callback_1: break; label_callback_2: - if (Entity::timeCheckCallback(kTime1800000, params->param2, 3, WRAP_SETUP_FUNCTION(Francois, setup_function13))) + if (Entity::timeCheckCallback(kTime1800000, params->param2, 3, WRAP_SETUP_FUNCTION(Francois, setup_haremVisit))) break; label_callback_3: @@ -1085,36 +1085,36 @@ IMPLEMENT_FUNCTION(25, Francois, chapter3Handler) if (ENTITY_PARAM(0, 1) && getEntities()->isPlayerInCar(kCarRedSleeping)) { setCallback(2); - setup_function15(); + setup_findCath(); break; } label_callback_2: - if (Entity::timeCheckCallback(kTime2025000, params->param3, 3, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2025000, params->param3, 3, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_3: - if (Entity::timeCheckCallback(kTime2052000, params->param4, 4, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2052000, params->param4, 4, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_4: - if (Entity::timeCheckCallback(kTime2079000, params->param5, 5, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2079000, params->param5, 5, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_5: - if (Entity::timeCheckCallback(kTime2092500, params->param6, 6, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2092500, params->param6, 6, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_6: - if (Entity::timeCheckCallback(kTime2173500, params->param7, 7, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2173500, params->param7, 7, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_7: - if (Entity::timeCheckCallback(kTime2182500, params->param8, 8, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2182500, params->param8, 8, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_8: - if (Entity::timeCheckCallback(kTime2241000, CURRENT_PARAM(1, 1), 9, WRAP_SETUP_FUNCTION(Francois, setup_function12))) + if (Entity::timeCheckCallback(kTime2241000, CURRENT_PARAM(1, 1), 9, WRAP_SETUP_FUNCTION(Francois, setup_takeWalk))) break; label_callback_9: @@ -1208,7 +1208,7 @@ label_callback_14: case kAction101107728: setCallback(1); - setup_function16(); + setup_letsGo(); break; case kAction189872836: @@ -1246,7 +1246,7 @@ IMPLEMENT_FUNCTION_END IMPLEMENT_FUNCTION(27, Francois, chapter4Handler) if (savepoint.action == kAction101107728) { setCallback(1); - setup_function16(); + setup_letsGo(); } IMPLEMENT_FUNCTION_END @@ -1314,7 +1314,7 @@ bool Francois::timeCheckCallbackCompartment(TimeValue timeValue, uint ¶meter if (getState()->time > timeValue && !parameter) { parameter = 1; setCallback(callback); - setup_function14(compartment, position, sequenceSuffix); + setup_chaseBeetle(compartment, position, sequenceSuffix); return true; } @@ -1326,7 +1326,7 @@ bool Francois::timeCheckCallback(TimeValue timeValue, uint ¶meter, byte call if (getState()->time > timeValue && !parameter) { parameter = 1; setCallback(callback); - setup_function11(timeValue2); + setup_rampage(timeValue2); return true; } diff --git a/engines/lastexpress/entities/francois.h b/engines/lastexpress/entities/francois.h index 51270fa4b6..a2ecee3e60 100644 --- a/engines/lastexpress/entities/francois.h +++ b/engines/lastexpress/entities/francois.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. @@ -85,21 +85,21 @@ public: DECLARE_FUNCTION_2(savegame, SavegameType savegameType, uint32 param) /** - * Updates the entity + * Walk * * @param car The car * @param entityPosition The entity position */ - DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition) + DECLARE_FUNCTION_2(doWalk, CarIndex car, EntityPosition entityPosition) - DECLARE_FUNCTION(function9) - DECLARE_FUNCTION(function10) - DECLARE_FUNCTION_1(function11, TimeValue timeValue) - DECLARE_FUNCTION(function12) - DECLARE_FUNCTION(function13) - DECLARE_FUNCTION_3(function14, ObjectIndex compartment, EntityPosition entityPosition, const char *str) - DECLARE_FUNCTION(function15) - DECLARE_FUNCTION(function16) + DECLARE_FUNCTION(exitCompartment) + DECLARE_FUNCTION(enterCompartment) + DECLARE_FUNCTION_1(rampage, TimeValue timeValue) + DECLARE_FUNCTION(takeWalk) + DECLARE_FUNCTION(haremVisit) + DECLARE_FUNCTION_3(chaseBeetle, ObjectIndex compartment, EntityPosition entityPosition, const char *str) + DECLARE_FUNCTION(findCath) + DECLARE_FUNCTION(letsGo) /** * Setup Chapter 1 @@ -110,8 +110,7 @@ public: * Handle Chapter 1 events */ DECLARE_FUNCTION(chapter1Handler) - - DECLARE_FUNCTION(function19) + DECLARE_FUNCTION(inCompartment) DECLARE_FUNCTION(function20) /** @@ -122,9 +121,8 @@ public: /** * Handle Chapter 2 events */ - DECLARE_FUNCTION(chapter2Handler) - - DECLARE_FUNCTION(function23) + DECLARE_FUNCTION(atBreakfast) + DECLARE_FUNCTION(withMama) /** * Setup Chapter 3 @@ -155,7 +153,6 @@ public: * Handle Chapter 5 events */ DECLARE_FUNCTION(chapter5Handler) - DECLARE_FUNCTION(function30) DECLARE_NULL_FUNCTION() diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp index a912fa4ecb..7b31c592cd 100644 --- a/engines/lastexpress/entities/gendarmes.cpp +++ b/engines/lastexpress/entities/gendarmes.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. @@ -250,7 +250,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje if (!params->param5) params->param5 = getState()->timeTicks + 75; - if (!getEntities()->isOutsideAlexeiWindow() && getObjects()->get((ObjectIndex)params->param3).location != kObjectLocation1) { + if (!getEntities()->isOutsideAlexeiWindow() && getObjects()->get((ObjectIndex)params->param3).status != kObjectLocation1) { setCallback(2); setup_savegame(kSavegameTypeEvent, kEventGendarmesArrestation); break; @@ -284,7 +284,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje break; case kActionKnock: - getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).location, kCursorNormal, kCursorNormal); + getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).status, kCursorNormal, kCursorNormal); setCallback(5); setup_arrestPlaysound16("POL1046B"); @@ -296,7 +296,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje break; case kActionDefault: - getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).location, kCursorNormal, kCursorNormal); + getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).status, kCursorNormal, kCursorNormal); setCallback(1); setup_arrestPlaysound16("POL1046"); @@ -308,7 +308,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje break; case 1: - getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).location, kCursorTalk, kCursorNormal); + getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).status, kCursorTalk, kCursorNormal); break; case 2: @@ -334,7 +334,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje break; case 5: - getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).location, kCursorNormal, kCursorHand); + getObjects()->update((ObjectIndex)params->param3, kEntityGendarmes, getObjects()->get((ObjectIndex)params->param3).status, kCursorNormal, kCursorHand); break; case 6: diff --git a/engines/lastexpress/entities/gendarmes.h b/engines/lastexpress/entities/gendarmes.h index a761643531..8475c50799 100644 --- a/engines/lastexpress/entities/gendarmes.h +++ b/engines/lastexpress/entities/gendarmes.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/lastexpress/entities/hadija.cpp b/engines/lastexpress/entities/hadija.cpp index e9abcd888a..14d5b714ca 100644 --- a/engines/lastexpress/entities/hadija.cpp +++ b/engines/lastexpress/entities/hadija.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/lastexpress/entities/hadija.h b/engines/lastexpress/entities/hadija.h index 545f21ee03..8e92dc6891 100644 --- a/engines/lastexpress/entities/hadija.h +++ b/engines/lastexpress/entities/hadija.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/lastexpress/entities/ivo.cpp b/engines/lastexpress/entities/ivo.cpp index c53f4689fb..b7697d0c52 100644 --- a/engines/lastexpress/entities/ivo.cpp +++ b/engines/lastexpress/entities/ivo.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/lastexpress/entities/ivo.h b/engines/lastexpress/entities/ivo.h index 75814336e0..a23d06cd3f 100644 --- a/engines/lastexpress/entities/ivo.h +++ b/engines/lastexpress/entities/ivo.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/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp index 467c8d8b3c..b7af87751f 100644 --- a/engines/lastexpress/entities/kahina.cpp +++ b/engines/lastexpress/entities/kahina.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. @@ -503,16 +503,16 @@ IMPLEMENT_FUNCTION(15, Kahina, function15) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityKahina); - getObjects()->update(kObjectCompartmentC, kEntityPlayer, getObjects()->get(kObjectCompartmentC).location, kCursorNormal, kCursorNormal); - getObjects()->update(kObject50, kEntityPlayer, getObjects()->get(kObject50).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartmentC, kEntityPlayer, getObjects()->get(kObjectCompartmentC).status, kCursorNormal, kCursorNormal); + getObjects()->update(kObject50, kEntityPlayer, getObjects()->get(kObject50).status, kCursorNormal, kCursorNormal); setCallback(13); setup_updateFromTime(900); break; case 13: - getObjects()->update(kObjectCompartmentC, kEntityPlayer, getObjects()->get(kObjectCompartmentC).location, kCursorHandKnock, kCursorHand); - getObjects()->update(kObject50, kEntityPlayer, getObjects()->get(kObject50).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartmentC, kEntityPlayer, getObjects()->get(kObjectCompartmentC).status, kCursorHandKnock, kCursorHand); + getObjects()->update(kObject50, kEntityPlayer, getObjects()->get(kObject50).status, kCursorHandKnock, kCursorHand); setCallback(14); setup_enterExitCompartment("616Bc", kObjectCompartmentC); @@ -1088,16 +1088,16 @@ IMPLEMENT_FUNCTION(23, Kahina, function23) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityKahina); - getObjects()->update(kObjectCompartmentF, kEntityPlayer, getObjects()->get(kObjectCompartmentF).location, kCursorNormal, kCursorNormal); - getObjects()->update(kObject53, kEntityPlayer, getObjects()->get(kObject53).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartmentF, kEntityPlayer, getObjects()->get(kObjectCompartmentF).status, kCursorNormal, kCursorNormal); + getObjects()->update(kObject53, kEntityPlayer, getObjects()->get(kObject53).status, kCursorNormal, kCursorNormal); setCallback(3); setup_updateFromTime(900); break; case 3: - getObjects()->update(kObjectCompartmentF, kEntityPlayer, getObjects()->get(kObjectCompartmentF).location, kCursorHandKnock, kCursorHand); - getObjects()->update(kObject53, kEntityPlayer, getObjects()->get(kObject53).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartmentF, kEntityPlayer, getObjects()->get(kObjectCompartmentF).status, kCursorHandKnock, kCursorHand); + getObjects()->update(kObject53, kEntityPlayer, getObjects()->get(kObject53).status, kCursorHandKnock, kCursorHand); setCallback(4); setup_enterExitCompartment("616Df", kObjectCompartmentF); @@ -1436,16 +1436,16 @@ IMPLEMENT_FUNCTION(26, Kahina, function26) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityKahina); - getObjects()->update(kObjectCompartmentA, kEntityPlayer, getObjects()->get(kObjectCompartmentA).location, kCursorNormal, kCursorNormal); - getObjects()->update(kObject48, kEntityPlayer, getObjects()->get(kObject48).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartmentA, kEntityPlayer, getObjects()->get(kObjectCompartmentA).status, kCursorNormal, kCursorNormal); + getObjects()->update(kObject48, kEntityPlayer, getObjects()->get(kObject48).status, kCursorNormal, kCursorNormal); setCallback(7); setup_updateFromTime(900); break; case 7: - getObjects()->update(kObjectCompartmentA, kEntityPlayer, getObjects()->get(kObjectCompartmentA).location, kCursorHandKnock, kCursorHand); - getObjects()->update(kObject48, kEntityPlayer, getObjects()->get(kObject48).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartmentA, kEntityPlayer, getObjects()->get(kObjectCompartmentA).status, kCursorHandKnock, kCursorHand); + getObjects()->update(kObject48, kEntityPlayer, getObjects()->get(kObject48).status, kCursorHandKnock, kCursorHand); if (getInventory()->get(kItemFirebird)->location == kObjectLocation1 || getInventory()->get(kItemFirebird)->location == kObjectLocation2) { getScenes()->loadSceneFromItemPosition(kItemFirebird); diff --git a/engines/lastexpress/entities/kahina.h b/engines/lastexpress/entities/kahina.h index 7479cf76f9..ee9ccf5c81 100644 --- a/engines/lastexpress/entities/kahina.h +++ b/engines/lastexpress/entities/kahina.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/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 26ce3ca424..8bf158943b 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.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. @@ -399,7 +399,7 @@ IMPLEMENT_FUNCTION(18, Kronos, function18) case kActionNone: if (getState()->time > kTime2079000 && !params->param2) { - getObjects()->updateLocation2(kObjectCompartmentKronos, kObjectLocation3); + getObjects()->updateModel(kObjectCompartmentKronos, kObjectModel3); getObjects()->update(kObjectCompartmentKronos, kEntityPlayer, kObjectLocation3, kCursorHandKnock, kCursorHand); params->param1 = 1; params->param2 = 1; @@ -462,7 +462,7 @@ IMPLEMENT_FUNCTION(19, Kronos, function19) RESET_ENTITY_STATE(kEntityRebecca, Rebecca, setup_function39); RESET_ENTITY_STATE(kEntitySophie, Sophie, setup_chaptersHandler); RESET_ENTITY_STATE(kEntityAugust, August, setup_function50); - RESET_ENTITY_STATE(kEntityAnna, Anna, setup_function56); + RESET_ENTITY_STATE(kEntityAnna, Anna, setup_concert); RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_function35); setup_function20(); diff --git a/engines/lastexpress/entities/kronos.h b/engines/lastexpress/entities/kronos.h index a7693fcd46..48da419a6e 100644 --- a/engines/lastexpress/entities/kronos.h +++ b/engines/lastexpress/entities/kronos.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/lastexpress/entities/mahmud.cpp b/engines/lastexpress/entities/mahmud.cpp index af86ef8cdd..08edda5276 100644 --- a/engines/lastexpress/entities/mahmud.cpp +++ b/engines/lastexpress/entities/mahmud.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/lastexpress/entities/mahmud.h b/engines/lastexpress/entities/mahmud.h index 685100f078..229e6d49d3 100644 --- a/engines/lastexpress/entities/mahmud.h +++ b/engines/lastexpress/entities/mahmud.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/lastexpress/entities/max.cpp b/engines/lastexpress/entities/max.cpp index abd2aae9e4..1056e7fd7a 100644 --- a/engines/lastexpress/entities/max.cpp +++ b/engines/lastexpress/entities/max.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/lastexpress/entities/max.h b/engines/lastexpress/entities/max.h index acd8235e89..7b7780742b 100644 --- a/engines/lastexpress/entities/max.h +++ b/engines/lastexpress/entities/max.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/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index 97dd293793..4bd276b7eb 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.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. @@ -1067,7 +1067,7 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) break; // Update objects - getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1); + getObjects()->updateModel((ObjectIndex)params->param1, kObjectModel1); if (params->param5 != kObjectLocation2) getObjects()->update((ObjectIndex)params->param1, (EntityIndex)params->param4, (ObjectLocation)params->param5, (CursorStyle)params->param6, (CursorStyle)params->param7); @@ -1090,15 +1090,15 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) case kActionDefault: params->param3 = 1; params->param4 = getObjects()->get((ObjectIndex)params->param1).entity; - params->param5 = getObjects()->get((ObjectIndex)params->param1).location; - params->param6 = getObjects()->get((ObjectIndex)params->param1).cursor; - params->param7 = getObjects()->get((ObjectIndex)params->param1).cursor2; + params->param5 = getObjects()->get((ObjectIndex)params->param1).status; + params->param6 = getObjects()->get((ObjectIndex)params->param1).windowCursor; + params->param7 = getObjects()->get((ObjectIndex)params->param1).handleCursor; if (params->param2) { - params->param8 = getObjects()->get((ObjectIndex)params->param2).entity; - CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).location; - CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).cursor; - CURRENT_PARAM(1, 3) = getObjects()->get((ObjectIndex)params->param2).cursor2; + params->param8 = getObjects()->get((ObjectIndex)params->param2).entity; + CURRENT_PARAM(1, 1) = getObjects()->get((ObjectIndex)params->param2).status; + CURRENT_PARAM(1, 2) = getObjects()->get((ObjectIndex)params->param2).windowCursor; + CURRENT_PARAM(1, 3) = getObjects()->get((ObjectIndex)params->param2).handleCursor; getObjects()->update((ObjectIndex)params->param2, kEntityMertens, kObjectLocation1, kCursorHandKnock, kCursorHand); } @@ -1506,7 +1506,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMertens); - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); setCallback(3); setup_playSound16("ZNU1001"); @@ -1522,14 +1522,14 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool) break; case 1: - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); setCallback(2); setup_playSound16("CON1062"); break; case 2: - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; @@ -1617,7 +1617,7 @@ IMPLEMENT_FUNCTION_I(27, Mertens, tylerCompartment, MertensActionType) } if (Entity::updateParameter(params->param2, getState()->timeTicks, 150)) { - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); setCallback(10); setup_playSound16("CON1018A"); @@ -1683,7 +1683,7 @@ label_callback11: } else { params->param3 = kTimeInvalid; - if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) { + if (getObjects()->get(kObjectCompartment1).status == kObjectLocation1) { getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal); setCallback(11); @@ -1742,11 +1742,11 @@ label_callback11: case kActionKnock: if (params->param1) { - getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); switch (params->param1) { default: - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; @@ -1774,7 +1774,7 @@ label_callback11: break; case kActionOpenDoor: - getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).location == kObjectLocation1 ? "LIB012" : "LIB014"); + getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).status == kObjectLocation1 ? "LIB012" : "LIB014"); if (getProgress().eventCorpseMovedFromFloor) { @@ -1828,7 +1828,7 @@ label_callback11: if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_8200) || getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_7850) || getEntities()->isOutsideAlexeiWindow()) { - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); if (getEntities()->isOutsideAlexeiWindow()) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); @@ -1920,15 +1920,15 @@ label_callback11: case 8: case 9: - getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).location, kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).status, kCursorTalk, kCursorHand); break; case 10: - getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).location, kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).status, kCursorTalk, kCursorHand); goto label_callback10; case 11: - getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).location, kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMertens, getObjects()->get(kObjectCompartment1).status, kCursorTalk, kCursorHand); goto label_callback11; case 13: @@ -1971,20 +1971,20 @@ label_callback11: case 23: getProgress().eventMertensAugustWaiting = true; - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; case 24: getProgress().eventMertensKronosInvitation = true; - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; case 25: - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; @@ -2182,7 +2182,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) case 2: if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_7500)) { - getObjects()->update(kObjectCompartment2, kEntityPlayer, getObjects()->get(kObjectCompartment2).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment2, kEntityPlayer, getObjects()->get(kObjectCompartment2).status, kCursorNormal, kCursorNormal); params->param3 = 1; } @@ -2192,7 +2192,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) case 3: if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_6470)) { - getObjects()->update(kObjectCompartment3, kEntityPlayer, getObjects()->get(kObjectCompartment3).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment3, kEntityPlayer, getObjects()->get(kObjectCompartment3).status, kCursorNormal, kCursorNormal); params->param3 = 1; } @@ -2220,7 +2220,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) case 5: if (params->param3) - getObjects()->update(kObjectCompartment2, kEntityPlayer, getObjects()->get(kObjectCompartment2).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment2, kEntityPlayer, getObjects()->get(kObjectCompartment2).status, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityMertens, kObjectCompartment2); @@ -2241,7 +2241,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) case 7: if (params->param3) - getObjects()->update(kObjectCompartment3, kEntityPlayer, getObjects()->get(kObjectCompartment3).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment3, kEntityPlayer, getObjects()->get(kObjectCompartment3).status, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityMertens, kObjectCompartment3); @@ -3688,9 +3688,9 @@ IMPLEMENT_FUNCTION(48, Mertens, function48) if (ENTITY_PARAM(2, 3)) { params->param1 = 1; - getObjects()->updateLocation2(kObjectCompartment2, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartment3, kObjectLocation1); - getObjects()->updateLocation2(kObjectCompartment4, kObjectLocation1); + getObjects()->updateModel(kObjectCompartment2, kObjectModel1); + getObjects()->updateModel(kObjectCompartment3, kObjectModel1); + getObjects()->updateModel(kObjectCompartment4, kObjectModel1); ENTITY_PARAM(1, 4) = 0; ENTITY_PARAM(1, 5) = 0; diff --git a/engines/lastexpress/entities/mertens.h b/engines/lastexpress/entities/mertens.h index 4cc58fd4ba..1b6d1d2f31 100644 --- a/engines/lastexpress/entities/mertens.h +++ b/engines/lastexpress/entities/mertens.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/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp index 519a613497..601187b672 100644 --- a/engines/lastexpress/entities/milos.cpp +++ b/engines/lastexpress/entities/milos.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. @@ -433,16 +433,16 @@ IMPLEMENT_FUNCTION(14, Milos, function14) if (CURRENT_PARAM(1, 1) < getState()->timeTicks) { - if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) { + if (getObjects()->get(kObjectCompartment1).status == kObjectLocation1) { if (!Entity::updateParameter(CURRENT_PARAM(1, 2), getState()->timeTicks, 75)) break; - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); ++params->param5; switch (params->param5) { default: - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); CURRENT_PARAM(1, 2) = 0; break; @@ -466,19 +466,19 @@ IMPLEMENT_FUNCTION(14, Milos, function14) if (params->param7 < 3) { params->param5 = 1; - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); CURRENT_PARAM(1, 2) = 0; break; } - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); callbackAction(); break; } } else { if (getProgress().eventCorpseMovedFromFloor && getProgress().jacket != kJacketBlood) { - params->param6 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? kEventMilosTylerCompartmentBedVisit : kEventMilosTylerCompartmentVisit; + params->param6 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMilosTylerCompartmentBedVisit : kEventMilosTylerCompartmentVisit; setCallback(3); setup_savegame(kSavegameTypeEvent, kEventMilosTylerCompartmentVisit); @@ -538,7 +538,7 @@ label_callback_12: setCallback(20); setup_playSound("LIB012"); } else if (!params->param3) { - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); setCallback(22); setup_playSound16("MIL1032"); @@ -549,9 +549,9 @@ label_callback_12: if (getProgress().eventCorpseMovedFromFloor && getProgress().jacket != kJacketBlood) { if (params->param2) { getEntityData(kEntityPlayer)->location = kLocationInsideCompartment; - params->param6 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? kEventMilosTylerCompartmentBed : kEventMilosTylerCompartment; + params->param6 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMilosTylerCompartmentBed : kEventMilosTylerCompartment; } else { - params->param6 = (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) ? kEventMilosTylerCompartmentBedVisit : kEventMilosTylerCompartmentVisit; + params->param6 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMilosTylerCompartmentBedVisit : kEventMilosTylerCompartmentVisit; } setCallback(17); @@ -568,14 +568,14 @@ label_callback_12: if (getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_8200) || getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_7850) || getEntities()->isOutsideAlexeiWindow()) { - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorNormal); if (getEntities()->isOutsideAlexeiWindow()) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); getSound()->playSound(kEntityPlayer, "LIB012"); - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorTalk, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, kCursorTalk, kCursorHand); params->param1 = 1; } else { @@ -644,7 +644,7 @@ label_callback_12: case 7: case 9: case 11: - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, params->param3 < 1 ? kCursorTalk : kCursorNormal, kCursorHand); CURRENT_PARAM(1, 2) = 0; break; @@ -682,13 +682,13 @@ label_callback_12: break; case 16: - getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).location == kObjectLocation1 ? "LIB032" : "LIB014"); + getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).status == kObjectLocation1 ? "LIB032" : "LIB014"); getAction()->playAnimation(kEventMilosCorpseFloor); getLogic()->gameOver(kSavegameTypeIndex, 1, getProgress().eventCorpseMovedFromFloor ? kSceneGameOverBloodJacket : kSceneGameOverPolice1, true); break; case 17: - getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).location == kObjectLocation1 ? "LIB032" : "LIB014"); + getSound()->playSound(kEntityPlayer, getObjects()->get(kObjectCompartment1).status == kObjectLocation1 ? "LIB032" : "LIB014"); getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectOutsideTylerCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); getAction()->playAnimation((EventIndex)params->param6); @@ -708,7 +708,7 @@ label_callback_12: case 22: params->param3 = 1; - getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorHand); break; } break; diff --git a/engines/lastexpress/entities/milos.h b/engines/lastexpress/entities/milos.h index e8f95dc5ff..b7b716c4e7 100644 --- a/engines/lastexpress/entities/milos.h +++ b/engines/lastexpress/entities/milos.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/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index 950644cb8f..f00fb7a9cb 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.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/lastexpress/entities/mmeboutarel.h b/engines/lastexpress/entities/mmeboutarel.h index 0f6e6349fe..11d74b00f9 100644 --- a/engines/lastexpress/entities/mmeboutarel.h +++ b/engines/lastexpress/entities/mmeboutarel.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/lastexpress/entities/pascale.cpp b/engines/lastexpress/entities/pascale.cpp index 6e9f992390..b6356a0acb 100644 --- a/engines/lastexpress/entities/pascale.cpp +++ b/engines/lastexpress/entities/pascale.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/lastexpress/entities/pascale.h b/engines/lastexpress/entities/pascale.h index eaf0f3ba0c..1b7777dec9 100644 --- a/engines/lastexpress/entities/pascale.h +++ b/engines/lastexpress/entities/pascale.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/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp index 5bcb6aef85..05211663bd 100644 --- a/engines/lastexpress/entities/rebecca.cpp +++ b/engines/lastexpress/entities/rebecca.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. @@ -665,7 +665,7 @@ IMPLEMENT_FUNCTION(21, Rebecca, chapter1) getObjects()->update(kObject52, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectOutsideBetweenCompartments, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); - getObjects()->updateLocation2(kObject110, kObjectLocation1); + getObjects()->updateModel(kObject110, kObjectModel1); getData()->entityPosition = kPosition_2830; getData()->location = kLocationInsideCompartment; @@ -1051,7 +1051,7 @@ IMPLEMENT_FUNCTION(28, Rebecca, chapter2) getObjects()->update(kObjectCompartmentE, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); getObjects()->update(kObject52, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); - getObjects()->updateLocation2(kObject110, kObjectLocation2); + getObjects()->updateModel(kObject110, kObjectModel2); ENTITY_PARAM(0, 2) = 1; break; @@ -1574,7 +1574,7 @@ IMPLEMENT_FUNCTION(42, Rebecca, chapter4) getData()->clothes = kClothesDefault; getData()->inventoryItem = kItemNone; - getObjects()->updateLocation2(kObject110, kObjectLocation3); + getObjects()->updateModel(kObject110, kObjectModel3); ENTITY_PARAM(0, 1) = 0; ENTITY_PARAM(0, 2) = 1; @@ -1750,7 +1750,7 @@ IMPLEMENT_FUNCTION(46, Rebecca, chapter5) getData()->car = kCarRestaurant; getData()->inventoryItem = kItemNone; - getObjects()->updateLocation2(kObject110, kObjectLocation4); + getObjects()->updateModel(kObject110, kObjectModel4); break; } IMPLEMENT_FUNCTION_END diff --git a/engines/lastexpress/entities/rebecca.h b/engines/lastexpress/entities/rebecca.h index 885632f884..88a14e65d2 100644 --- a/engines/lastexpress/entities/rebecca.h +++ b/engines/lastexpress/entities/rebecca.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/lastexpress/entities/salko.cpp b/engines/lastexpress/entities/salko.cpp index e8b4b4247b..26f512b900 100644 --- a/engines/lastexpress/entities/salko.cpp +++ b/engines/lastexpress/entities/salko.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/lastexpress/entities/salko.h b/engines/lastexpress/entities/salko.h index 6ca73e39f6..0b672b9dba 100644 --- a/engines/lastexpress/entities/salko.h +++ b/engines/lastexpress/entities/salko.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/lastexpress/entities/servers0.cpp b/engines/lastexpress/entities/servers0.cpp index 73e0d34722..590efa7157 100644 --- a/engines/lastexpress/entities/servers0.cpp +++ b/engines/lastexpress/entities/servers0.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. @@ -115,7 +115,7 @@ IMPLEMENT_FUNCTION_NOSETUP(5, Servers0, callbackActionOnDirection) case kActionExitCompartment: callbackAction(); - break; + break; case kActionExcuseMeCath: if (!params->param1) { @@ -445,7 +445,7 @@ IMPLEMENT_FUNCTION(24, Servers0, chapter2Handler) HANDLE_TABLE(1, 3, 1, setup_function25); HANDLE_TABLE(1, 4, 2, setup_function26); - break; + break; case kActionCallback: if (getCallback() == 1) diff --git a/engines/lastexpress/entities/servers0.h b/engines/lastexpress/entities/servers0.h index 4c35637d65..70f06596b0 100644 --- a/engines/lastexpress/entities/servers0.h +++ b/engines/lastexpress/entities/servers0.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/lastexpress/entities/servers1.cpp b/engines/lastexpress/entities/servers1.cpp index a8f4c0233c..153c2b66da 100644 --- a/engines/lastexpress/entities/servers1.cpp +++ b/engines/lastexpress/entities/servers1.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/lastexpress/entities/servers1.h b/engines/lastexpress/entities/servers1.h index c8f667ec5c..58566cd4d3 100644 --- a/engines/lastexpress/entities/servers1.h +++ b/engines/lastexpress/entities/servers1.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/lastexpress/entities/sophie.cpp b/engines/lastexpress/entities/sophie.cpp index 170090005f..ac4732556d 100644 --- a/engines/lastexpress/entities/sophie.cpp +++ b/engines/lastexpress/entities/sophie.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/lastexpress/entities/sophie.h b/engines/lastexpress/entities/sophie.h index 188788bb9b..5589caf0f3 100644 --- a/engines/lastexpress/entities/sophie.h +++ b/engines/lastexpress/entities/sophie.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/lastexpress/entities/tables.cpp b/engines/lastexpress/entities/tables.cpp index 4f8d2b954d..8701c012e4 100644 --- a/engines/lastexpress/entities/tables.cpp +++ b/engines/lastexpress/entities/tables.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/lastexpress/entities/tables.h b/engines/lastexpress/entities/tables.h index c213aac978..2e93eb7ca5 100644 --- a/engines/lastexpress/entities/tables.h +++ b/engines/lastexpress/entities/tables.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/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index 432def6253..c6788fd4b2 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.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. @@ -835,7 +835,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27) break; case 1: - RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function30); + RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_atBreakfast); getAction()->playAnimation(kEventTatianaBreakfastAlexei); getInventory()->addItem(kItemParchemin); getInventory()->setLocationAndProcess(kItem11, kObjectLocation1); @@ -843,7 +843,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27) break; case 2: - RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function30); + RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_atBreakfast); getAction()->playAnimation(kEventTatianaBreakfast); if (getInventory()->hasItem(kItemParchemin)) { getAction()->playAnimation(kEventTatianaBreakfastGivePoem); @@ -1917,7 +1917,7 @@ IMPLEMENT_FUNCTION(47, Tatiana, function47) case 3: case 4: - if (ENTITY_PARAM(0, 1) && getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) { + if (ENTITY_PARAM(0, 1) && getObjects()->get(kObjectCompartment1).model == kObjectModel1) { setup_function48(); } else { setCallback(4); @@ -1940,7 +1940,7 @@ IMPLEMENT_FUNCTION(48, Tatiana, function48) if (!getEvent(kEventTatianaTylerCompartment) && getEntities()->isInsideCompartment(kEntityPlayer, kCarGreenSleeping, kPosition_8200)) { params->param1 = 1; getProgress().field_E4 = 1; - getObjects()->update(kObjectCompartment1, kEntityTatiana, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityTatiana, getObjects()->get(kObjectCompartment1).status, kCursorNormal, kCursorHand); } if (!params->param1) @@ -1948,7 +1948,7 @@ IMPLEMENT_FUNCTION(48, Tatiana, function48) } if (!getEntities()->checkFields19(kEntityPlayer, kCarGreenSleeping, kPosition_7850)) { - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); params->param1 = 0; } @@ -1964,7 +1964,7 @@ IMPLEMENT_FUNCTION(48, Tatiana, function48) label_end: if (getEvent(kEventTatianaTylerCompartment) || getState()->time > kTime2475000) { if (params->param1) - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); getProgress().field_E4 = 0; getEntities()->exitCompartment(kEntityTatiana, kObjectCompartment2, true); @@ -2040,7 +2040,7 @@ label_end: case kAction238790488: params->param1 = 0; - getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); + getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).status, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityTatiana, kObjectCompartment2, true); getEntities()->clearSequences(kEntityTatiana); diff --git a/engines/lastexpress/entities/tatiana.h b/engines/lastexpress/entities/tatiana.h index 8ec69db5e9..ca2b800110 100644 --- a/engines/lastexpress/entities/tatiana.h +++ b/engines/lastexpress/entities/tatiana.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/lastexpress/entities/train.cpp b/engines/lastexpress/entities/train.cpp index e3f530ef25..f707b02ccf 100644 --- a/engines/lastexpress/entities/train.cpp +++ b/engines/lastexpress/entities/train.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/lastexpress/entities/train.h b/engines/lastexpress/entities/train.h index 4b8bc10c1a..1d94cba8f9 100644 --- a/engines/lastexpress/entities/train.h +++ b/engines/lastexpress/entities/train.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/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp index 4695f8831f..2faaa30b6f 100644 --- a/engines/lastexpress/entities/vassili.cpp +++ b/engines/lastexpress/entities/vassili.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. @@ -112,7 +112,7 @@ IMPLEMENT_FUNCTION(5, Vassili, chapter1Handler) break; } - if (!params->param2 && getObjects()->get(kObjectCompartmentA).location == kObjectLocation1) { + if (!params->param2 && getObjects()->get(kObjectCompartmentA).status == kObjectLocation1) { params->param2 = 1; getEntities()->drawSequenceLeft(kEntityVassili, "303A"); getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); @@ -289,7 +289,7 @@ IMPLEMENT_FUNCTION(9, Vassili, function9) case kActionDefault: case kActionDrawScene: - if ((getObjects()->get(kObjectCompartmentA).location == kObjectLocation2 && getEntities()->isPlayerPosition(kCarRedSleeping, 17)) + if ((getObjects()->get(kObjectCompartmentA).status == kObjectLocation2 && getEntities()->isPlayerPosition(kCarRedSleeping, 17)) || getEntities()->isPlayerPosition(kCarRedSleeping, 18) || getEntities()->isPlayerPosition(kCarRedSleeping, 37) || getEntities()->isPlayerPosition(kCarRedSleeping, 38) @@ -388,7 +388,7 @@ IMPLEMENT_FUNCTION(12, Vassili, chapter2) getData()->inventoryItem = kItemNone; getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - getObjects()->updateLocation2(kObjectCompartmentA, kObjectLocation1); + getObjects()->updateModel(kObjectCompartmentA, kObjectModel1); break; } IMPLEMENT_FUNCTION_END @@ -532,7 +532,7 @@ IMPLEMENT_FUNCTION(16, Vassili, chapter4) getData()->inventoryItem = kItemNone; getObjects()->update(kObjectCompartmentA, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - getObjects()->updateLocation2(kObjectCompartmentA, kObjectLocation1); + getObjects()->updateModel(kObjectCompartmentA, kObjectModel1); break; } IMPLEMENT_FUNCTION_END diff --git a/engines/lastexpress/entities/vassili.h b/engines/lastexpress/entities/vassili.h index d006770f7b..dfdacf7920 100644 --- a/engines/lastexpress/entities/vassili.h +++ b/engines/lastexpress/entities/vassili.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/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp index d9ddb0a4d1..31b6e19c63 100644 --- a/engines/lastexpress/entities/verges.cpp +++ b/engines/lastexpress/entities/verges.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. @@ -105,7 +105,7 @@ IMPLEMENT_FUNCTION(3, Verges, callbackActionOnDirection) case kActionExitCompartment: callbackAction(); - break; + break; case kActionExcuseMeCath: if (!params->param1) { @@ -1816,7 +1816,7 @@ IMPLEMENT_FUNCTION(41, Verges, askPassengersToStayInCompartments) break; case kActionDefault: - getObjects()->updateLocation2(kObjectRestaurantCar, kObjectLocation3); + getObjects()->updateModel(kObjectRestaurantCar, kObjectModel3); getData()->car = kCarRedSleeping; getData()->entityPosition = kPosition_9460; getData()->location = kLocationInsideCompartment; diff --git a/engines/lastexpress/entities/verges.h b/engines/lastexpress/entities/verges.h index 93cc190d1e..dc902b376d 100644 --- a/engines/lastexpress/entities/verges.h +++ b/engines/lastexpress/entities/verges.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/lastexpress/entities/vesna.cpp b/engines/lastexpress/entities/vesna.cpp index f29bce8b2b..6e9fb4f204 100644 --- a/engines/lastexpress/entities/vesna.cpp +++ b/engines/lastexpress/entities/vesna.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/lastexpress/entities/vesna.h b/engines/lastexpress/entities/vesna.h index 025d45882e..8d255500be 100644 --- a/engines/lastexpress/entities/vesna.h +++ b/engines/lastexpress/entities/vesna.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/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp index 1d280f51e0..e9c1c53a11 100644 --- a/engines/lastexpress/entities/yasmin.cpp +++ b/engines/lastexpress/entities/yasmin.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. @@ -39,22 +39,22 @@ Yasmin::Yasmin(LastExpressEngine *engine) : Entity(engine, kEntityYasmin) { ADD_CALLBACK_FUNCTION(Yasmin, playSound); ADD_CALLBACK_FUNCTION(Yasmin, updateFromTime); ADD_CALLBACK_FUNCTION(Yasmin, updateEntity); - ADD_CALLBACK_FUNCTION(Yasmin, function6); - ADD_CALLBACK_FUNCTION(Yasmin, function7); + ADD_CALLBACK_FUNCTION(Yasmin, goEtoG); + ADD_CALLBACK_FUNCTION(Yasmin, goGtoE); ADD_CALLBACK_FUNCTION(Yasmin, chapter1); - ADD_CALLBACK_FUNCTION(Yasmin, chapter1Handler); + ADD_CALLBACK_FUNCTION(Yasmin, part1); ADD_CALLBACK_FUNCTION(Yasmin, function10); ADD_CALLBACK_FUNCTION(Yasmin, chapter2); - ADD_CALLBACK_FUNCTION(Yasmin, chapter2Handler); + ADD_CALLBACK_FUNCTION(Yasmin, part2); ADD_CALLBACK_FUNCTION(Yasmin, chapter3); - ADD_CALLBACK_FUNCTION(Yasmin, chapter3Handler); + ADD_CALLBACK_FUNCTION(Yasmin, part3); ADD_CALLBACK_FUNCTION(Yasmin, chapter4); - ADD_CALLBACK_FUNCTION(Yasmin, chapter4Handler); + ADD_CALLBACK_FUNCTION(Yasmin, part4); ADD_CALLBACK_FUNCTION(Yasmin, function17); ADD_CALLBACK_FUNCTION(Yasmin, chapter5); - ADD_CALLBACK_FUNCTION(Yasmin, chapter5Handler); + ADD_CALLBACK_FUNCTION(Yasmin, part5); ADD_CALLBACK_FUNCTION(Yasmin, function20); - ADD_CALLBACK_FUNCTION(Yasmin, function21); + ADD_CALLBACK_FUNCTION(Yasmin, hiding); ADD_NULL_FUNCTION(); } @@ -98,7 +98,7 @@ IMPLEMENT_FUNCTION_II(5, Yasmin, updateEntity, CarIndex, EntityPosition) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(6, Yasmin, function6) +IMPLEMENT_FUNCTION(6, Yasmin, goEtoG) switch (savepoint.action) { default: break; @@ -138,7 +138,7 @@ IMPLEMENT_FUNCTION(6, Yasmin, function6) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(7, Yasmin, function7) +IMPLEMENT_FUNCTION(7, Yasmin, goGtoE) switch (savepoint.action) { default: break; @@ -184,7 +184,7 @@ IMPLEMENT_FUNCTION(8, Yasmin, chapter1) break; case kActionNone: - Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Yasmin, setup_chapter1Handler)); + Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Yasmin, setup_part1)); break; case kActionDefault: @@ -196,16 +196,16 @@ IMPLEMENT_FUNCTION(8, Yasmin, chapter1) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) +IMPLEMENT_FUNCTION(9, Yasmin, part1) switch (savepoint.action) { default: break; case kActionNone: - if (Entity::timeCheckCallback(kTime1093500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function6))) + if (Entity::timeCheckCallback(kTime1093500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG))) break; - if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; if (Entity::timeCheckPlaySoundUpdatePosition(kTime1162800, params->param3, 4, "Har1102", kPosition_4070)) @@ -217,7 +217,7 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound))) break; - Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; case kActionCallback: @@ -232,7 +232,7 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) break; case 2: - if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; // Fallback to case 3 @@ -252,7 +252,7 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) // Fallback to case 6 case 6: - Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; } break; @@ -282,18 +282,18 @@ IMPLEMENT_FUNCTION(11, Yasmin, chapter2) getData()->clothes = kClothesDefault; getData()->inventoryItem = kItemNone; - setup_chapter2Handler(); + setup_part2(); } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(12, Yasmin, chapter2Handler) +IMPLEMENT_FUNCTION(12, Yasmin, part2) switch (savepoint.action) { default: break; case kActionNone: - if (Entity::timeCheckCallback(kTime1759500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime1759500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; if (getState()->time > kTime1800000 && !params->param2) { @@ -327,7 +327,7 @@ IMPLEMENT_FUNCTION(13, Yasmin, chapter3) break; case kActionNone: - setup_chapter3Handler(); + setup_part3(); break; case kActionDefault: @@ -341,19 +341,19 @@ IMPLEMENT_FUNCTION(13, Yasmin, chapter3) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(14, Yasmin, chapter3Handler) +IMPLEMENT_FUNCTION(14, Yasmin, part3) switch (savepoint.action) { default: break; case kActionNone: - if (Entity::timeCheckCallback(kTime2062800, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function6))) + if (Entity::timeCheckCallback(kTime2062800, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG))) break; - if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; - Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; case kActionCallback: @@ -362,12 +362,12 @@ IMPLEMENT_FUNCTION(14, Yasmin, chapter3Handler) break; case 1: - if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; // Fallback to case 2 case 2: - Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; } break; @@ -381,7 +381,7 @@ IMPLEMENT_FUNCTION(15, Yasmin, chapter4) break; case kActionNone: - setup_chapter4Handler(); + setup_part4(); break; case kActionDefault: @@ -393,16 +393,16 @@ IMPLEMENT_FUNCTION(15, Yasmin, chapter4) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(16, Yasmin, chapter4Handler) +IMPLEMENT_FUNCTION(16, Yasmin, part4) switch (savepoint.action) { default: break; case kActionNone: - if (Entity::timeCheckCallback(kTime2457000, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function7))) + if (Entity::timeCheckCallback(kTime2457000, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_goGtoE))) break; - Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; case kActionCallback: @@ -417,7 +417,7 @@ IMPLEMENT_FUNCTION(16, Yasmin, chapter4Handler) break; case 2: - Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); + Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_goEtoG)); break; } break; @@ -437,7 +437,7 @@ IMPLEMENT_FUNCTION(18, Yasmin, chapter5) break; case kActionNone: - setup_chapter5Handler(); + setup_part5(); break; case kActionDefault: @@ -453,7 +453,7 @@ IMPLEMENT_FUNCTION(18, Yasmin, chapter5) IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(19, Yasmin, chapter5Handler) +IMPLEMENT_FUNCTION(19, Yasmin, part5) if (savepoint.action == kActionProceedChapter5) setup_function20(); IMPLEMENT_FUNCTION_END @@ -468,7 +468,7 @@ IMPLEMENT_FUNCTION(20, Yasmin, function20) if (!Entity::updateParameter(params->param1, getState()->time, 2700)) break; - setup_function21(); + setup_hiding(); break; case kActionDefault: @@ -479,14 +479,14 @@ IMPLEMENT_FUNCTION(20, Yasmin, function20) case kActionDrawScene: if (getEntities()->isInsideTrainCar(kEntityPlayer, kCarGreenSleeping)) { - setup_function21(); + setup_hiding(); } break; } IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// -IMPLEMENT_FUNCTION(21, Yasmin, function21) +IMPLEMENT_FUNCTION(21, Yasmin, hiding) switch (savepoint.action) { default: break; diff --git a/engines/lastexpress/entities/yasmin.h b/engines/lastexpress/entities/yasmin.h index b1413f5c2f..5ed735c9ac 100644 --- a/engines/lastexpress/entities/yasmin.h +++ b/engines/lastexpress/entities/yasmin.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. @@ -70,8 +70,8 @@ public: */ DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition) - DECLARE_FUNCTION(function6) - DECLARE_FUNCTION(function7) + DECLARE_FUNCTION(goEtoG) + DECLARE_FUNCTION(goGtoE) /** * Setup Chapter 1 @@ -81,7 +81,7 @@ public: /** * Handle Chapter 1 events */ - DECLARE_FUNCTION(chapter1Handler) + DECLARE_FUNCTION(part1) DECLARE_FUNCTION(function10) @@ -93,7 +93,7 @@ public: /** * Handle Chapter 2 events */ - DECLARE_FUNCTION(chapter2Handler) + DECLARE_FUNCTION(part2) /** * Setup Chapter 3 @@ -103,7 +103,7 @@ public: /** * Handle Chapter 3 events */ - DECLARE_FUNCTION(chapter3Handler) + DECLARE_FUNCTION(part3) /** * Setup Chapter 4 @@ -113,7 +113,7 @@ public: /** * Handle Chapter 4 events */ - DECLARE_FUNCTION(chapter4Handler) + DECLARE_FUNCTION(part4) DECLARE_FUNCTION(function17) @@ -125,10 +125,10 @@ public: /** * Handle Chapter 5 events */ - DECLARE_FUNCTION(chapter5Handler) + DECLARE_FUNCTION(part5) DECLARE_FUNCTION(function20) - DECLARE_FUNCTION(function21) + DECLARE_FUNCTION(hiding) DECLARE_NULL_FUNCTION() }; diff --git a/engines/lastexpress/eventhandler.h b/engines/lastexpress/eventhandler.h index c561d57541..75263a8ec6 100644 --- a/engines/lastexpress/eventhandler.h +++ b/engines/lastexpress/eventhandler.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/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp index 49a9b85657..47694dda3e 100644 --- a/engines/lastexpress/fight/fight.cpp +++ b/engines/lastexpress/fight/fight.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. @@ -222,7 +222,7 @@ Fight::FightEndType Fight::setup(FightType type) { break; case kFightMilos: - sceneIndex = (getObjects()->get(kObjectCompartment1).location2 < kObjectLocation3) ? kSceneFightMilos : kSceneFightMilosBedOpened; + sceneIndex = (getObjects()->get(kObjectCompartment1).model < kObjectModel3) ? kSceneFightMilos : kSceneFightMilosBedOpened; break; case kFightAnna: diff --git a/engines/lastexpress/fight/fight.h b/engines/lastexpress/fight/fight.h index fffb520789..5c6eff507a 100644 --- a/engines/lastexpress/fight/fight.h +++ b/engines/lastexpress/fight/fight.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/lastexpress/fight/fighter.cpp b/engines/lastexpress/fight/fighter.cpp index 4b1cddabd4..6fd2a6421c 100644 --- a/engines/lastexpress/fight/fighter.cpp +++ b/engines/lastexpress/fight/fighter.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/lastexpress/fight/fighter.h b/engines/lastexpress/fight/fighter.h index dad95af186..326610af1e 100644 --- a/engines/lastexpress/fight/fighter.h +++ b/engines/lastexpress/fight/fighter.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/lastexpress/fight/fighter_anna.cpp b/engines/lastexpress/fight/fighter_anna.cpp index c7660cab1a..723bd38cf0 100644 --- a/engines/lastexpress/fight/fighter_anna.cpp +++ b/engines/lastexpress/fight/fighter_anna.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/lastexpress/fight/fighter_anna.h b/engines/lastexpress/fight/fighter_anna.h index abb6f9dc64..667552b8dc 100644 --- a/engines/lastexpress/fight/fighter_anna.h +++ b/engines/lastexpress/fight/fighter_anna.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/lastexpress/fight/fighter_ivo.cpp b/engines/lastexpress/fight/fighter_ivo.cpp index 87a52c6be4..7bd9968da2 100644 --- a/engines/lastexpress/fight/fighter_ivo.cpp +++ b/engines/lastexpress/fight/fighter_ivo.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/lastexpress/fight/fighter_ivo.h b/engines/lastexpress/fight/fighter_ivo.h index ca54fea904..1988b4b8c4 100644 --- a/engines/lastexpress/fight/fighter_ivo.h +++ b/engines/lastexpress/fight/fighter_ivo.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/lastexpress/fight/fighter_milos.cpp b/engines/lastexpress/fight/fighter_milos.cpp index 9f8e726165..5b98b87304 100644 --- a/engines/lastexpress/fight/fighter_milos.cpp +++ b/engines/lastexpress/fight/fighter_milos.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/lastexpress/fight/fighter_milos.h b/engines/lastexpress/fight/fighter_milos.h index 2126dd1838..734177f3dc 100644 --- a/engines/lastexpress/fight/fighter_milos.h +++ b/engines/lastexpress/fight/fighter_milos.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/lastexpress/fight/fighter_salko.cpp b/engines/lastexpress/fight/fighter_salko.cpp index 1082674235..c0d15ec183 100644 --- a/engines/lastexpress/fight/fighter_salko.cpp +++ b/engines/lastexpress/fight/fighter_salko.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/lastexpress/fight/fighter_salko.h b/engines/lastexpress/fight/fighter_salko.h index 0a2a615867..365f28a808 100644 --- a/engines/lastexpress/fight/fighter_salko.h +++ b/engines/lastexpress/fight/fighter_salko.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/lastexpress/fight/fighter_vesna.cpp b/engines/lastexpress/fight/fighter_vesna.cpp index 02aaa1c16c..eeb00b821b 100644 --- a/engines/lastexpress/fight/fighter_vesna.cpp +++ b/engines/lastexpress/fight/fighter_vesna.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/lastexpress/fight/fighter_vesna.h b/engines/lastexpress/fight/fighter_vesna.h index 5c8ec855ae..a706922555 100644 --- a/engines/lastexpress/fight/fighter_vesna.h +++ b/engines/lastexpress/fight/fighter_vesna.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/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp index 796abf2ce7..986c56cb1b 100644 --- a/engines/lastexpress/game/action.cpp +++ b/engines/lastexpress/game/action.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. @@ -351,42 +351,42 @@ Action::Action(LastExpressEngine *engine) : _engine(engine) { ADD_ACTION(savePoint); ADD_ACTION(playSound); ADD_ACTION(playMusic); - ADD_ACTION(knock); + ADD_ACTION(knock); // 5 ADD_ACTION(compartment); ADD_ACTION(playSounds); ADD_ACTION(playAnimation); ADD_ACTION(openCloseObject); - ADD_ACTION(updateObjetLocation2); - ADD_ACTION(setItemLocation); - ADD_ACTION(knockNoSound); + ADD_ACTION(setModel); // 10 + ADD_ACTION(setItem); + ADD_ACTION(knockInside); ADD_ACTION(pickItem); ADD_ACTION(dropItem); - ADD_ACTION(dummy); + ADD_ACTION(dummy); // 15 ADD_ACTION(enterCompartment); ADD_ACTION(dummy); - ADD_ACTION(getOutsideTrain); - ADD_ACTION(slip); - ADD_ACTION(getInsideTrain); - ADD_ACTION(climbUpTrain); + ADD_ACTION(leanOutWindow); + ADD_ACTION(almostFall); + ADD_ACTION(climbInWindow); // 20 + ADD_ACTION(climbLadder); ADD_ACTION(climbDownTrain); - ADD_ACTION(jumpUpDownTrain); - ADD_ACTION(unbound); - ADD_ACTION(25); - ADD_ACTION(26); + ADD_ACTION(kronosSanctum); + ADD_ACTION(escapeBaggage); + ADD_ACTION(enterBaggage); // 25 + ADD_ACTION(bombPuzzle); ADD_ACTION(27); - ADD_ACTION(concertSitCough); + ADD_ACTION(kronosConcert); ADD_ACTION(29); - ADD_ACTION(catchBeetle); + ADD_ACTION(catchBeetle); // 30 ADD_ACTION(exitCompartment); - ADD_ACTION(32); - ADD_ACTION(useWhistle); + ADD_ACTION(outsideTrain); + ADD_ACTION(firebirdPuzzle); ADD_ACTION(openMatchBox); - ADD_ACTION(openBed); + ADD_ACTION(openBed); // 35 ADD_ACTION(dummy); ADD_ACTION(dialog); ADD_ACTION(eggBox); ADD_ACTION(39); - ADD_ACTION(bed); + ADD_ACTION(bed); // 40 ADD_ACTION(playMusicChapter); ADD_ACTION(playMusicChapterSetupTrain); ADD_ACTION(switchChapter); @@ -521,7 +521,7 @@ IMPLEMENT_ACTION(compartment) return kSceneNone; } - ObjectLocation location = getObjects()->get(compartment).location; + ObjectLocation location = getObjects()->get(compartment).status; if (location == kObjectLocation1 || location == kObjectLocation3 || getEntities()->checkFields2(compartment)) { if (location != kObjectLocation1 || getEntities()->checkFields2(compartment) @@ -625,14 +625,14 @@ IMPLEMENT_ACTION(openCloseObject) ////////////////////////////////////////////////////////////////////////// // Action 10 -IMPLEMENT_ACTION(updateObjetLocation2) +IMPLEMENT_ACTION(setModel) ObjectIndex object = (ObjectIndex)hotspot.param1; - ObjectLocation location = (ObjectLocation)hotspot.param2; + ObjectModel model = (ObjectModel)hotspot.param2; if (object >= kObjectMax) return kSceneInvalid; - getObjects()->updateLocation2(object, location); + getObjects()->updateModel(object, model); if (object != kObject112 || getSoundQueue()->isBuffered("LIB096")) { if (object == 1) @@ -646,13 +646,13 @@ IMPLEMENT_ACTION(updateObjetLocation2) ////////////////////////////////////////////////////////////////////////// // Action 11 -IMPLEMENT_ACTION(setItemLocation) +IMPLEMENT_ACTION(setItem) InventoryItem item = (InventoryItem)hotspot.param1; if (item >= kPortraitOriginal) return kSceneInvalid; Inventory::InventoryEntry *entry = getInventory()->get(item); - if (entry->isPresent) + if (entry->inPocket) return kSceneInvalid; entry->location = (ObjectLocation)hotspot.param2; @@ -667,7 +667,7 @@ IMPLEMENT_ACTION(setItemLocation) ////////////////////////////////////////////////////////////////////////// // Action 12 -IMPLEMENT_ACTION(knockNoSound) +IMPLEMENT_ACTION(knockInside) ObjectIndex object = (ObjectIndex)hotspot.param1; if (object >= kObjectMax) return kSceneInvalid; @@ -726,7 +726,7 @@ IMPLEMENT_ACTION(pickItem) break; case kItemBomb: - RESET_ENTITY_STATE(kEntityAbbot, Abbot, setup_pickBomb); + RESET_ENTITY_STATE(kEntityAbbot, Abbot, setup_catchCath); break; case kItemBriefcase: @@ -808,7 +808,7 @@ IMPLEMENT_ACTION(dropItem) ////////////////////////////////////////////////////////////////////////// // Action 16 IMPLEMENT_ACTION(enterCompartment) - if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1 || getObjects()->get(kObjectCompartment1).location == kObjectLocation3 || getInventory()->getSelectedItem() == kItemKey) + if (getObjects()->get(kObjectCompartment1).status == kObjectLocation1 || getObjects()->get(kObjectCompartment1).status == kObjectLocation3 || getInventory()->getSelectedItem() == kItemKey) return action_compartment(hotspot); if (getProgress().eventCorpseFound) { @@ -842,12 +842,12 @@ IMPLEMENT_ACTION(enterCompartment) ////////////////////////////////////////////////////////////////////////// // Action 18 -IMPLEMENT_ACTION(getOutsideTrain) +IMPLEMENT_ACTION(leanOutWindow) ObjectIndex object = (ObjectIndex)hotspot.param1; - if ((getEvent(kEventCathLookOutsideWindowDay) || getEvent(kEventCathLookOutsideWindowNight) || getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) + if ((getEvent(kEventCathLookOutsideWindowDay) || getEvent(kEventCathLookOutsideWindowNight) || getObjects()->get(kObjectCompartment1).model == kObjectModel1) && getProgress().isTrainRunning - && (object != kObjectOutsideAnnaCompartment || (!getEntities()->isInsideCompartment(kEntityRebecca, kCarRedSleeping, kPosition_4840) && getObjects()->get(kObjectOutsideBetweenCompartments).location == kObjectLocation2)) + && (object != kObjectOutsideAnnaCompartment || (!getEntities()->isInsideCompartment(kEntityRebecca, kCarRedSleeping, kPosition_4840) && getObjects()->get(kObjectOutsideBetweenCompartments).status == kObjectLocation2)) && getInventory()->getSelectedItem() != kItemFirebird && getInventory()->getSelectedItem() != kItemBriefcase) { @@ -887,7 +887,7 @@ IMPLEMENT_ACTION(getOutsideTrain) ////////////////////////////////////////////////////////////////////////// // Action 19 -IMPLEMENT_ACTION(slip) +IMPLEMENT_ACTION(almostFall) switch((ObjectIndex)hotspot.param1) { default: return kSceneInvalid; @@ -911,7 +911,7 @@ IMPLEMENT_ACTION(slip) ////////////////////////////////////////////////////////////////////////// // Action 20 -IMPLEMENT_ACTION(getInsideTrain) +IMPLEMENT_ACTION(climbInWindow) switch ((ObjectIndex)hotspot.param1) { default: return kSceneInvalid; @@ -937,7 +937,7 @@ IMPLEMENT_ACTION(getInsideTrain) ////////////////////////////////////////////////////////////////////////// // Action 21 -IMPLEMENT_ACTION(climbUpTrain) +IMPLEMENT_ACTION(climbLadder) byte action = hotspot.param1; if (action != 1 && action != 2) @@ -999,7 +999,7 @@ IMPLEMENT_ACTION(climbDownTrain) ////////////////////////////////////////////////////////////////////////// // Action 23 -IMPLEMENT_ACTION(jumpUpDownTrain) +IMPLEMENT_ACTION(kronosSanctum) switch (hotspot.param1) { default: break; @@ -1038,7 +1038,7 @@ IMPLEMENT_ACTION(jumpUpDownTrain) ////////////////////////////////////////////////////////////////////////// // Action 24 -IMPLEMENT_ACTION(unbound) +IMPLEMENT_ACTION(escapeBaggage) byte action = hotspot.param1; switch (action) { @@ -1086,7 +1086,7 @@ IMPLEMENT_ACTION(unbound) ////////////////////////////////////////////////////////////////////////// // Action 25 -IMPLEMENT_ACTION(25) +IMPLEMENT_ACTION(enterBaggage) switch(hotspot.param1) { default: break; @@ -1103,7 +1103,7 @@ IMPLEMENT_ACTION(25) case 3: getSound()->playSoundEvent(kEntityPlayer, 43); if (!getInventory()->hasItem(kItemKey) && !getEvent(kEventAnnaBaggageArgument)) { - RESET_ENTITY_STATE(kEntityAnna, Anna, setup_baggage); + RESET_ENTITY_STATE(kEntityAnna, Anna, setup_baggageFight); return kSceneNone; } break; @@ -1114,7 +1114,7 @@ IMPLEMENT_ACTION(25) ////////////////////////////////////////////////////////////////////////// // Action 26 -IMPLEMENT_ACTION(26) +IMPLEMENT_ACTION(bombPuzzle) switch(hotspot.param1) { default: return kSceneInvalid; @@ -1168,7 +1168,7 @@ IMPLEMENT_ACTION(27) ////////////////////////////////////////////////////////////////////////// // Action 28 -IMPLEMENT_ACTION(concertSitCough) +IMPLEMENT_ACTION(kronosConcert) switch(hotspot.param1) { default: return kSceneInvalid; @@ -1224,7 +1224,7 @@ IMPLEMENT_ACTION(exitCompartment) getProgress().field_30 = 1; } - getObjects()->updateLocation2(kObjectCompartment1, (ObjectLocation)hotspot.param2); + getObjects()->updateModel(kObjectCompartment1, (ObjectModel)hotspot.param2); // fall to case enterCompartment action return action_enterCompartment(hotspot); @@ -1232,7 +1232,7 @@ IMPLEMENT_ACTION(exitCompartment) ////////////////////////////////////////////////////////////////////////// // Action 32 -IMPLEMENT_ACTION(32) +IMPLEMENT_ACTION(outsideTrain) switch(hotspot.param1) { default: break; @@ -1273,7 +1273,7 @@ IMPLEMENT_ACTION(32) ////////////////////////////////////////////////////////////////////////// // Action 33 -IMPLEMENT_ACTION(useWhistle) +IMPLEMENT_ACTION(firebirdPuzzle) EventIndex evt = kEventNone; SceneIndex sceneIndex = kSceneInvalid; @@ -1335,7 +1335,7 @@ IMPLEMENT_ACTION(useWhistle) IMPLEMENT_ACTION(openMatchBox) // If the match is already in the inventory, do nothing if (!getInventory()->get(kItemMatch)->location - || getInventory()->get(kItemMatch)->isPresent) + || getInventory()->get(kItemMatch)->inPocket) return kSceneInvalid; getInventory()->addItem(kItemMatch); @@ -1392,7 +1392,7 @@ IMPLEMENT_ACTION(39) IMPLEMENT_ACTION(bed) getSound()->playSoundEvent(kEntityPlayer, 85); // falls to case knockNoSound - return action_knockNoSound(hotspot); + return action_knockInside(hotspot); } ////////////////////////////////////////////////////////////////////////// @@ -1724,7 +1724,7 @@ bool Action::handleOtherCompartment(ObjectIndex object, bool doPlaySound, bool d } void Action::playCompartmentSoundEvents(ObjectIndex object) const { - if (getObjects()->get(object).location == kObjectLocation1 || getObjects()->get(object).location == kObjectLocation3 || getEntities()->checkFields2(object)) { + if (getObjects()->get(object).status == kObjectLocation1 || getObjects()->get(object).status == kObjectLocation3 || getEntities()->checkFields2(object)) { getSound()->playSoundEvent(kEntityPlayer, 13); } else { getSound()->playSoundEvent(kEntityPlayer, 14); @@ -1757,7 +1757,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { if (object >= kObjectMax) return kCursorNormal; else - return (CursorStyle)getObjects()->get(object).cursor; + return (CursorStyle)getObjects()->get(object).windowCursor; case SceneHotspot::kAction12: debugC(2, kLastExpressDebugScenes, "================================= OBJECT %03d =================================", object); @@ -1765,7 +1765,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { return kCursorNormal; if (getObjects()->get(object).entity) - return (CursorStyle)getObjects()->get(object).cursor; + return (CursorStyle)getObjects()->get(object).windowCursor; else return kCursorNormal; @@ -1774,7 +1774,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { if (object >= kObjectCompartmentA) return kCursorNormal; - if ((!getInventory()->getSelectedItem() || getInventory()->getSelectedEntry()->manualSelect) + if ((!getInventory()->getSelectedItem() || getInventory()->getSelectedEntry()->floating) && (object != kObject21 || getProgress().eventCorpseMovedFromFloor)) return kCursorHand; else @@ -1806,8 +1806,8 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { return kCursorNormal; case SceneHotspot::kActionEnterCompartment: - if ((getInventory()->getSelectedItem() != kItemKey || getObjects()->get(kObjectCompartment1).location) - && (getObjects()->get(kObjectCompartment1).location != 1 || !getInventory()->hasItem(kItemKey) + if ((getInventory()->getSelectedItem() != kItemKey || getObjects()->get(kObjectCompartment1).status) + && (getObjects()->get(kObjectCompartment1).status != 1 || !getInventory()->hasItem(kItemKey) || (getInventory()->getSelectedItem() != kItemFirebird && getInventory()->getSelectedItem() != kItemBriefcase))) goto LABEL_KEY; @@ -1817,13 +1817,13 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { if (getProgress().jacket != kJacketGreen) return kCursorNormal; - if ((getEvent(kEventCathLookOutsideWindowDay) || getEvent(kEventCathLookOutsideWindowNight) || getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) + if ((getEvent(kEventCathLookOutsideWindowDay) || getEvent(kEventCathLookOutsideWindowNight) || getObjects()->get(kObjectCompartment1).model == kObjectModel1) && getProgress().isTrainRunning - && (object != kObjectOutsideAnnaCompartment || (getEntities()->isInsideCompartment(kEntityRebecca, kCarRedSleeping, kPosition_4840) && getObjects()->get(kObjectOutsideBetweenCompartments).location == 2)) + && (object != kObjectOutsideAnnaCompartment || (getEntities()->isInsideCompartment(kEntityRebecca, kCarRedSleeping, kPosition_4840) && getObjects()->get(kObjectOutsideBetweenCompartments).status == 2)) && getInventory()->getSelectedItem() != kItemBriefcase && getInventory()->getSelectedItem() != kItemFirebird) return kCursorForward; - return (getObjects()->get(kObjectCompartment1).location2 < kObjectLocation2) ? kCursorNormal : kCursorMagnifier; + return (getObjects()->get(kObjectCompartment1).model < kObjectModel2) ? kCursorNormal : kCursorMagnifier; case SceneHotspot::kActionSlip: return (getProgress().field_C8 < 1) ? kCursorNormal : kCursorLeft; @@ -1841,7 +1841,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { if (object != kObjectCompartment1) return kCursorNormal; - return (getObjects()->get(kObjectCeiling).location < kObjectLocation1) ? kCursorHand : kCursorNormal; + return (getObjects()->get(kObjectCeiling).status < kObjectLocation1) ? kCursorHand : kCursorNormal; case SceneHotspot::kActionUnbound: if (hotspot.param2 != 2) @@ -1904,11 +1904,11 @@ LABEL_KEY: if (getInventory()->getSelectedItem() != kItemKey || getObjects()->get(object).entity - || getObjects()->get(object).location != 1 - || !getObjects()->get(object).cursor2 + || getObjects()->get(object).status != 1 + || !getObjects()->get(object).handleCursor || getEntities()->isInsideCompartments(kEntityPlayer) || getEntities()->checkFields2(object)) - return (CursorStyle)getObjects()->get(object).cursor2; + return (CursorStyle)getObjects()->get(object).handleCursor; else return (CursorStyle)getInventory()->get(kItemKey)->cursor; } diff --git a/engines/lastexpress/game/action.h b/engines/lastexpress/game/action.h index e1a4a53224..80de60511d 100644 --- a/engines/lastexpress/game/action.h +++ b/engines/lastexpress/game/action.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. @@ -82,28 +82,28 @@ private: DECLARE_ACTION(playSounds); DECLARE_ACTION(playAnimation); DECLARE_ACTION(openCloseObject); - DECLARE_ACTION(updateObjetLocation2); - DECLARE_ACTION(setItemLocation); - DECLARE_ACTION(knockNoSound); + DECLARE_ACTION(setModel); + DECLARE_ACTION(setItem); + DECLARE_ACTION(knockInside); DECLARE_ACTION(pickItem); DECLARE_ACTION(dropItem); DECLARE_ACTION(enterCompartment); - DECLARE_ACTION(getOutsideTrain); - DECLARE_ACTION(slip); - DECLARE_ACTION(getInsideTrain); - DECLARE_ACTION(climbUpTrain); + DECLARE_ACTION(leanOutWindow); + DECLARE_ACTION(almostFall); + DECLARE_ACTION(climbInWindow); + DECLARE_ACTION(climbLadder); DECLARE_ACTION(climbDownTrain); - DECLARE_ACTION(jumpUpDownTrain); - DECLARE_ACTION(unbound); - DECLARE_ACTION(25); - DECLARE_ACTION(26); + DECLARE_ACTION(kronosSanctum); + DECLARE_ACTION(escapeBaggage); + DECLARE_ACTION(enterBaggage); + DECLARE_ACTION(bombPuzzle); DECLARE_ACTION(27); - DECLARE_ACTION(concertSitCough); + DECLARE_ACTION(kronosConcert); DECLARE_ACTION(29); DECLARE_ACTION(catchBeetle); DECLARE_ACTION(exitCompartment); - DECLARE_ACTION(32); - DECLARE_ACTION(useWhistle); + DECLARE_ACTION(outsideTrain); + DECLARE_ACTION(firebirdPuzzle); DECLARE_ACTION(openMatchBox); DECLARE_ACTION(openBed); DECLARE_ACTION(dialog); diff --git a/engines/lastexpress/game/beetle.cpp b/engines/lastexpress/game/beetle.cpp index d7a369ba40..a92d252f0a 100644 --- a/engines/lastexpress/game/beetle.cpp +++ b/engines/lastexpress/game/beetle.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/lastexpress/game/beetle.h b/engines/lastexpress/game/beetle.h index 034ebbd557..0a9a836065 100644 --- a/engines/lastexpress/game/beetle.h +++ b/engines/lastexpress/game/beetle.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/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp index fafbd7cb64..b4b5527f8d 100644 --- a/engines/lastexpress/game/entities.cpp +++ b/engines/lastexpress/game/entities.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/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h index 81aed627aa..089edbf87f 100644 --- a/engines/lastexpress/game/entities.h +++ b/engines/lastexpress/game/entities.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. @@ -110,7 +110,7 @@ public: * Query if 'entity' is inside a compartment * * @param entity The entity. - * @param car The car. + * @param car The car. * @param position The position. * * @return true if inside the compartment, false if not. @@ -247,7 +247,7 @@ public: /** * Query if nobody is in a compartment at that position. * - * @param car The car. + * @param car The car. * @param position The position. * * @return true if nobody is in a compartment, false if not. @@ -334,8 +334,8 @@ private: static const int _compartmentsCount = 16; static const int _positionsCount = 100 * 10; // 100 positions per train car - LastExpressEngine *_engine; - EntityData *_header; + LastExpressEngine *_engine; + EntityData *_header; Common::Array<Entity *> _entities; // Compartments & positions diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp index 2f1b0a8e76..9e02b3bc1d 100644 --- a/engines/lastexpress/game/inventory.cpp +++ b/engines/lastexpress/game/inventory.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. @@ -97,19 +97,19 @@ void Inventory::init() { _entries[kItemPassengerList].isSelectable = true; // Auto selection - _entries[kItem2].manualSelect = false; - _entries[kItem3].manualSelect = false; - _entries[kItem5].manualSelect = false; - _entries[kItem7].manualSelect = false; - _entries[kItem9].manualSelect = false; - _entries[kItem11].manualSelect = false; - _entries[kItemBeetle].manualSelect = false; - _entries[kItem17].manualSelect = false; - _entries[kItemFirebird].manualSelect = false; - _entries[kItemBriefcase].manualSelect = false; - _entries[kItemCorpse].manualSelect = false; - _entries[kItemGreenJacket].manualSelect = false; - _entries[kItem22].manualSelect = false; + _entries[kItem2].floating = false; + _entries[kItem3].floating = false; + _entries[kItem5].floating = false; + _entries[kItem7].floating = false; + _entries[kItem9].floating = false; + _entries[kItem11].floating = false; + _entries[kItemBeetle].floating = false; + _entries[kItem17].floating = false; + _entries[kItemFirebird].floating = false; + _entries[kItemBriefcase].floating = false; + _entries[kItemCorpse].floating = false; + _entries[kItemGreenJacket].floating = false; + _entries[kItem22].floating = false; // Scene _entries[kItemMatchBox].scene = kSceneMatchbox; @@ -123,8 +123,8 @@ void Inventory::init() { _entries[kItemBriefcase].scene = kSceneBriefcase; // Has item - _entries[kItemTelegram].isPresent = true; - _entries[kItemArticle].isPresent = true; + _entries[kItemTelegram].inPocket = true; + _entries[kItemArticle].inPocket = true; _selectedItem = kItemNone; } @@ -298,7 +298,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) { getScenes()->loadScene(entry.scene); } - if (entry.field_2) + if (entry.usable) selectItem((InventoryItem)index); else drawSelectedItem(); @@ -346,7 +346,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) { if (!getProgress().field_84 && getEntityData(kEntityPlayer)->location != kLocationOutsideTrain && getProgress().field_18 != 4 - && (_selectedItem == kItemNone || get(_selectedItem)->manualSelect || getState()->sceneUseBackup)) { + && (_selectedItem == kItemNone || get(_selectedItem)->floating || getState()->sceneUseBackup)) { // Draw inventory contents when clicking on portrait if (ev.type == Common::EVENT_LBUTTONDOWN) { @@ -363,7 +363,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) { close(); // Select item - if (_selectedItem == kItemNone || get(_selectedItem)->manualSelect) { + if (_selectedItem == kItemNone || get(_selectedItem)->floating) { _selectedItem = getFirstExaminableItem(); if (_selectedItem != kItemNone) @@ -447,11 +447,11 @@ void Inventory::addItem(InventoryItem item) { if (item >= kPortraitOriginal) return; - get(item)->isPresent = true; + get(item)->inPocket = true; get(item)->location = kObjectLocationNone; // Auto-select item if necessary - if (get(item)->cursor && !get(item)->manualSelect) { + if (get(item)->cursor && !get(item)->floating) { _selectedItem = item; drawItem(get(_selectedItem)->cursor, 44, 0); askForRedraw(); @@ -462,7 +462,7 @@ void Inventory::removeItem(InventoryItem item, ObjectLocation newLocation) { if (item >= kPortraitOriginal) return; - get(item)->isPresent = false; + get(item)->inPocket = false; get(item)->location = newLocation; if (get(item)->cursor == get(_selectedItem)->cursor) { @@ -473,7 +473,7 @@ void Inventory::removeItem(InventoryItem item, ObjectLocation newLocation) { } bool Inventory::hasItem(InventoryItem item) { - if (get(item)->isPresent && item < kPortraitOriginal) + if (get(item)->inPocket && item < kPortraitOriginal) return true; return false; @@ -537,7 +537,7 @@ InventoryItem Inventory::getFirstExaminableItem() const { int index = 0; InventoryEntry entry = _entries[index]; - while (!entry.isPresent || !entry.cursor || entry.manualSelect) { + while (!entry.inPocket || !entry.cursor || entry.floating) { index++; entry = _entries[index]; @@ -676,7 +676,7 @@ void Inventory::drawItem(CursorStyle id, uint16 x, uint16 y, int16 brightnessInd void Inventory::drawSelectedItem() { // Draw the selected item if any - if (!_selectedItem || get(_selectedItem)->manualSelect) { + if (!_selectedItem || get(_selectedItem)->floating) { _selectedItem = getFirstExaminableItem(); if (_selectedItem) { @@ -703,10 +703,10 @@ void Inventory::open() { // Draw at most 11 items in the inventory _itemsShown = 0; for (int i = 1; i < ARRAYSIZE(_entries); i++) { - if (!_entries[i].isPresent) + if (!_entries[i].inPocket) continue; - if (!_entries[i].manualSelect) + if (!_entries[i].floating) continue; if (_itemsShown < 11) { @@ -747,10 +747,10 @@ uint32 Inventory::getItemIndex(uint32 currentIndex) const { uint32 count = 0; for (uint32 i = 1; i < ARRAYSIZE(_entries); i++) { - if (!_entries[i].isPresent) + if (!_entries[i].inPocket) continue; - if (!_entries[i].manualSelect) + if (!_entries[i].floating) continue; if (count < 11) { diff --git a/engines/lastexpress/game/inventory.h b/engines/lastexpress/game/inventory.h index b1019a43c6..f3ab94ccab 100644 --- a/engines/lastexpress/game/inventory.h +++ b/engines/lastexpress/game/inventory.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. @@ -56,33 +56,33 @@ public: struct InventoryEntry : Common::Serializable { CursorStyle cursor; SceneIndex scene; - byte field_2; + byte usable; bool isSelectable; - bool isPresent; - bool manualSelect; + bool inPocket; + bool floating; ObjectLocation location; InventoryEntry() { cursor = kCursorNormal; scene = kSceneNone; - field_2 = 0; + usable = 0; isSelectable = false; - isPresent = false; - manualSelect = true; + inPocket = false; + floating = true; location = kObjectLocationNone; } Common::String toString() { - return Common::String::format("{ %d - %d - %d - %d - %d - %d - %d }", cursor, scene, field_2, isSelectable, isPresent, manualSelect, location); + return Common::String::format("{ %d - %d - %d - %d - %d - %d - %d }", cursor, scene, usable, isSelectable, inPocket, floating, location); } void saveLoadWithSerializer(Common::Serializer &s) { s.syncAsByte(cursor); s.syncAsByte(scene); - s.syncAsByte(field_2); + s.syncAsByte(usable); s.syncAsByte(isSelectable); - s.syncAsByte(isPresent); - s.syncAsByte(manualSelect); + s.syncAsByte(inPocket); + s.syncAsByte(floating); s.syncAsByte(location); } }; diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp index 09104d1bf9..7ba2b0ff85 100644 --- a/engines/lastexpress/game/logic.cpp +++ b/engines/lastexpress/game/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. @@ -413,8 +413,8 @@ void Logic::resetState() { /** * Handle game over * - * @param type The savegame type. - * @param value The value (event, time, index, ...) + * @param type The savegame type. + * @param value The value (event, time, index, ...) * @param sceneIndex Index of the scene to show. * @param showScene true to show a scene, false to return to menu directly */ @@ -468,7 +468,7 @@ void Logic::switchChapter() const { case kChapter3: getInventory()->get(kItemFirebird)->location = kObjectLocation4; - getInventory()->get(kItemFirebird)->isPresent = false; + getInventory()->get(kItemFirebird)->inPocket = false; getInventory()->get(kItem11)->location = kObjectLocation1; getInventory()->addItem(kItemWhistle); getInventory()->addItem(kItemKey); diff --git a/engines/lastexpress/game/logic.h b/engines/lastexpress/game/logic.h index efb8f1e1a3..33180dfdd1 100644 --- a/engines/lastexpress/game/logic.h +++ b/engines/lastexpress/game/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. @@ -54,7 +54,7 @@ public: void playFinalSequence() const; void updateCursor(bool redraw = true) const; - Action *getGameAction() { return _action; } + Action *getGameAction() { return _action; } Beetle *getGameBeetle() { return _beetle; } Entities *getGameEntities() { return _entities; } Fight *getGameFight() { return _fight; } diff --git a/engines/lastexpress/game/object.cpp b/engines/lastexpress/game/object.cpp index 48df91ea6d..31da650b9a 100644 --- a/engines/lastexpress/game/object.cpp +++ b/engines/lastexpress/game/object.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. @@ -32,7 +32,7 @@ namespace LastExpress { Common::String Objects::Object::toString() { - return Common::String::format("{ %s - %d - %d - %d - %d }", ENTITY_NAME(entity), location, cursor, cursor2, location2); + return Common::String::format("{ %s - %d - %d - %d - %d }", ENTITY_NAME(entity), status, windowCursor, handleCursor, model); } Objects::Objects(LastExpressEngine *engine) : _engine(engine) {} @@ -44,24 +44,24 @@ const Objects::Object Objects::get(ObjectIndex index) const { return _objects[index]; } -void Objects::update(ObjectIndex index, EntityIndex entity, ObjectLocation location, CursorStyle cursor, CursorStyle cursor2) { +void Objects::update(ObjectIndex index, EntityIndex entity, ObjectLocation status, CursorStyle windowCursor, CursorStyle handleCursor) { if (index >= kObjectMax) return; Object *object = &_objects[index]; // Store original location - ObjectLocation original_location = object->location; + ObjectLocation original_status = object->status; // Update entity object->entity = entity; - object->location = location; + object->status = status; - if (cursor != kCursorKeepValue || cursor2 != kCursorKeepValue) { - if (cursor != kCursorKeepValue) - object->cursor = cursor; - if (cursor2 != kCursorKeepValue) - object->cursor2 = cursor2; + if (windowCursor != kCursorKeepValue || handleCursor != kCursorKeepValue) { + if (windowCursor != kCursorKeepValue) + object->windowCursor = windowCursor; + if (handleCursor != kCursorKeepValue) + object->handleCursor = handleCursor; getLogic()->updateCursor(); } @@ -69,18 +69,19 @@ void Objects::update(ObjectIndex index, EntityIndex entity, ObjectLocation locat getFlags()->flag_3 = true; // Compartments - if (original_location != location && (original_location == kObjectLocation2 || location == kObjectLocation2)) + if (original_status != status && (original_status == kObjectLocation2 || status == kObjectLocation2)) { if ((index >= kObjectCompartment1 && index <= kObjectCompartment8) - || (index >= kObjectCompartmentA && index <= kObjectCompartmentF)) { - getScenes()->updateDoorsAndClock(); + || (index >= kObjectCompartmentA && index <= kObjectCompartmentF)) { + getScenes()->updateDoorsAndClock(); } + } } -void Objects::updateLocation2(ObjectIndex index, ObjectLocation location2) { +void Objects::updateModel(ObjectIndex index, ObjectModel model) { if (index >= kObjectMax) return; - _objects[index].location2 = location2; + _objects[index].model = model; } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/lastexpress/game/object.h b/engines/lastexpress/game/object.h index 87c9d7d407..78e8a84df3 100644 --- a/engines/lastexpress/game/object.h +++ b/engines/lastexpress/game/object.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. @@ -37,17 +37,17 @@ public: struct Object : Common::Serializable { // All fields should be saved as bytes EntityIndex entity; - ObjectLocation location; - CursorStyle cursor; - CursorStyle cursor2; - ObjectLocation location2; + ObjectLocation status; + CursorStyle windowCursor; + CursorStyle handleCursor; + ObjectModel model; Object() { entity = kEntityPlayer; - location = kObjectLocationNone; - cursor = kCursorHandKnock; - cursor2 = kCursorHandKnock; - location2 = kObjectLocationNone; + status = kObjectLocationNone; + windowCursor = kCursorHandKnock; + handleCursor = kCursorHandKnock; + model = kObjectModelNone; } Common::String toString(); @@ -55,18 +55,18 @@ public: // Serializable void saveLoadWithSerializer(Common::Serializer &s) { s.syncAsByte(entity); - s.syncAsByte(location); - s.syncAsByte(cursor); - s.syncAsByte(cursor2); - s.syncAsByte(location2); + s.syncAsByte(status); + s.syncAsByte(windowCursor); + s.syncAsByte(handleCursor); + s.syncAsByte(model); } }; Objects(LastExpressEngine *engine); const Object get(ObjectIndex index) const; - void update(ObjectIndex index, EntityIndex entity, ObjectLocation location, CursorStyle cursor, CursorStyle cursor2); - void updateLocation2(ObjectIndex index, ObjectLocation location2); + void update(ObjectIndex index, EntityIndex entity, ObjectLocation status, CursorStyle cursor, CursorStyle cursor2); + void updateModel(ObjectIndex index, ObjectModel model); // Serializable void saveLoadWithSerializer(Common::Serializer &s); diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp index 021dc40bb9..d9f2993c17 100644 --- a/engines/lastexpress/game/savegame.cpp +++ b/engines/lastexpress/game/savegame.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/lastexpress/game/savegame.h b/engines/lastexpress/game/savegame.h index 361957227e..f374e18a44 100644 --- a/engines/lastexpress/game/savegame.h +++ b/engines/lastexpress/game/savegame.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. @@ -40,32 +40,32 @@ Game data Format ----------------- - uint32 {4} - entity - uint32 {4} - current time - uint32 {4} - time delta (how much a tick is in "real" time) - uint32 {4} - time ticks - uint32 {4} - scene Index max: 2500 - byte {1} - use backup scene - uint32 {4} - backup Scene Index 1 max: 2500 - uint32 {4} - backup Scene Index 2 max: 2500 - uint32 {4} - selected inventory item max: 32 - uint32 {4*100*10} - positions (by car) - uint32 {4*16} - compartments - uint32 {4*16} - compartments ?? - uint32 {4*128} - game progress - byte {512} - game events - byte {7*32} - inventory - byte {5*128} - objects - byte {1262*40} - entities (characters and train entities) - - uint32 {4} - sound queue state - uint32 {4} - ?? - uint32 {4} - number of sound entries - byte {count*68} - sound entries - - byte {16*128} - save point data - uint32 {4} - number of save points (max: 128) - byte {count*16} - save points + uint32 {4} - entity + uint32 {4} - current time + uint32 {4} - time delta (how much a tick is in "real" time) + uint32 {4} - time ticks + uint32 {4} - scene Index max: 2500 + byte {1} - use backup scene + uint32 {4} - backup Scene Index 1 max: 2500 + uint32 {4} - backup Scene Index 2 max: 2500 + uint32 {4} - selected inventory item max: 32 + uint32 {4*100*10} - positions by car(BlockedView) + uint32 {4*16} - compartments (BlockedX) + uint32 {4*16} - compartments? (SoftBlockedX) + uint32 {4*128} - game progress + byte {512} - game events + byte {7*32} - inventory + byte {5*128} - objects + byte {1262*40} - entities (characters and train entities) + + uint32 {4} - sound queue state + uint32 {4} - ?? + uint32 {4} - number of sound entries + byte {count*68} - sound entries + + byte {16*128} - save point data + uint32 {4} - number of save points (max: 128) + byte {count*16} - save points ... more unknown stuff @@ -167,7 +167,7 @@ public: bool isGameFinished(uint32 menuIndex, uint32 savegameIndex); // Accessors - uint32 getTime(uint32 index) { return getEntry(index)->time; } + uint32 getTime(uint32 index) { return getEntry(index)->time; } ChapterIndex getChapter(uint32 index) { return getEntry(index)->chapter; } uint32 getValue(uint32 index) { return getEntry(index)->value; } uint32 getLastSavegameTicks() const { return _gameTicksLastSavegame; } diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp index 8d14ec386b..b0186a4ccc 100644 --- a/engines/lastexpress/game/savepoint.cpp +++ b/engines/lastexpress/game/savepoint.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/lastexpress/game/savepoint.h b/engines/lastexpress/game/savepoint.h index 005133891a..068c54eb0f 100644 --- a/engines/lastexpress/game/savepoint.h +++ b/engines/lastexpress/game/savepoint.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/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp index 82688fff2e..0d8f51af6e 100644 --- a/engines/lastexpress/game/scenes.cpp +++ b/engines/lastexpress/game/scenes.cpp @@ -579,7 +579,7 @@ void SceneManager::updateDoorsAndClock() { for (ObjectIndex index = firstIndex; index < (ObjectIndex)(firstIndex + 8); index = (ObjectIndex)(index + 1)) { // Doors is not open, nothing to do - if (getObjects()->get(index).location != kObjectLocation2) + if (getObjects()->get(index).status != kObjectLocation2) continue; // Load door sequence @@ -842,11 +842,11 @@ void SceneManager::preProcessScene(SceneIndex *index) { if (object >= kObjectMax) break; - if (getObjects()->get(object).location == kObjectLocationNone) + if (getObjects()->get(object).status == kObjectLocationNone) break; for (Common::Array<SceneHotspot *>::iterator it = scene->getHotspots()->begin(); it != scene->getHotspots()->end(); ++it) { - if (getObjects()->get(object).location != (*it)->location) + if (getObjects()->get(object).status != (*it)->location) continue; PROCESS_HOTSPOT_SCENE(*it, index); @@ -920,7 +920,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { int location = kObjectLocationNone; - if (getObjects()->get(object).location == kObjectLocation2) + if (getObjects()->get(object).status == kObjectLocation2) location = kObjectLocation1; if (getInventory()->get(item)->location != kObjectLocationNone) @@ -933,7 +933,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { if (location != (*it)->location) continue; - if (getObjects()->get(object).location != (*it)->param1) + if (getObjects()->get(object).status != (*it)->param1) continue; if (getInventory()->get(item)->location != (*it)->param2) @@ -994,7 +994,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { bool found = false; for (Common::Array<SceneHotspot *>::iterator it = scene->getHotspots()->begin(); it != scene->getHotspots()->end(); ++it) { - if (getObjects()->get(object).location2 != (*it)->location) + if (getObjects()->get(object).model != (*it)->location) continue; PROCESS_HOTSPOT_SCENE(*it, index); diff --git a/engines/lastexpress/game/state.cpp b/engines/lastexpress/game/state.cpp index 02ede25595..e47eda5ebd 100644 --- a/engines/lastexpress/game/state.cpp +++ b/engines/lastexpress/game/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/lastexpress/game/state.h b/engines/lastexpress/game/state.h index 944f6d47b1..38cd851aaa 100644 --- a/engines/lastexpress/game/state.h +++ b/engines/lastexpress/game/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. @@ -657,12 +657,12 @@ private: // Timer int _timer; - Flags *_flags; ///< Flags - Inventory *_inventory; ///< Inventory - Objects *_objects; ///< Objects - SavePoints *_savepoints; ///< SavePoints - GameState *_state; ///< State - Common::Point _coords; ///< Current coordinates + Flags *_flags; ///< Flags + Inventory *_inventory; ///< Inventory + Objects *_objects; ///< Objects + SavePoints *_savepoints; ///< SavePoints + GameState *_state; ///< State + Common::Point _coords; ///< Current coordinates }; } // End of namespace LastExpress diff --git a/engines/lastexpress/graphics.cpp b/engines/lastexpress/graphics.cpp index 9ced38a2e1..74e1efaa8b 100644 --- a/engines/lastexpress/graphics.cpp +++ b/engines/lastexpress/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. diff --git a/engines/lastexpress/graphics.h b/engines/lastexpress/graphics.h index 7db7e88989..843bfd6e22 100644 --- a/engines/lastexpress/graphics.h +++ b/engines/lastexpress/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/lastexpress/helpers.h b/engines/lastexpress/helpers.h index 02454be13d..6f94cf2a14 100644 --- a/engines/lastexpress/helpers.h +++ b/engines/lastexpress/helpers.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/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp index bc1624d171..293c3ab725 100644 --- a/engines/lastexpress/lastexpress.cpp +++ b/engines/lastexpress/lastexpress.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/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h index 1431b79b9f..b4098f3860 100644 --- a/engines/lastexpress/lastexpress.h +++ b/engines/lastexpress/lastexpress.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/lastexpress/menu/clock.cpp b/engines/lastexpress/menu/clock.cpp index dedf045940..fadb578de6 100644 --- a/engines/lastexpress/menu/clock.cpp +++ b/engines/lastexpress/menu/clock.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/lastexpress/menu/clock.h b/engines/lastexpress/menu/clock.h index 339a18604f..248f2439af 100644 --- a/engines/lastexpress/menu/clock.h +++ b/engines/lastexpress/menu/clock.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/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp index c48e55bb55..cbd2a4a819 100644 --- a/engines/lastexpress/menu/menu.cpp +++ b/engines/lastexpress/menu/menu.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/lastexpress/menu/menu.h b/engines/lastexpress/menu/menu.h index 4b84c065cb..5943c940ca 100644 --- a/engines/lastexpress/menu/menu.h +++ b/engines/lastexpress/menu/menu.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/lastexpress/menu/trainline.cpp b/engines/lastexpress/menu/trainline.cpp index f819776163..fe6c7ca979 100644 --- a/engines/lastexpress/menu/trainline.cpp +++ b/engines/lastexpress/menu/trainline.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/lastexpress/menu/trainline.h b/engines/lastexpress/menu/trainline.h index af6a121e9c..bad01610e9 100644 --- a/engines/lastexpress/menu/trainline.h +++ b/engines/lastexpress/menu/trainline.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/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp index 1d010355ac..2a48778c18 100644 --- a/engines/lastexpress/resource.cpp +++ b/engines/lastexpress/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/lastexpress/resource.h b/engines/lastexpress/resource.h index 90ac9b87ad..ddda4d6eb7 100644 --- a/engines/lastexpress/resource.h +++ b/engines/lastexpress/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/lastexpress/shared.h b/engines/lastexpress/shared.h index 56cf730e24..c0099db7ac 100644 --- a/engines/lastexpress/shared.h +++ b/engines/lastexpress/shared.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. @@ -755,7 +755,7 @@ enum ClothesIndex { }; ////////////////////////////////////////////////////////////////////////// -// Location of objects +// Objects (doors) ////////////////////////////////////////////////////////////////////////// enum ObjectLocation { kObjectLocationNone = 0, @@ -763,13 +763,27 @@ enum ObjectLocation { kObjectLocation2 = 2, // Bed ? kObjectLocation3 = 3, kObjectLocation4 = 4, // Window ? - kObjectLocation5 = 5, - kObjectLocation6 = 6, - kObjectLocation7 = 7, - kObjectLocation8 = 8, - kObjectLocation9 = 9, - kObjectLocation10 = 10, - kObjectLocation18 = 18 + kObjectLocation5 = 5, + kObjectLocation6 = 6, + kObjectLocation7 = 7, + kObjectLocation8 = 8, + kObjectLocation9 = 9, + kObjectLocation10 = 10, + kObjectLocation18 = 18 +}; + +enum ObjectModel { + kObjectModelNone = 0, + kObjectModel1 = 1, + kObjectModel2 = 2, + kObjectModel3 = 3, + kObjectModel4 = 4, + kObjectModel5 = 5, + kObjectModel6 = 6, + kObjectModel7 = 7, + kObjectModel8 = 8, + kObjectModel9 = 9, + kObjectModel10 = 10 }; ////////////////////////////////////////////////////////////////////////// diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp index 3d22657124..6bf1ebc9de 100644 --- a/engines/lastexpress/sound/entry.cpp +++ b/engines/lastexpress/sound/entry.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/lastexpress/sound/entry.h b/engines/lastexpress/sound/entry.h index a88b0b7210..d92b16a5dd 100644 --- a/engines/lastexpress/sound/entry.h +++ b/engines/lastexpress/sound/entry.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/lastexpress/sound/queue.cpp b/engines/lastexpress/sound/queue.cpp index 8904b48930..fe6d6f2251 100644 --- a/engines/lastexpress/sound/queue.cpp +++ b/engines/lastexpress/sound/queue.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/lastexpress/sound/queue.h b/engines/lastexpress/sound/queue.h index e1f9be1cf7..60c447596d 100644 --- a/engines/lastexpress/sound/queue.h +++ b/engines/lastexpress/sound/queue.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/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp index 319f7cd4f4..5f55f4e74e 100644 --- a/engines/lastexpress/sound/sound.cpp +++ b/engines/lastexpress/sound/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. @@ -1323,7 +1323,7 @@ void SoundManager::playLoopingSound(int param) { break; if (getEntities()->isInsideCompartment(kEntityPlayer, getEntityData(kEntityPlayer)->car, positions[pos])) { numLoops[0] = 1; - partNumber = (getObjects()->get((ObjectIndex)objNum).location - 2) < 1 ? 6 : 1; + partNumber = (getObjects()->get((ObjectIndex)objNum).status - 2) < 1 ? 6 : 1; } objNum++; } diff --git a/engines/lastexpress/sound/sound.h b/engines/lastexpress/sound/sound.h index 517543f470..81f1529286 100644 --- a/engines/lastexpress/sound/sound.h +++ b/engines/lastexpress/sound/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. |