Mercurial > hg > early-roguelike

changeset 281:4a3f4729257c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the urogue and bugfix branches.
author John "Elwin" Edwards
date Fri, 15 Sep 2017 21:16:28 -0400
parents 70aa5808c782 (current diff) 1bbdd13ec585 (diff)
children 8b6aba552f6f
files
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/urogue/command.c	Fri Sep 15 20:51:10 2017 -0400
+++ b/urogue/command.c	Fri Sep 15 21:16:28 2017 -0400
@@ -1303,6 +1303,7 @@
         case STICK:
             item_type = TYP_STICK;
             item_color = ws_made;
+            break;
         default:
             if (!mark)
             {
@@ -1312,10 +1313,7 @@
             break;
     }
 
-    elsewise = (guess_items[item_type][obj->o_which] != NULL ?
-       guess_items[item_type][obj->o_which] : item_color[obj->o_which]);
-
-    if (know_items[item_type][obj->o_which] && !mark)
+    if (!mark && know_items[item_type][obj->o_which])
     {
         msg("That has already been identified.");
         return;
@@ -1331,6 +1329,9 @@
     }
     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("What do you want to call it? ");
 
--- a/urogue/rip.c	Fri Sep 15 20:51:10 2017 -0400
+++ b/urogue/rip.c	Fri Sep 15 21:16:28 2017 -0400
@@ -169,7 +169,7 @@
     mvaddstr(15, 28 - ((int)(strlen(buf) + 1) / 2), buf);
     killer = killname(monst,buf);
     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);
 
     mvaddstr(LINES - 1, 0, retstr);