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

[peres001 at users.sourceforge.net]

Revision: 25814
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25814&view=rev
Author:   peres001
Date:     2007-02-24 01:12:07 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
ArchiveFile's details are now known only to archive code

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

Modified: scummvm/trunk/engines/parallaction/archive.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/archive.cpp	2007-02-24 09:11:12 UTC (rev 25813)
+++ scummvm/trunk/engines/parallaction/archive.cpp	2007-02-24 09:12:07 UTC (rev 25814)
@@ -27,6 +27,16 @@
 
 namespace Parallaction {
 
+struct ArchivedFile {
+	uint16	_index;
+	uint32	_offset;
+	uint32	_cursor;
+	uint16	field_A;	// unused
+	uint16	field_C;	// unused
+	uint32	_endOffset;
+};
+
+
 #define MAX_ARCHIVE_ENTRIES 		384
 
 #define DIRECTORY_OFFSET_IN_FILE	0x4000

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-02-24 09:11:12 UTC (rev 25813)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-02-24 09:12:07 UTC (rev 25814)
@@ -31,14 +31,7 @@
 //		ARCHIVE MANAGEMENT
 //------------------------------------------------------
 
-struct ArchivedFile {
-	uint16	_index;
-	uint32	_offset;
-	uint32	_cursor;
-	uint16	field_A;	// unused
-	uint16	field_C;	// unused
-	uint32	_endOffset;
-};
+struct ArchivedFile;
 
 void openArchive(const char *file);
 void closeArchive();

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-02-24 09:11:12 UTC (rev 25813)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-02-24 09:12:07 UTC (rev 25814)
@@ -73,7 +73,7 @@
 		if (!file) errorFileNotFound(filename);
 	}
 
-	uint32 count = file->_endOffset - file->_offset;
+	uint32 count = getArchivedFileLength(archivefile);
 	location_src = (char*)memAlloc(0x4000);
 
 	_locationScript = new Script(location_src);


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