isledecomp/SIEdit
1
0
Fork 0
mirror of https://github.com/isledecomp/SIEdit.git synced 2025-02-17 00:40:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: fix random list handling

Browse source
This commit is contained in:
itsmattkc 2022-08-05 11:44:26 -07:00
parent 501fa2f0cf
commit 3228bc8096
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/interleaf.cpp
View file

@ -136,8 +136,9 @@ Interleaf::Error Interleaf::ReadChunk(Core *parent, FileBase *f, Info *info)
if (list_count == LIST::Act_ || list_count == LIST::RAND) {
desc << "Extension: ";
if (list_count == LIST::RAND) {
uint32_t rand_lower = f->ReadU32();
uint64_t rand_val = uint64_t(list_count) << 32 | rand_lower;
uint32_t rand_upper = f->ReadU32();
uint64_t rand_val = uint64_t(rand_upper) << 32 | list_count;
f->seek(1, File::SeekCurrent);
desc << ((const char *) &rand_val);
} else if (list_count == LIST::Act_) {
desc << ((const char *) &list_count);
@ -211,7 +212,7 @@ Interleaf::Error Interleaf::ReadChunk(Core *parent, FileBase *f, Info *info)
if (!(flags & MxCh::FLAG_END)) {
std::map<uint32_t, Object*>::iterator it = m_ObjectIDTable.find(object);
if (it == m_ObjectIDTable.end()) {
LogError() << "Failed to find object " << object << " for chunk at " << std::hex << offset << std::endl;
LogError() << "Failed to find object " << object << " for chunk at " << std::hex << offset << std::dec << std::endl;
//return ERROR_INVALID_INPUT;
} else {
Object *o = it->second;

2
lib/sitypes.h
View file

@ -65,7 +65,7 @@ class LIST : public RIFF
public:
enum Variation {
Act_ = 0x00746341,
RAND = 0x4f444e41
RAND = 0x444e4152
};
};