[Scummvm-cvs-logs] SF.net SVN: scummvm: [25249] scummvm/trunk/engines/scumm

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jan 28 19:47:10 CET 2007


Revision: 25249
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25249&view=rev
Author:   fingolfin
Date:     2007-01-28 10:47:10 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
Partial fix for bug #1036707 (made by cyx): Get rid of _verbCharset, so that we use the correct font for verbs in COMI, with the correct spacing

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/saveload.h
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2007-01-28 18:40:30 UTC (rev 25248)
+++ scummvm/trunk/engines/scumm/intern.h	2007-01-28 18:47:10 UTC (rev 25249)
@@ -866,7 +866,7 @@
 	};
 	
 protected:
-	int _verbCharset, _verbLineSpacing;
+	int _verbLineSpacing;
 	bool _existLanguageFile;
 	char *_languageBuffer;
 	LangIndexNode *_languageIndex;

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2007-01-28 18:40:30 UTC (rev 25248)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2007-01-28 18:47:10 UTC (rev 25249)
@@ -1188,7 +1188,7 @@
 
 	const SaveLoadEntry V7Entries[] = {
 		MKLINE(ScummEngine_v7, _subtitleQueuePos, sleInt32, VER(61)),
-		MKLINE(ScummEngine_v7, _verbCharset, sleInt32, VER(68)),
+		MK_OBSOLETE(ScummEngine_v7, _verbCharset, sleInt32, VER(68), VER(68)),
 		MKLINE(ScummEngine_v7, _verbLineSpacing, sleInt32, VER(68)),
 		MKEND()
 	};

Modified: scummvm/trunk/engines/scumm/saveload.h
===================================================================
--- scummvm/trunk/engines/scumm/saveload.h	2007-01-28 18:40:30 UTC (rev 25248)
+++ scummvm/trunk/engines/scumm/saveload.h	2007-01-28 18:47:10 UTC (rev 25249)
@@ -47,7 +47,7 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 68
+#define CURRENT_VER 69
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2007-01-28 18:40:30 UTC (rev 25248)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2007-01-28 18:47:10 UTC (rev 25249)
@@ -819,7 +819,6 @@
 #ifndef DISABLE_SCUMM_7_8
 ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v6(syst, dr) {
-	_verbCharset = 0;
 	_verbLineSpacing = 10;
 
 	_smushFrameRate = 0;


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