warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix many compiler warnings.

Browse source 
There should only be two changes in behavior:

arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly
applied to characters who are not monks instead of monks who are not
empty-handed.

urogue/fight.c: fixed an interaction with the "debug" macro that could
cause the wrong message to be displayed.
This commit is contained in:
John "Elwin" Edwards 2021-04-14 18:55:33 -04:00
parent 6f21b5b88a
commit 6c3cd116ff
122 changed files with 374 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

16
urogue/command.c
View file

@ -33,7 +33,9 @@ command(void)
static int fight_to_death; /* Flags if we are fighting to death */
static coord dir; /* Last direction specified */
#ifdef WIZARD
object *obj;
#endif
char ch;
int ntimes = 1; /* Number of player moves */
coord nullcoord;
@ -579,10 +581,12 @@ command(void)
* If he ran into something to take, let him pick it up.
*/
if (take != 0)
{
if (!moving)
pick_up(take);
else
show_floor();
}
if (!running)
door_stop = FALSE;
} /* end while */
@ -676,10 +680,11 @@ do_after_effects(void)
}
}
}
}
}
/* Time to enforce weapon and armor restrictions */
if (rnd(9999) == 0)
/* Time to enforce weapon and armor restrictions */
if (rnd(9999) == 0)
{
if (((cur_weapon == NULL) ||
(wield_ok(&player, cur_weapon, NOMESSAGE)))
&& ((cur_armor == NULL) ||
@ -774,6 +779,7 @@ do_after_effects(void)
death(death_cause);
}
}
}
if (rnd(500000) == 0)
{
@ -1038,6 +1044,7 @@ help(void)
while (strp->h_ch)
{
if (strp->h_desc == 0)
{
if (!wizard)
break;
else
@ -1045,6 +1052,7 @@ help(void)
strp++;
continue;
}
}
if (strp->h_ch == helpch)
{
@ -1071,6 +1079,7 @@ help(void)
while (strp->h_ch)
{
if (strp->h_desc == 0)
{
if (!wizard)
break;
else
@ -1078,6 +1087,7 @@ help(void)
strp++;
continue;
}
}
mvwaddstr(hw, cnt % 23, cnt > 22 ? 40 : 0, unctrl(strp->h_ch));
waddstr(hw, strp->h_desc);