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

Support definition of additional sector types in sector.config,

Browse source 
missing bits:
(budg, calc_all, update_main): Use SCT_TYPE_MAX instead of SCT_MAXDEF
to size tables.
(map_char): Update sanity check; use CANT_HAPPEN().
(show_sect_build, show_sect_stats, show_sect_capab): Use the sentinel
instead of SCT_MAXDEF.
This commit is contained in:
Markus Armbruster 2006-06-22 20:21:48 +00:00
parent 063aabb893
commit 9e8f74d239
4 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/budg.c
View file

@ -64,7 +64,7 @@ int
budg(void)
{
int i;
long p_sect[SCT_MAXDEF+2][2];
long p_sect[SCT_TYPE_MAX+2][2];
int taxes, Ncivs, Nuws, bars, Nbars, mil;
int ships, sbuild, nsbuild, smaint;
int units, lbuild, nlbuild, lmaint;
@ -90,7 +90,7 @@ budg(void)
income = taxes + bars;
expenses = 0;
pr("Sector Type\t\t\tProduction\t\t\t Cost\n");
for (i = 0; i <= SCT_MAXDEF; i++) {
for (i = 0; i <= SCT_TYPE_MAX; i++) {
if (!p_sect[i][1] || i == SCT_CAPIT)
continue;
pr("%-17s\t\t", dchr[i].d_name);
@ -198,7 +198,7 @@ calc_all(long p_sect[][2],
int etu = etu_per_update;
mil_dbl_pay = 0;
memset(p_sect, 0, sizeof(**p_sect) * (SCT_MAXDEF+2) * 2);
memset(p_sect, 0, sizeof(**p_sect) * (SCT_TYPE_MAX+2) * 2);
*taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0;
*ships = *sbuild = *nsbuild = *smaint = 0;
*units = *lbuild = *nlbuild = *lmaint = 0;

4
src/lib/common/maps.c
View file

@ -290,10 +290,8 @@ bmnxtsct(struct nstr_sect *np)
static char
map_char(unsigned char type, natid own, int owner_or_god)
{
if (type > SCT_MAXDEF) {
logerror("bad sector type %d\n", type);
if (CANT_HAPPEN(type > SCT_TYPE_MAX || !dchr[type].d_mnem))
return '?';
}
if (owner_or_god
|| type == SCT_WATER || type == SCT_MOUNT || type == SCT_WASTE
|| (!own && (type == SCT_RURAL || type == SCT_PLAINS)))

7
src/lib/subs/show.c
View file

@ -32,6 +32,7 @@
* Jeff Bailey, 1990
* Steve McClure, 1996
* Ron Koenderink, 2005
* Markus Armbruster, 2006
*/
#include <config.h>
@ -499,7 +500,7 @@ show_sect_build(int foo)
int x, first;
first = 1;
for (x = 0; x <= SCT_MAXDEF; x++) {
for (x = 0; dchr[x].d_name; x++) {
if (dchr[x].d_mnem == 0)
continue;
if (dchr[x].d_cost < 0)
@ -537,7 +538,7 @@ show_sect_stats(int foo)
struct natstr *natp;
natp = getnatp(player->cnum);
for (x = 0; x <= SCT_MAXDEF; x++) {
for (x = 0; dchr[x].d_name; x++) {
if (dchr[x].d_mnem == 0)
continue;
if (first) {
@ -567,7 +568,7 @@ show_sect_capab(int foo)
int x, first = 1, i, j;
char *tmpstr;
for (x = 0; x <= SCT_MAXDEF; x++) {
for (x = 0; dchr[x].d_name; x++) {
if (dchr[x].d_mnem == 0 || dchr[x].d_prd < 0)
continue;
if (first) {

2
src/lib/update/main.c
View file

@ -112,7 +112,7 @@ update_main(void *unused)
logerror("done preparing sectors.");
logerror("producing for countries...");
for (x = 0; x < MAXNOC; x++) {
long p_sect[SCT_MAXDEF+2][2];
long p_sect[SCT_TYPE_MAX+2][2];
memset(p_sect, 0, sizeof(p_sect));
mil_dbl_pay = 0;