[Scummvm-git-logs] scummvm master -> b955b7ba446a2d464529e47c650cd082fdc1629b

[sev-]

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

Summary:
b955b7ba44 DIRECTOR: Switch to common readPascalString


Commit: b955b7ba446a2d464529e47c650cd082fdc1629b
    https://github.com/scummvm/scummvm/commit/b955b7ba446a2d464529e47c650cd082fdc1629b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-14T13:35:34+01:00

Commit Message:
DIRECTOR: Switch to common readPascalString

Changed paths:
    engines/director/director.cpp
    engines/director/director.h
    engines/director/resource.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index d2df6cd..e57401c 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -183,16 +183,6 @@ Common::HashMap<Common::String, Score *> *DirectorEngine::scanMovies(const Commo
 	return nameMap;
 }
 
-Common::String DirectorEngine::readPascalString(Common::SeekableReadStream &stream) {
-	byte length = stream.readByte();
-	Common::String x;
-
-	while (length--)
-		x += (char)stream.readByte();
-
-	return x;
-}
-
 void DirectorEngine::setPalette(byte *palette, uint16 count) {
 	_currentPalette = palette;
 	_currentPaletteLength = count;
diff --git a/engines/director/director.h b/engines/director/director.h
index 3a7a4c8..f80329e 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -34,7 +34,7 @@ class MacResManager;
 }
 
 namespace Graphics {
-class MacWindowManager; 
+class MacWindowManager;
 typedef Common::Array<byte *> MacPatterns;
 }
 
@@ -122,8 +122,6 @@ private:
 	void loadEXERIFX(Common::SeekableReadStream *stream, uint32 offset);
 	void loadMac();
 
-	Common::String readPascalString(Common::SeekableReadStream &stream);
-
 	Common::HashMap<int, Cast *> *_sharedCasts;
 	Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedDIB;
 	Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedSTXT;
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index da7f3b6..3d1f7a2 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -87,8 +87,8 @@ void DirectorEngine::loadEXEv3(Common::SeekableReadStream *stream) {
 	stream->skip(5); // unknown
 
 	stream->readUint32LE(); // Main MMM size
-	Common::String mmmFileName = readPascalString(*stream);
-	Common::String directoryName = readPascalString(*stream);
+	Common::String mmmFileName = stream->readPascalString();
+	Common::String directoryName = stream->readPascalString();
 
 	debugC(1, kDebugLoading, "Main MMM: '%s'", mmmFileName.c_str());
 	debugC(1, kDebugLoading, "Directory Name: '%s'", directoryName.c_str());