# HG changeset patch
# User John "Elwin" Edwards
# Date 1505524588 14400
# Node ID 4a3f4729257cf633f3d9a350f73da485cb323d77
# Parent  70aa5808c7820becf5104fcd60a95028475724b9# Parent  1bbdd13ec58572273cb5c74adbb2edab84f3f2f3
Merge the urogue and bugfix branches.

diff -r 70aa5808c782 -r 4a3f4729257c urogue/command.c
--- 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? ");
 
diff -r 70aa5808c782 -r 4a3f4729257c urogue/rip.c
--- 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);