[Scummvm-git-logs] scummvm master -> 75ea458e0ff533380134a657e0354d45e72950f5

[whiterandrek]

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:
8a660c646b PETKA: refactor FileMgr
75ea458e0f PETKA: fix walk bug


Commit: 8a660c646be4d12e22ffad766e169217d3fa51e0
    https://github.com/scummvm/scummvm/commit/8a660c646be4d12e22ffad766e169217d3fa51e0
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-11T00:19:27+03:00

Commit Message:
PETKA: refactor FileMgr

Changed paths:
    engines/petka/file_mgr.cpp
    engines/petka/file_mgr.h


diff --git a/engines/petka/file_mgr.cpp b/engines/petka/file_mgr.cpp
index 66c8ffa53d..a08fc8898f 100644
--- a/engines/petka/file_mgr.cpp
+++ b/engines/petka/file_mgr.cpp
@@ -29,13 +29,8 @@
 
 namespace Petka {
 
-FileMgr::~FileMgr() {
-	debug("FileMgr::dtor");
-	closeAll();
-}
-
 bool FileMgr::openStore(const Common::String &name) {
-	Common::ScopedPtr<Common::File> file(new Common::File());
+	Common::SharedPtr<Common::File> file(new Common::File());
 	if (name.empty() || !file->open(name) || file->readUint32BE() != MKTAG('S', 't', 'O', 'R')) {
 		return false;
 	}
@@ -45,45 +40,45 @@ bool FileMgr::openStore(const Common::String &name) {
 		return false;
 	}
 
+	const uint32 tableSize = file->size() - file->pos();
+
+	Common::ScopedPtr<Common::SeekableReadStream> stream(file->readStream(tableSize));
+	if (stream->size() != (int)tableSize)
+		return false;
+
 	_stores.push_back(Store());
+
 	Store &store = _stores.back();
-	store.descriptions.resize(file->readUint32LE());
+	store.file = file;
+	store.descriptions.resize(stream->readUint32LE());
 
-	for (uint i = 0; i < store.descriptions.size(); ++i) {
-		file->skip(4);
-		store.descriptions[i].offset = file->readUint32LE();
-		store.descriptions[i].size = file->readUint32LE();
+	for (auto &description : store.descriptions) {
+		stream->skip(4);
+		description.offset = stream->readUint32LE();
+		description.size = stream->readUint32LE();
 	}
 
-	for (uint i = 0; i < store.descriptions.size(); ++i) {
+	for (auto &description : store.descriptions) {
 		char ch;
-		while ((ch = file->readByte()) != 0) {
-			store.descriptions[i].name += ch;
+		while ((ch = stream->readByte()) != '\0') {
+			description.name += ch;
 		}
 	}
-	store.file = file.release();
-
-	debug("FileMgr: opened store %s (files count: %d)", name.c_str(), store.descriptions.size());
 
+	debugC(kPetkaDebugResources, "FileMgr: opened store %s (files count: %d)", name.c_str(), store.descriptions.size());
 	return true;
 }
 
 void FileMgr::closeStore(const Common::String &name) {
-	for (uint i = 0; i < _stores.size(); ++i) {
-		if (_stores[i].file->getName() == name) {
-			delete _stores[i].file;
-			_stores.remove_at(i);
+	for (auto it = _stores.begin(); it != _stores.end(); ++it) {
+		if (it->file->getName() == name) {
+			_stores.erase(it);
 			return;
 		}
 	}
-
 }
 
 void FileMgr::closeAll() {
-	debug("FileMgr::closeAll");
-	for (uint i = 0; i < _stores.size(); ++i) {
-		delete _stores[i].file;
-	}
 	_stores.clear();
 }
 
@@ -102,15 +97,14 @@ Common::SeekableReadStream *FileMgr::getFileStream(const Common::String &name) {
 		debugC(kPetkaDebugResources, "FileMgr: %s is opened from game directory", name.c_str());
 		return file.release();
 	}
-	for (uint i = 0; i < _stores.size(); ++i) {
-		for (uint j = 0; j < _stores[i].descriptions.size(); ++j) {
-			const Description &desc = _stores[i].descriptions[j];
-			if (desc.name.compareToIgnoreCase(name) == 0) {
-				return new Common::SafeSeekableSubReadStream(_stores[i].file, desc.offset, desc.offset + desc.size);
-			}
 
+	for (auto &store : _stores) {
+		for (auto &resource : store.descriptions) {
+			if (resource.name.compareToIgnoreCase(name) == 0)
+				return new Common::SafeSeekableSubReadStream(store.file.get(), resource.offset, resource.offset + resource.size);
 		}
 	}
+
 	debugC(kPetkaDebugResources, "FileMgr: %s not found", name.c_str());
 	return nullptr;
 }
diff --git a/engines/petka/file_mgr.h b/engines/petka/file_mgr.h
index ad2b1e6f25..1eb0d0048c 100644
--- a/engines/petka/file_mgr.h
+++ b/engines/petka/file_mgr.h
@@ -23,7 +23,8 @@
 #ifndef PETKA_FILE_MGR_H
 #define PETKA_FILE_MGR_H
 
-#include "common/array.h"
+#include "common/list.h"
+#include "common/ptr.h"
 
 namespace Common {
 	class File;
@@ -34,8 +35,6 @@ namespace Petka {
 
 class FileMgr {
 public:
-	~FileMgr();
-
 	bool openStore(const Common::String &name);
 	void closeStore(const Common::String &name);
 	void closeAll();
@@ -43,14 +42,14 @@ public:
 	Common::SeekableReadStream *getFileStream(const Common::String &name);
 
 private:
-	struct Description {
+	struct Resource {
 		Common::String name;
 		uint32 offset;
 		uint32 size;
 	};
 	struct Store {
-		Common::File *file;
-		Common::Array<Description> descriptions;
+		Common::SharedPtr<Common::File> file;
+		Common::Array<Resource> descriptions;
 	};
 	Common::Array<Store> _stores;
 };


Commit: 75ea458e0ff533380134a657e0354d45e72950f5
    https://github.com/scummvm/scummvm/commit/75ea458e0ff533380134a657e0354d45e72950f5
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-11T00:19:27+03:00

Commit Message:
PETKA: fix walk bug

Changed paths:
    engines/petka/walk.cpp


diff --git a/engines/petka/walk.cpp b/engines/petka/walk.cpp
index 592faa8018..754c31afb6 100644
--- a/engines/petka/walk.cpp
+++ b/engines/petka/walk.cpp
@@ -498,7 +498,7 @@ int Walk::sub_423600(Point p) {
 
 		for (int k = 2; k < _bkg3_1[j]; ++k) {
 			for (int l = 0; l < _bkg3_1[j]; ++l) {
-				if (sub_423570(v4[k - 1], _bkg3_2[j][l]) || v4[k - 2] == _bkg3_2[j][l]) {
+				if (sub_423570(v4[k - 1], _bkg3_2[j][l]) && v4[k - 2] != _bkg3_2[j][l]) {
 					v4[k] = _bkg3_2[j][l];
 					break;
 				}