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

[thebluegr at users.sourceforge.net]

Revision: 32388
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32388&view=rev
Author:   thebluegr
Date:     2008-05-30 03:02:56 -0700 (Fri, 30 May 2008)

Log Message:
-----------
talk_igorpuerta -> talk_igor_door
talk_igor_peluca -> talk_igor_wig
and replaced some unneeded if statements with atoi

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

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-05-30 09:45:00 UTC (rev 32387)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-05-30 10:02:56 UTC (rev 32388)
@@ -496,8 +496,8 @@
 	void talk_igor_frente(const char *, const char *);
 	void talk_tabernero(int);
 	void talk_tabernero(const char *said, const char *filename);
-	void talk_igorpuerta(const char *said, const char *filename);
-	void talk_igor_peluca(const char *said, const char *filename);
+	void talk_igor_door(const char *said, const char *filename);
+	void talk_igor_wig(const char *said, const char *filename);
 	void talk_pen(const char *, const char *);
 	void talk_pen2(const char *, const char *);
 	void talk_taber2(int);

Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp	2008-05-30 09:45:00 UTC (rev 32387)
+++ scummvm/trunk/engines/drascula/rooms.cpp	2008-05-30 10:02:56 UTC (rev 32388)
@@ -832,16 +832,16 @@
 		flags[12] = 1;
 		closeDoor(2, 0);
 		sentido_hare = 2;
-		talk_igorpuerta(_texti[_lang][27], "I27.als");
+		talk_igor_door(_texti[_lang][27], "I27.als");
 		flags[30] = 1;
-		talk_igorpuerta(_texti[_lang][28], "I28.als");
+		talk_igor_door(_texti[_lang][28], "I28.als");
 		lleva_al_hare(153, 180);
 	} else if (pickedObject == kVerbPick && fl == 143 && flags[18] == 0) {
 		lleva_al_hare(260, 180);
 		copyBackground(80, 78, 199, 94, 38, 27, drawSurface3, screenSurface);
 		updateScreen(199, 94, 199, 94, 38, 27, screenSurface);
 		pause(3);
-		talk_igor_peluca(_texti[_lang][25], "I25.als");
+		talk_igor_wig(_texti[_lang][25], "I25.als");
 		lleva_al_hare(153, 180);
 	} else if (pickedObject == kVerbTalk && fl == 51)
 		animation_1_4();

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-05-30 09:45:00 UTC (rev 32387)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-05-30 10:02:56 UTC (rev 32388)
@@ -1359,22 +1359,7 @@
 
 bucless:
 
-	if (sincronia[p] == '0')
-		face = 0;
-	if (sincronia[p] == '1')
-		face = 1;
-	if (sincronia[p] == '2')
-		face = 2;
-	if (sincronia[p] == '3')
-		face = 3;
-	if (sincronia[p] == '4')
-		face = 4;
-	if (sincronia[p] == '5')
-		face = 5;
-	if (sincronia[p] == '6')
-		face = 6;
-	if (sincronia[p] == '7')
-		face = 7;
+	face = atoi(&sincronia[p]);
 
 	copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
 
@@ -1502,7 +1487,7 @@
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 }
 
-void DrasculaEngine::talk_igorpuerta(const char *said, const char *filename) {
+void DrasculaEngine::talk_igor_door(const char *said, const char *filename) {
 	int length = strlen(said);
 
 	_rnd->setSeed((unsigned int)_system->getMillis() / 2);
@@ -1586,7 +1571,7 @@
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 }
 
-void DrasculaEngine::talk_igor_peluca(const char *said, const char *filename) {
+void DrasculaEngine::talk_igor_wig(const char *said, const char *filename) {
 	int x_talk[4] = {119, 158, 197, 236};
 	int face = 0;
 	int length = strlen(said);


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