[Scummvm-cvs-logs] scummvm master -> 36879872915e04a08aa7e9b3e0b39c5a72369132

sev- sev at scummvm.org
Tue Apr 29 07:15:50 CEST 2014


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:
3687987291 FULLPIPE: Fix ModalSaveGame::setup()


Commit: 36879872915e04a08aa7e9b3e0b39c5a72369132
    https://github.com/scummvm/scummvm/commit/36879872915e04a08aa7e9b3e0b39c5a72369132
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-29T08:14:43+03:00

Commit Message:
FULLPIPE: Fix ModalSaveGame::setup()

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 906e4e6..bba5df0 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1584,17 +1584,17 @@ void ModalSaveGame::setup(Scene *sc, int mode) {
 
 	int x = _bgr->_ox + _bgr->getDimensions(&point)->x / 2;
 	int y = _bgr->_oy + 90;
-	bool flag = false;
 	int w;
 	FileInfo *fileinfo;
 
 	for (int i = 0; i < 7; i++) {
 		fileinfo = new FileInfo;
+		memset(fileinfo, 0, sizeof(FileInfo));
 
 		snprintf(fileinfo->filename, 160, "save%02d.sav", i);
 
-		if (!getFileInfo(fileinfo->filename, fileinfo) || flag) {
-			flag = true;
+		if (!getFileInfo(fileinfo->filename, fileinfo)) {
+			fileinfo->empty = true;
 			w = _emptyD->getDimensions(&point)->x;
 		} else {
 			w = 0;
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index aced315..a214b1c 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -31,7 +31,7 @@ class Sound;
 
 struct FileInfo {
 	char filename[260];
-	int fi_104;
+	bool empty;
 	int day;
 	int month;
 	int year;






More information about the Scummvm-git-logs mailing list