[Scummvm-cvs-logs] scummvm master -> ffef92a134a27790584d4d2656e8966a980b5063
digitall
dgturner at iee.org
Wed Jul 31 04:36:20 CEST 2013
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:
ffef92a134 MORTEVIELLE: Fix two GCC compiler warnings.
Commit: ffef92a134a27790584d4d2656e8966a980b5063
https://github.com/scummvm/scummvm/commit/ffef92a134a27790584d4d2656e8966a980b5063
Author: D G Turner (digitall at scummvm.org)
Date: 2013-07-30T19:36:16-07:00
Commit Message:
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.
Changed paths:
engines/mortevielle/graphics.cpp
engines/mortevielle/saveload.cpp
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 8392fab..c066114 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 ff3bee5..77c242c 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;
More information about the Scummvm-git-logs
mailing list