[Scummvm-cvs-logs] scummvm master -> 0a51805a8ceaeaeeaa57eb224e1adc821fd359f2

lordhoto lordhoto at gmail.com
Tue Jul 3 18:43:59 CEST 2012 

This automated email contains information about 15 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48e6b80253 SAGA: Slight cleanup in querySaveMetaInfos implementation.
e242b91db0 SCUMM: Slight cleanup in querySaveMetaInfos.
afa94697dc CGE: Slight cleanup in querySaveMetaInfos.
bc3c80714b CRUISE: Slight cleanup in querySaveMetaInfos.
a513585358 DRACI: Slight cleanup in querySaveMetaInfos.
e66b9d4487 DREAMWEB: Slight cleanup in querySaveMetaInfos.
31f339880d GROOVIE: Slight cleanup in querySaveMetaInfos.
3b14ff33ca HUGO: Slight cleanup in querySaveMetaInfos.
05bd736d16 SCI: Slight cleanup in querySaveMetaInfos.
89b8f6bb56 SWORD1: Slight cleanup in querySaveMetaInfos.
72e1e5a31c TEENAGENT: Slight cleanup in querySaveMetaInfos.
69723c82bc TOLTECTS: Slight cleanup in querySaveMetaInfos.
b9ac34272d TOON: Slight cleanup in querySaveMetaInfos.
79e2403527 TSAGE: Slight cleanup in querySaveMetaInfos.
0a51805a8c ENGINES: Mention defaults for writable and deletable settings in SaveStateDescriptor docs.


Commit: 48e6b80253355a91fbd72d0d0f38b43f5c2340f2
    https://github.com/scummvm/scummvm/commit/48e6b80253355a91fbd72d0d0f38b43f5c2340f2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:46-07:00

Commit Message:
SAGA: Slight cleanup in querySaveMetaInfos implementation.

Saves are writable and deletable by default, there is no need to mark them
explicitly as such.

Changed paths:
    engines/saga/detection.cpp



diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index d39ec34..9c17855 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -252,9 +252,6 @@ SaveStateDescriptor SagaMetaEngine::querySaveMetaInfos(const char *target, int s
 			debug(0, "Save is for: %s", title);
 		}
 
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-
 		if (version >= 6) {
 			Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*in);
 			desc.setThumbnail(thumbnail);


Commit: e242b91db0401c2a5c7af4202ab185a895fded31
    https://github.com/scummvm/scummvm/commit/e242b91db0401c2a5c7af4202ab185a895fded31
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:49-07:00

Commit Message:
SCUMM: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/scumm/detection.cpp



diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index ebf1a26..8730592 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1266,7 +1266,6 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
 	Graphics::Surface *thumbnail = ScummEngine::loadThumbnailFromSlot(target, slot);
 
 	SaveStateDescriptor desc(slot, saveDesc);
-	desc.setDeletableFlag(true);
 	desc.setThumbnail(thumbnail);
 
 	SaveStateMetaInfos infos;


Commit: afa94697dcf21c3c96360f5dd54dd2a016d69e85
    https://github.com/scummvm/scummvm/commit/afa94697dcf21c3c96360f5dd54dd2a016d69e85
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:49-07:00

Commit Message:
CGE: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/cge/detection.cpp



diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index f723ec8..d16b682 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -217,8 +217,6 @@ SaveStateDescriptor CGEMetaEngine::querySaveMetaInfos(const char *target, int sl
 		} else {
 			// Create the return descriptor
 			SaveStateDescriptor desc(slot, header.saveName);
-			desc.setDeletableFlag(true);
-			desc.setWriteProtectedFlag(false);
 			desc.setThumbnail(header.thumbnail);
 			desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
 			desc.setSaveTime(header.saveHour, header.saveMinutes);


Commit: bc3c80714b768ef11459738ad10bc7cd79afb854
    https://github.com/scummvm/scummvm/commit/bc3c80714b768ef11459738ad10bc7cd79afb854
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
CRUISE: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/cruise/detection.cpp



diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index b2e267c..cbe17ea 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -303,8 +303,6 @@ SaveStateDescriptor CruiseMetaEngine::querySaveMetaInfos(const char *target, int
 
 		// Create the return descriptor
 		SaveStateDescriptor desc(slot, header.saveName);
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
 		desc.setThumbnail(header.thumbnail);
 
 		return desc;


Commit: a51358535824564934e22b84ca37f2ae66649f24
    https://github.com/scummvm/scummvm/commit/a51358535824564934e22b84ca37f2ae66649f24
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
DRACI: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/draci/detection.cpp



diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index de76eb8..61705a1 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -161,8 +161,6 @@ SaveStateDescriptor DraciMetaEngine::querySaveMetaInfos(const char *target, int
 
 		// Create the return descriptor
 		SaveStateDescriptor desc(slot, header.saveName);
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
 		desc.setThumbnail(header.thumbnail);
 
 		int day = (header.date >> 24) & 0xFF;


Commit: e66b9d4487b71cba26741882e94248d8259b5fcb
    https://github.com/scummvm/scummvm/commit/e66b9d4487b71cba26741882e94248d8259b5fcb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
DREAMWEB: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/dreamweb/detection.cpp



diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 6468281..f2e2f42 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -172,8 +172,6 @@ SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, i
 			saveName += (char)in->readByte();
 
 		SaveStateDescriptor desc(slot, saveName);
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
 
 		// Check if there is a ScummVM data block
 		if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {


Commit: 31f339880d94d85e6168a4ee152512a730396ddd
    https://github.com/scummvm/scummvm/commit/31f339880d94d85e6168a4ee152512a730396ddd
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
GROOVIE: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/groovie/saveload.cpp



diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp
index 14e7a09..1a92c02 100644
--- a/engines/groovie/saveload.cpp
+++ b/engines/groovie/saveload.cpp
@@ -103,8 +103,6 @@ Common::InSaveFile *SaveLoad::openForLoading(const Common::String &target, int s
 	if (descriptor) {
 		// Initialize the SaveStateDescriptor
 		descriptor->setSaveSlot(slot);
-		descriptor->setDeletableFlag(true);
-		descriptor->setWriteProtectedFlag(false);
 
 		// TODO: Add extra information
 		//setSaveDate(int year, int month, int day)


Commit: 3b14ff33caeff827c2a4e82dc61c6a61d83c8d94
    https://github.com/scummvm/scummvm/commit/3b14ff33caeff827c2a4e82dc61c6a61d83c8d94
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
HUGO: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/hugo/detection.cpp



diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index 9070816..bb5944a 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -244,9 +244,6 @@ SaveStateDescriptor HugoMetaEngine::querySaveMetaInfos(const char *target, int s
 		Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*file);
 		desc.setThumbnail(thumbnail);
 
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-
 		uint32 saveDate = file->readUint32BE();
 		uint16 saveTime = file->readUint16BE();
 


Commit: 05bd736d163f7e18ce27cd483a7e0f35adf1dce9
    https://github.com/scummvm/scummvm/commit/05bd736d163f7e18ce27cd483a7e0f35adf1dce9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
SCI: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 78df306..8a74bc8 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -762,9 +762,6 @@ SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int sl
 		Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*in);
 		desc.setThumbnail(thumbnail);
 
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-
 		int day = (meta.saveDate >> 24) & 0xFF;
 		int month = (meta.saveDate >> 16) & 0xFF;
 		int year = meta.saveDate & 0xFFFF;


Commit: 89b8f6bb56e62f04e36778cfbd0abbebb94c4771
    https://github.com/scummvm/scummvm/commit/89b8f6bb56e62f04e36778cfbd0abbebb94c4771
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
SWORD1: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/sword1/detection.cpp



diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 087dcd0..5662e46 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -268,9 +268,6 @@ SaveStateDescriptor SwordMetaEngine::querySaveMetaInfos(const char *target, int
 
 		SaveStateDescriptor desc(slot, name);
 
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-
 		if (versionSave < 2) // These older version of the savegames used a flag to signal presence of thumbnail
 			in->skip(1);
 


Commit: 72e1e5a31c723a1167568f4c3c952931815f3ff8
    https://github.com/scummvm/scummvm/commit/72e1e5a31c723a1167568f4c3c952931815f3ff8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
TEENAGENT: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/teenagent/detection.cpp



diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
index dad876d..f516ee0 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -174,7 +174,6 @@ public:
 			return SaveStateDescriptor(slot, desc);
 
 		SaveStateDescriptor ssd(slot, desc);
-		ssd.setDeletableFlag(true);
 
 		//checking for the thumbnail
 		if (Graphics::Surface *const thumb = Graphics::loadThumbnail(*in))


Commit: 69723c82bc41ea9f7a440bf3a8cb5869ceb4b206
    https://github.com/scummvm/scummvm/commit/69723c82bc41ea9f7a440bf3a8cb5869ceb4b206
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
TOLTECTS: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/toltecs/detection.cpp



diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index c532bbb..c1a5763 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -273,8 +273,6 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in
 		if (error == Toltecs::ToltecsEngine::kRSHENoError) {
 			SaveStateDescriptor desc(slot, header.description);
 
-			desc.setDeletableFlag(true);
-			desc.setWriteProtectedFlag(false);
 			desc.setThumbnail(header.thumbnail);
 
 			if (header.version > 0) {


Commit: b9ac34272d6c04473b4acfc08fbf383912f22465
    https://github.com/scummvm/scummvm/commit/b9ac34272d6c04473b4acfc08fbf383912f22465
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
TOON: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/toon/detection.cpp



diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 8234934..0cafee1 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -234,9 +234,6 @@ SaveStateDescriptor ToonMetaEngine::querySaveMetaInfos(const char *target, int s
 		Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*file);
 		desc.setThumbnail(thumbnail);
 
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-
 		uint32 saveDate = file->readUint32BE();
 		uint16 saveTime = file->readUint16BE();
 


Commit: 79e24035273cbf17f2518460c014ecb45ed6ea90
    https://github.com/scummvm/scummvm/commit/79e24035273cbf17f2518460c014ecb45ed6ea90
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:39:50-07:00

Commit Message:
TSAGE: Slight cleanup in querySaveMetaInfos.

Changed paths:
    engines/tsage/detection.cpp



diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 0c458f5..bcadfdc 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -164,8 +164,6 @@ public:
 
 			// Create the return descriptor
 			SaveStateDescriptor desc(slot, header.saveName);
-			desc.setDeletableFlag(true);
-			desc.setWriteProtectedFlag(false);
 			desc.setThumbnail(header.thumbnail);
 			desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
 			desc.setSaveTime(header.saveHour, header.saveMinutes);


Commit: 0a51805a8ceaeaeeaa57eb224e1adc821fd359f2
    https://github.com/scummvm/scummvm/commit/0a51805a8ceaeaeeaa57eb224e1adc821fd359f2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-03T09:40:40-07:00

Commit Message:
ENGINES: Mention defaults for writable and deletable settings in SaveStateDescriptor docs.

Changed paths:
    engines/savestate.h



diff --git a/engines/savestate.h b/engines/savestate.h
index 6cbdb22..c233554 100644
--- a/engines/savestate.h
+++ b/engines/savestate.h
@@ -40,6 +40,8 @@ struct Surface;
  *
  * Further possibilites are a thumbnail, play time, creation date,
  * creation time, delete protected, write protection.
+ *
+ * Saves are writable and deletable by default.
  */
 class SaveStateDescriptor {
 public:

More information about the Scummvm-git-logs mailing list