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

blnak line conflict?

This commit is contained in:
Enno Rehling 2019-04-03 18:24:42 +02:00
parent 53662878aa 3b1a615f25
commit 6351f04916
19 changed files with 2928 additions and 2870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/tests/e2/undead.lua
View File

@ -31,9 +31,15 @@ function test_undead_reserve_other()
u1.name = 'Xolgrim'
process_orders()
-- Intermittent Failure: expected 0 but was 2
if 0 ~= u1:get_item("log") then
-- try to catch that intermittent bug:
print(u1:show())
end
assert_equal(0, u1:get_item("log"))
if 2 ~= u2:get_item("log") then
-- try to catch that intermittent bug:
print(u2:show())
end
assert_equal(2, u2:get_item("log"))
end

5601
src/battle.c
View File

File diff suppressed because it is too large Load Diff

1
src/battle.h
View File

@ -121,7 +121,6 @@ extern "C" {
} battle;
typedef struct weapon {
int count, used;
const struct weapon_type *type;
int attackskill;
int defenseskill;

20
src/battle.test.c
View File

@ -96,6 +96,7 @@ static void test_make_fighter(CuTest * tc)
static void test_select_weapon_restricted(CuTest *tc) {
item_type *itype;
weapon_type * wtype;
unit *au;
fighter *af;
battle *b;
@ -104,7 +105,7 @@ static void test_select_weapon_restricted(CuTest *tc) {
test_setup();
au = test_create_unit(test_create_faction(NULL), test_create_plain(0, 0));
itype = test_create_itemtype("halberd");
new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE);
wtype = new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE);
i_change(&au->items, itype, 1);
rc = test_create_race("smurf");
CuAssertIntEquals(tc, 0, rc->mask_item & au->_race->mask_item);
@ -112,15 +113,15 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
itype->mask_deny = rc_mask(au->_race);
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 0, af->weapons[0].count);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[0].type);
free_battle(b);
itype->mask_deny = 0;
@ -128,9 +129,8 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertPtrEquals(tc, itype->rtype->wtype, (void *)af->weapons[0].type);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
itype->mask_deny = 0;
@ -138,7 +138,7 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 0, af->weapons[0].count);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[0].type);
free_battle(b);
itype->mask_deny = 0;
@ -146,8 +146,8 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
test_teardown();

3
src/bind_faction.c
View File

@ -383,7 +383,8 @@ static int tolua_faction_set_password(lua_State * L)
{
faction *self = (faction *)tolua_tousertype(L, 1, NULL);
const char * passw = tolua_tostring(L, 2, NULL);
faction_setpassword(self, password_hash(passw, PASSWORD_DEFAULT));
faction_setpassword(self,
passw ? password_hash(passw, PASSWORD_DEFAULT) : NULL);
return 0;
}

4
src/json.test.c
View File

@ -58,6 +58,7 @@ static cJSON *export_a_region(CuTest * tc, const struct terrain_type *terrain, r
int err;
region *r;
cJSON *json, *attr, *result, *regs;
size_t sz;
r = test_create_region(0, 0, terrain);
@ -65,7 +66,8 @@ static cJSON *export_a_region(CuTest * tc, const struct terrain_type *terrain, r
err = json_export(&out, EXPORT_REGIONS);
CuAssertIntEquals(tc, 0, err);
out.api->rewind(out.handle);
out.api->read(out.handle, buf, sizeof(buf));
sz = out.api->read(out.handle, buf, sizeof(buf));
buf[sz] = '\0';
mstream_done(&out);
json = cJSON_Parse(buf);

19
src/kernel/ally.c
View File

@ -28,6 +28,7 @@ typedef struct allies {
static void block_insert(allies *al, struct faction *f, int status) {
int i = al->num++;
assert(status > 0);
al->status[i] = status;
al->factions[i] = f;
/* TODO: heapify */
@ -46,7 +47,7 @@ static int block_search(allies *al, const struct faction *f) {
int allies_walk(struct allies *all, cb_allies_walk callback, void *udata)
{
allies *al;
allies *al;
for (al = all; al; al = al->next) {
int i;
for (i = 0; i != al->num; ++i) {
@ -94,13 +95,17 @@ void ally_set(allies **p_al, struct faction *f, int status)
return;
}
if (al->num < BLOCKSIZE) {
block_insert(al, f, status);
if (status > 0) {
block_insert(al, f, status);
}
return;
}
p_al = &al->next;
}
*p_al = calloc(1, sizeof(allies));
block_insert(*p_al, f, status);
if (status > 0) {
*p_al = calloc(1, sizeof(allies));
block_insert(*p_al, f, status);
}
}
void write_allies(gamedata * data, const allies *alist)
@ -112,6 +117,7 @@ void write_allies(gamedata * data, const allies *alist)
const faction * f = al->factions[i];
if (f && f->_alive) {
write_faction_reference(f, data->store);
assert(al->status[i] > 0);
WRITE_INT(data->store, al->status[i]);
}
}
@ -132,7 +138,10 @@ void read_allies(gamedata * data, allies **p_al)
f = findfaction(aid);
if (!f) f = faction_create(aid);
READ_INT(data->store, &status);
ally_set(p_al, f, status);
/* NB: some data files have allies with status=0 */
if (status > 0) {
ally_set(p_al, f, status);
}
}
}

26
src/kernel/ally.test.c
View File

@ -1,6 +1,7 @@
#include <platform.h>
#include "types.h"
#include "ally.h"
#include "faction.h"
#include <CuTest.h>
#include <tests.h>
@ -41,11 +42,36 @@ static void test_allies(CuTest *tc) {
test_teardown();
}
static void test_allies_set(CuTest *tc) {
struct faction *f1, *f2;
struct allies * al = NULL;
test_setup();
f1 = test_create_faction(NULL);
f2 = test_create_faction(NULL);
CuAssertPtrEquals(tc, NULL, al);
ally_set(&al, f1, HELP_ALL);
CuAssertPtrNotNull(tc, al);
ally_set(&al, f1, DONT_HELP);
CuAssertPtrEquals(tc, NULL, f1->allies);
ally_set(&al, f1, DONT_HELP);
CuAssertPtrEquals(tc, NULL, al);
ally_set(&al, f1, HELP_ALL);
ally_set(&al, f2, DONT_HELP);
ally_set(&al, f1, DONT_HELP);
CuAssertPtrEquals(tc, NULL, al);
test_teardown();
}
CuSuite *get_ally_suite(void)
{
CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_allies);
SUITE_ADD_TEST(suite, test_allies_clone);
SUITE_ADD_TEST(suite, test_allies_set);
return suite;
}

10
src/kernel/faction.c
View File

@ -299,7 +299,7 @@ unit *addplayer(region * r, faction * f)
} while (rc == NULL || urc == RC_DAEMON || !playerrace(rc));
u->irace = rc;
}
f->lastorders = 0;
return u;
}
@ -564,8 +564,12 @@ const char *faction_getpassword(const faction *f) {
void faction_setpassword(faction * f, const char *pwhash)
{
assert(pwhash);
f->password_id = dbstring_save(pwhash);
if (pwhash) {
f->password_id = dbstring_save(pwhash);
}
else {
f->password_id = 0;
}
}
bool valid_race(const struct faction *f, const struct race *rc)

3
src/kernel/gamedata.h
View File

@ -41,8 +41,9 @@
#define CRYPT_VERSION 363 /* passwords are encrypted */
#define FAMILIAR_FIXMAGE_VERSION 364 /* familiar links are fixed */
#define FAMILIAR_FIXSPELLBOOK_VERSION 365 /* familiar spells are fixed */
#define FIX_STARTLEVEL_VERSION 366 /* fixing resource startlevels */
#define RELEASE_VERSION FAMILIAR_FIXSPELLBOOK_VERSION /* current datafile */
#define RELEASE_VERSION FIX_STARTLEVEL_VERSION /* current datafile */
#define MIN_VERSION UIDHASH_VERSION /* minimal datafile we support */
#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */

6
src/kernel/save.c
View File

@ -630,6 +630,7 @@ static void fix_baselevel(region *r) {
}
}
}
}
}
@ -801,6 +802,11 @@ static region *readregion(gamedata *data, int x, int y)
}
}
read_attribs(data, &r->attribs, r);
if (r->resources && data->version < FIX_STARTLEVEL_VERSION) {
/* we had some badly made rawmaterials before this */
fix_baselevel(r);
}
return r;
}

2
src/kernel/version.c
View File

@ -8,7 +8,7 @@
#ifndef ERESSEA_VERSION
/* the version number, if it was not passed to make with -D */
#define ERESSEA_VERSION "3.19.0"
#define ERESSEA_VERSION "3.20.0"
#endif
const char *eressea_version(void) {

2
src/laws.c
View File

@ -3205,7 +3205,7 @@ static int faction_getmages(faction * f, unit ** results, int numresults)
for (u = f->units; u; u = u->nextF) {
if (u->number > 0) {
struct sc_mage * mage = get_mage(u);
if (mage && mage_get_spellbook(mage)) {
if (mage) {
int level = effskill(u, SK_MAGIC, NULL);
if (level > maxlevel) {
maxlevel = level;

22
src/races/dragons.c
View File

@ -27,26 +27,26 @@ static int age_chance(int a, int b, int p) {
return (r < 0) ? 0 : r;
}
#define DRAGONAGE 27
#define WYRMAGE 68
#define DRAGONAGE 27
#define WYRMAGE 68
static void evolve_dragon(unit * u, const struct race *rc) {
scale_number(u, 1);
u_setrace(u, rc);
u->irace = NULL;
u->hp = unit_max_hp(u);
}
void age_firedragon(unit * u)
{
if (u->number > 0 && rng_int() % 100 < age_chance(u->age, DRAGONAGE, 1)) {
double q = (double)u->hp / (double)(unit_max_hp(u) * u->number);
u_setrace(u, get_race(RC_DRAGON));
u->irace = NULL;
scale_number(u, 1);
u->hp = (int)(unit_max_hp(u) * u->number * q);
evolve_dragon(u, get_race(RC_DRAGON));
}
}
void age_dragon(unit * u)
{
if (u->number > 0 && rng_int() % 100 < age_chance(u->age, WYRMAGE, 1)) {
double q = (double)u->hp / (double)(unit_max_hp(u) * u->number);
u_setrace(u, get_race(RC_WYRM));
u->irace = NULL;
u->hp = (int)(unit_max_hp(u) * u->number * q);
evolve_dragon(u, get_race(RC_WYRM));
}
}

4
src/report.c
View File

@ -1509,7 +1509,7 @@ static int show_allies_cb(struct allies *all, faction *af, int status, void *uda
if ((mode & HELP_ALL) == HELP_ALL) {
sbs_strcat(sbp, LOC(f->locale, parameters[P_ANY]));
}
else {
else if (mode > 0) {
int h, hh = 0;
for (h = 1; h <= HELP_TRAVEL; h *= 2) {
int p = MAXPARAMS;
@ -2173,8 +2173,8 @@ report_plaintext(const char *filename, report_context * ctx,
if (wants_stats && r->seen.mode >= seen_travel) {
if (r->land || r->seen.mode >= seen_unit) {
newline(out);
statistics(out, r, f);
newline(out);
}
}

6
src/reports.c
View File

@ -144,8 +144,6 @@ bool omniscient(const faction *f)
return (f->race == rc_template);
}
static char *groupid(const struct group *g, const struct faction *f)
{
typedef char name[OBJECTIDSIZE + 1];
@ -1603,7 +1601,9 @@ int write_reports(faction * f)
if (noreports) {
return false;
}
if (f->lastorders == 0) {
if (f->lastorders == 0 || f->age <= 1) {
/* neue Parteien, oder solche die noch NIE einen Zug gemacht haben,
* kriegen ein neues Passwort: */
password = faction_genpassword(f, buffer);
}
prepare_report(&ctx, f, password);

1
src/reports.test.c
View File

@ -963,6 +963,7 @@ static void test_reports_genpassword(CuTest *tc) {
CuAssertTrue(tc, f->password_id != 0);
test_clear_messagelist(&f->msgs);
f->lastorders = 1;
f->age = 2;
pwid = f->password_id;
write_reports(f);
CuAssertIntEquals(tc, pwid, f->password_id);

56
src/spells/combatspells.c
View File

@ -298,35 +298,35 @@ int sp_combatrosthauch(struct castorder * co)
for (w = 0; df->weapons[w].type != NULL; ++w) {
weapon *wp = df->weapons;
int n = force;
if (n > wp->used) n = wp->used;
if (n) {
requirement *mat = wp->type->itype->construction->materials;
bool iron = false;
while (mat && mat->number > 0) {
if (mat->rtype == get_resourcetype(R_IRON)) {
iron = true;
break;
}
mat++;
}
if (iron) {
int p;
force -= n;
wp->used -= n;
k += n;
i_change(&df->unit->items, wp->type->itype, -n);
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].missile == wp) {
df->person[p].missile = NULL;
--n;
}
}
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].melee == wp) {
df->person[p].melee = NULL;
--n;
if (df->unit->items && force > 0) {
item ** itp = i_find(&df->unit->items, wp->type->itype);
if (*itp) {
item *it = *itp;
requirement *mat = wp->type->itype->construction->materials;
int n = force;
if (it->number < n) n = it->number;
while (mat && mat->number > 0) {
if (mat->rtype == get_resourcetype(R_IRON)) {
int p;
force -= n;
k += n;
i_change(itp, wp->type->itype, -n);
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].melee == wp) {
df->person[p].melee = NULL;
--n;
}
}
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].missile == wp) {
df->person[p].missile = NULL;
--n;
}
}
break;
}
mat++;
}
}
}

2
src/util/base36.c
View File

@ -88,7 +88,7 @@ const char *itoab_r(int i, int base, char *s, size_t len)
}
}
else {
log_error("static buffer exhauset, itoab(%d, %d)", i, base);
log_error("static buffer exhausted, itoab(%d, %d)", i, base);
assert(i == 0 || !"itoab: static buffer exhausted");
}
}