[Scummvm-cvs-logs] SF.net SVN: scummvm:[47835] scummvm/trunk/engines/sci

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Feb 3 02:33:48 CET 2010


Revision: 47835
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47835&view=rev
Author:   fingolfin
Date:     2010-02-03 01:33:48 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
cleanup

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-02-03 01:33:23 UTC (rev 47834)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-02-03 01:33:48 UTC (rev 47835)
@@ -990,7 +990,7 @@
 	retval->script_000 = retval->_segMan->getScript(retval->_segMan->getScriptSegment(0, SCRIPT_GET_DONT_LOAD));
 	retval->gc_countdown = GC_INTERVAL - 1;
 	retval->sys_strings_segment = retval->_segMan->findSegmentByType(SEG_TYPE_SYS_STRINGS);
-	retval->sys_strings = (SystemStrings *)GET_SEGMENT(*retval->_segMan, retval->sys_strings_segment, SEG_TYPE_SYS_STRINGS);
+	retval->sys_strings = (SystemStrings *)(retval->_segMan->_heap[retval->sys_strings_segment]);
 
 	// Time state:
 	retval->last_wait_time = g_system->getMillis();

Modified: scummvm/trunk/engines/sci/engine/segment.h
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.h	2010-02-03 01:33:23 UTC (rev 47834)
+++ scummvm/trunk/engines/sci/engine/segment.h	2010-02-03 01:33:48 UTC (rev 47835)
@@ -200,7 +200,9 @@
 };
 
 /** Clone has been marked as 'freed' */
-#define OBJECT_FLAG_FREED (1 << 0)
+enum {
+	OBJECT_FLAG_FREED = (1 << 0)
+};
 
 class Object {
 public:
@@ -517,8 +519,10 @@
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 };
 
-#define CLONE_USED -1
-#define CLONE_NONE -1
+enum {
+	CLONE_USED = -1,
+	CLONE_NONE = -1
+};
 
 typedef Object Clone;
 

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-02-03 01:33:23 UTC (rev 47834)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-02-03 01:33:48 UTC (rev 47835)
@@ -206,6 +206,7 @@
 
 	// Set the savegame dir (actually, we set it to a fake value,
 	// since we cannot let the game control where saves are stored)
+	assert(_gamestate->sys_strings->_strings[SYS_STRING_SAVEDIR]._value != 0);
 	strcpy(_gamestate->sys_strings->_strings[SYS_STRING_SAVEDIR]._value, "");
 
 	SciVersion soundVersion = _gamestate->detectDoSoundType();


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




More information about the Scummvm-git-logs mailing list