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

[thebluegr at users.sourceforge.net]

Revision: 32590
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32590&view=rev
Author:   thebluegr
Date:     2008-06-07 04:43:54 -0700 (Sat, 07 Jun 2008)

Log Message:
-----------
Fixed regression from last commit

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

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-06-07 11:31:40 UTC (rev 32589)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-06-07 11:43:54 UTC (rev 32590)
@@ -426,7 +426,7 @@
 	void talk_vonBraunpuerta(int);
 	void talk_blind(int);
 	void talk_hacker(int);
-	void talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords);
+	void talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords, byte* surface);
 
 	void hiccup(int);
 	void finishSound();

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-06-07 11:31:40 UTC (rev 32589)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-06-07 11:43:54 UTC (rev 32590)
@@ -461,7 +461,7 @@
 	int coords[7] = { 139, 228, 112, 47, 60, 221, 128 };
 
 	color_abc(kColorWhite);
-	talk_generic(said, filename, x_talk, 4, coords);
+	talk_generic(said, filename, x_talk, 4, coords, extraSurface);
 }
 
 void DrasculaEngine::talk_drunk(int index) {
@@ -483,7 +483,7 @@
 
 	color_abc(kColorDarkGreen);
 
-	talk_generic(said, filename, x_talk, 8, coords);
+	talk_generic(said, filename, x_talk, 8, coords, frontSurface);
 
 	flags[13] = 0;
 	if (currentChapter == 1)
@@ -651,7 +651,7 @@
 	int coords[7] = { 136, 198, 81, 26, 24, 203, 78 };
 
 	color_abc(kColorRed);
-	talk_generic(said, filename, x_talk, 9, coords);
+	talk_generic(said, filename, x_talk, 9, coords, drawSurface3);
 }
 
 void DrasculaEngine::talk_mus(int index) {
@@ -662,7 +662,7 @@
 	int coords[7] = { 156, 190, 64, 18, 24, 197, 64 };
 
 	color_abc(kColorWhite);
-	talk_generic(said, filename, x_talk, 8, coords);
+	talk_generic(said, filename, x_talk, 8, coords, drawSurface3);
 }
 
 void DrasculaEngine::talk_pen(const char *said, const char *filename, int talkerType) {
@@ -944,7 +944,7 @@
 	} while (!isTalkFinished(&length));
 }
 
-void DrasculaEngine::talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords) {
+void DrasculaEngine::talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords, byte* surface) {
 	int face;
 	int length = strlen(said);
 	talkInit(filename);
@@ -955,7 +955,7 @@
 		copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
 		updateRefresh_pre();
 		copyBackground(faces[face], coords[0], coords[1], coords[2], 
-						coords[3], coords[4], drawSurface3, screenSurface);
+						coords[3], coords[4], surface, screenSurface);
 		moveCharacters();
 		updateRefresh();
 


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