Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

count_unit(u) bestimmt, welche einheiten zum partei-limit gezaehlt werden. Das sollten alle sein, sind's aber vorlaeufig nicht. 

ausserdem ein bischen code-cleanup.
This commit is contained in:
Enno Rehling 2006-07-29 14:04:49 +00:00
parent 80e445fe96
commit 7b76da7c39
7 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/gamecode/laws.c
View File

@ -3411,13 +3411,13 @@ new_units (void)
int g, alias; int g, alias;
order ** newordersp; order ** newordersp;
if (checkunitnumber(u->faction, 1) == false) { if (!checkunitnumber(u->faction, 1)) {
if (global.unitsperalliance == false) { if (global.unitsperalliance) {
ADDMSG(&u->faction->msgs, msg_message("too_many_units_in_faction", ADDMSG(&u->faction->msgs, msg_message("too_many_units_in_alliance",
"command unit region allowed", "command unit region allowed",
makeord, u, r, maxunits(u->faction))); makeord, u, r, maxunits(u->faction)));
} else { } else {
ADDMSG(&u->faction->msgs, msg_message("too_many_units_in_alliance", ADDMSG(&u->faction->msgs, msg_message("too_many_units_in_faction",
"command unit region allowed", "command unit region allowed",
makeord, u, r, maxunits(u->faction))); makeord, u, r, maxunits(u->faction)));
} }

2
src/common/kernel/faction.c
View File

@ -126,7 +126,7 @@ addfaction(const char *email, const char * password,
f->locale = loc; f->locale = loc;
f->subscription = subscription; f->subscription = subscription;
f->options = Pow(O_REPORT) | Pow(O_ZUGVORLAGE) | Pow(O_SILBERPOOL) | Pow(O_COMPUTER) | Pow(O_COMPRESS) | Pow(O_ADRESSEN) | Pow(O_STATISTICS); f->options = want(O_REPORT) | want(O_ZUGVORLAGE) | want(O_SILBERPOOL) | want(O_COMPUTER) | want(O_COMPRESS) | want(O_ADRESSEN) | want(O_STATISTICS);
f->no = unused_faction_id(); f->no = unused_faction_id();
addlist(&factions, f); addlist(&factions, f);

2
src/common/kernel/reports.c
View File

@ -718,7 +718,7 @@ spskill(char * buffer, size_t size, const struct locale * lang, const struct uni
size -= rsize; size -= rsize;
bufp += rsize; bufp += rsize;
if(u->faction->options & Pow(O_SHOWSKCHANGE)) { if (u->faction->options & want(O_SHOWSKCHANGE)) {
skill *skill = get_skill(u, sk); skill *skill = get_skill(u, sk);
int oldeff = 0; int oldeff = 0;
int diff; int diff;

12
src/common/kernel/save.c
View File

@ -1002,9 +1002,9 @@ readunit(FILE * F)
u_setfaction(u, findfaction(MONSTER_FACTION)); u_setfaction(u, findfaction(MONSTER_FACTION));
set_number(u, 0); set_number(u, 0);
} }
if (playerrace(u->race)) {
u->faction->no_units++; if (count_unit(u)) u->faction->no_units++;
}
set_number(u, number); set_number(u, number);
u->building = findbuilding(rid(F)); u->building = findbuilding(rid(F));
u->ship = findship(rid(F)); u->ship = findship(rid(F));
@ -1561,9 +1561,9 @@ readfaction(FILE * F)
i = f->options = ri(F); i = f->options = ri(F);
if ((i & ((1<<O_REPORT)|(1<<O_COMPUTER)))==0 && f->no!=MONSTER_FACTION) { if ((i & (want(O_REPORT)|want(O_COMPUTER)))==0 && f->no!=MONSTER_FACTION) {
/* Kein Report eingestellt, Fehler */ /* Kein Report eingestellt, Fehler */
f->options = f->options | Pow(O_REPORT) | Pow(O_ZUGVORLAGE); f->options = f->options | want(O_REPORT) | want(O_ZUGVORLAGE);
} }
if (global.data_version < TYPES_VERSION) { if (global.data_version < TYPES_VERSION) {
@ -1650,7 +1650,7 @@ writefaction(FILE * F, const faction * f)
wi(F, ur->y); wi(F, ur->y);
} }
wnl(F); wnl(F);
wi(F, f->options & ~Pow(O_DEBUG)); wi(F, f->options & ~want(O_DEBUG));
wnl(F); wnl(F);
for (sf = f->allies; sf; sf = sf->next) { for (sf = f->allies; sf; sf = sf->next) {

4
src/common/kernel/unit.c
View File

@ -904,9 +904,7 @@ u_setfaction(unit * u, faction * f)
if (u->faction) { if (u->faction) {
unit ** iunit; unit ** iunit;
set_number(u, 0); set_number(u, 0);
if (playerrace(u->race)) {
--u->faction->no_units; --u->faction->no_units;
}
join_group(u, NULL); join_group(u, NULL);
free_orders(&u->orders); free_orders(&u->orders);
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
@ -932,11 +930,9 @@ u_setfaction(unit * u, faction * f)
if (u->region) update_interval(f, u->region); if (u->region) update_interval(f, u->region);
if (cnt && f) { if (cnt && f) {
set_number(u, cnt); set_number(u, cnt);
if (playerrace(u->race)) {
++f->no_units; ++f->no_units;
} }
} }
}
/* vorsicht Sprüche können u->number == RS_FARVISION haben! */ /* vorsicht Sprüche können u->number == RS_FARVISION haben! */
void void

2
src/mapper/mapper.c
View File

@ -1520,7 +1520,7 @@ makemonsters(void)
f->locale=default_locale; f->locale=default_locale;
factions=f; factions=f;
f->options = Pow(O_REPORT); f->options = want(O_REPORT);
f->no=MONSTER_FACTION; f->no=MONSTER_FACTION;
f->subscription = 0; f->subscription = 0;
f->name=strdup("Monster"); f->name=strdup("Monster");