[Scummvm-cvs-logs] SF.net SVN: scummvm: [32488] scummvm/trunk/engines/drascula

[sev at users.sourceforge.net]

Revision: 32488
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32488&view=rev
Author:   sev
Date:     2008-06-01 22:38:28 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
Proper implementation for talk_banterder(82)

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/staticdata.h
    scummvm/trunk/engines/drascula/talk.cpp

Modified: scummvm/trunk/engines/drascula/staticdata.h
===================================================================
--- scummvm/trunk/engines/drascula/staticdata.h	2008-06-02 05:15:34 UTC (rev 32487)
+++ scummvm/trunk/engines/drascula/staticdata.h	2008-06-02 05:38:28 UTC (rev 32488)
@@ -3414,7 +3414,7 @@
 	// 80
 	"",
 	"",
-	"",
+	"No, nada",
 	"bla, bla, bla."
 },
 {
@@ -3517,7 +3517,7 @@
 	// 80
 	"",
 	"",
-	"",
+	"No, nada",
 	"\244a, \244a, \244a. que bueno, que bueno."
 },
 {
@@ -3620,7 +3620,7 @@
 	// 80
 	"",
 	"",
-	"",
+	"No, nada",
 	"bla, bla, bla."
 },
 {
@@ -3723,7 +3723,7 @@
 	// 80
 	"",
 	"",
-	"",
+	"No, nada",
 	"bla, bla, bla."
 },
 {
@@ -3826,7 +3826,7 @@
 	// 80
 	"",
 	"",
-	"",
+	"No, nada",
 	"bla, bla, bla."
 },
 };

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-06-02 05:15:34 UTC (rev 32487)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-06-02 05:38:28 UTC (rev 32488)
@@ -233,15 +233,15 @@
 void DrasculaEngine::talk_bartender(int index, int talkerType) {
 	char filename[20];
 	sprintf(filename, "t%i.als", index);
-	char specialLine[20];
-	sprintf(specialLine, "No, nada");
 	const char *said;
 
-	// Line 82 is hardcoded
+	// Line 82 is a special case
 	if (index != 82)
 		said = _textt[_lang][index];
-	else
-		said = (const char*)specialLine;
+	else {
+		sprintf(filename, "d%i.als", index);
+		said = _textd[_lang][index];
+	}
 
 	int x_talk[9] = { 1, 23, 45, 67, 89, 111, 133, 155, 177 };
 	int face;


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