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

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

1 files changed, 43 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp
new file mode 100644
index 00000000..e1d50fbf
--- /dev/null
+++ b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp
@@ -0,0 +1,43 @@
+#include "stdafx.h"
+
+#include <string>
+
+#include "Minecraft.h"
+#include "Tutorial.h"
+
+#include "..\Minecraft.World\EntityHorse.h"
+
+#include "HorseChoiceTask.h"
+
+HorseChoiceTask::HorseChoiceTask(Tutorial *tutorial, int iDescHorse, int iDescDonkey, int iDescMule, int iPromptId,
+								 bool requiresUserInput, int iConfirmMapping, int iCancelMapping, 
+								 eTutorial_CompletionAction cancelAction, ETelemetryChallenges telemetryEvent)
+
+	: ChoiceTask(tutorial, -1, iPromptId, requiresUserInput, iConfirmMapping, iCancelMapping, cancelAction, telemetryEvent)
+{
+	m_eHorseType = -1;
+	m_iDescMule = iDescMule;
+	m_iDescDonkey = iDescDonkey;
+	m_iDescHorse = iDescHorse;
+}
+
+int HorseChoiceTask::getDescriptionId()
+{
+	switch (m_eHorseType)
+	{
+	case EntityHorse::TYPE_HORSE:	return m_iDescHorse;
+	case EntityHorse::TYPE_DONKEY:	return m_iDescDonkey;
+	case EntityHorse::TYPE_MULE:	return m_iDescMule;
+	default:						return -1;
+	}
+	return -1;
+}
+
+void HorseChoiceTask::onLookAtEntity(shared_ptr<Entity> entity)
+{
+	if ( (m_eHorseType < 0) && entity->instanceof(eTYPE_HORSE) )
+	{
+		shared_ptr<EntityHorse> horse = dynamic_pointer_cast<EntityHorse>(entity);
+		if ( horse->isAdult() ) m_eHorseType = horse->getType();
+	}
+}
\ No newline at end of file