Merge the MSVC branch.

This commit is contained in:
John "Elwin" Edwards 2015-11-27 08:59:24 -05:00
commit e1d228b946
3 changed files with 3 additions and 3 deletions

View file

@ -662,6 +662,7 @@ bool is_potion;
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 @@ bool is_potion;
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.");

View file

@ -838,7 +838,7 @@ total_winner()
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");

View file

@ -160,7 +160,7 @@ struct character_types char_class[NUM_CHARTYPES] = {
{ "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 },