[Scummvm-cvs-logs] SF.net SVN: scummvm:[51727] scummvm/trunk/engines/sci/engine/savegame.cpp

[fingolfin at users.sourceforge.net]

Revision: 51727
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51727&view=rev
Author:   fingolfin
Date:     2010-08-04 08:26:09 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
SCI: Simplify code (let the compiler interfer types where possible)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-04 08:25:39 UTC (rev 51726)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-04 08:26:09 UTC (rev 51727)
@@ -173,7 +173,7 @@
 template <>
 void syncWithSerializer(Common::Serializer &s, Class &obj) {
 	s.syncAsSint32LE(obj.script);
-	syncWithSerializer<reg_t>(s, obj.reg);
+	syncWithSerializer(s, obj.reg);
 }
 
 static void sync_SavegameMetadata(Common::Serializer &s, SavegameMetadata &obj) {
@@ -233,7 +233,7 @@
 
 void Object::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsSint32LE(_flags);
-	syncWithSerializer<reg_t>(s, _pos);
+	syncWithSerializer(s, _pos);
 	s.syncAsSint32LE(_methodCount);		// that's actually a uint16
 
 	syncArray<reg_t>(s, _variables);
@@ -243,25 +243,25 @@
 void syncWithSerializer(Common::Serializer &s, Table<Clone>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
-	syncWithSerializer<Object>(s, obj);
+	syncWithSerializer(s, obj);
 }
 
 template <>
 void syncWithSerializer(Common::Serializer &s, Table<List>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
-	syncWithSerializer<reg_t>(s, obj.first);
-	syncWithSerializer<reg_t>(s, obj.last);
+	syncWithSerializer(s, obj.first);
+	syncWithSerializer(s, obj.last);
 }
 
 template <>
 void syncWithSerializer(Common::Serializer &s, Table<Node>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
-	syncWithSerializer<reg_t>(s, obj.pred);
-	syncWithSerializer<reg_t>(s, obj.succ);
-	syncWithSerializer<reg_t>(s, obj.key);
-	syncWithSerializer<reg_t>(s, obj.value);
+	syncWithSerializer(s, obj.pred);
+	syncWithSerializer(s, obj.succ);
+	syncWithSerializer(s, obj.key);
+	syncWithSerializer(s, obj.value);
 }
 
 #ifdef ENABLE_SCI32
@@ -295,7 +295,7 @@
 		if (s.isSaving())
 			value = obj.getValue(i);
 
-		syncWithSerializer<reg_t>(s, value);
+		syncWithSerializer(s, value);
 
 		if (s.isLoading())
 			obj.setValue(i, value);
@@ -381,14 +381,14 @@
 		_objects.clear();
 		Object tmp;
 		for (uint i = 0; i < numObjs; ++i) {
-			syncWithSerializer<Object>(s, tmp);
+			syncWithSerializer(s, tmp);
 			_objects[tmp.getPos().offset] = tmp;
 		}
 	} else {
 		ObjMap::iterator it;
 		const ObjMap::iterator end = _objects.end();
 		for (it = _objects.begin(); it != end; ++it) {
-			syncWithSerializer<Object>(s, it->_value);
+			syncWithSerializer(s, it->_value);
 		}
 	}
 
@@ -494,7 +494,7 @@
 }
 
 void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
-	syncWithSerializer<reg_t>(s, soundObj);
+	syncWithSerializer(s, soundObj);
 	s.syncAsSint16LE(resourceId);
 	s.syncAsSint16LE(dataInc);
 	s.syncAsSint16LE(ticker);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.