added openTalk as loader for talk resources

svn-id: r25931

3 files changed, 5 insertions, 34 deletions

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 5ba9a28a8d..05c9b5441f 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -229,21 +229,7 @@ void runDialogue(SpeakData *data) {
 		debugC(1, kDebugDialogue, "runDialogue: special trick for 'museum' location");
 	}
 
-	char v20[PATH_LEN];
-	char *v24 = _vm->_characterName;
-	if (!scumm_strnicmp(v24, "mini", 4)) {
-		v24+=4;
-	}
-
-	if (_engineFlags & kEngineMiniDonna) {
-		sprintf(v20, "%stta", v24);
-	} else {
-		sprintf(v20, "%stal", v24);
-	}
-
-	debugC(1, kDebugDialogue, "runDialogue: loading 1st character head '%s'", v20);
-	_vm->_graphics->loadExternalCnv(v20, &_characterFace);
-	debugC(1, kDebugDialogue, "runDialogue: 1st character head loaded");
+	openTalk(_vm->_characterName, &_characterFace);
 
 	_vm->_graphics->setFont("comiccnv");
 
@@ -254,8 +240,8 @@ void runDialogue(SpeakData *data) {
 		memcpy(&v6E, &_characterFace, sizeof(Cnv));
 		debugC(1, kDebugDialogue, "runDialogue: using default character head");
 	} else {
-		debugC(1, kDebugDialogue, "runDialogue: loading 2nd character head '%s'", v20);
-		_vm->_graphics->loadCnv(data->_name, &v6E);
+		debugC(1, kDebugDialogue, "runDialogue: loading 2nd character head '%s'", _vm->_characterName);
+		openTalk(data->_name, &v6E);
 		debugC(1, kDebugDialogue, "runDialogue: 2nd character head loaded");
 	}
 
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 8bc66a5ebc..ad19a8468f 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -72,7 +72,7 @@ public:
 	uint32 read(void *dataPtr, uint32 dataSize);
 };
 
-
+void openTalk(const char *name, Cnv *cnv);
 
 } // namespace Parallaction
 
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp
index c4765ba812..ee83d71a59 100644
--- a/engines/parallaction/zone.cpp
+++ b/engines/parallaction/zone.cpp
@@ -365,22 +365,7 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
 void displayCharacterComment(ExamineData *data) {
 	if (data->_description == NULL) return;
 
-//	printf("displayCharacterComment()...");
-
-	char v20[20];
-	char *v24 = _vm->_characterName;
-	if (!scumm_strnicmp(v24, "mini", 4)) {
-		v24 += 4;
-	}
-	strcpy(v20, v24);
-
-	if (_engineFlags & kEngineMiniDonna) {
-		sprintf(v20, "%stta", v24);
-	} else {
-		sprintf(v20, "%stal", v24);
-	}
-
-	_vm->_graphics->loadExternalCnv(v20, &_characterFace);
+	openTalk(_vm->_characterName, &_characterFace);
 
 	StaticCnv v3C;
 	v3C._width = _characterFace._width;