[Scummvm-git-logs] scummvm master -> a98d3832d9d08eae63f48008466f7ecbdfca16bf
sev-
sev at scummvm.org
Tue Jan 7 21:00:43 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3002f07875 DIRECTOR: LINGO: Fix warnings
a98d3832d9 GRAPHICS: FONTS: Fix warnings
Commit: 3002f078753de2cd2e51f5f7ec35fb82953aa134
https://github.com/scummvm/scummvm/commit/3002f078753de2cd2e51f5f7ec35fb82953aa134
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-07T21:59:45+01:00
Commit Message:
DIRECTOR: LINGO: Fix warnings
Changed paths:
engines/director/lingo/lingo.cpp
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 31f2046..36a0c63 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -301,6 +301,7 @@ int Datum::toInt() {
switch (type) {
case REFERENCE:
toString();
+ // fallthrough
case STRING:
u.i = atoi(u.s->c_str());
break;
@@ -517,13 +518,13 @@ void Lingo::printAllVars() {
for (SymbolHash::iterator i = _localvars->begin(); i != _localvars->end(); ++i) {
debugN("%s, ", (*i)._key.c_str());
}
- debug("");
+ debugN("\n");
debugN(" Global vars: ");
for (SymbolHash::iterator i = _globalvars.begin(); i != _globalvars.end(); ++i) {
debugN("%s, ", (*i)._key.c_str());
}
- debug("");
+ debugN("\n");
}
} // End of namespace Director
Commit: a98d3832d9d08eae63f48008466f7ecbdfca16bf
https://github.com/scummvm/scummvm/commit/a98d3832d9d08eae63f48008466f7ecbdfca16bf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-07T22:00:23+01:00
Commit Message:
GRAPHICS: FONTS: Fix warnings
Changed paths:
graphics/fonts/macfont.cpp
diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp
index 730229c..50635fd 100644
--- a/graphics/fonts/macfont.cpp
+++ b/graphics/fonts/macfont.cpp
@@ -524,7 +524,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize, bool bo
#if DEBUGSCALING
if (i == ccc)
- debug("");
+ debugN("\n");
#endif
}
}
@@ -583,7 +583,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize, bool bo
debugN("%c", srcRow[bitmapOffset / 8] & (1 << (7 - (bitmapOffset % 8))) ? '*' : '.');
}
- debug("");
+ debugN("\n");
}
#endif
@@ -637,7 +637,7 @@ static void magnifyGray(Surface *src, int *dstGray, int width, int height, float
#if DEBUGSCALING
if (dododo)
- debug("");
+ debugN("\n");
#endif
}
}
More information about the Scummvm-git-logs
mailing list