diff options
| author | billf <billf@FreeBSD.org> | 1999-09-07 06:00:03 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 1999-09-07 06:00:03 +0000 |
| commit | 3e1d9f25c8a992fb915d18ffaccb3a266e8ad0a4 (patch) | |
| tree | a392a79dd376bd7e8273e85fac9e7af604437b66 /games/phantasia | |
| parent | 33adb981d4021526b69c31fe25c2fc524378289f (diff) | |
| download | FreeBSD-src-3e1d9f25c8a992fb915d18ffaccb3a266e8ad0a4.zip FreeBSD-src-3e1d9f25c8a992fb915d18ffaccb3a266e8ad0a4.tar.gz | |
Avoid ambigious if() if() else().
Diffstat (limited to 'games/phantasia')
| -rw-r--r-- | games/phantasia/fight.c | 6 | ||||
| -rw-r--r-- | games/phantasia/misc.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/games/phantasia/fight.c b/games/phantasia/fight.c index 54002bf..d3910a0 100644 --- a/games/phantasia/fight.c +++ b/games/phantasia/fight.c @@ -275,13 +275,14 @@ int ch; /* input */ mvaddstr(7, 0, "1:Melee 2:Skirmish 3:Evade 4:Spell 5:Nick "); - if (!Luckout) + if (!Luckout) { /* haven't tried to luckout yet */ if (Curmonster.m_type == SM_MORGOTH) /* cannot luckout against Morgoth */ addstr("6:Ally "); else addstr("6:Luckout "); + } if (Player.p_ring.ring_type != R_NONE) /* player has a ring */ @@ -1200,7 +1201,7 @@ double dtemp; /* for temporary calculations */ ch = getanswer("NY", FALSE); addstr("\n\n"); - if (ch == 'Y') + if (ch == 'Y') { if (drandom() < treasuretype / 35.0 + 0.04) /* cursed */ { @@ -1209,6 +1210,7 @@ double dtemp; /* for temporary calculations */ } else collecttaxes(gold, gems); + } return; } diff --git a/games/phantasia/misc.c b/games/phantasia/misc.c index bcc1f85..959578f 100644 --- a/games/phantasia/misc.c +++ b/games/phantasia/misc.c @@ -424,6 +424,7 @@ bool dishonest = FALSE;/* set when merchant is dishonest */ ch = getanswer("NY", FALSE); if (ch == 'Y') + { if (Player.p_gold < blessingcost) ++cheat; else @@ -435,6 +436,7 @@ bool dishonest = FALSE;/* set when merchant is dishonest */ else Player.p_blessing = TRUE; } + } break; } break; |
