nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-19 07:48:19 -05:00
parent 670f07a315 87783b1c48
commit 896f5f9774
14 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/polyself.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 polyself.c $NHDT-Date: 1548208238 2019/01/23 01:50:38 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.126 $ */
/* NetHack 3.6 polyself.c $NHDT-Date: 1550525094 2019/02/18 21:24:54 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.128 $ */
/* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
@@ -37,9 +37,8 @@ void
set_uasmon()
{
struct permonst *mdat = &mons[u.umonnum];
int new_speed, old_speed = g.youmonst.data ? g.youmonst.data->mmove : 0;
set_mon_data(&g.youmonst, mdat, 0);
set_mon_data(&g.youmonst, mdat);
#define PROPSET(PropIndx, ON) \
do { \
@@ -97,15 +96,6 @@ set_uasmon()
float_vs_flight(); /* maybe toggle (BFlying & I_SPECIAL) */
polysense();
if (g.youmonst.movement) {
new_speed = mdat->mmove;
/* prorate unused movement if new form is slower so that
it doesn't get extra moves leftover from previous form;
if new form is faster, leave unused movement as is */
if (new_speed < old_speed)
g.youmonst.movement = new_speed * g.youmonst.movement / old_speed;
}
#ifdef STATUS_HILITES
status_initialize(REASSESS_ONLY);
#endif