warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an assortment of compiler warnings.

Browse source 
A few potential bugs were removed in the process.  Much code cleanup
remains to be done.
This commit is contained in:
John "Elwin" Edwards 2019-11-22 21:18:27 -05:00
parent de95b19cee
commit 7d459d7d36
47 changed files with 608 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

12
urogue/trader.c
View file

@ -257,7 +257,7 @@ buy_more:
for(i=0,m_item=magic_array; i < array_size; i++, m_item++)
if (!is_spell && m_item->mi_worth > 0)
{
sprintf(buf, "%3d) %8d %s", i, m_item->mi_worth,
sprintf(buf, "%3d) %8ld %s", i, m_item->mi_worth,
m_item->mi_name);
add_line(buf);
}
@ -267,7 +267,7 @@ buy_more:
for (i = 0; i < array_size; i++)
if (!is_spell && armors[i].a_worth > 0)
{
sprintf(buf, "%3d) %8d %s", i, armors[i].a_worth,
sprintf(buf, "%3d) %8ld %s", i, armors[i].a_worth,
armors[i].a_name);
add_line(buf);
@ -278,7 +278,7 @@ buy_more:
for (i = 0; i < array_size; i++)
if (!is_spell && weaps[i].w_worth > 0)
{
sprintf(buf, "%3d) %8d %s", i, weaps[i].w_worth,
sprintf(buf, "%3d) %8ld %s", i, weaps[i].w_worth,
weaps[i].w_name);
add_line(buf);
}
@ -646,7 +646,7 @@ describe_it(struct object *obj)
else
charp = normal_d[rnd(sizeof(normal_d) / sizeof(char *))];
sprintf(buf, "It's a%s %s worth %d pieces of gold.",
sprintf(buf, "It's a%s %s worth %ld pieces of gold.",
vowelstr(charp), charp, obj->o_worth);
mvwaddstr(hw, 10, 0, inv_name(obj, TRUE));
@ -794,11 +794,11 @@ trans_line(void)
int adorned = is_wearing(R_ADORNMENT);
if (level == 0 && purse > 0)
sprintf(buf, "You still have %d pieces of gold left.", purse);
sprintf(buf, "You still have %ld pieces of gold left.", purse);
else if (purse == 0)
sprintf(buf, "You have no money left.");
else if (!wizard)
sprintf(buf, "You have %d transactions and %d gold pieces remaining.",
sprintf(buf, "You have %d transactions and %ld gold pieces remaining.",
max(0, (adorned ? MAXPURCH + 4 : MAXPURCH) - player.t_trans),
EFFECTIVE_PURSE);
else