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

18
src/lib/commands/prod.c
View file

@ -147,7 +147,7 @@ prod(void)
total_work(sect.sct_work, etu_per_update,
civs, sect.sct_item[I_MILIT],
uws, maxpop));
bwork = min(work / 2, bwork);
bwork = MIN(work / 2, bwork);
}
twork = 100 - eff;
if (twork > bwork) {
@ -215,7 +215,7 @@ prod(void)
continue;
if (CANT_HAPPEN(it <= I_NONE || I_MAX < it))
continue;
used = min(used, sect.sct_item[it] / pp->p_camt[j]);
used = MIN(used, sect.sct_item[it] / pp->p_camt[j]);
unit_work += pp->p_camt[j];
}
if (unit_work == 0)
@ -229,17 +229,17 @@ prod(void)
if (*resource * 100 < pp->p_nrdep * max)
max = *resource * 100 / pp->p_nrdep;
}
act = min(used, max);
act = MIN(used, max);
real = dmin(999.0, (double)act * prodeff);
maxr = dmin(999.0, (double)max * prodeff);
real = MIN(999.0, (double)act * prodeff);
maxr = MIN(999.0, (double)max * prodeff);
if (vtype != I_NONE) {
if (real < 0.0)
real = 0.0;
/* production backlog? */
there = min(ITEM_MAX, sect.sct_item[vtype]);
real = dmin(real, ITEM_MAX - there);
there = MIN(ITEM_MAX, sect.sct_item[vtype]);
real = MIN(real, ITEM_MAX - there);
}
if (prodeff != 0) {
@ -315,7 +315,7 @@ prod(void)
civs = (1.0 + obrate * etu_per_update) * sect.sct_item[I_CIVIL];
natp = getnatp(sect.sct_own);
maxpop = max_pop(natp->nat_level[NAT_RLEV], &sect);
civs = min(civs, maxpop);
civs = MIN(civs, maxpop);
/* This isn't quite right, since research might
rise/fall during the update, but it's the best
we can really do */
@ -354,7 +354,7 @@ prod(void)
}
if (vtype != I_NONE || pp->p_level == NAT_ELEV
|| pp->p_level == NAT_HLEV)
pr(" %5d\n", min(999, (int)(max * prodeff + 0.5)));
pr(" %5d\n", MIN(999, (int)(max * prodeff + 0.5)));
else
pr(" %5.2f\n", maxr);
}