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

(ship_bomb, deli, do_demo, fuel, grin, look_ship)

Browse source 
(ltend, multifire, quite_bigdef, mine, landmine)
(do_loan, prod, printdiff, sell, sona, stre)
(tend, fire_dchrg, vers, work, ac_planedamage)
(ac_shipflak, ask_off, get_mine_dsupport, att_fight)
(ask_move_in_off, detonate, sd, land_gun)
(land_unitgun, lnd_fort_interdiction, lnd_fortify)
(perform_mission, pln_mine, pln_mobcost)
(retreat_ship1, retreat_land1, shp_sweep)
(shp_fort_interdiction, shp_missle_defense)
(new_work, growfood, upd_land, land_repair)
(get_materials, do_mob_ship, do_mob_land)
(load_it, unload_it, prod_plane, produce)
(guerrilla, upd_buildeff, spread_fallout)
(upd_ship, ship_repair, min, dmin, MIN):
Remove min() and dmin() functions and replace
with a MIN macro in misc.h.  Remove local MIN
macros and use the new one in misc.h.  This
change removes the need for the special
case for _WIN32.

(fuel, look_ship, multifire, mission, sona)
(plane_sona, ef_open, player_accept, player_main)
(ac_dog, att_get_combat, calc_mobcost)
(ask_move_in_off, intelligence_report)
(build_mission_list_type, perform_mission)
(show_mission, use_supply, dodistribute)
(allocate_memory, max, dmax, MAX):
Remove max() and dmax() functions and replace
with a MAX macro in misc.h.  Remove local MAX
macros and use the new one in misc.h.  This
change removes the need for the special
case for _WIN32.
This commit is contained in:
Ron Koenderink 2006-01-12 14:23:55 +00:00
parent b89de57d51
commit 04a8b84592
48 changed files with 152 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/lndsub.c
View file

@ -392,7 +392,7 @@ intelligence_report(int destination, struct lndstr *lp, int spy,
if (chance((double)(spy + lp->lnd_vis) / 20.0)) {
int t;
t = lp->lnd_tech - 20 + roll(40);
t = max(t, 0);
t = MAX(t, 0);
if (destination == player->cnum)
pr(", tech %d)\n", t);
else
@ -938,7 +938,7 @@ lnd_fort_interdiction(struct emp_qelem *list,
gun = fsect.sct_item[I_GUN];
if (gun < 1)
continue;
range = tfactfire(fsect.sct_own, (double)min(gun, 7));
range = tfactfire(fsect.sct_own, (double)MIN(gun, 7));
if (fsect.sct_effic > 59)
range++;
range2 = roundrange(range);
@ -1378,7 +1378,7 @@ lnd_fortify (struct lndstr *lp, int hard_amt)
if ((lp->lnd_ship >= 0) || lp->lnd_land >= 0)
return 0;
hard_amt = min(lp->lnd_mobil, hard_amt);
hard_amt = MIN(lp->lnd_mobil, hard_amt);
if ((lp->lnd_harden + hard_amt) > land_mob_max)
hard_amt = land_mob_max - lp->lnd_harden;
@ -1409,7 +1409,7 @@ lnd_fortify (struct lndstr *lp, int hard_amt)
lp->lnd_mobil = 0;
lp->lnd_harden += hard_amt;
lp->lnd_harden = min(lp->lnd_harden, land_mob_max);
lp->lnd_harden = MIN(lp->lnd_harden, land_mob_max);
return hard_amt;
}