[Scummvm-cvs-logs] SF.net SVN: scummvm: [25931] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 25931
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25931&view=rev
Author:   peres001
Date:     2007-03-02 13:47:35 -0800 (Fri, 02 Mar 2007)

Log Message:
-----------
added openTalk as loader for talk resources

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp
    scummvm/trunk/engines/parallaction/disk.h
    scummvm/trunk/engines/parallaction/zone.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-02 21:46:54 UTC (rev 25930)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-02 21:47:35 UTC (rev 25931)
@@ -229,22 +229,8 @@
 		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;
-	}
+	openTalk(_vm->_characterName, &_characterFace);
 
-	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");
-
 	_vm->_graphics->setFont("comiccnv");
 
 	Cnv v6E;
@@ -254,8 +240,8 @@
 		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");
 	}
 

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-03-02 21:46:54 UTC (rev 25930)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-02 21:47:35 UTC (rev 25931)
@@ -72,8 +72,8 @@
 	uint32 read(void *dataPtr, uint32 dataSize);
 };
 
+void openTalk(const char *name, Cnv *cnv);
 
-
 } // namespace Parallaction
 
 

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 21:46:54 UTC (rev 25930)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 21:47:35 UTC (rev 25931)
@@ -365,23 +365,8 @@
 void displayCharacterComment(ExamineData *data) {
 	if (data->_description == NULL) return;
 
-//	printf("displayCharacterComment()...");
+	openTalk(_vm->_characterName, &_characterFace);
 
-	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);
-
 	StaticCnv v3C;
 	v3C._width = _characterFace._width;
 	v3C._height = _characterFace._height;


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