[Scummvm-git-logs] scummvm master -> d7b4cb0b565d4cc0e2e44724f70e3a5f5a3730ac
whiterandrek
whiterandrek at gmail.com
Fri Jun 29 19:36:10 CEST 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2409404740 PINK: added warning about GoToHelp command
18a531e4e4 PINK: implemented GoToDomain command
d7b4cb0b56 PINK: removed unnecessary loading of same page
Commit: 2409404740550ce59aa379b468791f4dc6772c9d
https://github.com/scummvm/scummvm/commit/2409404740550ce59aa379b468791f4dc6772c9d
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T20:36:00+03:00
Commit Message:
PINK: added warning about GoToHelp command
Changed paths:
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 60b51a4..5b6bc2c 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -56,6 +56,9 @@ void PDAMgr::execute(const Command &command) {
goToPage(_previousPages.pop());
break;
}
+ case Command::kGoToHelp:
+ warning("Command GoToHelp is not supported and won't be");
+ break;
case Command::kClose:
close();
break;
Commit: 18a531e4e4a92ea8ac643ccacdc5bf26e2abb434
https://github.com/scummvm/scummvm/commit/18a531e4e4a92ea8ac643ccacdc5bf26e2abb434
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T20:36:00+03:00
Commit Message:
PINK: implemented GoToDomain command
Changed paths:
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 5b6bc2c..69e6d10 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -56,6 +56,9 @@ void PDAMgr::execute(const Command &command) {
goToPage(_previousPages.pop());
break;
}
+ case Command::kGoToDomain:
+ goToPage(Common::String::format("%.6s", _page->getName().c_str()));
+ break;
case Command::kGoToHelp:
warning("Command GoToHelp is not supported and won't be");
break;
Commit: d7b4cb0b565d4cc0e2e44724f70e3a5f5a3730ac
https://github.com/scummvm/scummvm/commit/d7b4cb0b565d4cc0e2e44724f70e3a5f5a3730ac
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T20:36:00+03:00
Commit Message:
PINK: removed unnecessary loading of same page
Changed paths:
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 69e6d10..f3ea51a 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -71,7 +71,7 @@ void PDAMgr::execute(const Command &command) {
}
void PDAMgr::goToPage(const Common::String &pageName) {
- if (_page && _page->getName() == pageName)
+ if (_page && !_page->getName().compareToIgnoreCase(pageName))
return;
loadGlobal();
More information about the Scummvm-git-logs
mailing list