[Scummvm-cvs-logs] scummvm master -> 92f3a9f4824c89e4f300d561f1d48ac6f02e0b00

[Strangerke]

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

Summary:
131d2f73e0 TONY: Fix typo in comment
92f3a9f482 TONY: Remove an unused variable


Commit: 131d2f73e0781c5fd578968fa377a24b3a5f7b2a
    https://github.com/scummvm/scummvm/commit/131d2f73e0781c5fd578968fa377a24b3a5f7b2a
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-01T04:25:23+01:00

Commit Message:
TONY: Fix typo in comment

Changed paths:
    engines/tony/loc.cpp



diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index e505aa4..be2b202 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -601,7 +601,7 @@ void RMItem::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
 	// Offset direction for scrolling
 	prim->getDst().offset(-_curScroll);
 
-	// We must offset the cordinates of the item inside the primitive
+	// We must offset the coordinates of the item inside the primitive
 	// It is estimated as nonno + (babbo + figlio)
 	prim->getDst().offset(calculatePos());
 


Commit: 92f3a9f4824c89e4f300d561f1d48ac6f02e0b00
    https://github.com/scummvm/scummvm/commit/92f3a9f4824c89e4f300d561f1d48ac6f02e0b00
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-01T04:25:26+01:00

Commit Message:
TONY: Remove an unused variable

Changed paths:
    engines/tony/sound.cpp
    engines/tony/sound.h



diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 88379ba..faf91c1 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -468,9 +468,6 @@ bool FPStream::loadFile(const Common::String &fileName, int bufSize) {
 	if (_fileLoaded)
 		unloadFile();
 
-	// Save the codec type
-	_codec = FPCODEC_ADPCM;
-
 	// Open the file stream for reading
 	if (!_file.open(fileName)) {
 		// Fallback: try with an extra '0' prefix
diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 6aa4ae9..2ea1162 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -246,7 +246,6 @@ class FPStream {
 private:
 	uint32 _bufferSize;                  // Buffer size (bytes)
 	uint32 _size;                        // Stream size (bytes)
-	uint32 _codec;                       // CODEC used
 
 	Common::File _file;                  // File handle used for the stream