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

[sev-]

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:
7e05b1e94d DIRECTOR: Fix warning
319bbcfbf1 GRAPHICS: Hid noisy warning in MacFontManager
d1d8fc698a DIRECTOR: Lingo: Implement b_rollOver()
e8fb572487 DIRECTOR: Lingo: Improved stack printing for REFERENCE


Commit: 7e05b1e94dc25e1706b9e959cfbf34087c94f578
    https://github.com/scummvm/scummvm/commit/7e05b1e94dc25e1706b9e959cfbf34087c94f578
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-12T16:20:00+01:00

Commit Message:
DIRECTOR: Fix warning

Changed paths:
    engines/director/director.h


diff --git a/engines/director/director.h b/engines/director/director.h
index 1a98329..6e7947f 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -51,7 +51,7 @@ struct DirectorGameDescription;
 class DirectorSound;
 class Lingo;
 class Score;
-struct Cast;
+class Cast;
 
 enum {
 	kDebugLingoExec		= 1 << 0,


Commit: 319bbcfbf16b04b695c0d4c3e5f57de8a2928f3e
    https://github.com/scummvm/scummvm/commit/319bbcfbf16b04b695c0d4c3e5f57de8a2928f3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-12T16:20:00+01:00

Commit Message:
GRAPHICS: Hid noisy warning in MacFontManager

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index f57cc9b..8134955 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -267,7 +267,7 @@ const Font *MacFontManager::getFont(MacFont macFont) {
 		font = FontMan.getFontByName(macFont.getName());
 
 		if (!font) {
-			warning("Cannot load font '%s'", macFont.getName().c_str());
+			debug(1, "Cannot load font '%s'", macFont.getName().c_str());
 
 			font = FontMan.getFontByName(MacFont(kMacFontChicago, 12).getName());
 		}
@@ -375,7 +375,7 @@ void MacFontManager::generateFontSubstitute(MacFont &macFont) {
 	}
 
 	if (sizes.empty()) {
-		warning("No viable substitute found for font %s", getFontName(macFont));
+		debug(1, "No viable substitute found for font %s", getFontName(macFont));
 		return;
 	}
 


Commit: d1d8fc698a769cc2746084b231426b4ec8870394
    https://github.com/scummvm/scummvm/commit/d1d8fc698a769cc2746084b231426b4ec8870394
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-12T16:20:00+01:00

Commit Message:
DIRECTOR: Lingo: Implement b_rollOver()

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 85af186..c94717a 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -21,7 +21,10 @@
  */
 
 #include "common/system.h"
+#include "common/events.h"
+
 #include "director/lingo/lingo.h"
+#include "director/frame.h"
 
 namespace Director {
 
@@ -1216,9 +1219,27 @@ void Lingo::b_ramNeeded(int nargs) {
 
 void Lingo::b_rollOver(int nargs) {
 	Datum d = g_lingo->pop();
-	warning("STUB: b_rollOver(%d)", d.u.i);
 
-	g_lingo->push(Datum(0));
+	d.toInt();
+
+	int arg = d.u.i;
+
+	d.u.i = 0; // FALSE
+
+	Frame *frame = g_director->getCurrentScore()->_frames[g_director->getCurrentScore()->getCurrentFrame()];
+
+	if (arg >= frame->_sprites.size()) {
+		g_lingo->push(d);
+		return;
+	}
+
+	Common::Point pos = g_system->getEventManager()->getMousePos();
+	uint16 spriteId = frame->getSpriteIDFromPos(pos);
+
+	if (spriteId == arg)
+		d.u.i = 1; // TRUE
+
+	g_lingo->push(d);
 }
 
 void Lingo::b_spriteBox(int nargs) {


Commit: e8fb572487a599b8b66748b765e4669e811ab8c9
    https://github.com/scummvm/scummvm/commit/e8fb572487a599b8b66748b765e4669e811ab8c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-12T16:20:01+01:00

Commit Message:
DIRECTOR: Lingo: Improved stack printing for REFERENCE

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 2a089dd..f00d9a7 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -410,6 +410,9 @@ Common::String *Datum::toString() {
 	case VAR:
 		*s = Common::String::format("var: #%s", u.sym->name.c_str());
 		break;
+	case REFERENCE:
+		*s = Common::String::format("field#%d", u.i);
+		break;
 	default:
 		warning("Incorrect operation toString() for type: %s", type2str());
 	}