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

92
rogue3/init.c
View file

@ -548,50 +548,50 @@ badcheck(char *name, struct magic_item *magic, int bound)
}
struct h_list helpstr[] = {
'?', " prints help",
'/', " identify object",
'h', " left",
'j', " down",
'k', " up",
'l', " right",
'y', " up & left",
'u', " up & right",
'b', " down & left",
'n', " down & right",
'H', " run left",
'J', " run down",
'K', " run up",
'L', " run right",
'Y', " run up & left",
'U', " run up & right",
'B', " run down & left",
'N', " run down & right",
't', "<dir> throw something",
'f', "<dir> forward until find something",
'p', "<dir> zap a wand in a direction",
'z', " zap a wand or staff",
'>', " go down a staircase",
's', " search for trap/secret door",
'.', " rest for a turn",
'i', " inventory",
'I', " inventory single item",
'q', " quaff potion",
'r', " read paper",
'e', " eat food",
'w', " wield a weapon",
'W', " wear armor",
'T', " take armor off",
'P', " put on ring",
'R', " remove ring",
'd', " drop object",
'c', " call object",
'o', " examine/set options",
CTRL('L'), " redraw screen",
CTRL('R'), " repeat last message",
ESCAPE, " cancel command",
'v', " print program version number",
'!', " shell escape",
'S', " save game",
'Q', " quit",
0, 0
{ '?', " prints help" },
{ '/', " identify object" },
{ 'h', " left" },
{ 'j', " down" },
{ 'k', " up" },
{ 'l', " right" },
{ 'y', " up & left" },
{ 'u', " up & right" },
{ 'b', " down & left" },
{ 'n', " down & right" },
{ 'H', " run left" },
{ 'J', " run down" },
{ 'K', " run up" },
{ 'L', " run right" },
{ 'Y', " run up & left" },
{ 'U', " run up & right" },
{ 'B', " run down & left" },
{ 'N', " run down & right" },
{ 't', "<dir> throw something" },
{ 'f', "<dir> forward until find something" },
{ 'p', "<dir> zap a wand in a direction" },
{ 'z', " zap a wand or staff" },
{ '>', " go down a staircase" },
{ 's', " search for trap/secret door" },
{ '.', " rest for a turn" },
{ 'i', " inventory" },
{ 'I', " inventory single item" },
{ 'q', " quaff potion" },
{ 'r', " read paper" },
{ 'e', " eat food" },
{ 'w', " wield a weapon" },
{ 'W', " wear armor" },
{ 'T', " take armor off" },
{ 'P', " put on ring" },
{ 'R', " remove ring" },
{ 'd', " drop object" },
{ 'c', " call object" },
{ 'o', " examine/set options" },
{ CTRL('L'), " redraw screen" },
{ CTRL('R'), " repeat last message" },
{ ESCAPE, " cancel command" },
{ 'v', " print program version number" },
{ '!', " shell escape" },
{ 'S', " save game" },
{ 'Q', " quit" },
{ 0, 0 }
};

2
rogue3/list.c
View file

@ -121,7 +121,7 @@ _new(size_t size)
if (space == NULL)
{
sprintf(prbuf, "Rogue ran out of memory (%d). Fatal error!", md_memused());
sprintf(prbuf, "Rogue ran out of memory (%ld). Fatal error!", md_memused());
fatal(prbuf);
}
total++;

2
rogue3/rip.c
View file

@ -314,7 +314,7 @@ void writelog(int amount, int flags, int monst)
if (waswizard)
return;
#ifdef LOGFILE
sprintf(logmessage, "%d %d %s %d ", time(NULL), amount, whoami,
sprintf(logmessage, "%ld %d %s %d ", time(NULL), amount, whoami,
pstats.s_lvl);
if (flags == 0) /* died */
{

4
rogue3/things.c
View file

@ -62,9 +62,9 @@ inv_name(struct object *obj, int drop)
when FOOD:
if (obj->o_which == 1)
if (obj->o_count == 1)
sprintf(prbuf, "A%s %s", vowelstr(fruit), fruit);
sprintf(prbuf, "A%s %.76s", vowelstr(fruit), fruit);
else
sprintf(prbuf, "%d %ss", obj->o_count, fruit);
sprintf(prbuf, "%d %.66ss", obj->o_count, fruit);
else
if (obj->o_count == 1)
strcpy(prbuf, "Some food");

24
rogue3/weapons.c
View file

@ -38,18 +38,18 @@ static struct init_weps {
int iw_launch;
int iw_flags;
} init_dam[MAXWEAPONS] = {
"2d4", "1d3", NONE, 0, /* Mace */
"1d10", "1d2", NONE,0, /* Long sword */
"1d1", "1d1", NONE, 0, /* Bow */
"1d1", "1d6", BOW, ISMANY|ISMISL, /* Arrow */
"1d6", "1d4", NONE, ISMISL, /* Dagger */
"1d2", "1d4", SLING,ISMANY|ISMISL, /* Rock */
"3d6", "1d2", NONE, 0, /* 2h sword */
"0d0", "0d0", NONE, 0, /* Sling */
"1d1", "1d3", NONE, ISMANY|ISMISL, /* Dart */
"1d1", "1d1", NONE, 0, /* Crossbow */
"1d2", "1d10", CROSSBOW, ISMANY|ISMISL,/* Crossbow bolt */
"1d8", "1d6", NONE, ISMISL, /* Spear */
{ "2d4", "1d3", NONE, 0 }, /* Mace */
{ "1d10", "1d2", NONE,0 }, /* Long sword */
{ "1d1", "1d1", NONE, 0 }, /* Bow */
{ "1d1", "1d6", BOW, ISMANY|ISMISL }, /* Arrow */
{ "1d6", "1d4", NONE, ISMISL }, /* Dagger */
{ "1d2", "1d4", SLING,ISMANY|ISMISL }, /* Rock */
{ "3d6", "1d2", NONE, 0 }, /* 2h sword */
{ "0d0", "0d0", NONE, 0 }, /* Sling */
{ "1d1", "1d3", NONE, ISMANY|ISMISL }, /* Dart */
{ "1d1", "1d1", NONE, 0 }, /* Crossbow */
{ "1d2", "1d10", CROSSBOW, ISMANY|ISMISL }, /* Crossbow bolt */
{ "1d8", "1d6", NONE, ISMISL } /* Spear */
};
/*