DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Dont loop on bad item select

Browse Source
This commit is contained in:
jl777
2019-02-18 06:06:47 -11:00
parent 92e136108c
commit 12c97d71a7
1 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/cc/rogue/pack.c
View File

@@ -412,57 +412,61 @@ get_item(struct rogue_state *rs,char *purpose, int type)
char ch; char ch;
if (pack == NULL) if (pack == NULL)
msg(rs,"you aren't carrying anything"); msg(rs,"you aren't carrying anything");
else if (again) else if (again)
if (last_pick) if (last_pick)
return last_pick; return last_pick;
else else
msg(rs,"you ran out"); msg(rs,"you ran out");
else else
{ {
for (;;) for (;;)
{ {
if (!terse) if (!terse)
addmsg(rs,"which object do you want to "); addmsg(rs,"which object do you want to ");
addmsg(rs,purpose); addmsg(rs,purpose);
if (terse) if (terse)
addmsg(rs," what"); addmsg(rs," what");
msg(rs,"? (* for list): "); msg(rs,"? (* for list): ");
ch = readchar(rs); ch = readchar(rs);
mpos = 0; mpos = 0;
/* /*
* Give the poor player a chance to abort the command * Give the poor player a chance to abort the command
*/ */
if (ch == ESCAPE) if (ch == ESCAPE)
{ {
reset_last(); reset_last();
after = FALSE; after = FALSE;
msg(rs,""); msg(rs,"");
return NULL; return NULL;
} }
n_objs = 1; /* normal case: person types one char */ n_objs = 1; /* normal case: person types one char */
if (ch == '*') if (ch == '*')
{ {
mpos = 0; mpos = 0;
if (inventory(rs,pack, type) == 0) if (inventory(rs,pack, type) == 0)
{ {
after = FALSE; after = FALSE;
return NULL; return NULL;
} }
continue; continue;
} }
for (obj = pack; obj != NULL; obj = next(obj)) for (obj = pack; obj != NULL; obj = next(obj))
if (obj->o_packch == ch) if (obj->o_packch == ch)
break; break;
if (obj == NULL) if (obj == NULL)
{ {
msg(rs,"'%s' is not a valid item",unctrl(ch)); //msg(rs,"'%s' is not a valid item",unctrl(ch));
continue; //continue;
} reset_last();
else after = FALSE;
return obj; msg(rs,"'%s' is not a valid item",unctrl(ch));
} return NULL;
} }
else
return obj;
}
}
return NULL; return NULL;
} }