[Scummvm-cvs-logs] scummvm master -> 792ae03373e7480cff1e026c801e38a5875d910a
bluegr
bluegr at gmail.com
Sat Jan 23 02:19:55 CET 2016
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:
617ca2e306 LAB: Move mouse code in interfaceOn, for consistency with interfaceOff
792ae03373 LAB: Mark all versions as testing
Commit: 617ca2e30694bb587c31683e2f83ccd4f4a86c35
https://github.com/scummvm/scummvm/commit/617ca2e30694bb587c31683e2f83ccd4f4a86c35
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-23T03:18:52+02:00
Commit Message:
LAB: Move mouse code in interfaceOn, for consistency with interfaceOff
Changed paths:
engines/lab/engine.cpp
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 447579e..fa2791c 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -291,14 +291,14 @@ void LabEngine::interfaceOff() {
}
void LabEngine::interfaceOn() {
- _event->mouseShow();
-
if (_graphics->_longWinInFront)
_interface->attachButtonList(nullptr);
else if (_alternate)
_interface->attachButtonList(&_invButtonList);
else
_interface->attachButtonList(&_moveButtonList);
+
+ _event->mouseShow();
}
bool LabEngine::doUse(uint16 curInv) {
Commit: 792ae03373e7480cff1e026c801e38a5875d910a
https://github.com/scummvm/scummvm/commit/792ae03373e7480cff1e026c801e38a5875d910a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-23T03:18:52+02:00
Commit Message:
LAB: Mark all versions as testing
Changed paths:
engines/lab/detection.cpp
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index c262312..86071d6 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -48,7 +48,7 @@ static const ADGameDescription labDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_TESTING,
GUIO0()
},
{
@@ -61,7 +61,7 @@ static const ADGameDescription labDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformDOS,
- Lab::GF_LOWRES,
+ Lab::GF_LOWRES | ADGF_TESTING,
GUIO0()
},
{
@@ -75,7 +75,7 @@ static const ADGameDescription labDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_NO_FLAGS,
+ ADGF_TESTING,
GUIO0()
},
{
@@ -84,7 +84,7 @@ static const ADGameDescription labDescriptions[] = {
AD_ENTRY1s("doors", "7bf458df6ec30cc8ef4665e4d7c77f59", 2537), // game/doors
Common::EN_ANY,
Common::kPlatformAmiga,
- Lab::GF_LOWRES,
+ Lab::GF_LOWRES | ADGF_TESTING,
GUIO0()
},
AD_TABLE_END_MARKER
More information about the Scummvm-git-logs
mailing list