mirror of
https://github.com/edubart/otclient.git
synced 2025-12-14 12:49:47 +01:00
Adjust fallen changes
* Restore old map load() used in minimap * Change tabs to 4 spaces * Add missing cmake file
This commit is contained in:
@@ -251,26 +251,26 @@ std::string FileStream::getString()
|
||||
|
||||
uint8 FileStream::readNode(uint8 &oldNode, uint32 &type)
|
||||
{
|
||||
if (!oldNode) {
|
||||
if ((oldNode = getU8()) == 0xFE) {
|
||||
type = getU32();
|
||||
return oldNode;
|
||||
} else {
|
||||
dump << "Failed to read new node.";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (!oldNode) {
|
||||
if ((oldNode = getU8()) == 0xFE) {
|
||||
type = getU32();
|
||||
return oldNode;
|
||||
} else {
|
||||
dump << "Failed to read new node.";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
assert(getU8() == 0xFF);
|
||||
if ((oldNode = getU8()) == 0xFE) {
|
||||
type = getU32();
|
||||
return oldNode;
|
||||
} else {
|
||||
dump << "Failed to read node with old type: " << type;
|
||||
return 0;
|
||||
}
|
||||
assert(getU8() == 0xFF);
|
||||
if ((oldNode = getU8()) == 0xFE) {
|
||||
type = getU32();
|
||||
return oldNode;
|
||||
} else {
|
||||
dump << "Failed to read node with old type: " << type;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void FileStream::addU8(uint8 v)
|
||||
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
void addU32(uint8 v);
|
||||
void addU64(uint8 v);
|
||||
|
||||
uint8 readNode(uint8 &oldNode, uint32 &type);
|
||||
uint8 readNode(uint8 &oldNode, uint32 &type);
|
||||
private:
|
||||
std::string m_name;
|
||||
PHYSFS_File *m_fileHandle;
|
||||
|
||||
Reference in New Issue
Block a user