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

torpedo: Print "Starting our attack run" regardless of target

Browse source 
Instead of printing it only when the target owned by somebody else.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-15 15:06:14 +01:00
parent 33497e4242
commit 88bfa2e6a3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/torp.c
View file

@ -145,8 +145,10 @@ torp(void)
continue; continue;
} }
if (!(sub_mcp->m_flags & M_SUB)) if (!(sub_mcp->m_flags & M_SUB)) {
pr("Starting our attack run...\n");
anti_torp(sub.shp_uid, ntorping, vshipown); anti_torp(sub.shp_uid, ntorping, vshipown);
}
getship(sub.shp_uid, &sub); getship(sub.shp_uid, &sub);
if (sub.shp_own == 0) if (sub.shp_own == 0)
continue; continue;
@ -216,9 +218,6 @@ anti_torp(int f, int ntorping, int vshipown)
if (sub.shp_own == vshipown) if (sub.shp_own == vshipown)
return; return;
if ((mchr[(int)sub.shp_type].m_flags & M_SUB) == 0)
pr("Starting our attack run...\n");
x = 0; x = 0;
while (getship(x++, &dd) && sub.shp_effic >= SHIP_MINEFF) { while (getship(x++, &dd) && sub.shp_effic >= SHIP_MINEFF) {
if (dd.shp_own == 0) if (dd.shp_own == 0)

1
tests/torpedo/journal.log
View file

@ -361,6 +361,7 @@
Play#1 input torp 15 16 Play#1 input torp 15 16
Play#1 command torpedo Play#1 command torpedo
Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 1 ships are eligible to torpedo
Play#1 output Play#1 1 Starting our attack run...
Play#1 output Play#1 1 Effective torpedo range is 1.0 Play#1 output Play#1 1 Effective torpedo range is 1.0
Play#1 output Play#1 1 Whooosh... Hitchance = 90% Play#1 output Play#1 1 Whooosh... Hitchance = 90%
Play#1 output Play#1 1 Missed Play#1 output Play#1 1 Missed