[Scummvm-cvs-logs] scummvm master -> 17df6b343a0fdb2168b4d3a22927cd0f584ce735
sev-
sev at scummvm.org
Mon Sep 30 13:37:28 CEST 2013
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
246edc82e6 MOHAWK: Fix compiler warning
054ef1f1cd GUI: Fix compiler warning
5cc0850a67 WINTERMUTE: Fix compiler warnings
17df6b343a MORTEVIELLE: Remove unused variable
Commit: 246edc82e6f5fb394df40aa2a2060aa7f168ae11
https://github.com/scummvm/scummvm/commit/246edc82e6f5fb394df40aa2a2060aa7f168ae11
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-30T04:36:59-07:00
Commit Message:
MOHAWK: Fix compiler warning
Changed paths:
engines/mohawk/cstime_game.cpp
engines/mohawk/cstime_ui.cpp
engines/mohawk/cstime_ui.h
diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 2e21111..91d2f89 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -1094,7 +1094,7 @@ void CSTimeScene::idleAmbientAnims() {
bool CSTimeScene::eventIsActive() {
return _vm->NISIsRunning() /* TODO || _vm->soundIsPlaying()*/ || _vm->getCurrentEventType() == kCSTimeEventWaitForClick
- || _activeChar->_flappingState != 0xffff || _vm->getInterface()->getState() == 4;
+ || _activeChar->_flappingState != 0xffff || _vm->getInterface()->getState() == kCSTimeInterfaceDroppedInventory;
}
void CSTimeScene::cursorOverHotspot(uint id) {
diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp
index de7d5bd..6d5e5dd 100644
--- a/engines/mohawk/cstime_ui.cpp
+++ b/engines/mohawk/cstime_ui.cpp
@@ -854,7 +854,7 @@ void CSTimeInterface::dropItemInInventory(uint16 id) {
clearDialogArea();
_inventoryDisplay->show();
_inventoryDisplay->draw();
- _inventoryDisplay->setState(4);
+ _inventoryDisplay->setState(kCSTimeInterfaceDroppedInventory);
}
CSTimeHelp::CSTimeHelp(MohawkEngine_CSTime *vm) : _vm(vm) {
diff --git a/engines/mohawk/cstime_ui.h b/engines/mohawk/cstime_ui.h
index 27df7ca..3154d4b 100644
--- a/engines/mohawk/cstime_ui.h
+++ b/engines/mohawk/cstime_ui.h
@@ -167,7 +167,8 @@ protected:
enum CSTimeInterfaceState {
kCSTimeInterfaceStateNormal = 1,
kCSTimeInterfaceStateDragStart = 2,
- kCSTimeInterfaceStateDragging = 3
+ kCSTimeInterfaceStateDragging = 3,
+ kCSTimeInterfaceDroppedInventory = 4
};
class CSTimeInterface {
Commit: 054ef1f1cd80540236f5b3d3a45ad8d058c02086
https://github.com/scummvm/scummvm/commit/054ef1f1cd80540236f5b3d3a45ad8d058c02086
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-30T04:36:59-07:00
Commit Message:
GUI: Fix compiler warning
Changed paths:
gui/recorderdialog.h
diff --git a/gui/recorderdialog.h b/gui/recorderdialog.h
index eb690a4..9c5965f 100644
--- a/gui/recorderdialog.h
+++ b/gui/recorderdialog.h
@@ -34,6 +34,8 @@ class ContainerWidget;
class StaticTextWidget;
class RecorderDialog : public GUI::Dialog {
+ using GUI::Dialog::runModal;
+
private:
bool _firstScreenshotUpdate;
Common::PlaybackFile _playbackFile;
Commit: 5cc0850a6706b6ad1afa13404c6e81337c25410b
https://github.com/scummvm/scummvm/commit/5cc0850a6706b6ad1afa13404c6e81337c25410b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-30T04:36:59-07:00
Commit Message:
WINTERMUTE: Fix compiler warnings
Changed paths:
engines/wintermute/ad/ad_item.h
engines/wintermute/ui/ui_tiled_image.h
diff --git a/engines/wintermute/ad/ad_item.h b/engines/wintermute/ad/ad_item.h
index dd7039d..f074e5a 100644
--- a/engines/wintermute/ad/ad_item.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -35,6 +35,8 @@
namespace Wintermute {
class AdItem : public AdTalkHolder {
+ using Wintermute::AdObject::display;
+
public:
bool update();
DECLARE_PERSISTENT(AdItem, AdTalkHolder)
diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h
index 39bc649..5fd3346 100644
--- a/engines/wintermute/ui/ui_tiled_image.h
+++ b/engines/wintermute/ui/ui_tiled_image.h
@@ -36,6 +36,8 @@
namespace Wintermute {
class BaseSubFrame;
class UITiledImage : public BaseObject {
+ using Wintermute::BaseObject::display;
+
public:
DECLARE_PERSISTENT(UITiledImage, BaseObject)
void correctSize(int32 *width, int32 *height);
Commit: 17df6b343a0fdb2168b4d3a22927cd0f584ce735
https://github.com/scummvm/scummvm/commit/17df6b343a0fdb2168b4d3a22927cd0f584ce735
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-30T04:36:59-07:00
Commit Message:
MORTEVIELLE: Remove unused variable
Changed paths:
engines/mortevielle/mouse.h
diff --git a/engines/mortevielle/mouse.h b/engines/mortevielle/mouse.h
index 1b9856e..594031d 100644
--- a/engines/mortevielle/mouse.h
+++ b/engines/mortevielle/mouse.h
@@ -37,7 +37,6 @@ class MouseHandler {
private:
MortevielleEngine *_vm;
- int s_s[12][6];
int _counter;
public:
Common::Point _pos;
More information about the Scummvm-git-logs
mailing list