empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fire: Print "Kaboom" even when the target is out of range

Browse source 
To make shell use more obvious.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-08 12:29:22 +01:00
parent 2f24a01c65
commit ac15e5b961
2 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/commands/mfir.c
View file

@ -338,17 +338,6 @@ multifire(void)
pr("range is %d.00 (%.2f)\n", range2, range);
}
/*
* If the player fires guns at a submarine, take care not to
* disclose it's a submarine: pretend the target is out of range.
*/
if (target == targ_ship && (mchr[vship.shp_type].m_flags & M_SUB))
range2 = -1;
if (trange > range2) {
pr("Target out of range.\n");
continue;
}
nfiring++;
switch (target) {
case targ_sub:
@ -361,6 +350,17 @@ multifire(void)
break;
}
/*
* If the player fires guns at a submarine, take care not to
* disclose it's a submarine: pretend the target is out of range.
*/
if (target == targ_ship && (mchr[vship.shp_type].m_flags & M_SUB))
range2 = -1;
if (trange > range2) {
pr("Target out of range.\n");
continue;
}
switch (target) {
case targ_bogus:
case targ_land: