From 974919c1a5e4b5e6215f159b02e225177154c2f3 Mon Sep 17 00:00:00 2001
From: Luan Santos <github@luan.sh>
Date: Sat, 7 Oct 2023 20:23:41 -0700
Subject: [PATCH] fix: bad merge

---
 source/action.h       | 6 ++----
 source/iomap_otbm.cpp | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/source/action.h b/source/action.h
index 456cdcf5..c4da490c 100644
--- a/source/action.h
+++ b/source/action.h
@@ -65,10 +65,7 @@ struct WaypointData {
 };
 
 class Change {
-private:
-	ChangeType type;
-	void* data;
-
+public:
 	Change(Tile* tile);
 	~Change();
 
@@ -83,6 +80,7 @@ class Change {
 	uint32_t memsize() const;
 
 private:
+	Change();
 	ChangeType type;
 	void* data;
 
diff --git a/source/iomap_otbm.cpp b/source/iomap_otbm.cpp
index 0c117136..74d243d3 100644
--- a/source/iomap_otbm.cpp
+++ b/source/iomap_otbm.cpp
@@ -216,7 +216,7 @@ void Item::serializeItemAttributes_OTBM(const IOMap& maphandle, NodeFileWriteHan
 
 void Item::serializeItemCompact_OTBM(const IOMap& maphandle, NodeFileWriteHandle& stream) const
 {
-	stream.addU16(g_items[id].clientID);
+	stream.addU16(id);
 
 	/* This is impossible
 	const ItemType& iType = g_items[id];
@@ -230,7 +230,7 @@ void Item::serializeItemCompact_OTBM(const IOMap& maphandle, NodeFileWriteHandle
 bool Item::serializeItemNode_OTBM(const IOMap& maphandle, NodeFileWriteHandle& file) const
 {
 	file.addNode(OTBM_ITEM);
-	file.addU16(g_items[id].clientID);
+	file.addU16(id);
 	if(maphandle.version.otbm == MAP_OTBM_1) {
 		const ItemType& type = g_items.getItemType(id);
 		if(type.stackable || type.isSplash() || type.isFluidContainer()) {
@@ -362,7 +362,7 @@ bool Container::unserializeItemNode_OTBM(const IOMap& maphandle, BinaryNode* nod
 bool Container::serializeItemNode_OTBM(const IOMap& maphandle, NodeFileWriteHandle& file) const
 {
 	file.addNode(OTBM_ITEM);
-	file.addU16(g_items[id].clientID);
+	file.addU16(id);
 	if(maphandle.version.otbm == MAP_OTBM_1) {
 		// In the ludicrous event that an item is a container AND stackable, we have to do this. :p
 		const ItemType& type = g_items.getItemType(id);