OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Randy Heit 2013-11-19 21:01:15 -06:00
commit fe67ae5e54
21 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.cpp
View file

@ -565,7 +565,7 @@ void G_BuildTiccmd (ticcmd_t *cmd)
int tspeed = speed;
if (turnheld < SLOWTURNTICS)
tspeed *= 2; // slow turn
tspeed += 2; // slow turn
if (Button_Right.bDown)
{

15
src/p_conversation.cpp
View file

@ -522,19 +522,8 @@ static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses)
// If the first item check has a positive amount required, then
// add that to the reply string. Otherwise, use the reply as-is.
if (rsp->Count[0] > 0)
{
char moneystr[128];
mysnprintf (moneystr, countof(moneystr), "%s for %u", rsp->Reply, rsp->Count[0]);
reply->Reply = copystring (moneystr);
reply->NeedsGold = true;
}
else
{
reply->Reply = copystring (rsp->Reply);
reply->NeedsGold = false;
}
reply->Reply = copystring (rsp->Reply);
reply->NeedsGold = (rsp->Count[0] > 0);
// QuickYes messages are shown when you meet the item checks.
// QuickNo messages are shown when you don't.