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

Replace common pattern by new LIMIT_TO()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-14 22:34:05 +01:00
parent aa870f5d91
commit 726b9380d1
11 changed files with 73 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/load.c
View file

@ -30,7 +30,7 @@
* David Sharnoff, 1987
* Ken Stevens, 1995 (rewritten)
* Steve McClure, 1998-2000
* Markus Armbruster, 2004-2012
* Markus Armbruster, 2004-2013
*/
#include <config.h>
@ -326,14 +326,8 @@ move_amount(int sect_amt, int unit_amt, int unit_max,
move_amt = -amount - unit_amt;
else
move_amt = load_unload == LOAD ? amount : -amount;
if (move_amt > unit_max - unit_amt)
move_amt = unit_max - unit_amt;
if (move_amt < -unit_amt)
move_amt = -unit_amt;
if (move_amt > sect_amt)
move_amt = sect_amt;
if (move_amt < sect_amt - ITEM_MAX)
move_amt = sect_amt - ITEM_MAX;
move_amt = LIMIT_TO(move_amt, -unit_amt, unit_max - unit_amt);
move_amt = LIMIT_TO(move_amt, sect_amt - ITEM_MAX, sect_amt);
return move_amt;
}