[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.243,2.244 scumm.cpp,1.13,1.14 scumm.h,1.390,1.391

Max Horn fingolfin at users.sourceforge.net
Fri Apr 2 14:09:11 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24601

Modified Files:
	script_v8.cpp scumm.cpp scumm.h 
Log Message:
Got rid of _transText

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.243
retrieving revision 2.244
diff -u -d -r2.243 -r2.244
--- script_v8.cpp	2 Apr 2004 21:42:35 -0000	2.243
+++ script_v8.cpp	2 Apr 2004 21:56:27 -0000	2.244
@@ -1559,13 +1559,14 @@
 	int oldID = _charset->getCurID(); 
 	int width;
 	const byte *msg = _scriptPointer;
+	byte transBuf[512];
 	
 	// Skip to the next instruction
 	_scriptPointer += resStrLen(_scriptPointer) + 1;
 
 	if (msg[0] == '/') {
-		translateText(msg, _transText);
-		msg = _transText;
+		translateText(msg, transBuf);
+		msg = transBuf;
 	} 
 
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- scumm.cpp	30 Mar 2004 22:56:57 -0000	1.13
+++ scumm.cpp	2 Apr 2004 21:56:27 -0000	1.14
@@ -511,7 +511,6 @@
 	_existLanguageFile = false;
 	_languageBuffer = NULL;
 	_languageIndex = NULL;
-	memset(_transText, 0, sizeof(_transText));
 	_costumeRenderer = NULL;
 	_2byteFontPtr = 0;
 	_V1_talkingActor = 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -d -r1.390 -r1.391
--- scumm.h	2 Apr 2004 21:42:42 -0000	1.390
+++ scumm.h	2 Apr 2004 21:56:27 -0000	1.391
@@ -1079,7 +1079,6 @@
 	LangIndexNode *_languageIndex;
 	int _languageIndexSize;
 	char _lastStringTag[12+1];
-	byte _transText[512];
 
 	void loadLanguageBundle();
 	void playSpeech(const byte *ptr);





More information about the Scummvm-git-logs mailing list