[Scummvm-cvs-logs] scummvm master -> 7a79eec7eaa183412bcec0b1d89739603f9411b5

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7a79eec7ea DIRECTOR: Fix warnings


Commit: 7a79eec7eaa183412bcec0b1d89739603f9411b5
    https://github.com/scummvm/scummvm/commit/7a79eec7eaa183412bcec0b1d89739603f9411b5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-04T23:18:27+02:00

Commit Message:
DIRECTOR: Fix warnings

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



diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index b6388be..05c10f6 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -427,7 +427,7 @@ void Lingo::c_intersects() {
 	Datum d2 = g_lingo->pop();
 	Datum d1 = g_lingo->pop();
 
-	warning("STUB: c_intersects");
+	warning("STUB: c_intersects: %d", d2.u.i);
 
 	g_lingo->push(d1);
 }
@@ -436,7 +436,7 @@ void Lingo::c_within() {
 	Datum d2 = g_lingo->pop();
 	Datum d1 = g_lingo->pop();
 
-	warning("STUB: c_within");
+	warning("STUB: c_within: %d", d2.u.i);
 
 	g_lingo->push(d1);
 }
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 217ca56..8618463 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -54,10 +54,10 @@ namespace Director {
 void Lingo::execute(int pc) {
 	for(_pc = pc; (*_currentScript)[_pc] != STOP && !_returning;) {
 
-		for (int i = 0; i < _stack.size(); i++) {
+		for (uint i = 0; i < _stack.size(); i++) {
 			debugN(5, "%d ", _stack[i].u.i);
 		}
-		debug(5, "");
+		debug(5, "%s", "");
 
 		_pc++;
 		(*((*_currentScript)[_pc - 1]))();
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 4bb4dda..161bc86 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -370,7 +370,7 @@ void Score::loadLabels(Common::SeekableSubReadStreamEndian &stream) {
 }
 
 int Score::compareLabels(const void *a, const void *b) {
-	return ((Label *)a)->number - ((Label *)b)->number;
+	return ((const Label *)a)->number - ((const Label *)b)->number;
 }
 
 void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
@@ -1323,6 +1323,9 @@ void Frame::renderButton(Graphics::ManagedSurface &surface, uint16 spriteId) {
 	case kTypeButton:
 		surface.frameRect(Common::Rect(x, y, x + width, y + height), 0);
 		break;
+	case kTypeRadio:
+		warning("STUB: renderButton: kTypeRadio");
+		break;
 	}
 }