[Scummvm-git-logs] scummvm master -> 4ac21b4d58f3dd97bc93716acacccd3e1917526a

[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:
4ac21b4d58 PETKA: Aligned overridden method prototypes


Commit: 4ac21b4d58f3dd97bc93716acacccd3e1917526a
    https://github.com/scummvm/scummvm/commit/4ac21b4d58f3dd97bc93716acacccd3e1917526a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-17T14:26:33+02:00

Commit Message:
PETKA: Aligned overridden method prototypes

Changed paths:
    engines/petka/interfaces/interface.h
    engines/petka/interfaces/main.cpp
    engines/petka/interfaces/main.h
    engines/petka/interfaces/map.cpp
    engines/petka/interfaces/map.h
    engines/petka/interfaces/panel.cpp
    engines/petka/interfaces/panel.h
    engines/petka/interfaces/sequence.h
    engines/petka/interfaces/startup.cpp
    engines/petka/interfaces/startup.h
    engines/petka/q_system.cpp


diff --git a/engines/petka/interfaces/interface.h b/engines/petka/interfaces/interface.h
index 8dd7523152..2436619204 100644
--- a/engines/petka/interfaces/interface.h
+++ b/engines/petka/interfaces/interface.h
@@ -37,7 +37,7 @@ public:
 	Interface();
 	virtual ~Interface() {}
 
-	virtual void start() {};
+	virtual void start(int id) {};
 	virtual void stop() {};
 
 	virtual void onLeftButtonDown(const Common::Point p) {};
diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index cc8594816a..6ea1b637f2 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -65,7 +65,7 @@ InterfaceMain::InterfaceMain() {
 	_objs.push_back(g_vm->getQSystem()->_star.get());
 }
 
-void InterfaceMain::start() {
+void InterfaceMain::start(int id) {
 	g_vm->getQSystem()->update();
 	g_vm->getQSystem()->_isIniting = 0;
 
diff --git a/engines/petka/interfaces/main.h b/engines/petka/interfaces/main.h
index 9fd7ad8e1c..215aebd27c 100644
--- a/engines/petka/interfaces/main.h
+++ b/engines/petka/interfaces/main.h
@@ -39,7 +39,7 @@ class InterfaceMain : public Interface {
 public:
 	InterfaceMain();
 
-	void start() override;
+	void start(int id) override;
 
 	void loadRoom(int id, bool fromSave);
 
diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index c2a4872ecb..88b44db084 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -35,7 +35,7 @@ namespace Petka {
 
 const char *const mapName = "\xCA\xC0\xD0\xD2\xC0"; // КАРТА
 
-void InterfaceMap::start() {
+void InterfaceMap::start(int id) {
 	if (!g_vm->getQSystem()->_room->_showMap)
 		return;
 
diff --git a/engines/petka/interfaces/map.h b/engines/petka/interfaces/map.h
index eaecb81988..a5df37a3a7 100644
--- a/engines/petka/interfaces/map.h
+++ b/engines/petka/interfaces/map.h
@@ -29,7 +29,7 @@ namespace Petka {
 
 class InterfaceMap: public Interface {
 public:
-	void start() override;
+	void start(int id) override;
 	void stop() override;
 
 	void onLeftButtonDown(const Common::Point p) override;
@@ -46,4 +46,3 @@ private:
 } // End of namespace Petka
 
 #endif
-
diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index a7fb241e52..1e020babcd 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -93,7 +93,7 @@ InterfacePanel::InterfacePanel() {
 
 }
 
-void InterfacePanel::start() {
+void InterfacePanel::start(int id) {
 	readSettings();
 
 	QObjectBG *bg = (QObjectBG *)g_vm->getQSystem()->findObject(kPanelObjName);
@@ -303,4 +303,3 @@ void InterfacePanel::applySettings() {
 } // End of namespace Petka
 
 #endif
-
diff --git a/engines/petka/interfaces/panel.h b/engines/petka/interfaces/panel.h
index 3ff05a8728..46153607cd 100644
--- a/engines/petka/interfaces/panel.h
+++ b/engines/petka/interfaces/panel.h
@@ -31,7 +31,7 @@ class InterfacePanel : public Interface {
 public:
 	InterfacePanel();
 
-	void start() override;
+	void start(int id) override;
 
 	void onLeftButtonDown(const Common::Point p) override;
 	void onMouseMove(const Common::Point p) override;
diff --git a/engines/petka/interfaces/sequence.h b/engines/petka/interfaces/sequence.h
index 41ba2b5226..dade946b90 100644
--- a/engines/petka/interfaces/sequence.h
+++ b/engines/petka/interfaces/sequence.h
@@ -31,7 +31,7 @@ class InterfaceSequence : public Interface {
 public:
 	InterfaceSequence();
 
-	void start(int id);
+	void start(int id) override;
 	void stop() override;
 
 	void onLeftButtonDown(const Common::Point p) override;
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index d8b879929c..29ef1389c6 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -49,7 +49,7 @@ enum {
 	kBackgroundId = 4980
 };
 
-void InterfaceStartup::start() {
+void InterfaceStartup::start(int id) {
 	g_vm->getQSystem()->update();
 	g_vm->getQSystem()->_isIniting = 0;
 
@@ -133,5 +133,3 @@ void InterfaceStartup::onMouseMove(const Common::Point p) {
 }
 
 } // End of namespace Petka
-
-
diff --git a/engines/petka/interfaces/startup.h b/engines/petka/interfaces/startup.h
index 6230e28c3a..ed239cc8b4 100644
--- a/engines/petka/interfaces/startup.h
+++ b/engines/petka/interfaces/startup.h
@@ -29,7 +29,7 @@ namespace Petka {
 
 class InterfaceStartup : public Interface {
 public:
-	void start() override;
+	void start(int id) override;
 
 	void onLeftButtonDown(const Common::Point p) override;
 	void onMouseMove(const Common::Point p) override;
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 4a9e917d42..94e9cb7a30 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -172,10 +172,10 @@ bool QSystem::init() {
 	_panelInterface.reset(new InterfacePanel());
 	_mapInterface.reset(new InterfaceMap());
 	if (g_vm->getPart() == 0) {
-		_startupInterface->start();
+		_startupInterface->start(0);
 		_prevInterface = _currInterface = _startupInterface.get();
 	} else {
-		_mainInterface->start();
+		_mainInterface->start(0);
 		_prevInterface = _currInterface = _mainInterface.get();
 	}
 	return true;
@@ -229,7 +229,7 @@ void QSystem::togglePanelInterface() {
 		if (_currInterface == _panelInterface.get()) {
 			_currInterface->stop();
 		} else if (_currInterface == _mainInterface.get()) {
-			_panelInterface->start();
+			_panelInterface->start(0);
 		}
 	}
 }
@@ -241,7 +241,7 @@ void QSystem::toggleMapInterface() {
 			_currInterface->stop();
 		} else if (_currInterface == _mainInterface.get()) {
 			// setText
-			_mapInterface->start();
+			_mapInterface->start(0);
 		}
 	}
 }