| Description | The following patch that makes your umx loader to support .umx
and .uax files from unreal 1997/98 beta version.
See https://github.com/sezero/umr .
I use the same code in mikmod/libmikmod (sf.net/projects/mikmod),
uhexen2 (sf.net/p/uhexen2), and quakespasm (sf.net/p/quakespasm)
with success. |
|---|
| Additional Information | Index: soundlib/Load_umx.cpp
===================================================================
--- soundlib/Load_umx.cpp (revision 3569)
+++ soundlib/Load_umx.cpp (working copy)
@@ -132,23 +132,33 @@
// Read an entry from the import table.
-int32 ReadUMXImportTableEntry(FileReader &chunk)
+int32 ReadUMXImportTableEntry(FileReader &chunk, uint16 packageVersion)
//----------------------------------------------
{
ReadUMXIndex(chunk); // Class package
ReadUMXIndex(chunk); // Class name
- chunk.Skip(4); // Package
+ if(packageVersion >= 60)
+ {
+ chunk.Skip(4); // Package
+ }
+ else
+ {
+ ReadUMXIndex(chunk); // ??
+ }
return ReadUMXIndex(chunk); // Object name (offset into the name table)
}
// Read an entry from the export table.
-void ReadUMXExportTableEntry(FileReader &chunk, int32 &objClass, int32 &objOffset, int32 &objSize, int32 &objName)
+void ReadUMXExportTableEntry(FileReader &chunk, int32 &objClass, int32 &objOffset, int32 &objSize, int32 &objName, uint16 packageVersion)
//----------------------------------------------------------------------------------------------------------------
{
objClass = ReadUMXIndex(chunk); // Object class
ReadUMXIndex(chunk); // Object parent
- chunk.Skip(4); // Internal package / group of the object
+ if(packageVersion >= 60)
+ {
+ chunk.Skip(4); // Internal package / group of the object
+ }
objName = ReadUMXIndex(chunk); // Object name (offset into the name table)
chunk.Skip(4); // Object flags
objSize = ReadUMXIndex(chunk);
@@ -189,7 +199,7 @@ bool CSoundFile::ReadUMX(FileReader &fil
classes.reserve(fileHeader.importCount);
for(uint32 i = 0; i < fileHeader.importCount; i++)
{
- int32 objName = ReadUMXImportTableEntry(file);
+ int32 objName = ReadUMXImportTableEntry(file, fileHeader.packageVersion);
if(static_cast<size_t>(objName) < names.size())
{
classes.push_back(objName);
@@ -209,7 +219,7 @@ bool CSoundFile::ReadUMX(FileReader &fil
for(uint32 i = 0; i < fileHeader.exportCount; i++)
{
int32 objClass, objOffset, objSize, objName;
- ReadUMXExportTableEntry(file, objClass, objOffset, objSize, objName);
+ ReadUMXExportTableEntry(file, objClass, objOffset, objSize, objName, fileHeader.packageVersion);
if(objSize <= 0 || objClass >= 0)
{
@@ -246,6 +256,14 @@ bool CSoundFile::ReadUMX(FileReader &fil
if(chunk.IsValid())
{
+ if(fileHeader.packageVersion < 40)
+ {
+ chunk.Skip(8); // 00 00 00 00 00 00 00 00
+ }
+ if(fileHeader.packageVersion < 60)
+ {
+ chunk.Skip(16); // 81 00 00 00 00 00 FF FF FF FF FF FF FF FF 00 00
+ }
// Read object properties
size_t propertyName = static_cast<size_t>(ReadUMXIndex(chunk));
if(propertyName >= names.size() || strcmp(names[propertyName].c_str(), "none"))
|
|---|
