From 9a6895352cc9b92055b81c67850cf8f2fed7cba7 Mon Sep 17 00:00:00 2001
From: obligaron <obligaron@live.com>
Date: Sun, 22 Aug 2021 10:58:49 +0200
Subject: [PATCH] Remember last frame when animation is changed for towners
 (girl & cow farmer)

---
 Source/towners.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/towners.cpp b/Source/towners.cpp
index ae705a24a..b89f8889e 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -653,7 +653,9 @@ void TalkToCowFarmer(PlayerStruct &player, TownerStruct &cowFarmer)
 		SpawnUnique(UITEM_BOVINE, cowFarmer.position + DIR_SE);
 		InitQTextMsg(TEXT_JERSEY8);
 		quest._qactive = QUEST_DONE;
+		auto curFrame = cowFarmer._tAnimFrame;
 		LoadTownerAnimations(cowFarmer, "Towners\\Farmer\\mfrmrn2.CEL", 15, DIR_SW, 3);
+		cowFarmer._tAnimFrame = std::min(curFrame, cowFarmer._tAnimLen);
 		return;
 	}
 
@@ -734,7 +736,9 @@ void TalkToGirl(PlayerStruct &player, TownerStruct &girl)
 		CreateAmulet(girl.position, 13, false, true);
 		quest._qlog = false;
 		quest._qactive = QUEST_DONE;
+		auto curFrame = girl._tAnimFrame;
 		LoadTownerAnimations(girl, "Towners\\Girl\\Girls1.CEL", 20, DIR_S, 6);
+		girl._tAnimFrame = std::min(curFrame, girl._tAnimLen);
 		if (gbIsMultiplayer)
 			NetSendCmdQuest(true, quest);
 		return;