aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-04 23:18:27 +0200
committerEugene Sandulenko2016-08-04 23:18:27 +0200
commit7a79eec7eaa183412bcec0b1d89739603f9411b5 (patch)
treee738906521376c43469081aeecb0d8e0ca2adee5 /engines/director
parente52bdfd5ed2043f0bb5f4312d63bc53edf52d5a3 (diff)
downloadscummvm-rg350-7a79eec7eaa183412bcec0b1d89739603f9411b5.tar.gz
scummvm-rg350-7a79eec7eaa183412bcec0b1d89739603f9411b5.tar.bz2
scummvm-rg350-7a79eec7eaa183412bcec0b1d89739603f9411b5.zip
DIRECTOR: Fix warnings
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/lingo/lingo-code.cpp4
-rw-r--r--engines/director/lingo/lingo-codegen.cpp4
-rw-r--r--engines/director/score.cpp5
3 files changed, 8 insertions, 5 deletions
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index b6388be118..05c10f6cc4 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 217ca562e4..8618463e42 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 4bb4dda2e5..161bc86768 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;
}
}