zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 13:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Christoph Oelckers 2013-09-03 08:44:52 +02:00
commit 18386e4b23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/am_map.cpp
View file

@ -2657,10 +2657,11 @@ void AM_drawThings ()
if (texture == NULL) goto drawTriangle; // fall back to standard display if no sprite can be found. 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)), 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 else
{ {

5
src/p_conversation.cpp
View file

@ -752,7 +752,10 @@ public:
{ {
ReplyText = GStrings(ReplyText + 1); 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()); mResponses.Push(mResponseLines.Size());
for (j = 0; ReplyLines[j].Width >= 0; ++j) for (j = 0; ReplyLines[j].Width >= 0; ++j)

1
src/p_usdf.cpp
View file

@ -224,7 +224,6 @@ class USDFParser : public UDMFParserBase
if (reply->ItemCheck.Size() > 0) if (reply->ItemCheck.Size() > 0)
{ {
if (reply->ItemCheck[0].Amount <= 0) reply->NeedsGold = false; if (reply->ItemCheck[0].Amount <= 0) reply->NeedsGold = false;
if (reply->NeedsGold) ReplyString.AppendFormat(" for %u", reply->ItemCheck[0].Amount);
} }
reply->Reply = ncopystring(ReplyString); reply->Reply = ncopystring(ReplyString);