[Scummvm-git-logs] scummvm master -> 820520f9d6e50b87908454fedb636deaa29743cc
sev-
sev at scummvm.org
Sun Jul 26 22:46:20 UTC 2020
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:
490e614b30 DIRECTOR: Fix warning
300bea13c8 DIRECTOR: Remove unused variable
820520f9d6 JANOTORIAL: Fix indentation
Commit: 490e614b3025cf322898156363d4331be01953d7
https://github.com/scummvm/scummvm/commit/490e614b3025cf322898156363d4331be01953d7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T00:39:07+02:00
Commit Message:
DIRECTOR: Fix warning
Changed paths:
engines/director/castmember.h
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index b1d53e45a0..671143270b 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -170,7 +170,7 @@ public:
virtual bool isModified() override;
virtual bool isEditable() override;
virtual void setEditable(bool editable) override;
- virtual void updateFromWidget(Graphics::MacWidget *widget);
+ virtual void updateFromWidget(Graphics::MacWidget *widget) override;
Graphics::TextAlign getAlignment();
virtual uint getBackColor() override { return _bgcolor; }
Commit: 300bea13c843cbc8d5ddaeb3da51cc05da07e988
https://github.com/scummvm/scummvm/commit/300bea13c843cbc8d5ddaeb3da51cc05da07e988
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T00:39:40+02:00
Commit Message:
DIRECTOR: Remove unused variable
Changed paths:
engines/director/events.cpp
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 960019f735..39bbf6b344 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -75,8 +75,6 @@ void DirectorEngine::processEvents() {
}
}
- uint16 spriteId = 0;
-
Common::Point pos;
while (g_system->getMillis() < endTime) {
@@ -102,10 +100,10 @@ void DirectorEngine::processEvents() {
bool Stage::processEvent(Common::Event &event) {
if (MacWindow::processEvent(event))
return true;
-
+
if (_currentMovie && _currentMovie->processEvent(event))
return true;
-
+
return false;
}
Commit: 820520f9d6e50b87908454fedb636deaa29743cc
https://github.com/scummvm/scummvm/commit/820520f9d6e50b87908454fedb636deaa29743cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T00:46:00+02:00
Commit Message:
JANOTORIAL: Fix indentation
Changed paths:
engines/director/lingo/xlibs/flushxobj.cpp
engines/director/lingo/xlibs/flushxobj.h
engines/director/lingo/xlibs/palxobj.cpp
engines/director/lingo/xlibs/palxobj.h
diff --git a/engines/director/lingo/xlibs/flushxobj.cpp b/engines/director/lingo/xlibs/flushxobj.cpp
index bf95bf8740..8158e8de0e 100644
--- a/engines/director/lingo/xlibs/flushxobj.cpp
+++ b/engines/director/lingo/xlibs/flushxobj.cpp
@@ -21,7 +21,7 @@
*/
/* FlushXObj is a Mac only XObject to call the underlying FlushEvents function
- * from the Macintosh Toolbox. Its purpose is to flush, i.e. remove, events
+ * from the Macintosh Toolbox. Its purpose is to flush, i.e. remove, events
* that happened while loading code.
*
* Implemented as a no-op, there's no need to flush events because:
@@ -31,7 +31,7 @@
* More information about the Toolbox and the flush events can be found here:
* https://en.wikipedia.org/wiki/Macintosh_Toolbox
* https://developer.apple.com/legacy/library/documentation/mac/pdf/MacintoshToolboxEssentials.pdf
- *
+ *
*/
#include "director/director.h"
@@ -48,13 +48,13 @@ static MethodProto xlibMethods[] = {
{ "new", FlushXObj::m_new, 0, 0, 4 }, // D4
{ "AddToMask", FlushXObj::m_addToMask, 2, 2, 4 }, // D4
{ "ClearMask", FlushXObj::m_clearMask, 0, 0, 4 }, // D4
- { "Flush", FlushXObj::m_flush, 0, 0, 4 }, // D4
- { "FlushEvents", FlushXObj::m_flushEvents, 2, 2, 4 }, // D4
+ { "Flush", FlushXObj::m_flush, 0, 0, 4 }, // D4
+ { "FlushEvents", FlushXObj::m_flushEvents, 2, 2, 4 }, // D4
{ 0, 0, 0, 0, 0 }
};
void FlushXObj::initialize(int type) {
- FlushXObject::initMethods(xlibMethods);
+ FlushXObject::initMethods(xlibMethods);
if (type & kXObj) {
if (!g_lingo->_globalvars.contains(xlibName)) {
FlushXObject *xobj = new FlushXObject(kXObj);
@@ -67,32 +67,32 @@ void FlushXObj::initialize(int type) {
FlushXObject::FlushXObject(ObjectType ObjectType) :Object<FlushXObject>("FlushXObj") {
- _objType = ObjectType;
+ _objType = ObjectType;
}
void FlushXObj::m_new(int nargs) {
- g_lingo->push(g_lingo->_currentMe);
+ g_lingo->push(g_lingo->_currentMe);
}
void FlushXObj::m_clearMask(int nargs) {
- debug(5, "FlushXobj::m_clearMask: no-op");
+ debug(5, "FlushXobj::m_clearMask: no-op");
}
void FlushXObj::m_addToMask(int nargs) {
- g_lingo->pop();
- g_lingo->pop();
+ g_lingo->pop();
+ g_lingo->pop();
- debug(5, "FlushXobj::m_addToMask: no-op");
+ debug(5, "FlushXobj::m_addToMask: no-op");
}
void FlushXObj::m_flush(int nargs) {
- debug(5, "FlushXobj::m_flush: no-op");
+ debug(5, "FlushXobj::m_flush: no-op");
}
void FlushXObj::m_flushEvents(int nargs) {
- g_lingo->pop();
- g_lingo->pop();
- debug(5, "FlushXobj::m_flush: no-op");
+ g_lingo->pop();
+ g_lingo->pop();
+ debug(5, "FlushXobj::m_flush: no-op");
}
} // End of namespace Director
diff --git a/engines/director/lingo/xlibs/flushxobj.h b/engines/director/lingo/xlibs/flushxobj.h
index e5e9b91ff1..1657ee5e10 100644
--- a/engines/director/lingo/xlibs/flushxobj.h
+++ b/engines/director/lingo/xlibs/flushxobj.h
@@ -27,19 +27,19 @@ namespace Director {
class FlushXObject : public Object<FlushXObject> {
public:
- FlushXObject(ObjectType objType);
+ FlushXObject(ObjectType objType);
};
namespace FlushXObj {
- void initialize(int type);
+ void initialize(int type);
- void m_new(int nargs);
- void m_clearMask(int nargs);
- void m_addToMask(int nargs);
- void m_flush(int nargs);
- void m_flushEvents(int nargs);
+ void m_new(int nargs);
+ void m_clearMask(int nargs);
+ void m_addToMask(int nargs);
+ void m_flush(int nargs);
+ void m_flushEvents(int nargs);
} // End of namespace FlushXObj
} // End of namespace Director
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/director/lingo/xlibs/palxobj.cpp b/engines/director/lingo/xlibs/palxobj.cpp
index ed69eb6bb5..ef0d2f6599 100644
--- a/engines/director/lingo/xlibs/palxobj.cpp
+++ b/engines/director/lingo/xlibs/palxobj.cpp
@@ -25,15 +25,15 @@
* this XObject can be used to patch this problem
* use mPatchIt message on the same frame as the palette switch
* pass in the stage window coordinates when creating the XObject
- *
+ *
* From: http://www.zeusprod.com/technote/patchpal.html
- * The FixPalette XObject is needed when using QuickTime movies with
- * more than one custom palette. If it not used on the PC, nor is it
- * needed if you are only using one custom palette. If the first
- * QuickTime you play looks fine, but the second QuickTime video
- * that is played looks funky or psychedelic, then there is a good
+ * The FixPalette XObject is needed when using QuickTime movies with
+ * more than one custom palette. If it not used on the PC, nor is it
+ * needed if you are only using one custom palette. If the first
+ * QuickTime you play looks fine, but the second QuickTime video
+ * that is played looks funky or psychedelic, then there is a good
* chance that the FixPaletet XObject will solve your problem.
- *
+ *
* It's only necessary on Mac.
*/
@@ -50,12 +50,12 @@ static const char *xlibName = "FixPalette";
static MethodProto xlibMethods[] = {
{ "new", PalXObj::m_new, 4, 4, 4 }, // D4
- { "PatchIt", PalXObj::m_patchIt, 0, 0, 4 }, // D4
+ { "PatchIt", PalXObj::m_patchIt, 0, 0, 4 }, // D4
{ 0, 0, 0, 0, 0 }
};
void PalXObj::initialize(int type) {
- PalXObject::initMethods(xlibMethods);
+ PalXObject::initMethods(xlibMethods);
if (type & kXObj) {
if (!g_lingo->_globalvars.contains(xlibName)) {
PalXObject *xobj = new PalXObject(kXObj);
@@ -68,24 +68,24 @@ void PalXObj::initialize(int type) {
PalXObject::PalXObject(ObjectType ObjectType) :Object<PalXObject>("PalXObj") {
- _objType = ObjectType;
+ _objType = ObjectType;
}
void PalXObj::m_new(int nargs) {
- PalXObject *me = static_cast<PalXObject *>(g_lingo->_currentMe.u.obj);
+ PalXObject *me = static_cast<PalXObject *>(g_lingo->_currentMe.u.obj);
- Common::Rect rect;
- rect.bottom = g_lingo->pop().asInt();
- rect.right = g_lingo->pop().asInt();
- rect.top = g_lingo->pop().asInt();
- rect.left = g_lingo->pop().asInt();
- me->_stageWindowCoordinates = rect;
+ Common::Rect rect;
+ rect.bottom = g_lingo->pop().asInt();
+ rect.right = g_lingo->pop().asInt();
+ rect.top = g_lingo->pop().asInt();
+ rect.left = g_lingo->pop().asInt();
+ me->_stageWindowCoordinates = rect;
- g_lingo->push(g_lingo->_currentMe);
+ g_lingo->push(g_lingo->_currentMe);
}
void PalXObj::m_patchIt(int nargs) {
- warning("STUB: PalXObj::m_patchIt");
+ warning("STUB: PalXObj::m_patchIt");
}
} // End of namespace Director
diff --git a/engines/director/lingo/xlibs/palxobj.h b/engines/director/lingo/xlibs/palxobj.h
index 3fb09fb547..fd1e8b28f5 100644
--- a/engines/director/lingo/xlibs/palxobj.h
+++ b/engines/director/lingo/xlibs/palxobj.h
@@ -27,19 +27,19 @@ namespace Director {
class PalXObject : public Object<PalXObject> {
public:
- Common::Rect _stageWindowCoordinates;
+ Common::Rect _stageWindowCoordinates;
public:
- PalXObject(ObjectType objType);
+ PalXObject(ObjectType objType);
};
namespace PalXObj {
- void initialize(int type);
+ void initialize(int type);
- void m_new(int nargs);
- void m_patchIt(int nargs);
+ void m_new(int nargs);
+ void m_patchIt(int nargs);
} // End of namespace PalXObj
} // End of namespace Director
-#endif
\ No newline at end of file
+#endif
More information about the Scummvm-git-logs
mailing list