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

[peres001 at users.sourceforge.net]

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

Log Message:
-----------
added loaders for static images like pickable items and for characters frames

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

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-03-02 23:13:13 UTC (rev 25940)
@@ -128,7 +128,7 @@
 				}
 			}
 
-			_vm->_graphics->loadCnv(vC8, &vD0->_cnv);
+			loadFrames(vC8, &vD0->_cnv);
 //			int16 _ax = _vm->_graphics->loadCnv(vC8, &vD0->_cnv);
 //			if (_ax == -1) exit(-1);
 		}

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-02 23:13:13 UTC (rev 25940)
@@ -513,7 +513,7 @@
 		_vm->_archive.close();
 		strcpy(_vm->_disk, "disk1");
 		_vm->_archive.open(_vm->_disk);
-		_vm->_graphics->loadCnv("dino", &_tempFrames);
+		loadFrames("dino", &_tempFrames);
 
 		memcpy(&_yourself._cnv, &_tempFrames, sizeof(Cnv));
 

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 23:13:13 UTC (rev 25940)
@@ -150,4 +150,19 @@
 	return;
 }
 
+void loadStatic(const char* name, StaticCnv* cnv) {
+
+	_vm->_graphics->loadStaticCnv(name, cnv);
+
+	return;
+}
+
+void loadFrames(const char* name, Cnv* cnv) {
+
+	_vm->_graphics->loadCnv(name, cnv);
+
+	return;
+}
+
+
 } // namespace Parallaction

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-02 23:13:13 UTC (rev 25940)
@@ -79,8 +79,9 @@
 void loadPointer(StaticCnv* cnv);
 void loadHead(const char* name, StaticCnv* cnv);
 void loadFont(const char* name, Cnv* cnv);
+void loadStatic(const char* name, StaticCnv* cnv);
+void loadFrames(const char* name, Cnv* cnv);
 
-
 } // namespace Parallaction
 
 

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-02 23:13:13 UTC (rev 25940)
@@ -857,11 +857,11 @@
 
 		char path[PATH_LEN];
 		strcpy(path, v32);
-		_graphics->loadCnv(path, &_tempFrames);
+		loadFrames(path, &_tempFrames);
 
 		if (name[0] != 'D') {
 			sprintf(path, "mini%s", v32);
-			_graphics->loadCnv(path, &_miniCharacterFrames);
+			loadFrames(path, &_miniCharacterFrames);
 
 			sprintf(path, "%s.tab", name);
 			initTable(path, _objectsNames);

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 22:55:46 UTC (rev 25939)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-03-02 23:13:13 UTC (rev 25940)
@@ -279,7 +279,7 @@
 				strcpy(vC8, _tokens[1]);
 
 				StaticCnv vE0;
-				_vm->_graphics->loadCnv(vC8, doorcnv);
+				loadFrames(vC8, doorcnv);
 
 //				printf("door width: %i, height: %i", doorcnv->_width, doorcnv->_height );
 
@@ -309,7 +309,7 @@
 			if (!scumm_stricmp(_tokens[0], "file")) {
 				StaticCnv *vE4 = &u->get->_cnv;
 				strcpy(vC8, _tokens[1]);
-				_vm->_graphics->loadStaticCnv(vC8, vE4);
+				loadStatic(vC8, vE4);
 				vE4->_data2 = (byte*)memAlloc(vE4->_width*vE4->_height);
 
 				if ((z->_flags & kFlagsRemove) == 0) {
@@ -412,7 +412,7 @@
 
 	char v68[PATH_LEN];
 	strcpy(v68, data->_filename);
-	_vm->_graphics->loadStaticCnv(v68, &data->_cnv);
+	loadStatic(v68, &data->_cnv);
 	_vm->_graphics->flatBlitCnv(&data->_cnv, 140, (SCREEN_HEIGHT - data->_cnv._height)/2, Graphics::kBitFront, data->_cnv._data1);
 	_vm->_graphics->freeStaticCnv(&data->_cnv);
 


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