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

load: Factor out plane_loadable(), land_loadable()

Browse source 
load_plane_ship() and load_plane_land() duplicate code to check
whether a plane can be loaded, except for the phrasing of one message.
Factor out into plane_loadable().  tran_plane() has equivalent code,
but wants different messages, which makes de-duplication unattractive.

load_land_ship() and load_land_land() duplicate code to check whether
a land unit can be loaded.  Factor out into land_loadable().

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-09-03 17:58:42 +02:00
parent c931758307
commit 31256510cc
2 changed files with 54 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/load-tend/journal.log
View file

@ -1513,7 +1513,7 @@
Play#1 command lload
Play#1 output Play#1 1 sam Sea Sparrow #231 loaded onto rad radar unit #121 at -2,0.
Play#1 output Play#1 1 Can't put plane 233 on this unit!
Play#1 output Play#1 1 sam Sea Sparrow #231 is already on unit #121!
Play#1 output Play#1 1 sam Sea Sparrow #231 is already on land unit #121!
Play#1 output Play#1 1 sam Sea Sparrow #233 loaded onto rad radar unit #123 at -2,0.
Play#1 output Play#1 1 2 units loaded
Play#1 output Play#1 6 0 483
@ -1560,7 +1560,7 @@
Play#1 input lload plane 100 57/58
Play#1 command lload
Play#1 output Play#1 1 sam Sea Sparrow #57 is already on ship #105!
Play#1 output Play#1 1 sam Sea Sparrow #58 is already on unit #105!
Play#1 output Play#1 1 sam Sea Sparrow #58 is already on land unit #105!
Play#1 output Play#1 1 No units affected
Play#1 output Play#1 6 0 474
Play#1 input lload plane 100 59