aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2013-07-31 03:36:16 +0100
committerD G Turner2013-07-31 03:36:16 +0100
commitffef92a134a27790584d4d2656e8966a980b5063 (patch)
tree64cb0f026e8ce4c89cdb4d0b3c4b4d4102378a7c /engines
parent1396052dc9ee95618c7d57f9230803bccb2f99d9 (diff)
downloadscummvm-rg350-ffef92a134a27790584d4d2656e8966a980b5063.tar.gz
scummvm-rg350-ffef92a134a27790584d4d2656e8966a980b5063.tar.bz2
scummvm-rg350-ffef92a134a27790584d4d2656e8966a980b5063.zip
MORTEVIELLE: Fix two GCC compiler warnings.
The first is due to a variable set but never used i.e. destSurface, but I think this call is still needed to lock the area being copied, hence have removed the variable, but not the call. The second was a real bug in the type of the print format string used for savegame naming. slot is a number, not a string and can vary from 0 to 999, hence the 3 digit fixed size with zero padded prefix.
Diffstat (limited to 'engines')
-rw-r--r--engines/mortevielle/graphics.cpp2
-rw-r--r--engines/mortevielle/saveload.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 8392fabd6a..c066114e8d 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -974,7 +974,7 @@ void ScreenSurface::drawPicture(GfxSurface &surface, int x, int y) {
* Copys a given surface to the given position
*/
void ScreenSurface::copyFrom(Graphics::Surface &src, int x, int y) {
- Graphics::Surface destSurface = lockArea(Common::Rect(x, y, x + src.w, y + src.h));
+ lockArea(Common::Rect(x, y, x + src.w, y + src.h));
// Loop through writing
for (int yp = 0; yp < src.h; ++yp) {
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index ff3bee5c06..77c242c9e7 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -300,7 +300,7 @@ SaveStateDescriptor SavegameManager::querySaveMetaInfos(const Common::String &fi
// Original savegame perhaps?
delete f;
- SaveStateDescriptor desc(slot, Common::String::format("Savegame - %s", slot));
+ SaveStateDescriptor desc(slot, Common::String::format("Savegame - %03d", slot));
desc.setDeletableFlag(slot != 0);
desc.setWriteProtectedFlag(slot == 0);
return desc;