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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Wed Apr 30 06:38:29 CEST 2008


Revision: 31784
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31784&view=rev
Author:   Kirben
Date:     2008-04-29 21:38:29 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
The Dig (Second release) used similar charset code to COMI. This could cause regressions, if there are differences between the two releases of The Dig.

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

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2008-04-30 01:31:41 UTC (rev 31783)
+++ scummvm/trunk/engines/scumm/actor.cpp	2008-04-30 04:38:29 UTC (rev 31784)
@@ -1884,13 +1884,16 @@
 	if (_game.version == 7)
 		VAR(VAR_HAVE_MSG) = 0xFF;
 	_haveActorSpeechMsg = true;
-	if (_game.version == 8) {
+	if (_game.id == GID_DIG || _game.id == GID_CMI) {
 		stringWrap = _string[0].wrapping;
 		_string[0].wrapping = true;
 	}
 	CHARSET_1();
-	if (_game.version == 8) {
-		VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
+	if (_game.id == GID_DIG || _game.id == GID_CMI) {
+		if (_game.version == 8)
+			VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
+		else
+			VAR(VAR_HAVE_MSG) = 1;
 		_string[0].wrapping = stringWrap;
 	}
 }

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2008-04-30 01:31:41 UTC (rev 31783)
+++ scummvm/trunk/engines/scumm/intern.h	2008-04-30 04:38:29 UTC (rev 31784)
@@ -909,6 +909,7 @@
 	void processSubtitleQueue();
 	void addSubtitleToQueue(const byte *text, const Common::Point &pos, byte color, byte charset);
 	void clearSubtitleQueue();
+	virtual void CHARSET_1();
 
 protected:
 	virtual int runDialog(Dialog &dialog);
@@ -977,7 +978,6 @@
 	virtual const char *getOpcodeDesc(byte i);
 
 	virtual void printString(int m, const byte *msg);
-	virtual void CHARSET_1();
 
 	virtual void scummLoop_handleSaveLoad();
 

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2008-04-30 01:31:41 UTC (rev 31783)
+++ scummvm/trunk/engines/scumm/string.cpp	2008-04-30 04:38:29 UTC (rev 31784)
@@ -679,7 +679,12 @@
 }
 
 #ifndef DISABLE_SCUMM_7_8
-void ScummEngine_v8::CHARSET_1() {
+void ScummEngine_v7::CHARSET_1() {
+	if (_game.id == GID_FT) {
+		ScummEngine::CHARSET_1();
+		return;
+	}
+
 	byte subtitleBuffer[2048];
 	byte *subtitleLine = subtitleBuffer;
 	Common::Point subtitlePos;
@@ -830,7 +835,7 @@
 			}
 		}
 	}
-	_haveMsg = 2;
+	_haveMsg = (_game.version == 8) ? 2 : 1;
 	_keepText = false;
 	_string[0] = saveStr;
 }


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