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

[peres001 at users.sourceforge.net]

Revision: 25934
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25934&view=rev
Author:   peres001
Date:     2007-03-02 14:12:57 -0800 (Fri, 02 Mar 2007)

Log Message:
-----------
replaced calls to loadExternalStaticCnv with separate loaders for Head and Pointer resources

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

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 22:02:19 UTC (rev 25933)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 22:12:57 UTC (rev 25934)
@@ -89,5 +89,24 @@
 
 }
 
+void loadHead(const char* name, StaticCnv* cnv) {
 
+	char path[PATH_LEN];
+
+	if (!scumm_strnicmp(name, "mini", 4)) {
+		name += 4;
+	}
+
+	snprintf(path, 8, "%shead", name);
+	path[8] = '\0';
+
+	_vm->_graphics->loadExternalStaticCnv(path, cnv);
+
+}
+
+
+void loadPointer(StaticCnv* cnv) {
+	_vm->_graphics->loadExternalStaticCnv("pointer", cnv);
+}
+
 } // namespace Parallaction

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-03-02 22:02:19 UTC (rev 25933)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-02 22:12:57 UTC (rev 25934)
@@ -74,6 +74,8 @@
 
 void openLocation(const char *name, char* script);
 void openTalk(const char *name, Cnv *cnv);
+void loadPointer(StaticCnv* cnv);
+void loadHead(const char* name, StaticCnv* cnv);
 
 } // namespace Parallaction
 

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-03-02 22:02:19 UTC (rev 25933)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-03-02 22:12:57 UTC (rev 25934)
@@ -509,7 +509,7 @@
 
 void Graphics::initMouse(uint16 arg_0) {
 
-	loadExternalStaticCnv("pointer", &_mouseComposedArrow);
+	loadPointer(&_mouseComposedArrow);
 
 	byte temp[16*16];
 	memcpy(temp, _mouseArrow, 16*16);

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 22:02:19 UTC (rev 25933)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 22:12:57 UTC (rev 25934)
@@ -416,21 +416,9 @@
 	_vm->_graphics->flatBlitCnv(&data->_cnv, 140, (SCREEN_HEIGHT - data->_cnv._height)/2, Graphics::kBitFront, data->_cnv._data1);
 	_vm->_graphics->freeStaticCnv(&data->_cnv);
 
-	char *v4 = _vm->_characterName;
-	if (!scumm_strnicmp(v4, "mini", 4)) {
-		v4 += 4;
-	}
-
 	StaticCnv cnv;
+	loadHead(_vm->_characterName, &cnv);
 
-	sprintf(v68, "%shead", v4);
-
-	// WORKAROUND
-	// dos file names are in 8.3 format
-	v68[8] = '\0';
-
-	_vm->_graphics->loadExternalStaticCnv(v68, &cnv);
-
 	int16 v6A = 0, v6C = 0;
 
 	_vm->_graphics->setFont("comiccnv");


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