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

[thebluegr at users.sourceforge.net]

Revision: 32574
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32574&view=rev
Author:   thebluegr
Date:     2008-06-06 03:01:14 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Cleanup

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

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-06-06 09:53:33 UTC (rev 32573)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-06-06 10:01:14 UTC (rev 32574)
@@ -106,8 +106,11 @@
 			if (withVoices == 0)
 				centerText(said, 87, 66);
 			updateScreen();
-		} else if (talkerType == 3) {
-			copyBackground(x_talk3[face], 109, 207, 92, 21, 23, drawSurface3, screenSurface);
+		} else if (talkerType == 3 || talkerType == 4) {
+			if (talkerType == 3)
+				copyBackground(x_talk3[face], 109, 207, 92, 21, 23, drawSurface3, screenSurface);
+			else
+				copyBackground(x_talk4[face], 78, 199, 94, 38, 27, drawSurface3, screenSurface);
 			moveCharacters();
 			updateRefresh();
 			if (withVoices == 0)
@@ -115,15 +118,6 @@
 
 			updateScreen();
 			pause(3);
-		} else if (talkerType == 4) {
-			copyBackground(x_talk4[face], 78, 199, 94, 38, 27, drawSurface3, screenSurface);
-			moveCharacters();
-			updateRefresh();
-			if (withVoices == 0)
-				centerText(said, 221, 102);
-
-			updateScreen();
-			pause(3);
 		}
 	} while	(!isTalkFinished(&length));
 


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