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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Fri Mar 2 23:23:04 CET 2007


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

Log Message:
-----------
added inventory objects loader routine

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

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 22:18:37 UTC (rev 25935)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-02 22:23:02 UTC (rev 25936)
@@ -116,4 +116,20 @@
 	_vm->_graphics->loadExternalCnv(path, cnv);
 }
 
+// loads character's icons set
+
+void openObjects(const char *name, Cnv* cnv) {
+
+	if (!scumm_strnicmp("mini", name, 4)) {
+		name += 4;
+	}
+
+	char path[PATH_LEN];
+	sprintf(path, "%sobj", name);
+
+	_vm->_graphics->loadExternalCnv(path, cnv);
+
+	return;
+}
+
 } // namespace Parallaction

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-03-02 22:18:37 UTC (rev 25935)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-02 22:23:02 UTC (rev 25936)
@@ -74,9 +74,12 @@
 
 void openLocation(const char *name, char* script);
 void openTalk(const char *name, Cnv *cnv);
+void openObjects(const char *name, Cnv *cnv);
 void loadPointer(StaticCnv* cnv);
 void loadHead(const char* name, StaticCnv* cnv);
 void loadFont(const char* name, Cnv* cnv);
+
+
 } // namespace Parallaction
 
 

Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-02 22:18:37 UTC (rev 25935)
+++ scummvm/trunk/engines/parallaction/inventory.cpp	2007-03-02 22:23:02 UTC (rev 25936)
@@ -22,6 +22,7 @@
 
 
 #include "parallaction/parallaction.h"
+#include "parallaction/disk.h"
 #include "parallaction/zone.h"
 #include "parallaction/graphics.h"
 #include "parallaction/inventory.h"
@@ -368,22 +369,10 @@
 }
 
 
-// loads character's icons set
 
-void loadCharacterItems(const char *character) {
 
-	if (!scumm_strnicmp("mini", character, 4)) character += 4;
-
-	char filename[PATH_LEN];
-	sprintf(filename, "%sobj", character);
-
-	_vm->_graphics->loadExternalCnv(filename, &_characterInventory);
-
-	return;
-}
-
 void refreshInventory(const char *character) {
-	loadCharacterItems(character);
+	openObjects(character, &_characterInventory);
 	redrawInventory();
 	_vm->_graphics->freeCnv(&_characterInventory);
 
@@ -392,7 +381,7 @@
 
 
 void refreshInventoryItem(const char *character, uint16 index) {
-	loadCharacterItems(character);
+	openObjects(character, &_characterInventory);
 	drawInventoryItem(index, &_inventory[index]);
 	_vm->_graphics->freeCnv(&_characterInventory);
 


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




More information about the Scummvm-git-logs mailing list