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 97a43994725008e35fceb984d5549df9c8cea470. * 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:
@@ -18,16 +18,16 @@ ContainerClickPacket::ContainerClickPacket()
|
||||
buttonNum = 0;
|
||||
uid = 0;
|
||||
item = nullptr;
|
||||
quickKey = false;
|
||||
clickType = 0;
|
||||
}
|
||||
|
||||
ContainerClickPacket::ContainerClickPacket(int containerId, int slotNum, int buttonNum, bool quickKey, shared_ptr<ItemInstance> item, short uid)
|
||||
ContainerClickPacket::ContainerClickPacket(int containerId, int slotNum, int buttonNum, int clickType, shared_ptr<ItemInstance> item, short uid)
|
||||
{
|
||||
this->containerId = containerId;
|
||||
this->slotNum = slotNum;
|
||||
this->buttonNum = buttonNum;
|
||||
this->uid = uid;
|
||||
this->quickKey = quickKey;
|
||||
this->clickType = clickType;
|
||||
// 4J - make a copy of the relevant bits of this item, as we want our packets to have full ownership of any data they reference
|
||||
this->item = item ? item->copy() : nullptr;
|
||||
}
|
||||
@@ -43,7 +43,7 @@ void ContainerClickPacket::read(DataInputStream *dis) //throws IOException
|
||||
slotNum = dis->readShort();
|
||||
buttonNum = dis->readByte();
|
||||
uid = dis->readShort();
|
||||
quickKey = dis->readBoolean();
|
||||
clickType = dis->readByte();
|
||||
|
||||
item = readItem(dis);
|
||||
}
|
||||
@@ -54,7 +54,7 @@ void ContainerClickPacket::write(DataOutputStream *dos) // throws IOException
|
||||
dos->writeShort(slotNum);
|
||||
dos->writeByte(buttonNum);
|
||||
dos->writeShort(uid);
|
||||
dos->writeBoolean(quickKey);
|
||||
dos->writeByte(clickType);
|
||||
|
||||
writeItem(item, dos);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user