diff options
author | Eugene Sandulenko | 2017-03-13 19:58:15 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-03-13 19:58:15 +0100 |
commit | b4a4ab667303beb01f6123182b21bcb803ff7154 (patch) | |
tree | 33e831ab967cdd759a69e741d7bd7c1995ec2594 | |
parent | cf6f08b137bedc807d8eed00988aa338c6cffd15 (diff) | |
download | scummvm-rg350-b4a4ab667303beb01f6123182b21bcb803ff7154.tar.gz scummvm-rg350-b4a4ab667303beb01f6123182b21bcb803ff7154.tar.bz2 scummvm-rg350-b4a4ab667303beb01f6123182b21bcb803ff7154.zip |
DIRECTOR: Initial work on sprite dragging
-rw-r--r-- | engines/director/director.cpp | 5 | ||||
-rw-r--r-- | engines/director/director.h | 4 | ||||
-rw-r--r-- | engines/director/events.cpp | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 1077b75475..70d5cf3c62 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -92,7 +92,10 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam _keyCode = 0; _machineType = 9; // Macintosh IIci _playbackPaused = false; - g_director->_skipFrameAdvance = false; + _skipFrameAdvance = false; + + _draggingSprite = false; + _draggingSpriteId = 0; } DirectorEngine::~DirectorEngine() { diff --git a/engines/director/director.h b/engines/director/director.h index 61c5f4e2df..3c3e2e947a 100644 --- a/engines/director/director.h +++ b/engines/director/director.h @@ -164,6 +164,10 @@ private: Common::String _sharedCastFile; Common::HashMap<int, CastType> _dummyCastType; + bool _draggingSprite; + uint16 _draggingSpriteId; + Common::Point _draggingSpritePos; + private: void testFontScaling(); void testFonts(); diff --git a/engines/director/events.cpp b/engines/director/events.cpp index 116db9c059..88716e48b2 100644 --- a/engines/director/events.cpp +++ b/engines/director/events.cpp @@ -123,6 +123,10 @@ void DirectorEngine::processEvents() { } void DirectorEngine::setDraggedSprite(uint16 id) { + _draggingSprite = true; + _draggingSpriteId = id; + _draggingSpritePos = g_system->getEventManager()->getMousePos(); + warning("STUB: DirectorEngine::setDraggedSprite(%d)", id); } |