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

Make struct sctstr member sct_effic signed

Browse source 
To bring it in line with unit efficiency.
This commit is contained in:
Markus Armbruster 2009-12-31 11:36:59 +01:00
parent 76575df96b
commit ca2dba33f0
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sect.h
View file

@ -54,7 +54,7 @@ struct sctstr {
coord sct_y; /* y coord of sector */ coord sct_y; /* y coord of sector */
signed char sct_type; /* sector type */ signed char sct_type; /* sector type */
/* end of part matching struct empobj */ /* end of part matching struct empobj */
unsigned char sct_effic; /* 0% to 100% */ signed char sct_effic; /* 0% to 100% */
short sct_mobil; /* mobility units */ short sct_mobil; /* mobility units */
unsigned char sct_loyal; /* updates until civilans "converted" */ unsigned char sct_loyal; /* updates until civilans "converted" */
unsigned char sct_terr; /* territory 0 id # of sector */ unsigned char sct_terr; /* territory 0 id # of sector */

2
src/lib/commands/edit.c
View file

@ -487,7 +487,7 @@ doland(char op, int arg, char *p, struct sctstr *sect)
case 'e': case 'e':
new = errcheck(arg, 0, 100); new = errcheck(arg, 0, 100);
noise(sect, "Efficiency", sect->sct_effic, new); noise(sect, "Efficiency", sect->sct_effic, new);
sect->sct_effic = (unsigned char)new; sect->sct_effic = new;
break; break;
case 'm': case 'm':
new = errcheck(arg, -127, 255); new = errcheck(arg, -127, 255);

2
src/lib/commands/setsect.c
View file

@ -193,7 +193,7 @@ setsector(void)
current = 100; current = 100;
pr("Efficiency in %s changed to %d.\n", pr("Efficiency in %s changed to %d.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), current); xyas(sect.sct_x, sect.sct_y, player->cnum), current);
sect.sct_effic = (unsigned char)current; sect.sct_effic = current;
putsect(&sect); putsect(&sect);
} }
break; break;

2
src/lib/common/nsc.c
View file

@ -139,7 +139,7 @@ struct castr sect_ca[] = {
{"xloc", fldoff(sct_x), NSC_XCOORD, 0, NULL, EF_BAD, NSC_CONST}, {"xloc", fldoff(sct_x), NSC_XCOORD, 0, NULL, EF_BAD, NSC_CONST},
{"yloc", fldoff(sct_y), NSC_YCOORD, 0, NULL, EF_BAD, NSC_CONST}, {"yloc", fldoff(sct_y), NSC_YCOORD, 0, NULL, EF_BAD, NSC_CONST},
{"des", fldoff(sct_type), NSC_CHAR, 0, NULL, EF_SECTOR_CHR, 0}, {"des", fldoff(sct_type), NSC_CHAR, 0, NULL, EF_SECTOR_CHR, 0},
{"effic", fldoff(sct_effic), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"effic", fldoff(sct_effic), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"mobil", fldoff(sct_mobil), NSC_SHORT, 0, NULL, EF_BAD, 0}, {"mobil", fldoff(sct_mobil), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"loyal", fldoff(sct_loyal), NSC_UCHAR, 0, NULL, EF_BAD, NSC_DEITY}, {"loyal", fldoff(sct_loyal), NSC_UCHAR, 0, NULL, EF_BAD, NSC_DEITY},
{"terr", 0, NSC_UCHAR, 0, nsc_sct_terr, EF_BAD, NSC_EXTRA}, {"terr", 0, NSC_UCHAR, 0, nsc_sct_terr, EF_BAD, NSC_EXTRA},