From 792286874a9f64e9aa282b219bcad574919ce7b8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 30 May 2008 10:02:56 +0000
Subject: talk_igorpuerta -> talk_igor_door talk_igor_peluca -> talk_igor_wig
 and replaced some unneeded if statements with atoi

svn-id: r32388
---
 engines/drascula/drascula.h |  4 ++--
 engines/drascula/rooms.cpp  |  6 +++---
 engines/drascula/talk.cpp   | 21 +++------------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 52e493d925..b2ebae09e6 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -496,8 +496,8 @@ public:
 	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);
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 374dd0968b..f7c6eacca4 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -832,16 +832,16 @@ void DrasculaEngine::room_26(int fl) {
 		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();
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index efec50134b..111c2e6187 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -1359,22 +1359,7 @@ void DrasculaEngine::talk_sinc(const char *said, const char *filename, const cha
 
 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 @@ bucless:
 	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 @@ bucless:
 	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);
-- 
cgit v1.2.3