Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-24 11:50:34 -04:00
13 changed files with 88 additions and 30 deletions

View File

@@ -2711,6 +2711,7 @@ boolean incr;
if (incr && occupation &&
(occupation != eatfood && occupation != opentin))
stop_occupation();
context.travel = context.travel1 = context.mv = context.run = 0;
break;
case WEAK:
if (Hallucination)
@@ -2730,6 +2731,7 @@ boolean incr;
if (incr && occupation &&
(occupation != eatfood && occupation != opentin))
stop_occupation();
context.travel = context.travel1 = context.mv = context.run = 0;
break;
}
u.uhs = newhs;