Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 3 insertions, 6 deletions

diff --git a/Minecraft.World/Painting.h b/Minecraft.World/Painting.h
index 7866b662..b47a012b 100644
--- a/Minecraft.World/Painting.h
+++ b/Minecraft.World/Painting.h
@@ -72,10 +72,6 @@ public:
 	};
 
 public:
-// 	int dir;
-// 
-// 	int xTile, yTile, zTile;
-
 	Motive *motive;
 
 private:
@@ -88,7 +84,8 @@ public:
 	Painting(Level *level, int x, int y, int z, int dir, wstring motiveName);
 
 	// 4J Stu - Added this so that we can use some shared_ptr functions that were needed in the ctor
-	void PaintingPostConstructor(int dir);
+	// 4J Stu - Added motive param for debugging/artists only
+	void PaintingPostConstructor(int dir, int motive = -1);
 
 protected:
 	//void defineSynchedData();
@@ -113,5 +110,5 @@ public:
 
 	virtual int getWidth();
 	virtual int getHeight();
-	virtual void dropItem();
+	virtual void dropItem(shared_ptr<Entity> causedBy);
 };