[Scummvm-git-logs] scummvm master -> cf6f08b137bedc807d8eed00988aa338c6cffd15

sev- sev at scummvm.org
Mon Mar 13 09:23:43 CET 2017


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:
1ffb661853 GUI: Fix warnings
121cb80696 JANITORIAL: Remove trailing spaces
a3828cf7a5 DIRECTOR: Lingo: Improved check for REFERENCE assignment
cf6f08b137 DIRECTOR: Lingo: Implement b_moveableSprite()


Commit: 1ffb66185300f9e46d23225dc336160a758a18cb
    https://github.com/scummvm/scummvm/commit/1ffb66185300f9e46d23225dc336160a758a18cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-13T08:59:10+01:00

Commit Message:
GUI: Fix warnings

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index feb4e50..43e3fa3 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -255,7 +255,7 @@ Dialog *GuiManager::getTopDialog() const {
 }
 
 void GuiManager::addToTrash(GuiObject* object, Dialog* parent) {
-	debug(7, "Adding Gui Object %p to trash", object);
+	debug(7, "Adding Gui Object %p to trash", (void *)object);
 	GuiObjectTrashItem t;
 	t.object = object;
 	t.parent = 0;
@@ -362,7 +362,7 @@ void GuiManager::runLoop() {
 		Common::List<GuiObjectTrashItem>::iterator it = _guiObjectTrash.begin();
 		while (it != _guiObjectTrash.end()) {
 			if ((*it).parent == 0 || (*it).parent == activeDialog) {
-				debug(7, "Delayed deletion of Gui Object %p", (*it).object);
+				debug(7, "Delayed deletion of Gui Object %p", (void *)(*it).object);
 				delete (*it).object;
 				it = _guiObjectTrash.erase(it);
 			} else


Commit: 121cb806965ad43eaeba525a9fe1883a13e2821c
    https://github.com/scummvm/scummvm/commit/121cb806965ad43eaeba525a9fe1883a13e2821c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-13T08:59:22+01:00

Commit Message:
JANITORIAL: Remove trailing spaces

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 43e3fa3..6f9fd8b 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -345,11 +345,11 @@ void GuiManager::runLoop() {
 			// triggered in 3x mode or when running ScummVM under Valgrind.)
 			if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED) {
 				processEvent(event, getTopDialog());
-				continue;		
+				continue;
 			}
-			
+
 			processEvent(event, activeDialog);
-			
+
 
 			if (lastRedraw + waitTime < _system->getMillis(true)) {
 				lastRedraw = _system->getMillis(true);


Commit: a3828cf7a5534151057621130fdb35fa1753f7b6
    https://github.com/scummvm/scummvm/commit/a3828cf7a5534151057621130fdb35fa1753f7b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-13T09:08:51+01:00

Commit Message:
DIRECTOR: Lingo: Improved check for REFERENCE assignment

Changed paths:
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 7bc82ed..d0d29dd 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -307,10 +307,14 @@ void Lingo::c_assign() {
 	}
 
 	if (d1.type == REFERENCE) {
-		if (!g_director->getCurrentScore()->_castsInfo.contains(d1.u.i)) {
-			warning("c_assign: Unknown REFERENCE %d", d1.u.i);
-			g_lingo->pushVoid();
-			return;
+		if (!g_director->getCurrentScore()->_loadedText->contains(d1.u.i)) {
+			if (!g_director->getCurrentScore()->_loadedText->contains(d1.u.i - 1024)) {
+				warning("c_assign: Unknown REFERENCE %d", d1.u.i);
+				g_lingo->pushVoid();
+				return;
+			} else {
+				d1.u.i -= 1024;
+			}
 		}
 
 		warning("STUB: c_assing REFERENCE");


Commit: cf6f08b137bedc807d8eed00988aa338c6cffd15
    https://github.com/scummvm/scummvm/commit/cf6f08b137bedc807d8eed00988aa338c6cffd15
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-13T09:23:20+01:00

Commit Message:
DIRECTOR: Lingo: Implement b_moveableSprite()

Changed paths:
    engines/director/director.h
    engines/director/events.cpp
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/director.h b/engines/director/director.h
index 6e7947f..61c5f4e 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -105,6 +105,7 @@ public:
 	void cleanupMainArchive();
 
 	void processEvents(); // evetns.cpp
+	void setDraggedSprite(uint16 id); // events.cpp
 
 	Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedDIB() const { return _sharedDIB; }
 	Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedBMP() const { return _sharedBMP; }
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index b010f74..116db9c 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -122,4 +122,8 @@ void DirectorEngine::processEvents() {
 	}
 }
 
+void DirectorEngine::setDraggedSprite(uint16 id) {
+	warning("STUB: DirectorEngine::setDraggedSprite(%d)", id);
+}
+
 } // End of namespace Director
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index d79b201..cb6a7d6 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -25,6 +25,7 @@
 
 #include "director/lingo/lingo.h"
 #include "director/frame.h"
+#include "director/sprite.h"
 
 namespace Director {
 
@@ -1166,9 +1167,12 @@ void Lingo::b_move(int nargs) {
 }
 
 void Lingo::b_moveableSprite(int nargs) {
-	g_lingo->printSTUBWithArglist("b_moveableSprite", nargs);
+	Frame *frame = g_director->getCurrentScore()->_frames[g_director->getCurrentScore()->getCurrentFrame()];
 
-	g_lingo->dropStack(nargs);
+	// Will have no effect
+	frame->_sprites[g_lingo->_currentEntityId]->_moveable = true;
+
+	g_director->setDraggedSprite(frame->_sprites[g_lingo->_currentEntityId]->_castId);
 }
 
 void Lingo::b_pasteClipBoardInto(int nargs) {





More information about the Scummvm-git-logs mailing list