From 75dd5503cf953238e749d075673d0bb6a6fe0691 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 3 Sep 2013 08:24:47 +0200
Subject: [PATCH 1/2] - fixed: Cost strings for dialogues must not be added in
 the dialogue parser but while displaying the message to properly handle
 stringtable entries.

---
 src/p_conversation.cpp | 5 ++++-
 src/p_usdf.cpp         | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 350c464789..e51389ce8d 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -752,7 +752,10 @@ public:
 			{
 				ReplyText = GStrings(ReplyText + 1);
 			}
-			FBrokenLines *ReplyLines = V_BreakLines (SmallFont, 320-50-10, ReplyText);
+			FString ReplyString = ReplyText;
+			if (reply->NeedsGold) ReplyString.AppendFormat(" for %u", reply->ItemCheck[0].Amount);
+
+			FBrokenLines *ReplyLines = V_BreakLines (SmallFont, 320-50-10, ReplyString);
 
 			mResponses.Push(mResponseLines.Size());
 			for (j = 0; ReplyLines[j].Width >= 0; ++j)
diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp
index 95c8f5dc04..6ea32b3085 100644
--- a/src/p_usdf.cpp
+++ b/src/p_usdf.cpp
@@ -224,7 +224,6 @@ class USDFParser : public UDMFParserBase
 		if (reply->ItemCheck.Size() > 0)
 		{
 			if (reply->ItemCheck[0].Amount <= 0) reply->NeedsGold = false;
-			if (reply->NeedsGold) ReplyString.AppendFormat(" for %u", reply->ItemCheck[0].Amount);
 		}
 
 		reply->Reply = ncopystring(ReplyString);

From 11c026ee840684333327e307673bd0f48332704a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 3 Sep 2013 08:34:55 +0200
Subject: [PATCH 2/2] - fixed: displaying sprites on the automap ignored both
 the actor's scale and translation.

---
 src/am_map.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/am_map.cpp b/src/am_map.cpp
index 610ba48253..ad34995d0a 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -2388,10 +2388,11 @@ void AM_drawThings ()
 
 					if (texture == NULL) goto drawTriangle;	// fall back to standard display if no sprite can be found.
 
-					const fixed_t spriteScale = 10 * scale_mtof;
+					const fixed_t spriteXScale = FixedMul(t->scaleX, 10 * scale_mtof);
+					const fixed_t spriteYScale = FixedMul(t->scaleY, 10 * scale_mtof);
 
 					DrawMarker (texture, p.x, p.y, 0, !!(frame->Flip & (1 << rotation)),
-						spriteScale, spriteScale, 0, FRACUNIT, 0, LegacyRenderStyles[STYLE_Normal]);
+						spriteXScale, spriteYScale, t->Translation, FRACUNIT, 0, LegacyRenderStyles[STYLE_Normal]);
 				}
 				else
 				{