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

Merge branch 'develop' into order_id

This commit is contained in:
Enno Rehling 2017-11-19 03:21:02 +01:00
parent 50e242b810 c39708f40c
commit 9c44c1ce63
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/save.c
View File

@ -509,7 +509,7 @@ unit *read_unit(gamedata *data)
u_setrace(u, rc);
READ_TOK(data->store, rname, sizeof(rname));
if (rname[0] && skill_enabled(SK_STEALTH))
if (rname[0])
u->irace = rc_find(rname);
else
u->irace = NULL;

9
src/kernel/save.test.c
View File

@ -1,5 +1,6 @@
#include <platform.h>
#include <kernel/config.h>
#include <kernel/race.h>
#include <util/attrib.h>
#include <util/gamedata.h>
#include <attributes/key.h>
@ -51,6 +52,7 @@ static void test_readwrite_unit(CuTest * tc)
struct unit *u;
struct region *r;
struct faction *f;
struct race *irace;
int fno;
test_setup();
@ -60,6 +62,12 @@ static void test_readwrite_unit(CuTest * tc)
u = test_create_unit(f, r);
unit_setname(u, " Hodor ");
CuAssertStrEquals(tc, " Hodor ", u->_name);
enable_skill(SK_STEALTH, false);
irace = test_create_race("halfling");
CuAssertTrue(tc, playerrace(irace));
u->irace = irace;
CuAssertTrue(tc, irace == u_irace(u));
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);
write_unit(&data, u);
@ -74,6 +82,7 @@ static void test_readwrite_unit(CuTest * tc)
CuAssertPtrNotNull(tc, u);
CuAssertPtrEquals(tc, f, u->faction);
CuAssertStrEquals(tc, "Hodor", u->_name);
CuAssertTrue(tc, irace == u_irace(u));
CuAssertPtrEquals(tc, 0, u->region);
mstream_done(&data.strm);

2
src/kernel/unit.c
View File

@ -1063,7 +1063,7 @@ void clone_men(const unit * u, unit * dst, int n)
transfer_curse(u, dst, n);
}
set_number(dst, dst->number + n);
dst->hp += u->hp * n / u->number;
dst->hp += (long)u->hp * n / u->number;
assert(dst->hp >= dst->number);
/* TODO: Das ist schnarchlahm! und gehoert nicht hierhin */
a = a_find(dst->attribs, &at_effect);

21
src/kernel/unit.test.c
View File

@ -544,6 +544,25 @@ static void test_unlimited_units(CuTest *tc) {
test_cleanup();
}
static void test_clone_men_bug_2386(CuTest *tc) {
unit *u1, *u2;
region *r;
faction *f;
test_setup();
r = test_create_region(0, 0, NULL);
f = test_create_faction(NULL);
u1 = test_create_unit(f, r);
scale_number(u1, 8237);
u1->hp = 39 * u1->number;
u2 = test_create_unit(f, r);
scale_number(u2, 0);
clone_men(u1, u2, 8100);
CuAssertIntEquals(tc, 8100, u2->number);
CuAssertIntEquals(tc, u2->number * 39, u2->hp);
test_cleanup();
}
static void test_clone_men(CuTest *tc) {
unit *u1, *u2;
region *r;
@ -598,6 +617,8 @@ CuSuite *get_unit_suite(void)
SUITE_ADD_TEST(suite, test_update_monster_name);
SUITE_ADD_TEST(suite, test_clone_men);
SUITE_ADD_TEST(suite, test_transfermen);
SUITE_ADD_TEST(suite, test_clone_men_bug_2386);
SUITE_ADD_TEST(suite, test_transfermen);
SUITE_ADD_TEST(suite, test_remove_unit);
SUITE_ADD_TEST(suite, test_remove_empty_units);
SUITE_ADD_TEST(suite, test_remove_units_without_faction);