feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -10,6 +10,7 @@ public:
|
||||
|
||||
IntArrayTag(const wstring &name) : Tag(name)
|
||||
{
|
||||
data = intArray();
|
||||
}
|
||||
|
||||
IntArrayTag(const wstring &name, intArray data) : Tag(name)
|
||||
@@ -17,6 +18,11 @@ public:
|
||||
this->data = data;
|
||||
}
|
||||
|
||||
~IntArrayTag()
|
||||
{
|
||||
delete [] data.data;
|
||||
}
|
||||
|
||||
void write(DataOutput *dos)
|
||||
{
|
||||
dos->writeInt(data.length);
|
||||
@@ -26,7 +32,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void load(DataInput *dis)
|
||||
void load(DataInput *dis, int tagDepth)
|
||||
{
|
||||
int length = dis->readInt();
|
||||
|
||||
@@ -52,7 +58,7 @@ public:
|
||||
if (Tag::equals(obj))
|
||||
{
|
||||
IntArrayTag *o = (IntArrayTag *) obj;
|
||||
return ((data.data == NULL && o->data.data == NULL) || (data.data != NULL && data.length == o->data.length && memcmp(data.data, o->data.data, data.length) == 0) );
|
||||
return ((data.data == NULL && o->data.data == NULL) || (data.data != NULL && data.length == o->data.length && memcmp(data.data, o->data.data, data.length * sizeof(int)) == 0) );
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user