[Scummvm-cvs-logs] scummvm master -> 0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979

[bluegr]

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:
b41b3e1a89 ZVISION: Fix code formatting
0f590561bd ZVISION: Simplify check


Commit: b41b3e1a89d7646561697b1bc3636345230a9f12
    https://github.com/scummvm/scummvm/commit/b41b3e1a89d7646561697b1bc3636345230a9f12
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-20T18:06:26+02:00

Commit Message:
ZVISION: Fix code formatting

Changed paths:
    engines/zvision/file/search_manager.cpp



diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 30c269c..d0d4e43 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -265,7 +265,7 @@ void SearchManager::addDir(const Common::String &name) {
 
 void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
 	Common::FSList fsList;
-	if ( fsNode.getChildren(fsList) ) {
+	if (fsNode.getChildren(fsList)) {
 
 		_list.push_back(fsNode.getPath());
 


Commit: 0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979
    https://github.com/scummvm/scummvm/commit/0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-20T18:06:26+02:00

Commit Message:
ZVISION: Simplify check

Thanks to DrMcCoy for spotting this

Changed paths:
    engines/zvision/sound/zork_raw.cpp



diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 8688039..b2c88b3 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -73,10 +73,7 @@ RawChunkStream::RawChunk RawChunkStream::readNextChunk(Common::SeekableReadStrea
 	tmp.size = 0;
 	tmp.data = NULL;
 
-	if (!stream)
-		return tmp;
-
-	if (stream && (stream->size() == 0 || stream->eos()))
+	if (!stream || stream->size() == 0 || stream->eos())
 		return tmp;
 
 	tmp.size = (stream->size() - stream->pos()) * 2;