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

Merge the urogue and bugfix branches.

Browse source
This commit is contained in:
John "Elwin" Edwards 2017-09-15 21:16:28 -04:00
commit 3349419ebc
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
urogue/command.c
View file

@ -1303,6 +1303,7 @@ call(int mark)
case STICK: case STICK:
item_type = TYP_STICK; item_type = TYP_STICK;
item_color = ws_made; item_color = ws_made;
break;
default: default:
if (!mark) if (!mark)
{ {
@ -1312,10 +1313,7 @@ call(int mark)
break; break;
} }
elsewise = (guess_items[item_type][obj->o_which] != NULL ? if (!mark && know_items[item_type][obj->o_which])
guess_items[item_type][obj->o_which] : item_color[obj->o_which]);
if (know_items[item_type][obj->o_which] && !mark)
{ {
msg("That has already been identified."); msg("That has already been identified.");
return; return;
@ -1331,6 +1329,9 @@ call(int mark)
} }
else else
{ {
elsewise = (guess_items[item_type][obj->o_which] != NULL ?
guess_items[item_type][obj->o_which] : item_color[obj->o_which]);
msg("Was called \"%s\".", elsewise); msg("Was called \"%s\".", elsewise);
msg("What do you want to call it? "); msg("What do you want to call it? ");

2
urogue/rip.c
View file

@ -169,7 +169,7 @@ death(int monst)
mvaddstr(15, 28 - ((int)(strlen(buf) + 1) / 2), buf); mvaddstr(15, 28 - ((int)(strlen(buf) + 1) / 2), buf);
killer = killname(monst,buf); killer = killname(monst,buf);
mvaddstr(17, 28 - ((int)(strlen(killer) + 1) / 2), killer); mvaddstr(17, 28 - ((int)(strlen(killer) + 1) / 2), killer);
mvaddstr(18, 28, (sprintf(prbuf, "%2d", lt->tm_year), prbuf)); mvaddstr(18, 26, (sprintf(prbuf, "%4d", 1900+lt->tm_year), prbuf));
move(LINES - 1, 0); move(LINES - 1, 0);
mvaddstr(LINES - 1, 0, retstr); mvaddstr(LINES - 1, 0, retstr);