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

- bugfix broken subset-selection 

- bugfix lighthouse-update
This commit is contained in:
Enno Rehling 2005-12-11 15:39:53 +00:00
parent b2bd092252
commit d187097fad
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ equip_unit(struct unit * u, const struct equipment * eq)
int i; int i;
for (i=0;eq->subsets[i].sets;++i) { for (i=0;eq->subsets[i].sets;++i) {
if (chance(eq->subsets[i].chance)) { if (chance(eq->subsets[i].chance)) {
float rnd = 1000.0f / (1+rand() % 1000); float rnd = (1+rand() % 1000) / 1000.0f;
int k; int k;
for (k=0;eq->subsets[i].sets[k].set;++k) { for (k=0;eq->subsets[i].sets[k].set;++k) {
if (rnd<=eq->subsets[i].sets[k].chance) { if (rnd<=eq->subsets[i].sets[k].chance) {
@ -172,7 +172,7 @@ equip_items(struct item ** items, const struct equipment * eq)
int i; int i;
for (i=0;eq->subsets[i].sets;++i) { for (i=0;eq->subsets[i].sets;++i) {
if (chance(eq->subsets[i].chance)) { if (chance(eq->subsets[i].chance)) {
float rnd = 1000.0f / (1+rand() % 1000); float rnd = (1+rand() % 1000) / 1000.0f;
int k; int k;
for (k=0;eq->subsets[i].sets[k].set;++k) { for (k=0;eq->subsets[i].sets[k].set;++k) {
if (rnd<=eq->subsets[i].sets[k].chance) { if (rnd<=eq->subsets[i].sets[k].chance) {

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

@ -1172,11 +1172,15 @@ update_lighthouse(building * lh)
region * r = lh->region; region * r = lh->region;
short d = (short)log10(lh->size) + 1; short d = (short)log10(lh->size) + 1;
short x, y; short x, y;
static const struct building_type * bt_lighthouse; static boolean init_lighthouse = false;
if (!bt_lighthouse) bt_lighthouse = bt_find("lighthouse"); static const struct building_type * bt_lighthouse = 0;
assert(bt_lighthouse);
if (lh->type!=bt_lighthouse) return; if (!init_lighthouse) {
bt_lighthouse = bt_find("lighthouse");
init_lighthouse = true;
}
if (bt_lighthouse==NULL || lh->type!=bt_lighthouse) return;
for (x=-d;x<=d;++x) { for (x=-d;x<=d;++x) {
for (y=-d;y<=d;++y) { for (y=-d;y<=d;++y) {