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

[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:
785d2b6c20 PETKA: use vm field in QManager
eaf599e04f PETKA: added override to Engine dor


Commit: 785d2b6c20339857fbbe955cc0fa3bece09cc94c
    https://github.com/scummvm/scummvm/commit/785d2b6c20339857fbbe955cc0fa3bece09cc94c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-05T20:51:07+03:00

Commit Message:
PETKA: use vm field in QManager

Changed paths:
    engines/petka/q_manager.cpp


diff --git a/engines/petka/q_manager.cpp b/engines/petka/q_manager.cpp
index bf348ea523..444da277bc 100644
--- a/engines/petka/q_manager.cpp
+++ b/engines/petka/q_manager.cpp
@@ -145,8 +145,8 @@ Graphics::Surface *QManager::loadBitmap(uint32 id) {
 	Graphics::Surface *s = loadBitmapSurface(*stream);
 	if (s) {
 		s->convertToInPlace(g_system->getScreenFormat());
-		g_vm->getQSystem()->_sceneWidth = s->w;
-		g_vm->getQSystem()->_xOffset = 0;
+		_vm.getQSystem()->_sceneWidth = s->w;
+		_vm.getQSystem()->_xOffset = 0;
 
 		QResource &res = _resourceMap.getVal(id);
 		res.type = QResource::kSurface;


Commit: eaf599e04f38be1c9fd5f914fe651bb394c5bd4e
    https://github.com/scummvm/scummvm/commit/eaf599e04f38be1c9fd5f914fe651bb394c5bd4e
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-05T20:51:53+03:00

Commit Message:
PETKA: added override to Engine dor

Changed paths:
    engines/petka/petka.h


diff --git a/engines/petka/petka.h b/engines/petka/petka.h
index 54f8b3d1da..0c46efcf47 100644
--- a/engines/petka/petka.h
+++ b/engines/petka/petka.h
@@ -72,7 +72,7 @@ enum {
 class PetkaEngine : public Engine {
 public:
 	PetkaEngine(OSystem *syst, const ADGameDescription *desc);
-	~PetkaEngine();
+	~PetkaEngine() override;
 
 	bool isDemo() const;