[Scummvm-git-logs] scummvm master -> 665a05fe893aef5205bb1355fdb744002b338269

whiterandrek whiterandrek at gmail.com
Thu May 28 22:51:41 UTC 2020


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:
37ae071fdc PETKA: use cursor function for changing action type
665a05fe89 PETKA: removed outdated commentary


Commit: 37ae071fdcb11032bb14c1f57b4691ecf931d127
    https://github.com/scummvm/scummvm/commit/37ae071fdcb11032bb14c1f57b4691ecf931d127
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T01:03:29+03:00

Commit Message:
PETKA: use cursor function for changing action type

Changed paths:
    engines/petka/q_system.cpp


diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 23b085100d..7eb4a97ff6 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -248,11 +248,7 @@ void QSystem::toggleMapInterface() {
 
 void QSystem::setChapayev() {
 	if (_star->_isActive && _currInterface == _mainInterface.get() && _chapayev->_isShown) {
-		_cursor->show(false);
-		_cursor->_resourceId = 5007;
-		_cursor->returnInvItem();
-		_cursor->_actionType = kActionObjUseChapayev;
-		_cursor->show(true);
+		_cursor->setAction(kActionObjUseChapayev);
 	}
 }
 


Commit: 665a05fe893aef5205bb1355fdb744002b338269
    https://github.com/scummvm/scummvm/commit/665a05fe893aef5205bb1355fdb744002b338269
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T01:03:59+03:00

Commit Message:
PETKA: removed outdated commentary

Changed paths:
    engines/petka/q_system.cpp


diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 7eb4a97ff6..bc0c4bf2cf 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -112,7 +112,7 @@ bool QSystem::init() {
 	bgsIni.allowNonEnglishCharacters();
 
 	if (namesStream)
-		namesIni.loadFromStream(*namesStream); //fails because ini is broken for Russian letters
+		namesIni.loadFromStream(*namesStream);
 	if (castStream)
 		castIni.loadFromStream(*castStream);
 	if (bgsStream)




More information about the Scummvm-git-logs mailing list