diff options
Diffstat (limited to 'engines')
93 files changed, 186 insertions, 1475 deletions
diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp index 1e0baeaa81..69a8698ecb 100644 --- a/engines/agi/agi_v3.cpp +++ b/engines/agi/agi_v3.cpp @@ -52,14 +52,14 @@ int AgiLoader_v3::detectGame() { FSList fslist; FilesystemNode dir(ConfMan.get("path")); - if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) { - warning("AgiEngine: invalid game path '%s'", dir.path().c_str()); + if (!dir.getChildren(fslist, FilesystemNode::kListFilesOnly)) { + warning("AgiEngine: invalid game path '%s'", dir.getPath().c_str()); return errInvalidAGIFile; } for (FSList::const_iterator file = fslist.begin(); file != fslist.end() && !found; ++file) { - Common::String f = file->name(); + Common::String f = file->getName(); f.toLowercase(); if (f.hasSuffix("vol.0")) { diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 29b5bb726a..1ab59c0806 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -1876,13 +1876,13 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) { // First grab all filenames and at the same time count the number of *.wag files for (FSList::const_iterator file = fslist->begin(); file != fslist->end(); ++file) { if (file->isDirectory()) continue; - Common::String filename = file->name(); + Common::String filename = file->getName(); filename.toLowercase(); allFiles[filename] = true; // Save the filename in a hash table if (filename.hasSuffix(".wag")) { // Save latest found *.wag file's path (Can be used to open the file, the name can't) - wagFilePath = file->path(); + wagFilePath = file->getPath(); wagFileCount++; // Count found *.wag files } } diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp deleted file mode 100644 index bac4a34454..0000000000 --- a/engines/agi/wagparser.cpp +++ /dev/null @@ -1,229 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "common/stdafx.h" - -#include "common/file.h" -#include "common/util.h" - -#include "agi/wagparser.h" - -namespace Agi { - -WagProperty::WagProperty() { - setDefaults(); -} - -WagProperty::~WagProperty() { - deleteData(); -} - -WagProperty::WagProperty(const WagProperty &other) { - deepCopy(other); -} - -WagProperty &WagProperty::operator=(const WagProperty &other) { - if (&other != this) deepCopy(other); // Don't do self-assignment - return *this; -} - -void WagProperty::deepCopy(const WagProperty &other) { - _readOk = other._readOk; - _propCode = other._propCode; - _propType = other._propType; - _propNum = other._propNum; - _propSize = other._propSize; - - deleteData(); // Delete old data (If any) and set _propData to NULL - if (other._propData != NULL) { - _propData = new char[other._propSize + 1UL]; // Allocate space for property's data plus trailing zero - memcpy(_propData, other._propData, other._propSize + 1UL); // Copy the whole thing - } -} - -bool WagProperty::read(Common::SeekableReadStream &stream) { - // First read the property's header - _propCode = (enum WagPropertyCode) stream.readByte(); - _propType = (enum WagPropertyType) stream.readByte(); - _propNum = stream.readByte(); - _propSize = stream.readUint16LE(); - - if (stream.ioFailed()) { // Check that we got the whole header - _readOk = false; - return _readOk; - } - - // Then read the property's data - deleteData(); // Delete old data (If any) - _propData = new char[_propSize + 1UL]; // Allocate space for property's data plus trailing zero - uint32 readBytes = stream.read(_propData, _propSize); // Read the data in - _propData[_propSize] = 0; // Set the trailing zero for easy C-style string access - - _readOk = (_propData != NULL && readBytes == _propSize); // Check that we got the whole data - return _readOk; -} - -void WagProperty::clear() { - deleteData(); - setDefaults(); -} - -void WagProperty::setDefaults() { - _readOk = false; - _propCode = PC_UNDEFINED; - _propType = PT_UNDEFINED; - _propNum = 0; - _propSize = 0; - _propData = NULL; -} - -void WagProperty::deleteData() { - if (_propData != NULL) { - delete _propData; - _propData = NULL; - } -} - -WagFileParser::WagFileParser() : - _parsedOk(false) { -} - -WagFileParser::~WagFileParser() { -} - -bool WagFileParser::checkAgiVersionProperty(const WagProperty &version) const { - if (version.getCode() == WagProperty::PC_INTVERSION && // Must be AGI interpreter version property - version.getSize() >= 3 && // Need at least three characters for a version number like "X.Y" - isdigit(version.getData()[0]) && // And the first character must be a digit - (version.getData()[1] == ',' || version.getData()[1] == '.')) { // And the second a comma or a period - - for (int i = 2; i < version.getSize(); i++) // And the rest must all be digits - if (!isdigit(version.getData()[i])) - return false; // Bail out if found a non-digit after the decimal point - - return true; - } else // Didn't pass the preliminary test so fails - return false; -} - -uint16 WagFileParser::convertToAgiVersionNumber(const WagProperty &version) { - // Examples of the conversion: "2.44" -> 0x2440, "2.917" -> 0x2917, "3.002086" -> 0x3086. - if (checkAgiVersionProperty(version)) { // Check that the string is a valid AGI interpreter version string - // Convert first ascii digit to an integer and put it in the fourth nibble (Bits 12...15) of the version number - // and at the same time set all other nibbles to zero. - uint16 agiVerNum = ((uint16) (version.getData()[0] - '0')) << (3 * 4); - - // Convert at most three least significant digits of the version number's minor part - // (i.e. the part after the decimal point) and put them in order to the third, second - // and the first nibble of the version number. Just to clarify version.getSize() - 2 - // is the number of digits after the decimal point. - int32 digitCount = MIN<int32>(3, ((int32) version.getSize()) - 2); // How many digits left to convert - for (int i = 0; i < digitCount; i++) - agiVerNum |= ((uint16) (version.getData()[version.getSize() - digitCount + i] - '0')) << ((2 - i) * 4); - - debug(3, "WagFileParser: Converted AGI version from string %s to number 0x%x", version.getData(), agiVerNum); - return agiVerNum; - } else // Not a valid AGI interpreter version string - return 0; // Can't convert, so failure -} - -bool WagFileParser::checkWagVersion(Common::SeekableReadStream &stream) { - if (stream.size() >= WINAGI_VERSION_LENGTH) { // Stream has space to contain the WinAGI version string - // Read the last WINAGI_VERSION_LENGTH bytes of the stream and make a string out of it - char str[WINAGI_VERSION_LENGTH+1]; // Allocate space for the trailing zero also - uint32 oldStreamPos = stream.pos(); // Save the old stream position - stream.seek(stream.size() - WINAGI_VERSION_LENGTH); - uint32 readBytes = stream.read(str, WINAGI_VERSION_LENGTH); - stream.seek(oldStreamPos); // Seek back to the old stream position - str[readBytes] = 0; // Set the trailing zero to finish the C-style string - if (readBytes != WINAGI_VERSION_LENGTH) { // Check that we got the whole version string - debug(3, "WagFileParser::checkWagVersion: Error reading WAG file version from stream"); - return false; - } - debug(3, "WagFileParser::checkWagVersion: Read WinAGI version string (\"%s\")", str); - - // Check that the WinAGI version string is one of the two version strings - // WinAGI 1.1.21 recognizes as acceptable in the end of a *.wag file. - // Note that they are all of length 16 and are padded with spaces to be that long. - return scumm_stricmp(str, "WINAGI v1.0 ") == 0 || - scumm_stricmp(str, "1.0 BETA ") == 0; - } else { // Stream is too small to contain the WinAGI version string - debug(3, "WagFileParser::checkWagVersion: Stream is too small to contain a valid WAG file"); - return false; - } -} - -bool WagFileParser::parse(const char *filename) { - Common::File file; - WagProperty property; // Temporary property used for reading - Common::MemoryReadStream *stream = NULL; // The file is to be read fully into memory and handled using this - - _parsedOk = false; // We haven't parsed the file yet - - if (file.open(filename)) { // Open the file - stream = file.readStream(file.size()); // Read the file into memory - if (stream != NULL && stream->size() == file.size()) { // Check that the whole file was read into memory - if (checkWagVersion(*stream)) { // Check that WinAGI version string is valid - // It seems we've got a valid *.wag file so let's parse its properties from the start. - stream->seek(0); // Rewind the stream - if (!_propList.empty()) _propList.clear(); // Clear out old properties (If any) - - do { // Parse the properties - if (property.read(*stream)) { // Read the property and check it was read ok - _propList.push_back(property); // Add read property to properties list - debug(4, "WagFileParser::parse: Read property with code %d, type %d, number %d, size %d, data \"%s\"", - property.getCode(), property.getType(), property.getNumber(), property.getSize(), property.getData()); - } else // Reading failed, let's bail out - break; - } while (!endOfProperties(*stream)); // Loop until the end of properties - - // File was parsed successfully only if we got to the end of properties - // and all the properties were read successfully (Also the last). - _parsedOk = endOfProperties(*stream) && property.readOk(); - - if (!_parsedOk) // Error parsing stream - warning("Error parsing WAG file (%s). WAG file ignored", filename); - } else // Invalid WinAGI version string or it couldn't be read - warning("Invalid WAG file (%s) version or error reading it. WAG file ignored", filename); - } else // Couldn't fully read file into memory - warning("Error reading WAG file (%s) into memory. WAG file ignored", filename); - } else // Couldn't open file - warning("Couldn't open WAG file (%s). WAG file ignored", filename); - - if (stream != NULL) delete stream; // If file was read into memory, deallocate that buffer - return _parsedOk; -} - -const WagProperty *WagFileParser::getProperty(const WagProperty::WagPropertyCode code) const { - for (PropertyList::const_iterator iter = _propList.begin(); iter != _propList.end(); iter++) - if (iter->getCode() == code) return iter; - return NULL; -} - -bool WagFileParser::endOfProperties(const Common::SeekableReadStream &stream) const { - return stream.pos() >= (stream.size() - WINAGI_VERSION_LENGTH); -} - -} // End of namespace Agi diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h deleted file mode 100644 index 1fc554d522..0000000000 --- a/engines/agi/wagparser.h +++ /dev/null @@ -1,288 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -namespace Agi { - -/** - * WagProperty represents a single property from WinAGI's *.wag file. - * A property consists of a header and of data. - * The header consists of the following: - * - Property code (Integer/Enumeration, 1 byte) - * - Property type (Integer/Enumeration, 1 byte) - * - Property number (Integer, 1 byte) - * - Property size (Little endian integer, 2 bytes) - * And then there's the data with as many bytes as defined in the header's property size variable. - */ -class WagProperty { -// Constants, enumerations etc -public: - /** - * Property codes taken from WinAGI 1.1.21's source code file WinAGI/AGIObjects.bas. - */ - enum WagPropertyCode { - PC_GAMEDESC = 129, ///< Game description (WinAGI 1.1.21 limits these to 4096 bytes) - PC_GAMEAUTHOR, ///< Game author (WinAGI 1.1.21 limits these to 256 bytes) - PC_GAMEID, ///< Game ID - PC_INTVERSION, ///< Interpreter version (WinAGI 1.1.21 defaults to version 2.917) - PC_GAMELAST, ///< Last edit date - PC_GAMEVERSION, ///< Game version (WinAGI 1.1.21 limits these to 256 bytes) - PC_GAMEABOUT, ///< About game (WinAGI 1.1.21 limits these to 4096 bytes) - PC_GAMEEXEC, ///< Game executable - PC_RESDIR, ///< Resource directory name - PC_DEFSYNTAX, ///< Default syntax - PC_INVOBJDESC = 144, - PC_VOCABWORDDESC = 160, - PC_PALETTE = 172, - PC_USERESNAMES = 180, - PC_LOGIC = 192, - PC_PICTURE = 208, - PC_SOUND = 224, - PC_VIEW = 240, - PC_UNDEFINED = 0x100 ///< An undefined property code (Added for ScummVM). - }; - - /** - * Property types taken from WinAGI 1.1.21's source code file WinAGI/AGIObjects.bas. - * At the moment these aren't really at all needed by ScummVM. Just here if anyone decides to use them. - */ - enum WagPropertyType { - PT_ID, - PT_DESC, - PT_SYNTAX, - PT_CRC32, - PT_KEY, - PT_INST0, - PT_INST1, - PT_INST2, - PT_MUTE0, - PT_MUTE1, - PT_MUTE2, - PT_MUTE3, - PT_TPQN, - PT_ROOM, - PT_VIS0, - PT_VIS1, - PT_VIS2, - PT_VIS3, - PT_ALL = 0xff, - PT_UNDEFINED = 0x100 ///< An undefined property type (Added for ScummVM). - }; - -// Constructors, destructors, operators etc -public: - /** - * Creates an empty WagProperty object. - * No property header or property data in it. - */ - WagProperty(); - - /** - * Destructor. Releases allocated memory if any etc. The usual. - */ - ~WagProperty(); - - /** - * Copy constructor. Deep copies the variables. - */ - WagProperty(const WagProperty &other); - - /** - * Assignment operator. Deep copies the variables. - */ - WagProperty &operator=(const WagProperty &other); - -// Non-public helper methods -protected: - /** - * Sets the default values for member variables. - */ - void setDefaults(); - - /** - * Delete's the property's data from memory if we have it, otherwise does nothing. - */ - void deleteData(); - - /** - * Deep copies the parameter object to this object. - * @param other The object to be deep copied to this object. - */ - void deepCopy(const WagProperty &other); - -// Public methods that have side-effects -public: - /** - * Read in a property (Header and data). - * @return True if reading was a success, false otherwise. - */ - bool read(Common::SeekableReadStream &stream); - - /** - * Clears the property. - * After this the property is empty. No header or data. - */ - void clear(); - -// Public access functions -public: - /** - * Was the property read ok from the source stream? - */ - bool readOk() const { return _readOk; }; - - /** - * Return the property's code. - * @return The property's code if readOk(), PC_UNDEFINED otherwise. - */ - enum WagPropertyCode getCode() const { return _propCode; }; - - /** - * Return the property's type. - * @return The property's type if readOk(), PT_UNDEFINED otherwise. - */ - enum WagPropertyType getType() const { return _propType; }; - - /** - * Return the property's number. - * @return The property's number if readOk(), 0 otherwise. - */ - byte getNumber() const { return _propNum; }; - - /** - * Return the property's data's length. - * @return The property's data's length if readOk(), 0 otherwise. - */ - uint16 getSize() const { return _propSize; } - - /** - * Return property's data. Constant access version. - * Can be used as a C-style string (i.e. this is guaranteed to have a trailing zero). - * @return The property's data if readOk(), NULL otherwise. - */ - const char *getData() const { return _propData; }; - -// Member variables -protected: - bool _readOk; ///< Was the property read ok from the source stream? - enum WagPropertyCode _propCode; ///< Property code (Part of the property's header) - enum WagPropertyType _propType; ///< Property type (Part of the property's header) - byte _propNum; ///< Property number (Part of the property's header) - uint16 _propSize; ///< Property's size (Part of the property's header) - char *_propData; ///< The property's data (Plus a trailing zero for C-style string access) -}; - - -/** - * Class for parsing *.wag files created by WinAGI. - * Using this class you can get information about fanmade AGI games if they have provided a *.wag file with them. - */ -class WagFileParser { -// Constants, type definitions, enumerations etc. -public: - static const uint WINAGI_VERSION_LENGTH = 16; ///< WinAGI's version string's length (Always 16) - typedef Common::Array<WagProperty> PropertyList; ///< A type definition for an array of *.wag file properties - -public: - /** - * Constructor. Creates a WagFileParser object in a default state. - */ - WagFileParser(); - - /** - * Destructor. - */ - ~WagFileParser(); - - /** - * Loads a *.wag file and parses it. - * @note After this you can access the loaded properties using getProperty() and getProperties() etc. - * @param filename Name of the file to be parsed. - * @return True if parsed successfully, false otherwise. - */ - bool parse(const char *filename); - - /** - * Get list of the loaded properties. - * @note Use only after a call to parse() first. - * @return The list of loaded properties. - */ - const PropertyList &getProperties() const { return _propList; }; - - /** - * Get property with the given property code. - * @note Use only after a call to parse() first. - * @return Pointer to the property if its found in memory, NULL otherwise. - * - * TODO/FIXME: Handle cases where several properties with the given property code are found. - * At the moment we don't need this functionality because the properties we use - * for fallback detection probably don't have multiples in the WAG-file. - * TODO: Make this faster than linear time if desired/needed. - */ - const WagProperty *getProperty(const WagProperty::WagPropertyCode code) const; - - /** - * Tests if the given property contains a valid AGI interpreter version string. - * A valid AGI interpreter version string is of the form "X.Y" or "X,Y" where - * X is a single decimal digit and Y is a string of decimal digits (At least one digit). - * @param version The property to be tested. - * @return True if the given property contains a valid AGI interpreter version string, false otherwise. - */ - bool checkAgiVersionProperty(const WagProperty &version) const; - - /** - * Convert property's data to an AGI interpreter version number. - * @param version The property to be converted (Property code should be PC_INTVERSION). - * @return AGI interpreter version number if successful, 0 otherwise. - */ - uint16 convertToAgiVersionNumber(const WagProperty &version); - - /** - * Was the file parsed successfully? - * @return True if file was parsed successfully, false otherwise. - */ - bool parsedOk() const { return _parsedOk; }; - -protected: - /** - * Checks if stream has a valid WinAGI version string in its end. - * @param stream The stream to be checked. - * @return True if reading was successful and stream contains a valid WinAGI version string, false otherwise. - */ - bool checkWagVersion(Common::SeekableReadStream &stream); - - /** - * Checks if we're at or past the end of the properties stored in the stream. - * @param stream The stream whose seeking position is to be checked. - * @return True if stream's seeking position is at or past the end of the properties, false otherwise. - */ - bool endOfProperties(const Common::SeekableReadStream &stream) const; - -// Member variables -protected: - PropertyList _propList; ///< List of loaded properties from the file. - bool _parsedOk; ///< Did the parsing of the file go ok? -}; - -} // End of namespace Agi diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index f16224dacd..0f5aa2768a 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/agos/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 6e499d2724..cb6123dc54 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/agos/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 4ba083a653..4746e87a66 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cine/sound.cpp $ + * $Id:sound.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cine/sound.h b/engines/cine/sound.h index 719f37f151..4ebda2c236 100644 --- a/engines/cine/sound.h +++ b/engines/cine/sound.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cine/sound.h $ + * $Id:sound.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 44b0c9c92d..dd38e15838 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/actor.cpp $ + * $Id:actor.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h index 43b9b03e87..072eef9581 100644 --- a/engines/cruise/actor.h +++ b/engines/cruise/actor.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/actor.h $ + * $Id:actor.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp index c375b37b1b..ebf0b78934 100644 --- a/engines/cruise/background.cpp +++ b/engines/cruise/background.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/background.cpp $ + * $Id:background.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/background.h b/engines/cruise/background.h index d506d1663e..b8b9e623c6 100644 --- a/engines/cruise/background.h +++ b/engines/cruise/background.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/background.h $ + * $Id:background.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp index 25713394d9..edaa68b490 100644 --- a/engines/cruise/backgroundIncrust.cpp +++ b/engines/cruise/backgroundIncrust.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/backgroundIncrust.cpp $ + * $Id:backgroundIncrust.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/backgroundIncrust.h b/engines/cruise/backgroundIncrust.h index 6de30978fd..3f61faadae 100644 --- a/engines/cruise/backgroundIncrust.h +++ b/engines/cruise/backgroundIncrust.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/backgroundIncrust.h $ + * $Id:backgroundIncrust.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cell.cpp b/engines/cruise/cell.cpp index d4b5aaed66..8a7b524a7b 100644 --- a/engines/cruise/cell.cpp +++ b/engines/cruise/cell.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cell.cpp $ + * $Id:cell.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cell.h b/engines/cruise/cell.h index c10ab93541..ea2fb7e777 100644 --- a/engines/cruise/cell.h +++ b/engines/cruise/cell.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cell.h $ + * $Id:cell.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index 9693fb7d03..b427498c6f 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise.cpp $ + * $Id:cruise.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index 73de46c599..cf768d8d57 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise.h $ + * $Id:cruise.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index bd6f341d24..79a699433f 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise_main.cpp $ + * $Id:cruise_main.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h index c42650a007..324d99f024 100644 --- a/engines/cruise/cruise_main.h +++ b/engines/cruise/cruise_main.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/cruise_main.h $ + * $Id:cruise_main.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/ctp.cpp b/engines/cruise/ctp.cpp index 84e510a53f..07df6029b2 100644 --- a/engines/cruise/ctp.cpp +++ b/engines/cruise/ctp.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/ctp.cpp $ + * $Id:ctp.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/ctp.h b/engines/cruise/ctp.h index 2ea47ce62e..b35523a3a7 100644 --- a/engines/cruise/ctp.h +++ b/engines/cruise/ctp.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/ctp.h $ + * $Id:ctp.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 54a0e97732..2212a3bde2 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/dataLoader.cpp $ + * $Id:dataLoader.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/dataLoader.h b/engines/cruise/dataLoader.h index 46e4ef447f..6b6bf52cf6 100644 --- a/engines/cruise/dataLoader.h +++ b/engines/cruise/dataLoader.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/dataLoader.h $ + * $Id:dataLoader.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp index 7adfd00f3e..68beab0846 100644 --- a/engines/cruise/decompiler.cpp +++ b/engines/cruise/decompiler.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/decompiler.cpp $ + * $Id:decompiler.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/delphine-unpack.cpp b/engines/cruise/delphine-unpack.cpp index b1cdc13148..db4188fbfe 100644 --- a/engines/cruise/delphine-unpack.cpp +++ b/engines/cruise/delphine-unpack.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/delphine-unpack.cpp $ + * $Id:delphine-unpack.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 2ca83f4046..fc1d864a56 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index c94bbc8f82..92064acc53 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/font.cpp $ + * $Id:font.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/font.h b/engines/cruise/font.h index b74482962d..2a75cf28dd 100644 --- a/engines/cruise/font.h +++ b/engines/cruise/font.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/font.h $ + * $Id:font.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/fontCharacterTable.cpp b/engines/cruise/fontCharacterTable.cpp index 2c2dddc479..ce0bec0f0f 100644 --- a/engines/cruise/fontCharacterTable.cpp +++ b/engines/cruise/fontCharacterTable.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/fontCharacterTable.cpp $ + * $Id:fontCharacterTable.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/fontCharacterTable.h b/engines/cruise/fontCharacterTable.h index 0bfe78641a..f7956968ec 100644 --- a/engines/cruise/fontCharacterTable.h +++ b/engines/cruise/fontCharacterTable.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/fontCharacterTable.h $ + * $Id:fontCharacterTable.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 7841a5e4ce..092425bfc7 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/function.cpp $ + * $Id:function.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/function.h b/engines/cruise/function.h index 13eb21ea1f..76100e41ba 100644 --- a/engines/cruise/function.h +++ b/engines/cruise/function.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/function.h $ + * $Id:function.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index 881bf1d3ca..119f99739e 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/gfxModule.cpp $ + * $Id:gfxModule.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/gfxModule.h b/engines/cruise/gfxModule.h index e63b26e29f..7339113f4c 100644 --- a/engines/cruise/gfxModule.h +++ b/engines/cruise/gfxModule.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/gfxModule.h $ + * $Id:gfxModule.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp index 6cd28062d3..0057625e81 100644 --- a/engines/cruise/linker.cpp +++ b/engines/cruise/linker.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/linker.cpp $ + * $Id:linker.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h index 808ace75e0..975ed0f322 100644 --- a/engines/cruise/linker.h +++ b/engines/cruise/linker.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/linker.h $ + * $Id:linker.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 95142e9edf..3d409d0ba5 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mainDraw.cpp $ + * $Id:mainDraw.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mainDraw.h b/engines/cruise/mainDraw.h index ad10bcddc6..7ff6ffdc8f 100644 --- a/engines/cruise/mainDraw.h +++ b/engines/cruise/mainDraw.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mainDraw.h $ + * $Id:mainDraw.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp index 2ea8c4ff8c..e30542cc1b 100644 --- a/engines/cruise/menu.cpp +++ b/engines/cruise/menu.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/menu.cpp $ + * $Id:menu.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/menu.h b/engines/cruise/menu.h index 4e15d15cf1..9a33545224 100644 --- a/engines/cruise/menu.h +++ b/engines/cruise/menu.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/menu.h $ + * $Id:menu.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mouse.cpp b/engines/cruise/mouse.cpp index a918e0536f..c9cec8f72a 100644 --- a/engines/cruise/mouse.cpp +++ b/engines/cruise/mouse.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mouse.cpp $ + * $Id:mouse.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/mouse.h b/engines/cruise/mouse.h index a6911ce27e..c7ef2a69c5 100644 --- a/engines/cruise/mouse.h +++ b/engines/cruise/mouse.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/mouse.h $ + * $Id:mouse.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 22e81dea90..ce4de2a12b 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/object.cpp $ + * $Id:object.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/object.h b/engines/cruise/object.h index 546d2bc440..feec666687 100644 --- a/engines/cruise/object.h +++ b/engines/cruise/object.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/object.h $ + * $Id:object.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 2b83e0f2b2..c1b35f61f6 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/overlay.cpp $ + * $Id:overlay.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/overlay.h b/engines/cruise/overlay.h index 5d2e4e890e..03db06fada 100644 --- a/engines/cruise/overlay.h +++ b/engines/cruise/overlay.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/overlay.h $ + * $Id:overlay.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp index e0cd85f2fe..a95607a2f1 100644 --- a/engines/cruise/perso.cpp +++ b/engines/cruise/perso.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/perso.cpp $ + * $Id:perso.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/perso.h b/engines/cruise/perso.h index aa9f59a1a3..0d5676a4c8 100644 --- a/engines/cruise/perso.h +++ b/engines/cruise/perso.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/perso.h $ + * $Id:perso.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/polys.cpp b/engines/cruise/polys.cpp index a2eea8a9a7..83192b0dda 100644 --- a/engines/cruise/polys.cpp +++ b/engines/cruise/polys.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/polys.cpp $ + * $Id:polys.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/polys.h b/engines/cruise/polys.h index 53ce4672cd..b5da8dd241 100644 --- a/engines/cruise/polys.h +++ b/engines/cruise/polys.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/polys.h $ + * $Id:polys.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index b5ec064d4b..d6b2c9ec93 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/saveload.cpp $ + * $Id:saveload.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/saveload.h b/engines/cruise/saveload.h index 5a719066c5..de97f24b64 100644 --- a/engines/cruise/saveload.h +++ b/engines/cruise/saveload.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/saveload.h $ + * $Id:saveload.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index d3d88a8b5f..dc1b12f736 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/script.cpp $ + * $Id:script.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/script.h b/engines/cruise/script.h index e5d21b1ba0..ca7d812836 100644 --- a/engines/cruise/script.h +++ b/engines/cruise/script.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/script.h $ + * $Id:script.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stack.cpp b/engines/cruise/stack.cpp index 1639ba3942..7622564503 100644 --- a/engines/cruise/stack.cpp +++ b/engines/cruise/stack.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stack.cpp $ + * $Id:stack.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stack.h b/engines/cruise/stack.h index 831c07e217..1adb3540cb 100644 --- a/engines/cruise/stack.h +++ b/engines/cruise/stack.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stack.h $ + * $Id:stack.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stringSupport.cpp b/engines/cruise/stringSupport.cpp index 791f203d9b..54747104ff 100644 --- a/engines/cruise/stringSupport.cpp +++ b/engines/cruise/stringSupport.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stringSupport.cpp $ + * $Id:stringSupport.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/stringSupport.h b/engines/cruise/stringSupport.h index 841e2dd496..531fe56aca 100644 --- a/engines/cruise/stringSupport.h +++ b/engines/cruise/stringSupport.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/stringSupport.h $ + * $Id:stringSupport.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/various.cpp b/engines/cruise/various.cpp index 5c6134c374..e4c908af5f 100644 --- a/engines/cruise/various.cpp +++ b/engines/cruise/various.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/various.cpp $ + * $Id:various.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/various.h b/engines/cruise/various.h index fe18e5abd6..f6e07e00e7 100644 --- a/engines/cruise/various.h +++ b/engines/cruise/various.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/various.h $ + * $Id:various.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/vars.cpp b/engines/cruise/vars.cpp index 094680f0bb..1a3d5f0a27 100644 --- a/engines/cruise/vars.cpp +++ b/engines/cruise/vars.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/vars.cpp $ + * $Id:vars.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h index dbace8bdf3..63a15f24e4 100644 --- a/engines/cruise/vars.h +++ b/engines/cruise/vars.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/vars.h $ + * $Id:vars.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index b32ffb0ccd..901ac4a7a5 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/volume.cpp $ + * $Id:volume.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/cruise/volume.h b/engines/cruise/volume.h index 0f9e489236..7881f6c872 100644 --- a/engines/cruise/volume.h +++ b/engines/cruise/volume.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/volume.h $ + * $Id:volume.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp index 61e7fb61d0..6f1af258ca 100644 --- a/engines/gob/init_v3.cpp +++ b/engines/gob/init_v3.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/gob/init_v3.cpp $ + * $Id:init_v3.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 46bcc1e85f..e1b5a2b7c3 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ */ #include "kyra/kyra.h" diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 3246e0f426..7fc13a6c38 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v1.cpp $ + * $Id:kyra_v1.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 5afa248981..e103086dc4 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v1.h $ + * $Id:kyra_v1.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 03d1f8e27e..6857b3ac09 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.cpp $ + * $Id:kyra_v2.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index e3dac3f0d5..a002baec19 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v2.h $ + * $Id:kyra_v2.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index f035158892..eee901598e 100644 --- a/engines/kyra/kyra_v3.cpp +++ b/engines/kyra/kyra_v3.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v3.cpp $ + * $Id:kyra_v3.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h index 5616fcbf0e..eda382d89a 100644 --- a/engines/kyra/kyra_v3.h +++ b/engines/kyra/kyra_v3.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/kyra/kyra_v3.h $ + * $Id:kyra_v3.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 7c15cee2f9..319845c22c 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -82,8 +82,8 @@ Resource::Resource(KyraEngine *vm) { FSList fslist; FilesystemNode dir(ConfMan.get("path")); - if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) - error("invalid game path '%s'", dir.path().c_str()); + if (!dir.getChildren(fslist, FilesystemNode::kListFilesOnly)) + error("invalid game path '%s'", dir.getPath().c_str()); if (_vm->game() == GI_KYRA1 && _vm->gameFlags().isTalkie) { static const char *list[] = { @@ -96,7 +96,7 @@ Resource::Resource(KyraEngine *vm) { Common::for_each(_pakfiles.begin(), _pakfiles.end(), Common::bind2nd(Common::mem_fun(&ResourceFile::protect), true)); } else { for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { - Common::String filename = file->name(); + Common::String filename = file->getName(); filename.toUppercase(); // No real PAK file! @@ -104,8 +104,8 @@ Resource::Resource(KyraEngine *vm) { continue; if (filename.hasSuffix("PAK") || filename.hasSuffix("APK")) { - if (!loadPakFile(file->name())) - error("couldn't open pakfile '%s'", file->name().c_str()); + if (!loadPakFile(file->getName())) + error("couldn't open pakfile '%s'", file->getName().c_str()); } } diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index b4a69bfd43..d072a009d5 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/lure/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp deleted file mode 100644 index 4c478bbc17..0000000000 --- a/engines/lure/fights.cpp +++ /dev/null @@ -1,583 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "lure/fights.h" -#include "lure/luredefs.h" -#include "lure/game.h" -#include "lure/res.h" -#include "lure/room.h" -#include "lure/sound.h" - -namespace Lure { - -// Three records containing initial states for player, pig, and Skorl -FighterRecord fighterList[3] = { - {0x23C, 0x440, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {0, 0x441, 0x1092, 0, 3, 0, 0, 0, 0xB94, 8, 0xA34, 0x8D4, 0xD06, 0, - 0, 0, 0, 0, 0xDDC, PLAYER_ID}, - {0, 0x446, 0x1092, 0, 3, 0, 0, 0, 0xB94, 8, 0xA34, 0x8D4, 0xD06, 0, - 0, 0, 0, 0, 0xDDC, PLAYER_ID} -}; - -FightsManager *int_fights = NULL; - -FightsManager::FightsManager() { - int_fights = this; - _fightData = NULL; - _mouseFlags = 0; -} - -FightsManager::~FightsManager() { - if (_fightData != NULL) - // Release the fight data - delete _fightData; -} - -FightsManager &FightsManager::getReference() { - return *int_fights; -} - -FighterRecord &FightsManager::getDetails(uint16 hotspotId) { - if (hotspotId == PLAYER_ID) return fighterList[0]; - else if (hotspotId == PIG_ID) return fighterList[1]; - else if (hotspotId == SKORL_FIGHTER_ID) return fighterList[2]; - error("Unknown NPC %d attempted to fight", hotspotId); -} - -// Sets up the data for the pig fight in the cave - -void FightsManager::setupPigFight() { - Resources &res = Resources::getReference(); - Hotspot *player = res.getActiveHotspot(PLAYER_ID); - player->setSkipFlag(false); - player->resource()->colourOffset = 16; - player->setTickProc(PLAYER_FIGHT_TICK_PROC_ID); - player->setSize(48, 53); - player->setAnimation(PLAYER_FIGHT_ANIM_ID); - player->resource()->width = 48; - player->resource()->height = 53; - - player->setOccupied(false); - player->setPosition(262, 94); - FighterRecord &rec = getDetails(PLAYER_ID); - rec.fwhits = 0; - rec.fwtrue_x = 262; - rec.fwtrue_y = 53; - rec.fwseq_ad = FIGHT_PLAYER_INIT; - rec.fwenemy_ad = PIG_ID; -} - -void FightsManager::setupSkorlFight() { - Resources &res = Resources::getReference(); - Hotspot *player = res.getActiveHotspot(PLAYER_ID); - FighterRecord &rec = getDetails(PLAYER_ID); - - setupPigFight(); - - rec.fwenemy_ad = SKORL_FIGHTER_ID; - rec.fwweapon = 0x445; - rec.fwtrue_x = 282; - rec.fwtrue_y = 136; - player->setPosition(282, 136); - player->resource()->colourOffset = 96; -} - -bool FightsManager::isFighting() { - FighterRecord &rec = getDetails(PLAYER_ID); - return rec.fwhits == 0; -} - -void FightsManager::fightLoop() { - Resources &res = Resources::getReference(); - Events &events = Events::getReference(); - FighterRecord &playerFight = getDetails(PLAYER_ID); - - // Loop for the duration of the battle - while (!events.quitFlag && (playerFight.fwhits != GENERAL_MAGIC_ID)) { - checkEvents(); - - Game::getReference().tick(); - Room::getReference().update(); - res.delayList().tick(); - Screen::getReference().update(); - - g_system->delayMillis(20); - } -} - -void FightsManager::saveToStream(Common::WriteStream *stream) { - for (int fighterCtr = 0; fighterCtr < 3; ++fighterCtr) { - FighterRecord &rec = fighterList[fighterCtr]; - - stream->writeUint16LE(rec.fwseq_no); - stream->writeUint16LE(rec.fwseq_ad); - stream->writeUint16LE(rec.fwdist); - stream->writeUint16LE(rec.fwwalk_roll); - stream->writeUint16LE(rec.fwmove_number); - stream->writeUint16LE(rec.fwhits); - } -} - -void FightsManager::loadFromStream(Common::ReadStream *stream) { - for (int fighterCtr = 0; fighterCtr < 3; ++fighterCtr) { - FighterRecord &rec = fighterList[fighterCtr]; - - rec.fwseq_no = stream->readUint16LE(); - rec.fwseq_ad = stream->readUint16LE(); - rec.fwdist = stream->readUint16LE(); - rec.fwwalk_roll = stream->readUint16LE(); - rec.fwmove_number = stream->readUint16LE(); - rec.fwhits = stream->readUint16LE(); - } -} - -const CursorType moveList[] = {CURSOR_LEFT_ARROW, CURSOR_FIGHT_UPPER, - CURSOR_FIGHT_MIDDLE, CURSOR_FIGHT_LOWER, CURSOR_RIGHT_ARROW}; - -struct KeyMapping { - Common::KeyCode keycode; - uint8 moveNumber; -}; - -const KeyMapping keyList[] = { - {Common::KEYCODE_LEFT, 10}, {Common::KEYCODE_RIGHT, 14}, {Common::KEYCODE_7, 11}, {Common::KEYCODE_4, 12}, - {Common::KEYCODE_1, 13}, {Common::KEYCODE_9, 6}, {Common::KEYCODE_6, 7}, {Common::KEYCODE_3, 8}, {Common::KEYCODE_INVALID, 0}}; - -void FightsManager::checkEvents() { - Events &events = Events::getReference(); - if (!events.pollEvent()) return; - FighterRecord &rec = getDetails(PLAYER_ID); - Hotspot *player = Resources::getReference().getActiveHotspot(PLAYER_ID); - Mouse &mouse = Mouse::getReference(); - - int moveNumber = 0; - - if (events.type() == Common::EVENT_KEYDOWN) { - switch (events.event().kbd.keycode) { - case Common::KEYCODE_ESCAPE: - events.quitFlag = true; - break; - - default: - // Scan through the mapping list for a move for the keypress - const KeyMapping *keyPtr = &keyList[0]; - while ((keyPtr->keycode != Common::KEYCODE_INVALID) && - (keyPtr->keycode != events.event().kbd.keycode)) - ++keyPtr; - if (keyPtr->keycode != Common::KEYCODE_INVALID) - moveNumber = keyPtr->moveNumber; - } - } - - if (events.type() == Common::EVENT_MOUSEMOVE) { - Point mPos = events.event().mouse; - if (mPos.x < rec.fwtrue_x - 12) - mouse.setCursorNum(CURSOR_LEFT_ARROW); - else if (mPos.x > rec.fwtrue_x + player->width()) - mouse.setCursorNum(CURSOR_RIGHT_ARROW); - else if (mPos.y < player->y() + 4) - mouse.setCursorNum(CURSOR_FIGHT_UPPER); - else if (mPos.y < player->y() + 38) - mouse.setCursorNum(CURSOR_FIGHT_MIDDLE); - else - mouse.setCursorNum(CURSOR_FIGHT_LOWER); - } - - if ((events.type() == Common::EVENT_LBUTTONDOWN) || - (events.type() == Common::EVENT_RBUTTONDOWN) || - (events.type() == Common::EVENT_LBUTTONUP) || - (events.type() == Common::EVENT_RBUTTONUP)) { - _mouseFlags = 0; - if (events.type() == Common::EVENT_LBUTTONDOWN) ++_mouseFlags; - if (events.type() == Common::EVENT_RBUTTONDOWN) _mouseFlags += 2; - } - - // Get the correct base index for the move - while ((moveNumber < 5) && (moveList[moveNumber] != mouse.getCursorNum())) - ++moveNumber; - if (moveNumber < 5) { - if (_mouseFlags == 1) - // Left mouse - moveNumber += 10; - else if (_mouseFlags == 2) - // Right mouse - moveNumber += 5; - } - - rec.fwmove_number = moveNumber; - - if (rec.fwmove_number >= 5) - debugC(ERROR_INTERMEDIATE, kLureDebugFights, - "Player fight move number=%d", rec.fwmove_number); -} - -void FightsManager::fighterAnimHandler(Hotspot &h) { - FighterRecord &fighter = getDetails(h.hotspotId()); - FighterRecord &opponent = getDetails(fighter.fwenemy_ad); - FighterRecord &player = getDetails(PLAYER_ID); - - fetchFighterDistance(fighter, opponent); - - if (fighter.fwseq_ad) { - fightHandler(h, fighter.fwseq_ad); - return; - } - - uint16 seqNum = 0; - if (fighter.fwdist != FIGHT_DISTANCE) { - seqNum = getFighterMove(fighter, fighter.fwnot_near); - } else { - uint16 offset = (fighter.fwhits * fighter.fwdef_len) + fighter.fwdefend_adds + 4; - - // Scan for the given sequence - uint16 v = getWord(offset); - while ((v != 0) && (v != player.fwseq_no)) { - offset += 4; - v = getWord(offset); - } - - if (v == 0) { - // No sequence match found - seqNum = getFighterMove(fighter, fighter.fwattack_table); - } else { - v = getWord(offset + 2); - seqNum = getFighterMove(fighter, fighter.fwdefend_table); - - if (seqNum == 0) - seqNum = getFighterMove(fighter, fighter.fwattack_table); - else if (seqNum == 0xff) - seqNum = v; - } - } - - // Set the sequence and pass onto the fight handler - fighter.fwseq_no = seqNum; - fighter.fwseq_ad = getWord(FIGHT_TBL_1 + (seqNum << 1)); -} - -void FightsManager::playerAnimHandler(Hotspot &h) { - FighterRecord &fighter = getDetails(h.hotspotId()); - fightHandler(h, fighter.fwseq_ad); -} - -void FightsManager::fightHandler(Hotspot &h, uint16 moveOffset) { - Resources &res = Resources::getReference(); - FighterRecord &fighter = getDetails(h.hotspotId()); - FighterRecord &opponent = getDetails(fighter.fwenemy_ad); - - uint16 v1, v2; - bool breakFlag = false; - - while (!breakFlag) { - if (moveOffset == 0) { - // Player is doing nothing, so check the move number - moveOffset = getWord(FIGHT_PLAYER_MOVE_TABLE + (fighter.fwmove_number << 1)); - - debugC(ERROR_DETAILED, kLureDebugFights, - "Hotspot %xh fight move=%d, new offset=%xh", - h.hotspotId(), fighter.fwmove_number, moveOffset); - - if (moveOffset == 0) - return; - - fighter.fwseq_no = fighter.fwmove_number; - fighter.fwseq_ad = moveOffset; - } - - uint16 moveValue = getWord(moveOffset); - debugC(ERROR_DETAILED, kLureDebugFights, - "Hotspot %xh script offset=%xh value=%xh", - h.hotspotId(), moveOffset, moveValue); - moveOffset += sizeof(uint16); - - if ((moveValue & 0x8000) == 0) { - // Set frame to specified number - h.setFrameNumber(moveValue); - - // Set the new fighter position - int16 newX, newY; - newX = h.x() + (int16)getWord(moveOffset); - if (newX < 32) newX = 32; - if (newX > 240) newX = 240; - newY = h.y() + (int16)getWord(moveOffset + 2); - h.setPosition(newX, newY); - - if (fighter.fwweapon != 0) { - Hotspot *weaponHotspot = res.getActiveHotspot(fighter.fwweapon); - assert(weaponHotspot); - weaponHotspot->setFrameNumber(getWord(moveOffset + 4)); - weaponHotspot->setPosition(weaponHotspot->x() + - (int16)getWord(moveOffset + 6), - weaponHotspot->y() + getWord(moveOffset + 8)); - } - - moveOffset += 5 * sizeof(uint16); - fighter.fwseq_ad = moveOffset; - return; - } - - switch (moveValue) - { - case 0xFFFA: - // Walk left - if ((fighter.fwmove_number == 5) || (fighter.fwmove_number == 10)) { - if (h.x() < 32) { - breakFlag = true; - } else { - h.setPosition(h.x() - 4, h.y()); - fighter.fwtrue_x = h.x(); - if (fetchFighterDistance(fighter, opponent) < FIGHT_DISTANCE) { - h.setPosition(h.x() + 4, h.y()); - fighter.fwtrue_x += 4; - breakFlag = true; - } else { - removeWeapon(fighter.fwweapon); - fighter.fwtrue_x = h.x(); - fighter.fwtrue_y = h.y(); - - uint16 frameNum = (fighter.fwwalk_roll == 7) ? 0 : - fighter.fwwalk_roll + 1; - fighter.fwwalk_roll = frameNum; - fighter.fwseq_ad = moveOffset; - h.setFrameNumber(frameNum); - return; - } - } - } else { - // Signal to start a new action - moveOffset = 0; - } - break; - - case 0xFFF9: - // Walk right - if ((fighter.fwmove_number == 9) || (fighter.fwmove_number == 14)) { - if (h.x() >= 240) { - breakFlag = true; - } else { - removeWeapon(fighter.fwweapon); - h.setPosition(h.x() + 4, h.y()); - fighter.fwtrue_x = h.x(); - fighter.fwtrue_y = h.y(); - - fighter.fwwalk_roll = (fighter.fwwalk_roll == 0) ? 7 : - fighter.fwwalk_roll - 1; - fighter.fwseq_ad = moveOffset; - h.setFrameNumber(fighter.fwwalk_roll); - return; - } - - } else { - // Signal to start a new action - moveOffset = 0; - } - break; - - case 0xFFEB: - // Enemy right - removeWeapon(fighter.fwweapon); - h.setPosition(h.x() + 4, h.y()); - fighter.fwtrue_x = h.x(); - - if (fetchFighterDistance(fighter, opponent) < FIGHT_DISTANCE) { - h.setPosition(h.x() - 4, h.y()); - fighter.fwtrue_x -= 4; - fighter.fwseq_ad = 0; - h.setFrameNumber(8); - } else { - h.setFrameNumber(getWord(moveOffset)); - moveOffset += sizeof(uint16); - fighter.fwseq_ad = moveOffset; - } - return; - - case 0xFFFB: - // End of sequence - breakFlag = true; - break; - - case 0xFFF8: - // Set fight address - moveOffset = getWord(moveOffset); - break; - - case 0xFFFF: - case 0xFFFE: - if (moveValue == 0xffff) - // Set the animation record - h.setAnimation(getWord(moveOffset)); - else - // New set animation record - h.setAnimation(getWord(fighter.fwheader_list + (getWord(moveOffset) << 1))); - h.setFrameNumber(0); - moveOffset += sizeof(uint16); - break; - - case 0xFFF7: - // On hold - if (getWord(moveOffset) == fighter.fwmove_number) - moveOffset = getWord(moveOffset + 2); - else - moveOffset += 2 * sizeof(uint16); - break; - - case 0xFFF6: - // Not hold - if (getWord(moveOffset) == fighter.fwmove_number) - moveOffset += 2 * sizeof(uint16); - else - moveOffset = getWord(moveOffset + 2); - break; - - case 0xFFF4: - // End sequence - fighter.fwseq_no = 0; - break; - - case 0xFFF2: - // Set defend - fighter.fwblocking = getWord(moveOffset); - moveOffset += sizeof(uint16); - break; - - case 0xFFF1: - // If blocking - v1 = getWord(moveOffset); - v2 = getWord(moveOffset + 2); - moveOffset += 2 * sizeof(uint16); - - if (v1 == opponent.fwblocking) { - Sound.playSound(42); - moveOffset = v2; - } - break; - - case 0xFFF0: - // Check hit - v1 = getWord(moveOffset); - moveOffset += sizeof(uint16); - if (fighter.fwdist <= FIGHT_DISTANCE) { - if (h.hotspotId() == PLAYER_ID) { - // Player hits opponent - Sound.playSound(52); - - if (opponent.fwhits != 5) { - opponent.fwseq_ad = v1; - if (++opponent.fwhit_value != opponent.fwhit_rate) { - opponent.fwhit_value = 0; - if (++opponent.fwhits == 5) - opponent.fwseq_ad = opponent.fwdie_seq; - } - } - } else { - // Opponent hit player - Sound.playSound(37); - opponent.fwseq_ad = v1; - if (++opponent.fwhits == 10) { - // Player has been killed - fighter.fwhits = 10; - opponent.fwseq_ad = FIGHT_PLAYER_DIES; - Sound.playSound(36); - } - } - } - break; - - case 0xFFEF: - // Save co-ordinates - fighter.fwtrue_x = h.x(); - fighter.fwtrue_y = h.y(); - break; - - case 0xFFEE: - // Restore co-ordinates - h.setPosition(fighter.fwtrue_x, fighter.fwtrue_y); - break; - - case 0xFFED: - // End of game - getDetails(PLAYER_ID).fwhits = GENERAL_MAGIC_ID; - Game::getReference().setState(GS_RESTORE_RESTART); - return; - - case 0xFFEC: - // Enemy has been killed - enemyKilled(); - break; - - case 0xFFEA: - // Fight sound - Sound.playSound(getWord(moveOffset)); - moveOffset += sizeof(uint16); - break; - - default: - error("Unknown fight command %xh", moveValue); - } - } - - fighter.fwseq_no = 0; - fighter.fwseq_ad = 0; - if (h.hotspotId() == PLAYER_ID) - _mouseFlags = 0; -} - -uint16 FightsManager::fetchFighterDistance(FighterRecord &f1, FighterRecord &f2) { - f1.fwdist = ABS(f1.fwtrue_x - f2.fwtrue_x) & 0xFFF8; - return f1.fwdist; -} - -void FightsManager::enemyKilled() { - Resources &res = Resources::getReference(); - Hotspot *playerHotspot = res.getActiveHotspot(PLAYER_ID); - FighterRecord &playerRec = getDetails(PLAYER_ID); - - playerHotspot->setTickProc(PLAYER_TICK_PROC_ID); - playerRec.fwhits = GENERAL_MAGIC_ID; - playerHotspot->resource()->colourOffset = 128; - playerHotspot->setSize(32, 48); - playerHotspot->resource()->width = 32; - playerHotspot->resource()->height = 48; - playerHotspot->setAnimation(PLAYER_ANIM_ID); - playerHotspot->setPosition(playerHotspot->x(), playerHotspot->y() + 5); - playerHotspot->setDirection(LEFT); - - if (playerHotspot->roomNumber() == 6) { - Dialog::show(0xc9f); - HotspotData *axeHotspot = res.getHotspot(0x2738); - axeHotspot->roomNumber = PLAYER_ID; - axeHotspot->flags |= HOTSPOTFLAG_FOUND; - } -} - -// Makes sure the given weapon is off-screen -void FightsManager::removeWeapon(uint16 weaponId) { - Hotspot *weaponHotspot = Resources::getReference().getActiveHotspot(weaponId); - weaponHotspot->setPosition(-32, -32); -} - -uint16 FightsManager::getFighterMove(FighterRecord &rec, uint16 baseOffset) { - int actionIndex = _rnd.getRandomNumber(31); - return getByte(baseOffset + (rec.fwhits << 5) + actionIndex); -} - -} // end of namespace Lure diff --git a/engines/lure/fights.h b/engines/lure/fights.h deleted file mode 100644 index 048949f2b6..0000000000 --- a/engines/lure/fights.h +++ /dev/null @@ -1,111 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#ifndef LURE_FIGHT_H -#define LURE_FIGHT_H - -#include "lure/luredefs.h" -#include "lure/hotspots.h" -#include "lure/palette.h" -#include "common/singleton.h" -#include "common/endian.h" - -namespace Lure { - -struct FighterRecord { - uint16 fwheader_list; - uint16 fwweapon; - uint16 fwdie_seq; - uint16 fwhit_value; - uint16 fwhit_rate; - int16 fwtrue_x; - int16 fwtrue_y; - uint16 fwblocking; - uint16 fwattack_table; - uint16 fwdef_len; - uint16 fwdefend_table; - uint16 fwnot_near; - uint16 fwdefend_adds; - uint16 fwseq_no; - uint16 fwdist; - uint16 fwwalk_roll; - uint16 fwmove_number; - uint16 fwhits; - uint16 fwseq_ad; - uint16 fwenemy_ad; -}; - -// Constant references into the fight data -#define FIGHT_TBL_1 0x8b8 -#define FIGHT_PLAYER_MOVE_TABLE 0xDAA -#define FIGHT_PLAYER_INIT 0xDC8 -#define FIGHT_PLAYER_DIES 0xF46 - -#define FIGHT_DISTANCE 32 - -class FightsManager { -private: - MemoryBlock *_fightData; - Common::RandomSource _rnd; - uint8 _mouseFlags; - - FighterRecord &getDetails(uint16 hotspotId); - uint16 fetchFighterDistance(FighterRecord &f1, FighterRecord &f2); - void removeWeapon(uint16 weaponId); - void enemyKilled(); - uint16 getFighterMove(FighterRecord &rec, uint16 baseOffset); - void checkEvents(); - void fightHandler(Hotspot &h, uint16 moveOffset); - - inline uint16 getWord(uint16 offset) { - if (!_fightData) - _fightData = Disk::getReference().getEntry(FIGHT_DATA_RESOURCE_ID); - if (offset >= _fightData->size() - 1) error("Invalid fight data index"); - return READ_LE_UINT16(_fightData->data() + offset); - } - inline uint8 getByte(uint16 offset) { - if (!_fightData) - _fightData = Disk::getReference().getEntry(FIGHT_DATA_RESOURCE_ID); - if (offset >= _fightData->size()) error("Invalid fight data index"); - return _fightData->data()[offset]; - } -public: - FightsManager(); - ~FightsManager(); - static FightsManager &getReference(); - - void setupPigFight(); - void setupSkorlFight(); - bool isFighting(); - void fightLoop(); - void saveToStream(Common::WriteStream *stream); - void loadFromStream(Common::ReadStream *stream); - - void fighterAnimHandler(Hotspot &h); - void playerAnimHandler(Hotspot &h); -}; - -#define Fights FightsManager::getReference() - -} // End of namespace Lure - -#endif diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp deleted file mode 100644 index 6961e4c7cc..0000000000 --- a/engines/lure/sound.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "lure/sound.h" - -DECLARE_SINGLETON(Lure::SoundManager); - -namespace Lure { - -void SoundManager::killSounds() { - -} - -void SoundManager::playSound(uint16 soundId) { - -} - -} // end of namespace Lure diff --git a/engines/lure/sound.h b/engines/lure/sound.h deleted file mode 100644 index 4a7422d77f..0000000000 --- a/engines/lure/sound.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2005-2006 The ScummVM project - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#ifndef LURE_SOUND_H -#define LURE_SOUND_H - -#include "lure/luredefs.h" -#include "common/singleton.h" - -namespace Lure { - -class SoundManager: public Common::Singleton<SoundManager> { -public: - static void killSounds(); - static void playSound(uint16 soundId); -}; - -} // End of namespace Lure - -#define Sound (::Lure::SoundManager::instance()) - -#endif diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index 3bc7835888..56c26b7b4f 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/font.cpp $ + * $Id:font.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp index 9976ec13a8..13b989e202 100644 --- a/engines/parallaction/sound.cpp +++ b/engines/parallaction/sound.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/sound.cpp $ + * $Id:sound.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index 920a804226..f244bd4070 100644 --- a/engines/parallaction/sound.h +++ b/engines/parallaction/sound.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/parallaction/sound.h $ + * $Id:sound.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index bbb186d0ae..c1e909ffdb 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -73,7 +73,7 @@ GameList Engine_QUEEN_detectGames(const FSList &fslist) { if (file->isDirectory()) { continue; } - if (file->name().equalsIgnoreCase("queen.1") || file->name().equalsIgnoreCase("queen.1c")) { + if (file->getName().equalsIgnoreCase("queen.1") || file->getName().equalsIgnoreCase("queen.1c")) { Common::File dataFile; if (!dataFile.open(*file)) { continue; diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 2096ca9af1..9b9a0ca872 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 8cef19d37f..631a1a4e83 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h index 3e1845abba..83bc536959 100644 --- a/engines/saga/displayinfo.h +++ b/engines/saga/displayinfo.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/saga/displayinfo.h $ + * $Id:displayinfo.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 2d260a9908..8624f80fe7 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -194,7 +194,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com // the first match is used. static bool searchFSNode(const FSList &fslist, const Common::String &name, FilesystemNode &result) { for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { - if (!scumm_stricmp(file->name().c_str(), name.c_str())) { + if (!scumm_stricmp(file->getName().c_str(), name.c_str())) { result = *file; return true; } @@ -220,7 +220,7 @@ static Common::Language detectLanguage(const FSList &fslist, byte id) { FSList tmpList; if (searchFSNode(fslist, "RESOURCE", resDir) && resDir.isDirectory() - && resDir.listDir(tmpList, FilesystemNode::kListFilesOnly) + && resDir.getChildren(tmpList, FilesystemNode::kListFilesOnly) && searchFSNode(tmpList, filename, langFile)) { tmp.open(langFile); } @@ -317,7 +317,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu DetectorDesc d; d.node = *file; d.md5Entry = 0; - fileMD5Map[file->name()] = d; + fileMD5Map[file->getName()] = d; } } @@ -444,7 +444,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com Common::File tmp; if (!tmp.open(d.node)) { - warning("SCUMM detectGames: failed to open '%s' for read access", d.node.path().c_str()); + warning("SCUMM detectGames: failed to open '%s' for read access", d.node.getPath().c_str()); return false; } @@ -748,7 +748,7 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) { // Fetch the list of files in the current directory FSList fslist; FilesystemNode dir(ConfMan.get("path")); - if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) { + if (!dir.getChildren(fslist, FilesystemNode::kListFilesOnly)) { return kInvalidPathError; } diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h index bc67aafb7e..d0fefe3a29 100644 --- a/engines/scumm/detection.h +++ b/engines/scumm/detection.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection.h $ + * $Id:detection.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 0c72951fb2..246126611e 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/scumm/detection_tables.h $ + * $Id:detection_tables.h 26949 2007-05-26 20:23:24Z david_corrales $ * */ diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 79c1f0cb7d..1ff23dbd07 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -124,11 +124,11 @@ GameList Engine_SKY_detectGames(const FSList &fslist) { // Iterate over all files in the given directory for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (!file->isDirectory()) { - const char *fileName = file->name().c_str(); + const char *fileName = file->getName().c_str(); if (0 == scumm_stricmp("sky.dsk", fileName)) { Common::File dataDisk; - if (dataDisk.open(file->path())) { + if (dataDisk.open(file->getPath())) { hasSkyDsk = true; dataDiskSize = dataDisk.size(); } @@ -136,7 +136,7 @@ GameList Engine_SKY_detectGames(const FSList &fslist) { if (0 == scumm_stricmp("sky.dnr", fileName)) { Common::File dinner; - if (dinner.open(file->path())) { + if (dinner.open(file->getPath())) { hasSkyDnr = true; dinnerTableEntries = dinner.readUint32LE(); } diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 3c8abd0953..d899d25df5 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -107,15 +107,15 @@ GameDescriptor Engine_SWORD1_findGameID(const char *gameid) { void Sword1CheckDirectory(const FSList &fslist, bool *filesFound) { for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (!file->isDirectory()) { - const char *fileName = file->name().c_str(); + const char *fileName = file->getName().c_str(); for (int cnt = 0; cnt < NUM_FILES_TO_CHECK; cnt++) if (scumm_stricmp(fileName, g_filesToCheck[cnt]) == 0) filesFound[cnt] = true; } else { for (int cnt = 0; cnt < ARRAYSIZE(g_dirNames); cnt++) - if (scumm_stricmp(file->name().c_str(), g_dirNames[cnt]) == 0) { + if (scumm_stricmp(file->getName().c_str(), g_dirNames[cnt]) == 0) { FSList fslist2; - if (file->listDir(fslist2, FilesystemNode::kListFilesOnly)) + if (file->getChildren(fslist2, FilesystemNode::kListFilesOnly)) Sword1CheckDirectory(fslist2, filesFound); } } diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 8bf3467b86..6bbd58ff3c 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -101,7 +101,7 @@ GameList Engine_SWORD2_detectGames(const FSList &fslist) { // Iterate over all files in the given directory for (file = fslist.begin(); file != fslist.end(); ++file) { if (!file->isDirectory()) { - const char *fileName = file->name().c_str(); + const char *fileName = file->getName().c_str(); if (0 == scumm_stricmp(g->detectname, fileName)) { // Match found, add to list of candidates, then abort inner loop. @@ -118,11 +118,11 @@ GameList Engine_SWORD2_detectGames(const FSList &fslist) { // present e.g. if the user copied the data straight from CD. for (file = fslist.begin(); file != fslist.end(); ++file) { if (file->isDirectory()) { - const char *fileName = file->name().c_str(); + const char *fileName = file->getName().c_str(); if (0 == scumm_stricmp("clusters", fileName)) { FSList recList; - if (file->listDir(recList, FilesystemNode::kListAll)) { + if (file->getChildren(recList, FilesystemNode::kListAll)) { GameList recGames(Engine_SWORD2_detectGames(recList)); if (!recGames.empty()) { detectedGames.push_back(recGames); @@ -144,7 +144,7 @@ PluginError Engine_SWORD2_create(OSystem *syst, Engine **engine) { FSList fslist; FilesystemNode dir(ConfMan.get("path")); - if (!dir.listDir(fslist, FilesystemNode::kListAll)) { + if (!dir.getChildren(fslist, FilesystemNode::kListAll)) { return kInvalidPathError; } diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 8e8de71e9c..2860d832dd 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/touche/detection.cpp $ + * $Id:detection.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ |