[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.26,2.27 scumm.h,1.515,1.516 string.cpp,1.260,1.261

[Max Horn]

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

Modified Files:
	script_v100he.cpp scumm.h string.cpp 
Log Message:
Renamed unkMessage2 to showMessageDialog; use printString() in script_v100he.cpp, too

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- script_v100he.cpp	19 Oct 2004 12:30:40 -0000	2.26
+++ script_v100he.cpp	22 Nov 2004 22:32:46 -0000	2.27
@@ -1858,20 +1858,7 @@
 		break;
 	case 35:
 		decodeScriptString(name, true);
-		switch (m) {
-		case 0:
-			actorTalk(name);
-			break;
-		case 1:
-			drawString(1, name);
-			break;
-		case 2:
-			unkMessage1(name);
-			break;
-		case 3:
-			unkMessage2(name);
-			break;
-		}
+		printString(m, name);
 		break;
 	case 46:		// SO_LEFT
 		_string[m].center = false;
@@ -1888,39 +1875,11 @@
 		ptr = getResourceAddress(rtTalkie, pop());
 		size = READ_BE_UINT32(ptr + 12);
 		memcpy(name, ptr + 16, size);
-
-		switch (m) {
-		case 0:
-			actorTalk(name);
-			break;
-		case 1:
-			drawString(1, name);
-			break;
-		case 2:
-			unkMessage1(name);
-			break;
-		case 3:
-			unkMessage2(name);
-			break;
-		}
+		printString(m, name);
 		break;
 	case 79:		// SO_TEXTSTRING
-		switch (m) {
-		case 0:
-			actorTalk(_scriptPointer);
-			break;
-		case 1:
-			drawString(1, _scriptPointer);
-			break;
-		case 2:
-			unkMessage1(_scriptPointer);
-			break;
-		case 3:
-			unkMessage2(_scriptPointer);
-			break;
-		}
+		printString(m, _scriptPointer);
 		_scriptPointer += resStrLen(_scriptPointer) + 1;
-
 		break;
 	case 91:
 		_string[m].loadDefault();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -d -r1.515 -r1.516
--- scumm.h	15 Nov 2004 03:57:22 -0000	1.515
+++ scumm.h	22 Nov 2004 22:32:46 -0000	1.516
@@ -1157,7 +1157,7 @@
 	void CHARSET_1();
 	void drawString(int a, const byte *msg);
 	void unkMessage1(const byte *msg);
-	void unkMessage2(const byte *msg);
+	void showMessageDialog(const byte *msg);
 
 	int addMessageToStack(const byte *msg, byte *dst, int dstSize);
 	int addIntToStack(byte *dst, int dstSize, int var);

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- string.cpp	23 Oct 2004 23:08:51 -0000	1.260
+++ string.cpp	22 Nov 2004 22:32:46 -0000	1.261
@@ -46,7 +46,7 @@
 		unkMessage1(msg);
 		break;
 	case 3:
-		unkMessage2(msg);
+		showMessageDialog(msg);
 		break;
 	}
 }
@@ -79,7 +79,7 @@
 	}
 }
 
-void ScummEngine::unkMessage2(const byte *msg) {
+void ScummEngine::showMessageDialog(const byte *msg) {
 	// Original COMI used different code at this point.
 	// Seemed to use blastText for the messages
 	byte buf[100];