# HG changeset patch
# User John "Elwin" Edwards
# Date 1448632764 18000
# Node ID 4438569c1b02579c5fc099a2fdc3e6cd7c2ae279
# Parent  4146e2a06bc12a8209e8f8d2f1332478084adcb0# Parent  ca876944b1960e9804c68d0a8fe043855f966896
Merge the MSVC branch.

diff -r 4146e2a06bc1 -r 4438569c1b02 arogue7/potions.c
--- a/arogue7/potions.c	Tue Aug 18 13:23:56 2015 -0400
+++ b/arogue7/potions.c	Fri Nov 27 08:59:24 2015 -0500
@@ -662,6 +662,7 @@
 		if (show) {
 		    if (is_potion) p_know[P_FFIND] = TRUE;
 		    msg("Your nose tingles.");
+		    msg("You sense the presence of food on this level.");
 		    waddstr(msgw, morestr);
 		    clearok(msgw, FALSE);
 		    draw(msgw);
@@ -669,7 +670,6 @@
 		    msg("");
 		    overlay(hw,cw);
 		    draw(cw);
-		    msg("You sense the presence of food on this level.");
 		}
 		else
 	            msg("You have a strange feeling for a moment, then it passes.");
diff -r 4146e2a06bc1 -r 4438569c1b02 arogue7/rip.c
--- a/arogue7/rip.c	Tue Aug 18 13:23:56 2015 -0400
+++ b/arogue7/rip.c	Fri Nov 27 08:59:24 2015 -0500
@@ -838,7 +838,7 @@
     addstr("Dungeons of Doom alive.  You journey home and sell all your loot at\n");
     addstr("a great profit and are appointed leader of a ");
     switch (player.t_ctype) {
-	case C_MAGICIAN:addstr("magic user's guild.\n");
+	case C_MAGICIAN:addstr("magician's guild.\n");
 	when C_FIGHTER:	addstr("fighter's guild.\n");
 	when C_RANGER:	addstr("ranger's guild.\n");
 	when C_CLERIC:	addstr("monastery.\n");
diff -r 4146e2a06bc1 -r 4438569c1b02 arogue7/rogue.c
--- a/arogue7/rogue.c	Tue Aug 18 13:23:56 2015 -0400
+++ b/arogue7/rogue.c	Fri Nov 27 08:59:24 2015 -0500
@@ -160,7 +160,7 @@
 { "fighter",	80,	1310720, 12,	10,	30,	2,	1,	2 },
 { "ranger",	140,	2293760,  8,	10,	20,	2,	1,	2 },
 { "paladin",	120,	1966080, 10,	10,	23,	2,	1,	2 },
-{ "magic user",	130,	2129920,  6,	9,	18,	2,	1,	5 },
+{ "magician",	130,	2129920,  6,	9,	18,	2,	1,	5 },
 { "cleric",	110,	1802240,  8,	10,	19,	2,	1,	3 },
 { "thief",	75,	1228800,  6,	10,	25,	2,	1,	4 },
 { "assassin",	85,	1392640,  6,	10,	25,	2,	1,	4 },