[Scummvm-cvs-logs] scummvm master -> 93632681c0e23da9031c68785060f197100411a6

[wjp]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f83f5c5677 COMMON: Fix spelling of length
1d0904197f PARALLACTION: Fix spelling of length
93632681c0 SCUMM: Fix spelling of length


Commit: f83f5c5677111f4005d4fed633efba0e86bc805c
    https://github.com/scummvm/scummvm/commit/f83f5c5677111f4005d4fed633efba0e86bc805c
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2012-04-04T21:22:31-07:00

Commit Message:
COMMON: Fix spelling of length

Changed paths:
    common/util.h



diff --git a/common/util.h b/common/util.h
index b90be06..7834098 100644
--- a/common/util.h
+++ b/common/util.h
@@ -83,7 +83,7 @@ namespace Common {
  * Print a hexdump of the data passed in. The number of bytes per line is
  * customizable.
  * @param data	the data to be dumped
- * @param len	the lenght of that data
+ * @param len	the length of that data
  * @param bytesPerLine	number of bytes to print per line (default: 16)
  * @param startOffset	shift the shown offsets by the starting offset (default: 0)
  */


Commit: 1d0904197f8aba757a65afddaea316aa9e3c36ab
    https://github.com/scummvm/scummvm/commit/1d0904197f8aba757a65afddaea316aa9e3c36ab
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2012-04-04T21:23:00-07:00

Commit Message:
PARALLACTION: Fix spelling of length

Changed paths:
    engines/parallaction/disk_ns.cpp



diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index b2285d0..839b2c6 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -62,7 +62,7 @@ class NSArchive : public Common::Archive {
 	Common::SeekableReadStream	*_stream;
 
 	char			_archiveDir[MAX_ARCHIVE_ENTRIES][32];
-	uint32			_archiveLenghts[MAX_ARCHIVE_ENTRIES];
+	uint32			_archiveLengths[MAX_ARCHIVE_ENTRIES];
 	uint32			_archiveOffsets[MAX_ARCHIVE_ENTRIES];
 	uint32			_numFiles;
 
@@ -103,8 +103,8 @@ NSArchive::NSArchive(Common::SeekableReadStream *stream, Common::Platform platfo
 	uint32 dataOffset = (isSmallArchive) ? SMALL_ARCHIVE_DATA_OFS : NORMAL_ARCHIVE_DATA_OFS;
 	for (uint16 i = 0; i < _numFiles; i++) {
 		_archiveOffsets[i] = dataOffset;
-		_archiveLenghts[i] = _stream->readUint32BE();
-		dataOffset += _archiveLenghts[i];
+		_archiveLengths[i] = _stream->readUint32BE();
+		dataOffset += _archiveLengths[i];
 	}
 
 }
@@ -133,7 +133,7 @@ Common::SeekableReadStream *NSArchive::createReadStreamForMember(const Common::S
 	debugC(9, kDebugDisk, "NSArchive::createReadStreamForMember: '%s' found in slot %i", name.c_str(), index);
 
 	int offset = _archiveOffsets[index];
-	int endOffset = _archiveOffsets[index] + _archiveLenghts[index];
+	int endOffset = _archiveOffsets[index] + _archiveLengths[index];
 	return new Common::SeekableSubReadStream(_stream, offset, endOffset, DisposeAfterUse::NO);
 }
 


Commit: 93632681c0e23da9031c68785060f197100411a6
    https://github.com/scummvm/scummvm/commit/93632681c0e23da9031c68785060f197100411a6
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2012-04-04T21:23:14-07:00

Commit Message:
SCUMM: Fix spelling of length

Changed paths:
    engines/scumm/imuse_digi/dimuse_sndmgr.h



diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h
index f869c62..ff6281d 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h
@@ -47,7 +47,7 @@ public:
 private:
 	struct Region {
 		int32 offset;		// offset of region
-		int32 length;		// lenght of region
+		int32 length;		// length of region
 	};
 
 	struct Jump {