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

Merge branch 'develop' of github.com:eressea/server into develop

This commit is contained in:
Enno Rehling 2015-08-06 19:54:51 +02:00
parent 2305466853 01649ce682
commit c0a760a645
46 changed files with 888 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,6 +11,7 @@ addons:
- libncurses5-dev - libncurses5-dev
- libsqlite3-dev - libsqlite3-dev
- libxml2-dev - libxml2-dev
- valgrind
os: os:
- linux - linux
- osx - osx

11
res/core/messages.xml
View File

@ -2830,17 +2830,6 @@
<text locale="de">"$unit($unit) in $region($region) produziert $int($amount)$if($eq($wanted,$amount),""," von $int($wanted)") $resource($resource,$wanted)."</text> <text locale="de">"$unit($unit) in $region($region) produziert $int($amount)$if($eq($wanted,$amount),""," von $int($wanted)") $resource($resource,$wanted)."</text>
<text locale="en">"$unit($unit) in $region($region) produces $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") $resource($resource,$amount)."</text> <text locale="en">"$unit($unit) in $region($region) produces $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") $resource($resource,$amount)."</text>
</message> </message>
<message name="manufacture" section="production">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="amount" type="int"/>
<arg name="wanted" type="int"/>
<arg name="resource" type="resource"/>
</type>
<text locale="de">"$unit($unit) in $region($region) produziert $int($amount)$if($eq($wanted,$amount),""," von $int($wanted)") $resource($resource,$wanted)."</text>
<text locale="en">"$unit($unit) in $region($region) produces $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") $resource($resource,$amount)."</text>
</message>
<message name="buildbuilding" section="production"> <message name="buildbuilding" section="production">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>

2
s/travis-build
View File

@ -16,3 +16,5 @@ s/build
cd $ROOT cd $ROOT
inifile inifile
s/runtests s/runtests
cd tests
./write-reports.sh

2
scripts/eressea/jsreport.lua
View File

@ -1,7 +1,5 @@
local pkg = {} local pkg = {}
print("loading jsreport module")
function pkg.init() function pkg.init()
eressea.settings.set("feature.jsreport.enable", "1") eressea.settings.set("feature.jsreport.enable", "1")
end end

1
scripts/tests/e3/rules.lua
View File

@ -460,7 +460,6 @@ function test_canoe_passes_through_land()
u1:add_order("NACH O O O") u1:add_order("NACH O O O")
process_orders() process_orders()
assert_equal(land, u2.region, "canoe did not stop at coast") assert_equal(land, u2.region, "canoe did not stop at coast")
u1:add_order("NACH O O O")
process_orders() process_orders()
assert_equal(dst, sh.region, "canoe could not leave coast") assert_equal(dst, sh.region, "canoe could not leave coast")
assert_equal(dst, u1.region, "canoe could not leave coast") assert_equal(dst, u1.region, "canoe could not leave coast")

1
scripts/tests/e3/spells.lua
View File

@ -58,7 +58,6 @@ function test_magic()
u:add_spell("protective_runes") u:add_spell("protective_runes")
u:add_spell("analyze_magic") u:add_spell("analyze_magic")
u:clear_orders() u:clear_orders()
u:add_order("ZAUBERE \"Runen des Schutzes\" BURG " .. itoa36(b.id));
u.building = b u.building = b
u:add_order("ZAUBERE \"Magie analysieren\" BURG " .. itoa36(b.id)); u:add_order("ZAUBERE \"Magie analysieren\" BURG " .. itoa36(b.id));
process_orders() process_orders()

69
scripts/tests/study.lua
View File

@ -6,13 +6,19 @@ function setup()
conf = [[{ conf = [[{
"races" : { "human" : {} }, "races" : { "human" : {} },
"terrains" : { "plain" : { "flags" : [ "land" ] } }, "terrains" : { "plain" : { "flags" : [ "land" ] } },
"keywords" : { "de" : { "study": "LERNEN" } }, "keywords" : { "de" : { "study": "LERNEN", "teach": "LEHREN" } },
"skills" : { "de": { "alchemy" : "Alchemie", "crossbow" : "Armbrust" } }, "skills" : { "de": {
"tactics" : "Taktik",
"alchemy" : "Alchemie",
"crossbow" : "Armbrust"
} },
"spells" : { "fireball" : { "syntax" : "u+" } } "spells" : { "fireball" : { "syntax" : "u+" } }
}]] }]]
eressea.game.reset() eressea.game.reset()
eressea.config.reset(); eressea.config.reset();
eressea.settings.set('rules.magic.playerschools', '') eressea.settings.set('rules.magic.playerschools', '')
eressea.settings.set("rules.economy.food", "4")
eressea.settings.set('study.random_progress', '0')
eressea.config.parse(conf) eressea.config.parse(conf)
end end
@ -51,3 +57,62 @@ function test_unit_spells()
assert_equal("fireball", sp.name) assert_equal("fireball", sp.name)
assert_equal(2, sp.level) assert_equal(2, sp.level)
end end
local function make_teacher(student, f, skill)
f = f or student.faction
local u = unit.create(f, student.region, 1)
u:clear_orders()
u:add_order("LEHRE " .. itoa36(student.id))
u:set_skill(skill or "crossbow", 10)
return u
end
local function make_student(f, r, num, skill)
local u = unit.create(f, r, num or 1)
u:clear_orders()
u:add_order("LERNE " .. (skill or "Armbrust"))
return u
end
function test_study_no_teacher()
local r = region.create(0, 0, "plain")
local f = faction.create("test@example.com", "human", "de")
local u1 = make_student(f, r, 1)
u1:set_skill("crossbow", 1)
process_orders()
assert_equal(1, u1:get_skill("crossbow"))
end
function test_study_with_teacher()
local r = region.create(0, 0, "plain")
local f = faction.create("test@example.com", "human", "de")
local u1 = make_student(f, r, 1)
make_teacher(u1)
u1:set_skill("crossbow", 1)
process_orders()
assert_equal(2, u1:get_skill("crossbow"))
end
function test_study_too_many_students()
local r = region.create(0, 0, "plain")
local f = faction.create("test@example.com", "human", "de")
local u1 = make_student(f, r, 20, "Taktik")
u1.name = "Student"
u1:add_item("money", 201*u1.number)
make_teacher(u1, f, "tactics")
process_orders()
assert_equal(u1.number, u1:get_item("money"))
end
function test_study_multiple_teachers()
local r = region.create(0, 0, "plain")
local f = faction.create("test@example.com", "human", "de")
local u1 = make_student(f, r, 20, "Taktik")
u1.name = "Student"
u1:add_item("money", 201*u1.number)
make_teacher(u1, f, "tactics")
make_teacher(u1, f, "tactics")
process_orders()
assert_equal(u1.number, u1:get_item("money"))
end

1
src/CMakeLists.txt
View File

@ -193,6 +193,7 @@ set(TESTS_SRC
skill.test.c skill.test.c
spells.test.c spells.test.c
spy.test.c spy.test.c
study.test.c
upkeep.test.c upkeep.test.c
spells/magicresistance.test.c spells/magicresistance.test.c
${ATTRIBUTES_TESTS} ${ATTRIBUTES_TESTS}

2
src/battle.c
View File

@ -3231,7 +3231,7 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
} }
/* Illusionen und Zauber kaempfen nicht */ /* Illusionen und Zauber kaempfen nicht */
if (fval(u_race(u), RCF_ILLUSIONARY) || idle(u->faction) || u->number == 0) { if (fval(u_race(u), RCF_ILLUSIONARY) || u->number == 0) {
return NULL; return NULL;
} }
if (s1 == NULL) { if (s1 == NULL) {

2
src/bind_process.c
View File

@ -159,7 +159,7 @@ void process_quit(void) {
void process_study(void) { void process_study(void) {
process_cmd(K_TEACH, teach_cmd, PROC_LONG_ORDER); process_cmd(K_TEACH, teach_cmd, PROC_LONG_ORDER);
process_cmd(K_STUDY, learn_cmd, PROC_LONG_ORDER); process_cmd(K_STUDY, study_cmd, PROC_LONG_ORDER);
} }
void process_movement(void) { void process_movement(void) {

165
src/creport.c
View File

@ -68,6 +68,7 @@ without prior permission by the authors of Eressea.
#include <util/message.h> #include <util/message.h>
#include <util/nrmessage.h> #include <util/nrmessage.h>
#include <quicklist.h> #include <quicklist.h>
#include <filestream.h>
/* libc includes */ /* libc includes */
#include <assert.h> #include <assert.h>
@ -176,7 +177,7 @@ static void print_items(FILE * F, item * items, const struct locale *lang)
} }
static void static void
cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t typ) cr_output_curses(stream *out, const faction * viewer, const void *obj, objtype_t typ)
{ {
bool header = false; bool header = false;
attrib *a = NULL; attrib *a = NULL;
@ -258,10 +259,10 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
char buf[BUFFERSIZE]; char buf[BUFFERSIZE];
if (!header) { if (!header) {
header = 1; header = 1;
fputs("EFFECTS\n", F); stream_printf(out, "EFFECTS\n");
} }
nr_render(msg, viewer->locale, buf, sizeof(buf), viewer); nr_render(msg, viewer->locale, buf, sizeof(buf), viewer);
fprintf(F, "\"%s\"\n", buf); stream_printf(out, "\"%s\"\n", buf);
msg_release(msg); msg_release(msg);
} }
a = a->next; a = a->next;
@ -272,9 +273,9 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
const char *key = resourcename(data->type->itype->rtype, 0); const char *key = resourcename(data->type->itype->rtype, 0);
if (!header) { if (!header) {
header = 1; header = 1;
fputs("EFFECTS\n", F); stream_printf(out, "EFFECTS\n");
} }
fprintf(F, "\"%d %s\"\n", data->value, translate(key, stream_printf(out, "\"%d %s\"\n", data->value, translate(key,
LOC(default_locale, key))); LOC(default_locale, key)));
} }
a = a->next; a = a->next;
@ -285,6 +286,13 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
} }
} }
static void cr_output_curses_compat(FILE *F, const faction * viewer, const void *obj, objtype_t typ) {
// TODO: eliminate this function
stream strm;
fstream_init(&strm, F);
cr_output_curses(&strm, viewer, obj, typ);
}
static int cr_unit(variant var, char *buffer, const void *userdata) static int cr_unit(variant var, char *buffer, const void *userdata)
{ {
unit *u = (unit *)var.v; unit *u = (unit *)var.v;
@ -636,7 +644,7 @@ faction * f)
fprintf(F, "%d;Partei\n", fno); fprintf(F, "%d;Partei\n", fno);
if (b->besieged) if (b->besieged)
fprintf(F, "%d;Belagerer\n", b->besieged); fprintf(F, "%d;Belagerer\n", b->besieged);
cr_output_curses(F, f, b, TYP_BUILDING); cr_output_curses_compat(F, f, b, TYP_BUILDING);
} }
/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
@ -682,30 +690,22 @@ const faction * f, const region * r)
if (w != NODIRECTION) if (w != NODIRECTION)
fprintf(F, "%d;Kueste\n", w); fprintf(F, "%d;Kueste\n", w);
cr_output_curses(F, f, sh, TYP_SHIP); cr_output_curses_compat(F, f, sh, TYP_SHIP);
} }
static void static int stream_order(stream *out, const struct order *ord) {
fwriteorder(FILE * F, const struct order *ord, const struct locale *lang, const char *str;
bool escape)
{
char ebuf[1025]; char ebuf[1025];
char obuf[1024]; char obuf[1024];
const char *str = obuf;
fputc('"', F);
write_order(ord, obuf, sizeof(obuf)); write_order(ord, obuf, sizeof(obuf));
if (escape) {
str = escape_string(obuf, ebuf, sizeof(ebuf)); str = escape_string(obuf, ebuf, sizeof(ebuf));
if (str == ebuf) { if (str == ebuf) {
ebuf[1024] = 0; ebuf[1024] = 0;
} }
} return stream_printf(out, "\"%s\"\n", str);
if (str[0])
fputs(str, F);
fputc('"', F);
} }
static void cr_output_spells(FILE * F, const unit * u, int maxlevel) static void cr_output_spells(stream *out, const unit * u, int maxlevel)
{ {
spellbook * book = unit_get_spellbook(u); spellbook * book = unit_get_spellbook(u);
@ -720,17 +720,20 @@ static void cr_output_spells(FILE * F, const unit * u, int maxlevel)
spell * sp = sbe->sp; spell * sp = sbe->sp;
const char *name = translate(mkname("spell", sp->sname), spell_name(sp, f->locale)); const char *name = translate(mkname("spell", sp->sname), spell_name(sp, f->locale));
if (!header) { if (!header) {
fputs("SPRUECHE\n", F); stream_printf(out, "SPRUECHE\n");
header = 1; header = 1;
} }
fprintf(F, "\"%s\"\n", name); stream_printf(out, "\"%s\"\n", name);
} }
} }
} }
} }
/* prints all that belongs to a unit */ /** prints all that belongs to a unit
static void cr_output_unit(FILE * F, const region * r, const faction * f, /* observers faction */ * @param f observers faction
* @param u unit to report
*/
void cr_output_unit(stream *out, const region * r, const faction * f,
const unit * u, int mode) const unit * u, int mode)
{ {
/* Race attributes are always plural and item attributes always /* Race attributes are always plural and item attributes always
@ -751,7 +754,7 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
const char *prefix; const char *prefix;
assert(u && u->number); assert(u && u->number);
if (u != NULL || fval(u_race(u), RCF_INVISIBLE)) if (fval(u_race(u), RCF_INVISIBLE))
return; return;
if (!init) { if (!init) {
@ -763,11 +766,11 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
itemcloak = cu && curse_active(cu); itemcloak = cu && curse_active(cu);
} }
fprintf(F, "EINHEIT %d\n", u->no); stream_printf(out, "EINHEIT %d\n", u->no);
fprintf(F, "\"%s\";Name\n", unit_getname(u)); stream_printf(out, "\"%s\";Name\n", unit_getname(u));
str = u_description(u, f->locale); str = u_description(u, f->locale);
if (str) { if (str) {
fprintf(F, "\"%s\";Beschr\n", str); stream_printf(out, "\"%s\";Beschr\n", str);
} }
/* print faction information */ /* print faction information */
sf = visible_faction(f, u); sf = visible_faction(f, u);
@ -784,41 +787,41 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
a = a_find(u->attribs, &at_group); a = a_find(u->attribs, &at_group);
if (a != NULL) { if (a != NULL) {
const group *g = (const group *)a->data.v; const group *g = (const group *)a->data.v;
fprintf(F, "%d;gruppe\n", g->gid); stream_printf(out, "%d;gruppe\n", g->gid);
} }
fprintf(F, "%d;Partei\n", u->faction->no); stream_printf(out, "%d;Partei\n", u->faction->no);
if (sf != u->faction) if (sf != u->faction)
fprintf(F, "%d;Verkleidung\n", sf->no); stream_printf(out, "%d;Verkleidung\n", sf->no);
if (fval(u, UFL_ANON_FACTION)) if (fval(u, UFL_ANON_FACTION))
fprintf(F, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION))); stream_printf(out, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION)));
if (otherfaction) { if (otherfaction) {
if (otherfaction != u->faction) { if (otherfaction != u->faction) {
fprintf(F, "%d;Anderepartei\n", otherfaction->no); stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
} }
} }
mage = get_familiar_mage(u); mage = get_familiar_mage(u);
if (mage) { if (mage) {
fprintf(F, "%u;familiarmage\n", mage->no); stream_printf(out, "%u;familiarmage\n", mage->no);
} }
} }
else { else {
if (fval(u, UFL_ANON_FACTION)) { if (fval(u, UFL_ANON_FACTION)) {
/* faction info is hidden */ /* faction info is hidden */
fprintf(F, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION))); stream_printf(out, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION)));
} }
else { else {
const attrib *a_otherfaction = a_find(u->attribs, &at_otherfaction); const attrib *a_otherfaction = a_find(u->attribs, &at_otherfaction);
const faction *otherfaction = const faction *otherfaction =
a_otherfaction ? get_otherfaction(a_otherfaction) : NULL; a_otherfaction ? get_otherfaction(a_otherfaction) : NULL;
/* other unit. show visible faction, not u->faction */ /* other unit. show visible faction, not u->faction */
fprintf(F, "%d;Partei\n", sf->no); stream_printf(out, "%d;Partei\n", sf->no);
if (sf == f) { if (sf == f) {
fprintf(F, "1;Verraeter\n"); stream_printf(out, "1;Verraeter\n");
} }
if (a_otherfaction) { if (a_otherfaction) {
if (otherfaction != u->faction) { if (otherfaction != u->faction) {
if (alliedunit(u, f, HELP_FSTEALTH)) { if (alliedunit(u, f, HELP_FSTEALTH)) {
fprintf(F, "%d;Anderepartei\n", otherfaction->no); stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
} }
} }
} }
@ -826,53 +829,53 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
} }
if (prefix) { if (prefix) {
prefix = mkname("prefix", prefix); prefix = mkname("prefix", prefix);
fprintf(F, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale, stream_printf(out, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale,
prefix))); prefix)));
} }
if (u->faction != f && a_fshidden if (u->faction != f && a_fshidden
&& a_fshidden->data.ca[0] == 1 && effskill(u, SK_STEALTH) >= 6) { && a_fshidden->data.ca[0] == 1 && effskill(u, SK_STEALTH) >= 6) {
fprintf(F, "-1;Anzahl\n"); stream_printf(out, "-1;Anzahl\n");
} }
else { else {
fprintf(F, "%d;Anzahl\n", u->number); stream_printf(out, "%d;Anzahl\n", u->number);
} }
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
fprintf(F, "\"%s\";Typ\n", pzTmp); stream_printf(out, "\"%s\";Typ\n", pzTmp);
if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) { if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) {
const char *zRace = rc_name_s(u_race(u), NAME_PLURAL); const char *zRace = rc_name_s(u_race(u), NAME_PLURAL);
fprintf(F, "\"%s\";wahrerTyp\n", stream_printf(out, "\"%s\";wahrerTyp\n",
translate(zRace, LOC(f->locale, zRace))); translate(zRace, LOC(f->locale, zRace)));
} }
} }
else { else {
const race *irace = u_irace(u); const race *irace = u_irace(u);
const char *zRace = rc_name_s(irace, NAME_PLURAL); const char *zRace = rc_name_s(irace, NAME_PLURAL);
fprintf(F, "\"%s\";Typ\n", stream_printf(out, "\"%s\";Typ\n",
translate(zRace, LOC(f->locale, zRace))); translate(zRace, LOC(f->locale, zRace)));
if (u->faction == f && irace != u_race(u)) { if (u->faction == f && irace != u_race(u)) {
assert(skill_enabled(SK_STEALTH) assert(skill_enabled(SK_STEALTH)
|| !"we're resetting this on load, so.. ircase should never be used"); || !"we're resetting this on load, so.. ircase should never be used");
zRace = rc_name_s(u_race(u), NAME_PLURAL); zRace = rc_name_s(u_race(u), NAME_PLURAL);
fprintf(F, "\"%s\";wahrerTyp\n", stream_printf(out, "\"%s\";wahrerTyp\n",
translate(zRace, LOC(f->locale, zRace))); translate(zRace, LOC(f->locale, zRace)));
} }
} }
if (u->building) { if (u->building) {
assert(u->building->region); assert(u->building->region);
fprintf(F, "%d;Burg\n", u->building->no); stream_printf(out, "%d;Burg\n", u->building->no);
} }
if (u->ship) { if (u->ship) {
assert(u->ship->region); assert(u->ship->region);
fprintf(F, "%d;Schiff\n", u->ship->no); stream_printf(out, "%d;Schiff\n", u->ship->no);
} }
if (is_guard(u, GUARD_ALL) != 0) { if (is_guard(u, GUARD_ALL) != 0) {
fprintf(F, "%d;bewacht\n", 1); stream_printf(out, "%d;bewacht\n", 1);
} }
if ((b = usiege(u)) != NULL) { if ((b = usiege(u)) != NULL) {
fprintf(F, "%d;belagert\n", b->no); stream_printf(out, "%d;belagert\n", b->no);
} }
/* additional information for own units */ /* additional information for own units */
if (u->faction == f || omniscient(f)) { if (u->faction == f || omniscient(f)) {
@ -884,56 +887,55 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
i = ualias(u); i = ualias(u);
if (i > 0) if (i > 0)
fprintf(F, "%d;temp\n", i); stream_printf(out, "%d;temp\n", i);
else if (i < 0) else if (i < 0)
fprintf(F, "%d;alias\n", -i); stream_printf(out, "%d;alias\n", -i);
i = get_money(u); i = get_money(u);
fprintf(F, "%d;Kampfstatus\n", u->status); stream_printf(out, "%d;Kampfstatus\n", u->status);
fprintf(F, "%d;weight\n", weight(u)); stream_printf(out, "%d;weight\n", weight(u));
if (fval(u, UFL_NOAID)) { if (fval(u, UFL_NOAID)) {
fputs("1;unaided\n", F); stream_printf(out, "1;unaided\n");
} }
if (fval(u, UFL_STEALTH)) { if (fval(u, UFL_STEALTH)) {
i = u_geteffstealth(u); i = u_geteffstealth(u);
if (i >= 0) { if (i >= 0) {
fprintf(F, "%d;Tarnung\n", i); stream_printf(out, "%d;Tarnung\n", i);
} }
} }
xc = uprivate(u); xc = uprivate(u);
if (xc) { if (xc) {
fprintf(F, "\"%s\";privat\n", xc); stream_printf(out, "\"%s\";privat\n", xc);
} }
c = hp_status(u); c = hp_status(u);
if (c && *c && (u->faction == f || omniscient(f))) { if (c && *c && (u->faction == f || omniscient(f))) {
fprintf(F, "\"%s\";hp\n", translate(c, stream_printf(out, "\"%s\";hp\n", translate(c,
LOC(u->faction->locale, c))); LOC(u->faction->locale, c)));
} }
if (fval(u, UFL_HERO)) { if (fval(u, UFL_HERO)) {
fputs("1;hero\n", F); stream_printf(out, "1;hero\n");
} }
if (fval(u, UFL_HUNGER) && (u->faction == f)) { if (fval(u, UFL_HUNGER) && (u->faction == f)) {
fputs("1;hunger\n", F); stream_printf(out, "1;hunger\n");
} }
if (is_mage(u)) { if (is_mage(u)) {
fprintf(F, "%d;Aura\n", get_spellpoints(u)); stream_printf(out, "%d;Aura\n", get_spellpoints(u));
fprintf(F, "%d;Auramax\n", max_spellpoints(u->region, u)); stream_printf(out, "%d;Auramax\n", max_spellpoints(u->region, u));
} }
/* default commands */ /* default commands */
fprintf(F, "COMMANDS\n"); stream_printf(out, "COMMANDS\n");
for (ord = u->old_orders; ord; ord = ord->next) { for (ord = u->old_orders; ord; ord = ord->next) {
/* this new order will replace the old defaults */ /* this new order will replace the old defaults */
if (is_persistent(ord)) { if (is_persistent(ord)) {
fwriteorder(F, ord, f->locale, true); stream_order(out, ord);
fputc('\n', F);
} }
} }
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (u->old_orders && is_repeated(ord)) keyword_t kwd = getkeyword(ord);
if (u->old_orders && is_repeated(kwd))
continue; /* unit has defaults */ continue; /* unit has defaults */
if (is_persistent(ord)) { if (is_persistent(ord)) {
fwriteorder(F, ord, f->locale, true); stream_order(out, ord);
fputc('\n', F);
} }
} }
@ -945,9 +947,9 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
int esk = eff_skill(u, sk, r); int esk = eff_skill(u, sk, r);
if (!pr) { if (!pr) {
pr = 1; pr = 1;
fprintf(F, "TALENTE\n"); stream_printf(out, "TALENTE\n");
} }
fprintf(F, "%d %d;%s\n", u->number * level_days(sv->level), esk, stream_printf(out, "%d %d;%s\n", u->number * level_days(sv->level), esk,
translate(mkname("skill", skillnames[sk]), skillname(sk, translate(mkname("skill", skillnames[sk]), skillname(sk,
f->locale))); f->locale)));
} }
@ -957,7 +959,7 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
mage = get_mage(u); mage = get_mage(u);
if (mage) { if (mage) {
int i, maxlevel = effskill(u, SK_MAGIC); int i, maxlevel = effskill(u, SK_MAGIC);
cr_output_spells(F, u, maxlevel); cr_output_spells(out, u, maxlevel);
for (i = 0; i != MAXCOMBATSPELLS; ++i) { for (i = 0; i != MAXCOMBATSPELLS; ++i) {
const spell *sp = mage->combatspells[i].sp; const spell *sp = mage->combatspells[i].sp;
@ -965,9 +967,9 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
const char *name = const char *name =
translate(mkname("spell", sp->sname), spell_name(sp, translate(mkname("spell", sp->sname), spell_name(sp,
f->locale)); f->locale));
fprintf(F, "KAMPFZAUBER %d\n", i); stream_printf(out, "KAMPFZAUBER %d\n", i);
fprintf(F, "\"%s\";name\n", name); stream_printf(out, "\"%s\";name\n", name);
fprintf(F, "%d;level\n", mage->combatspells[i].level); stream_printf(out, "%d;level\n", mage->combatspells[i].level);
} }
} }
} }
@ -1000,12 +1002,21 @@ static void cr_output_unit(FILE * F, const region * r, const faction * f,
continue; continue;
if (!pr) { if (!pr) {
pr = 1; pr = 1;
fputs("GEGENSTAENDE\n", F); stream_printf(out, "GEGENSTAENDE\n");
} }
fprintf(F, "%d;%s\n", in, translate(ic, LOC(f->locale, ic))); stream_printf(out, "%d;%s\n", in, translate(ic, LOC(f->locale, ic)));
} }
cr_output_curses(F, f, u, TYP_UNIT); cr_output_curses(out, f, u, TYP_UNIT);
}
static void cr_output_unit_compat(FILE * F, const region * r, const faction * f,
const unit * u, int mode)
{
// TODO: eliminate this function
stream strm;
fstream_init(&strm, F);
cr_output_unit(&strm, r, f, u, mode);
} }
/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
@ -1376,7 +1387,7 @@ static void cr_output_region(FILE * F, report_context * ctx, seen_region * sr)
if (r->land) { if (r->land) {
print_items(F, r->land->items, f->locale); print_items(F, r->land->items, f->locale);
} }
cr_output_curses(F, f, r, TYP_REGION); cr_output_curses_compat(F, f, r, TYP_REGION);
cr_borders(ctx->seen, r, f, sr->mode, F); cr_borders(ctx->seen, r, f, sr->mode, F);
if (sr->mode == see_unit && is_astral(r) if (sr->mode == see_unit && is_astral(r)
&& !is_cursed(r->attribs, C_ASTRALBLOCK, 0)) { && !is_cursed(r->attribs, C_ASTRALBLOCK, 0)) {
@ -1468,7 +1479,7 @@ static void cr_output_region(FILE * F, report_context * ctx, seen_region * sr)
if (u->building || u->ship || (stealthmod > INT_MIN if (u->building || u->ship || (stealthmod > INT_MIN
&& cansee(f, r, u, stealthmod))) { && cansee(f, r, u, stealthmod))) {
cr_output_unit(F, r, f, u, sr->mode); cr_output_unit_compat(F, r, f, u, sr->mode);
} }
} }
} }

6
src/creport.h
View File

@ -15,10 +15,16 @@
extern "C" { extern "C" {
#endif #endif
struct stream;
struct region;
struct faction;
struct unit;
void creport_cleanup(void); void creport_cleanup(void);
void register_cr(void); void register_cr(void);
int crwritemap(const char *filename); int crwritemap(const char *filename);
void cr_output_unit(struct stream *out, const struct region * r, const struct faction * f, const struct unit * u, int mode);
#ifdef __cplusplus #ifdef __cplusplus
} }

27
src/economy.c
View File

@ -563,7 +563,7 @@ static void recruit(unit * u, struct order *ord, request ** recruitorders)
return; return;
} }
} }
if (!playerrace(rc) || idle(u->faction)) { if (!playerrace(rc)) {
cmistake(u, ord, 139, MSG_EVENT); cmistake(u, ord, 139, MSG_EVENT);
return; return;
} }
@ -979,27 +979,14 @@ void economics(region * r)
remove_empty_units_in_region(r); remove_empty_units_in_region(r);
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {
order *ord; order *ord = u->thisorder;
bool destroyed = false;
if (u->number > 0) {
for (ord = u->orders; ord; ord = ord->next) {
keyword_t kwd = getkeyword(ord); keyword_t kwd = getkeyword(ord);
if (kwd == K_DESTROY) { if (kwd == K_DESTROY) {
if (!destroyed) { if (destroy_cmd(u, ord) == 0) {
if (destroy_cmd(u, ord) != 0)
ord = NULL;
destroyed = true;
}
}
if (u->orders == NULL) {
break;
}
}
}
if (destroyed) {
fset(u, UFL_LONGACTION | UFL_NOTMOVING); fset(u, UFL_LONGACTION | UFL_NOTMOVING);
} }
} }
}
} }
@ -1051,7 +1038,7 @@ static void manufacture(unit * u, const item_type * itype, int want)
i_change(&u->items, itype, n); i_change(&u->items, itype, n);
if (want == INT_MAX) if (want == INT_MAX)
want = n; want = n;
ADDMSG(&u->faction->msgs, msg_message("manufacture", ADDMSG(&u->faction->msgs, msg_message("produce",
"unit region amount wanted resource", u, u->region, n, want, "unit region amount wanted resource", u, u->region, n, want,
itype->rtype)); itype->rtype));
} }
@ -1466,7 +1453,7 @@ static void create_potion(unit * u, const potion_type * ptype, int want)
i_change(&u->items, ptype->itype, built); i_change(&u->items, ptype->itype, built);
if (want == INT_MAX) if (want == INT_MAX)
want = built; want = built;
ADDMSG(&u->faction->msgs, msg_message("manufacture", ADDMSG(&u->faction->msgs, msg_message("produce",
"unit region amount wanted resource", u, u->region, built, want, "unit region amount wanted resource", u, u->region, built, want,
ptype->itype->rtype)); ptype->itype->rtype));
break; break;
@ -3216,7 +3203,7 @@ void produce(struct region *r)
continue; continue;
if (fval(u, UFL_LONGACTION) && u->thisorder == NULL) { if (fval(u, UFL_LONGACTION) && u->thisorder == NULL) {
/* this message was already given in laws.setdefaults /* this message was already given in laws.c:update_long_order
cmistake(u, u->thisorder, 52, MSG_PRODUCE); cmistake(u, u->thisorder, 52, MSG_PRODUCE);
*/ */
continue; continue;

4
src/jsreport.c
View File

@ -59,11 +59,13 @@ static int report_json(const char *filename, report_context * ctx, const char *c
if (sr) { if (sr) {
terrain_t ter = oldterrain(r->terrain); terrain_t ter = oldterrain(r->terrain);
if (ter == NOTERRAIN) { if (ter == NOTERRAIN) {
log_warning("report_json: %s has no terrain id\n", r->terrain->_name); data = 1 + r->terrain->_name[0];
} }
else {
data = 1 + (int)ter; data = 1 + (int)ter;
} }
} }
}
fprintf(F, "%d", data); fprintf(F, "%d", data);
if (x != maxx || y != maxy) fputs(", ", F); if (x != maxx || y != maxy) fputs(", ", F);
} }

16
src/kernel/build.c
View File

@ -151,11 +151,11 @@ int destroy_cmd(unit * u, struct order *ord)
int n = INT_MAX; int n = INT_MAX;
if (u->number < 1) if (u->number < 1)
return 0; return 1;
if (fval(u, UFL_LONGACTION)) { if (fval(u, UFL_LONGACTION)) {
cmistake(u, ord, 52, MSG_PRODUCE); cmistake(u, ord, 52, MSG_PRODUCE);
return 0; return 52;
} }
init_order(ord); init_order(ord);
@ -183,11 +183,11 @@ int destroy_cmd(unit * u, struct order *ord)
if (u != building_owner(b)) { if (u != building_owner(b)) {
cmistake(u, ord, 138, MSG_PRODUCE); cmistake(u, ord, 138, MSG_PRODUCE);
return 0; return 138;
} }
if (fval(b->type, BTF_INDESTRUCTIBLE)) { if (fval(b->type, BTF_INDESTRUCTIBLE)) {
cmistake(u, ord, 138, MSG_PRODUCE); cmistake(u, ord, 138, MSG_PRODUCE);
return 0; return 138;
} }
if (n >= b->size) { if (n >= b->size) {
/* destroy completly */ /* destroy completly */
@ -213,11 +213,11 @@ int destroy_cmd(unit * u, struct order *ord)
if (u != ship_owner(sh)) { if (u != ship_owner(sh)) {
cmistake(u, ord, 138, MSG_PRODUCE); cmistake(u, ord, 138, MSG_PRODUCE);
return 0; return 138;
} }
if (fval(r->terrain, SEA_REGION)) { if (fval(r->terrain, SEA_REGION)) {
cmistake(u, ord, 14, MSG_EVENT); cmistake(u, ord, 14, MSG_EVENT);
return 0; return 14;
} }
if (n >= (sh->size * 100) / sh->type->construction->maxsize) { if (n >= (sh->size * 100) / sh->type->construction->maxsize) {
@ -242,11 +242,11 @@ int destroy_cmd(unit * u, struct order *ord)
} }
else { else {
cmistake(u, ord, 138, MSG_PRODUCE); cmistake(u, ord, 138, MSG_PRODUCE);
return 0; return 138;
} }
if (con) { if (con) {
/* TODO: Nicht an ZERSTÖRE mit Punktangabe angepaßt! */ /* TODO: Nicht an ZERSTÖRE mit Punktangabe angepasst! */
int c; int c;
for (c = 0; con->materials[c].number; ++c) { for (c = 0; con->materials[c].number; ++c) {
const requirement *rq = con->materials + c; const requirement *rq = con->materials + c;

25
src/kernel/config.c
View File

@ -530,7 +530,9 @@ int alliedunit(const unit * u, const faction * f2, int mode)
ally *sf; ally *sf;
int automode; int automode;
assert(u && u->region); /* the unit should be in a region, but it's possible that u->number==0 (TEMP units) */ assert(u);
assert(f2);
assert(u->region); /* the unit should be in a region, but it's possible that u->number==0 (TEMP units) */
if (u->faction == f2) if (u->faction == f2)
return mode; return mode;
if (u->faction != NULL && f2 != NULL) { if (u->faction != NULL && f2 != NULL) {
@ -904,11 +906,6 @@ int newcontainerid(void)
return random_no; return random_no;
} }
bool idle(faction * f)
{
return (bool)(f ? false : true);
}
int maxworkingpeasants(const struct region *r) int maxworkingpeasants(const struct region *r)
{ {
int size = production(r); int size = production(r);
@ -922,6 +919,10 @@ static const char * parameter_key(int i)
return parameters[i]; return parameters[i];
} }
void init_parameters(struct locale *lang) {
init_translations(lang, UT_PARAMS, parameter_key, MAXPARAMS);
}
void init_terrains_translation(const struct locale *lang) { void init_terrains_translation(const struct locale *lang) {
void **tokens; void **tokens;
@ -1012,7 +1013,7 @@ void init_locale(struct locale *lang)
if (name) addtoken(tokens, name, var); if (name) addtoken(tokens, name, var);
} }
init_translations(lang, UT_PARAMS, parameter_key, MAXPARAMS); init_parameters(lang);
init_options_translation(lang); init_options_translation(lang);
init_terrains_translation(lang); init_terrains_translation(lang);
@ -1684,6 +1685,11 @@ void kernel_init(void)
} }
static order * defaults[MAXLOCALES]; static order * defaults[MAXLOCALES];
keyword_t default_keyword = NOKEYWORD;
void set_default_order(int kwd) {
default_keyword = (keyword_t)kwd;
}
order *default_order(const struct locale *lang) order *default_order(const struct locale *lang)
{ {
@ -1691,6 +1697,11 @@ order *default_order(const struct locale *lang)
int i = locale_index(lang); int i = locale_index(lang);
order *result = 0; order *result = 0;
assert(i < MAXLOCALES); assert(i < MAXLOCALES);
if (default_keyword!=NOKEYWORD) {
return create_order(default_keyword, lang, 0);
}
result = defaults[i]; result = defaults[i];
if (!result && usedefault) { if (!result && usedefault) {
const char * str = LOC(lang, "defaultorder"); const char * str = LOC(lang, "defaultorder");

5
src/kernel/config.h
View File

@ -179,7 +179,6 @@ extern "C" {
bool has_limited_skills(const struct unit *u); bool has_limited_skills(const struct unit *u);
const struct race *findrace(const char *, const struct locale *); const struct race *findrace(const char *, const struct locale *);
bool idle(struct faction *f);
bool unit_has_cursed_item(const struct unit *u); bool unit_has_cursed_item(const struct unit *u);
/* grammatik-flags: */ /* grammatik-flags: */
@ -287,8 +286,12 @@ extern "C" {
int AllianceAuto(void); /* flags that allied factions get automatically */ int AllianceAuto(void); /* flags that allied factions get automatically */
int AllianceRestricted(void); /* flags restricted to allied factions */ int AllianceRestricted(void); /* flags restricted to allied factions */
int HelpMask(void); /* flags restricted to allied factions */ int HelpMask(void); /* flags restricted to allied factions */
struct order *default_order(const struct locale *lang); struct order *default_order(const struct locale *lang);
void set_default_order(int kwd);
int entertainmoney(const struct region *r); int entertainmoney(const struct region *r);
void init_parameters(struct locale *lang);
void free_gamedata(void); void free_gamedata(void);

5
src/kernel/messages.c
View File

@ -285,8 +285,9 @@ extern unsigned int new_hashstring(const char *s);
void free_messagelist(message_list * msgs) void free_messagelist(message_list * msgs)
{ {
struct mlist **mlistptr = &msgs->begin; struct mlist **mlistptr;
while (*mlistptr) { assert(msgs && msgs->begin);
for (mlistptr = &msgs->begin; *mlistptr;) {
struct mlist *ml = *mlistptr; struct mlist *ml = *mlistptr;
*mlistptr = ml->next; *mlistptr = ml->next;
msg_release(ml->msg); msg_release(ml->msg);

33
src/kernel/order.c
View File

@ -115,7 +115,9 @@ char* get_command(const order *ord, char *sbuffer, size_t size) {
assert(str); assert(str);
if (text) --size; if (text) --size;
bytes = (int)strlcpy(bufp, str, size); bytes = (int)strlcpy(bufp, str, size);
if (wrptr(&bufp, &size, bytes) != 0) WARN_STATIC_BUFFER(); if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
}
if (text) *bufp++ = ' '; if (text) *bufp++ = ' ';
} }
else { else {
@ -252,6 +254,19 @@ static order_data *create_data(keyword_t kwd, const char *sptr, int lindex)
return data; return data;
} }
static void free_localedata(int lindex) {
int i;
for (i = 0; i != MAXKEYWORDS; ++i) {
release_data(locale_array[lindex]->short_orders[i]);
locale_array[lindex]->short_orders[i] = 0;
}
for (i = 0; i != MAXSKILLS; ++i) {
release_data(locale_array[lindex]->study_orders[i]);
locale_array[lindex]->study_orders[i] = 0;
}
locale_array[lindex]->lang = 0;
}
static order *create_order_i(keyword_t kwd, const char *sptr, bool persistent, static order *create_order_i(keyword_t kwd, const char *sptr, bool persistent,
const struct locale *lang) const struct locale *lang)
{ {
@ -276,7 +291,12 @@ static order *create_order_i(keyword_t kwd, const char *sptr, bool persistent,
lindex = locale_index(lang); lindex = locale_index(lang);
assert(lindex < MAXLOCALES); assert(lindex < MAXLOCALES);
if (!locale_array[lindex]) {
locale_array[lindex] = (locale_data *)calloc(1, sizeof(locale_data)); locale_array[lindex] = (locale_data *)calloc(1, sizeof(locale_data));
}
else if (locale_array[lindex]->lang != lang) {
free_localedata(lindex);
}
locale_array[lindex]->lang = lang; locale_array[lindex]->lang = lang;
ord = (order *)malloc(sizeof(order)); ord = (order *)malloc(sizeof(order));
@ -292,13 +312,13 @@ order *create_order(keyword_t kwd, const struct locale * lang,
const char *params, ...) const char *params, ...)
{ {
char zBuffer[DISPLAYSIZE]; char zBuffer[DISPLAYSIZE];
assert(lang);
if (params) { if (params) {
char *bufp = zBuffer; char *bufp = zBuffer;
int bytes; int bytes;
size_t size = sizeof(zBuffer) - 1; size_t size = sizeof(zBuffer) - 1;
va_list marker; va_list marker;
assert(lang);
va_start(marker, params); va_start(marker, params);
while (*params) { while (*params) {
if (*params == '%') { if (*params == '%') {
@ -389,9 +409,8 @@ order *parse_order(const char *s, const struct locale * lang)
* \return true if the order is long * \return true if the order is long
* \sa is_exclusive(), is_repeated(), is_persistent() * \sa is_exclusive(), is_repeated(), is_persistent()
*/ */
bool is_repeated(const order * ord) bool is_repeated(keyword_t kwd)
{ {
keyword_t kwd = ORD_KEYWORD(ord);
switch (kwd) { switch (kwd) {
case K_CAST: case K_CAST:
case K_BUY: case K_BUY:
@ -468,10 +487,8 @@ bool is_exclusive(const order * ord)
* \return true if the order is long * \return true if the order is long
* \sa is_exclusive(), is_repeated(), is_persistent() * \sa is_exclusive(), is_repeated(), is_persistent()
*/ */
bool is_long(const order * ord) bool is_long(keyword_t kwd)
{ {
keyword_t kwd = ORD_KEYWORD(ord);
switch (kwd) { switch (kwd) {
case K_CAST: case K_CAST:
case K_BUY: case K_BUY:
@ -522,7 +539,7 @@ bool is_persistent(const order * ord)
case K_KOMMENTAR: case K_KOMMENTAR:
return true; return true;
default: default:
return ord->_persistent || is_repeated(ord); return ord->_persistent || is_repeated(kwd);
} }
} }

4
src/kernel/order.h
View File

@ -55,8 +55,8 @@ extern "C" {
char* get_command(const order *ord, char *buffer, size_t size); char* get_command(const order *ord, char *buffer, size_t size);
bool is_persistent(const order * ord); bool is_persistent(const order * ord);
bool is_exclusive(const order * ord); bool is_exclusive(const order * ord);
bool is_repeated(const order * ord); bool is_repeated(keyword_t kwd);
bool is_long(const order * ord); bool is_long(keyword_t kwd);
char *write_order(const order * ord, char *buffer, size_t size); char *write_order(const order * ord, char *buffer, size_t size);
keyword_t init_order(const struct order *ord); keyword_t init_order(const struct order *ord);

46
src/kernel/save.c
View File

@ -139,7 +139,8 @@ static unit *unitorders(FILE * F, int enc, struct faction *f)
ordp = &u->old_orders; ordp = &u->old_orders;
while (*ordp) { while (*ordp) {
order *ord = *ordp; order *ord = *ordp;
if (!is_repeated(ord)) { keyword_t kwd = getkeyword(ord);
if (!is_repeated(kwd)) {
*ordp = ord->next; *ordp = ord->next;
ord->next = NULL; ord->next = NULL;
free_order(ord); free_order(ord);
@ -233,7 +234,7 @@ static faction *factionorders(void)
f->no, pass)); f->no, pass));
return 0; return 0;
} }
/* Die Partei hat sich zumindest gemeldet, so daß sie noch /* Die Partei hat sich zumindest gemeldet, so dass sie noch
* nicht als untätig gilt */ * nicht als untätig gilt */
/* TODO: +1 ist ein Workaround, weil cturn erst in process_orders /* TODO: +1 ist ein Workaround, weil cturn erst in process_orders
@ -309,8 +310,8 @@ int readorders(const char *filename)
* Partei, eine neue Einheit oder das File-Ende. Das switch() wird erneut * Partei, eine neue Einheit oder das File-Ende. Das switch() wird erneut
* durchlaufen, und die entsprechende Funktion aufgerufen. Man darf buf * durchlaufen, und die entsprechende Funktion aufgerufen. Man darf buf
* auf alle Fälle nicht überschreiben! Bei allen anderen Einträgen hier * auf alle Fälle nicht überschreiben! Bei allen anderen Einträgen hier
* muß buf erneut gefüllt werden, da die betreffende Information in nur * muss buf erneut gefüllt werden, da die betreffende Information in nur
* einer Zeile steht, und nun die nächste gelesen werden muß. */ * einer Zeile steht, und nun die nächste gelesen werden muss. */
case P_NEXT: case P_NEXT:
f = NULL; f = NULL;
@ -777,7 +778,8 @@ void write_unit(struct gamedata *data, const unit * u)
} }
} }
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (u->old_orders && is_repeated(ord)) keyword_t kwd = getkeyword(ord);
if (u->old_orders && is_repeated(kwd))
continue; /* has new defaults */ continue; /* has new defaults */
if (is_persistent(ord)) { if (is_persistent(ord)) {
if (++p < MAXPERSISTENT) { if (++p < MAXPERSISTENT) {
@ -1603,7 +1605,6 @@ int readgame(const char *filename, bool backup)
while (--p >= 0) { while (--p >= 0) {
unit *u = read_unit(&gdata); unit *u = read_unit(&gdata);
sc_mage *mage;
if (gdata.version < JSON_REPORT_VERSION) { if (gdata.version < JSON_REPORT_VERSION) {
if (u->_name && fval(u->faction, FFL_NPC)) { if (u->_name && fval(u->faction, FFL_NPC)) {
@ -1618,21 +1619,6 @@ int readgame(const char *filename, bool backup)
up = &u->next; up = &u->next;
update_interval(u->faction, u->region); update_interval(u->faction, u->region);
mage = get_mage(u);
if (mage) {
faction *f = u->faction;
int skl = effskill(u, SK_MAGIC);
if (!fval(f, FFL_NPC) && f->magiegebiet == M_GRAY) {
log_error("faction %s had magic=gray, fixing (%s)\n", factionname(f), magic_school[mage->magietyp]);
f->magiegebiet = mage->magietyp;
}
if (f->max_spelllevel < skl) {
f->max_spelllevel = skl;
}
if (mage->spellcount < 0) {
mage->spellcount = 0;
}
}
} }
} }
log_printf(stdout, "\n"); log_printf(stdout, "\n");
@ -1656,6 +1642,7 @@ int readgame(const char *filename, bool backup)
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
if (f->flags & FFL_NPC) { if (f->flags & FFL_NPC) {
f->alive = 1; f->alive = 1;
f->magiegebiet = M_GRAY;
if (f->no == 0) { if (f->no == 0) {
int no = 666; int no = 666;
while (findfaction(no)) while (findfaction(no))
@ -1666,8 +1653,23 @@ int readgame(const char *filename, bool backup)
} }
else { else {
for (u = f->units; u; u = u->nextF) { for (u = f->units; u; u = u->nextF) {
sc_mage *mage = get_mage(u);
if (mage) {
faction *f = u->faction;
int skl = effskill(u, SK_MAGIC);
if (f->magiegebiet == M_GRAY) {
log_error("faction %s had magic=gray, fixing (%s)\n", factionname(f), magic_school[mage->magietyp]);
f->magiegebiet = mage->magietyp;
}
if (f->max_spelllevel < skl) {
f->max_spelllevel = skl;
}
if (mage->spellcount < 0) {
mage->spellcount = 0;
}
}
if (u->number > 0) { if (u->number > 0) {
f->alive = 1; f->alive = true;
break; break;
} }
} }

3
src/kernel/terrain.c
View File

@ -127,8 +127,7 @@ const struct terrain_type *newterrain(terrain_t t)
terrain_t oldterrain(const struct terrain_type * terrain) terrain_t oldterrain(const struct terrain_type * terrain)
{ {
terrain_t t; terrain_t t;
if (terrain == NULL) assert(terrain);
return NOTERRAIN;
for (t = 0; t != MAXTERRAINS; ++t) { for (t = 0; t != MAXTERRAINS; ++t) {
if (newterrains[t] == terrain) if (newterrains[t] == terrain)
return t; return t;

43
src/kernel/unit.c
View File

@ -1274,25 +1274,10 @@ static int item_modification(const unit * u, skill_t sk, int val)
return val; return val;
} }
static int update_gbdream(const unit * u, int bonus, curse *c, const curse_type *gbdream_ct, int sign){ static int att_modification(const unit * u, skill_t sk)
if (curse_active(c) && c->type == gbdream_ct) {
double effect = curse_geteffect(c);
unit *mage = c->magician;
/* wir suchen jeweils den groessten Bonus und den groestsen Malus */
if (sign * effect > sign * bonus) {
if (mage == NULL || mage->number == 0
|| (sign>0?alliedunit(mage, u->faction, HELP_GUARD):!alliedunit(mage, u->faction, HELP_GUARD))) {
bonus = (int)effect;
}
}
}
return bonus;
}
int att_modification(const unit * u, skill_t sk)
{ {
double result = 0; double result = 0;
static bool init = false; static bool init = false; // TODO: static variables are bad global state
static const curse_type *skillmod_ct, *gbdream_ct, *worse_ct; static const curse_type *skillmod_ct, *gbdream_ct, *worse_ct;
curse *c; curse *c;
@ -1321,15 +1306,21 @@ int att_modification(const unit * u, skill_t sk)
/* TODO hier kann nicht mit get/iscursed gearbeitet werden, da nur der /* TODO hier kann nicht mit get/iscursed gearbeitet werden, da nur der
* jeweils erste vom Typ C_GBDREAM zurueckgegen wird, wir aber alle * jeweils erste vom Typ C_GBDREAM zurueckgegen wird, wir aber alle
* durchsuchen und aufaddieren muessen */ * durchsuchen und aufaddieren muessen */
if (u->region) { if (gbdream_ct && u->region) {
int bonus = 0, malus = 0; int bonus = 0, malus = 0;
attrib *a = a_find(u->region->attribs, &at_curse); attrib *a = a_find(u->region->attribs, &at_curse);
while (a && a->type == &at_curse) { while (a && a->type == &at_curse) {
curse *c = (curse *)a->data.v; curse *c = (curse *)a->data.v;
bonus = update_gbdream(u, bonus, c, gbdream_ct, 1); if (curse_active(c) && c->type == gbdream_ct) {
malus = update_gbdream(u, malus, c, gbdream_ct, -1); int effect = curse_geteffect_int(c);
bool allied = alliedunit(c->magician, u->faction, HELP_GUARD);
if (allied) {
if (effect > bonus) bonus = effect;
} else {
if (effect < malus) malus = effect;
}
}
a = a->next; a = a->next;
} }
result = result + bonus + malus; result = result + bonus + malus;
@ -1717,6 +1708,16 @@ int unit_getcapacity(const unit * u)
return walkingcapacity(u); return walkingcapacity(u);
} }
void renumber_unit(unit *u, int no) {
uunhash(u);
if (!ualias(u)) {
attrib *a = a_add(&u->attribs, a_new(&at_alias));
a->data.i = -u->no;
}
u->no = no;
uhash(u);
}
void unit_addorder(unit * u, order * ord) void unit_addorder(unit * u, order * ord)
{ {
order **ordp = &u->orders; order **ordp = &u->orders;

2
src/kernel/unit.h
View File

@ -127,6 +127,8 @@ extern "C" {
int ualias(const struct unit *u); int ualias(const struct unit *u);
int weight(const struct unit *u); int weight(const struct unit *u);
void renumber_unit(struct unit *u, int no);
const struct race *u_irace(const struct unit *u); const struct race *u_irace(const struct unit *u);
const struct race *u_race(const struct unit *u); const struct race *u_race(const struct unit *u);
void u_setrace(struct unit *u, const struct race *); void u_setrace(struct unit *u, const struct race *);

180
src/laws.c
View File

@ -183,7 +183,7 @@ static void live(region * r)
reduce_skill(u, sb, weeks); reduce_skill(u, sb, weeks);
ADDMSG(&u->faction->msgs, msg_message("dumbeffect", ADDMSG(&u->faction->msgs, msg_message("dumbeffect",
"unit weeks skill", u, weeks, (skill_t)sb->id)); "unit weeks skill", u, weeks, (skill_t)sb->id));
} /* sonst Glück gehabt: wer nix weiß, kann nix vergessen... */ } /* sonst Glück gehabt: wer nix weiss, kann nix vergessen... */
change_effect(u, oldpotiontype[P_FOOL], -effect); change_effect(u, oldpotiontype[P_FOOL], -effect);
} }
age_unit(r, u); age_unit(r, u);
@ -402,7 +402,7 @@ static void migrate(region * r)
* wer fragt das? Die Baumwanderung war abhängig von der * wer fragt das? Die Baumwanderung war abhängig von der
* Auswertungsreihenfolge der regionen, * Auswertungsreihenfolge der regionen,
* das hatte ich geändert. jemand hat es wieder gelöscht, toll. * das hatte ich geändert. jemand hat es wieder gelöscht, toll.
* ich habe es wieder aktiviert, muß getestet werden. * ich habe es wieder aktiviert, muss getestet werden.
*/ */
*hp = m->next; *hp = m->next;
m->next = free_migrants; m->next = free_migrants;
@ -442,7 +442,7 @@ static void horses(region * r)
/* Pferde wandern in Nachbarregionen. /* Pferde wandern in Nachbarregionen.
* Falls die Nachbarregion noch berechnet * Falls die Nachbarregion noch berechnet
* werden muß, wird eine migration-Struktur gebildet, * werden muss, wird eine migration-Struktur gebildet,
* die dann erst in die Berechnung der Nachbarstruktur einfließt. * die dann erst in die Berechnung der Nachbarstruktur einfließt.
*/ */
@ -632,7 +632,7 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
a->data.sa[0] = (short)rtrees(r, 0); a->data.sa[0] = (short)rtrees(r, 0);
a->data.sa[1] = (short)rtrees(r, 1); a->data.sa[1] = (short)rtrees(r, 1);
} }
/* wir haben 6 Wochen zum wachsen, jeder Same/Sproß hat 18% Chance /* wir haben 6 Wochen zum wachsen, jeder Same/Spross hat 18% Chance
* zu wachsen, damit sollten nach 5-6 Wochen alle gewachsen sein */ * zu wachsen, damit sollten nach 5-6 Wochen alle gewachsen sein */
growth = 1800; growth = 1800;
@ -1347,10 +1347,12 @@ int ally_cmd(unit * u, struct order *ord)
s = gettoken(token, sizeof(token)); s = gettoken(token, sizeof(token));
if (s && !s[0]) if (!s || !s[0]) {
keyword = P_ANY; keyword = P_ANY;
else }
else {
keyword = findparam(s, u->faction->locale); keyword = findparam(s, u->faction->locale);
}
sfp = &u->faction->allies; sfp = &u->faction->allies;
if (fval(u, UFL_GROUP)) { if (fval(u, UFL_GROUP)) {
@ -1990,7 +1992,7 @@ int mail_cmd(unit * u, struct order *ord)
s = gettoken(token, sizeof(token)); s = gettoken(token, sizeof(token));
/* Falls kein Parameter, ist das eine Einheitsnummer; /* Falls kein Parameter, ist das eine Einheitsnummer;
* das Füllwort "AN" muß wegfallen, da gültige Nummer! */ * das Füllwort "AN" muss wegfallen, da gültige Nummer! */
do { do {
cont = 0; cont = 0;
@ -3020,13 +3022,7 @@ int renumber_cmd(unit * u, order * ord)
break; break;
} }
} }
uunhash(u); renumber_unit(u, i);
if (!ualias(u)) {
attrib *a = a_add(&u->attribs, a_new(&at_alias));
a->data.i = -u->no;
}
u->no = i;
uhash(u);
break; break;
case P_SHIP: case P_SHIP:
@ -3407,126 +3403,101 @@ void new_units(void)
} }
} }
/** Checks for two long orders and issues a warning if necessary.
*/
void check_long_orders(unit * u)
{
order *ord;
keyword_t otherorder = MAXKEYWORDS;
for (ord = u->orders; ord; ord = ord->next) {
if (getkeyword(ord) == NOKEYWORD) {
cmistake(u, ord, 22, MSG_EVENT);
}
else if (is_long(ord)) {
keyword_t longorder = getkeyword(ord);
if (otherorder != MAXKEYWORDS) {
switch (longorder) {
case K_CAST:
if (otherorder != longorder) {
cmistake(u, ord, 52, MSG_EVENT);
}
break;
case K_BUY:
if (otherorder == K_SELL) {
otherorder = K_BUY;
}
else {
cmistake(u, ord, 52, MSG_EVENT);
}
break;
case K_SELL:
if (otherorder != K_SELL && otherorder != K_BUY) {
cmistake(u, ord, 52, MSG_EVENT);
}
break;
default:
cmistake(u, ord, 52, MSG_EVENT);
}
}
else {
otherorder = longorder;
}
}
}
}
void update_long_order(unit * u) void update_long_order(unit * u)
{ {
order *ord; order *ord;
bool trade = false; bool exclusive = true;
keyword_t thiskwd = NOKEYWORD;
bool hunger = LongHunger(u); bool hunger = LongHunger(u);
freset(u, UFL_MOVED); freset(u, UFL_MOVED);
freset(u, UFL_LONGACTION); freset(u, UFL_LONGACTION);
if (hunger) {
/* Hungernde Einheiten führen NUR den default-Befehl aus */
set_order(&u->thisorder, default_order(u->faction->locale));
}
else {
check_long_orders(u);
}
/* check all orders for a potential new long order this round: */ /* check all orders for a potential new long order this round: */
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (getkeyword(ord) == NOKEYWORD) keyword_t kwd = getkeyword(ord);
continue; if (kwd == NOKEYWORD) continue;
if (u->old_orders && is_repeated(ord)) { if (u->old_orders && is_repeated(kwd)) {
/* this new order will replace the old defaults */ /* this new order will replace the old defaults */
free_orders(&u->old_orders); free_orders(&u->old_orders);
if (hunger)
break;
} }
if (hunger)
continue;
if (is_exclusive(ord)) { // hungry units do not get long orders:
/* Über dieser Zeile nur Befehle, die auch eine idle Faction machen darf */ if (hunger) {
if (idle(u->faction)) { if (u->old_orders) {
set_order(&u->thisorder, default_order(u->faction->locale)); // keep looking for repeated orders that might clear the old_orders
} continue;
else {
set_order(&u->thisorder, copy_order(ord));
} }
break; break;
} }
else {
keyword_t keyword = getkeyword(ord); if (is_long(kwd)) {
switch (keyword) { if (thiskwd == NOKEYWORD) {
// we have found the (first) long order
// some long orders can have multiple instances:
switch (kwd) {
/* Wenn gehandelt wird, darf kein langer Befehl ausgeführt /* Wenn gehandelt wird, darf kein langer Befehl ausgeführt
* werden. Da Handel erst nach anderen langen Befehlen kommt, * werden. Da Handel erst nach anderen langen Befehlen kommt,
* muß das vorher abgefangen werden. Wir merken uns also * muss das vorher abgefangen werden. Wir merken uns also
* hier, ob die Einheit handelt. */ * hier, ob die Einheit handelt. */
case K_BUY: case K_BUY:
case K_SELL: case K_SELL:
/* Wenn die Einheit handelt, muß der Default-Befehl gelöscht
* werden.
* Wird je diese Ausschliesslichkeit aufgehoben, muss man aufpassen
* mit der Reihenfolge von Kaufen, Verkaufen etc., damit es Spielern
* nicht moeglich ist, Schulden zu machen. */
trade = true;
break;
case K_CAST: case K_CAST:
/* dient dazu, das neben Zaubern kein weiterer Befehl // non-exclusive orders can be used with others. BUY can be paired with SELL,
* ausgeführt werden kann, Zaubern ist ein kurzer Befehl */ // CAST with other CAST orders. compatibility is checked once the second
set_order(&u->thisorder, copy_order(ord)); // long order is analyzed (below).
exclusive = false;
break; break;
default: default:
set_order(&u->thisorder, copy_order(ord));
break;
}
thiskwd = kwd;
}
else {
// we have found a second long order. this is okay for some, but not all commands.
// u->thisorder is already set, and should not have to be updated.
switch (kwd) {
case K_CAST:
if (thiskwd != K_CAST) {
cmistake(u, ord, 52, MSG_EVENT);
}
break;
case K_SELL:
if (thiskwd != K_SELL && thiskwd != K_BUY) {
cmistake(u, ord, 52, MSG_EVENT);
}
break;
case K_BUY:
if (thiskwd != K_SELL) {
cmistake(u, ord, 52, MSG_EVENT);
}
else {
thiskwd = K_BUY;
}
break;
default:
// TODO: decide https://bugs.eressea.de/view.php?id=2080#c6011
if (kwd > thiskwd) {
// swap out thisorder for the new one
cmistake(u, u->thisorder, 52, MSG_EVENT);
set_order(&u->thisorder, copy_order(ord));
}
else {
cmistake(u, ord, 52, MSG_EVENT);
}
break; break;
} }
} }
} }
if (hunger) {
return;
} }
/* Wenn die Einheit handelt, muß der Default-Befehl gelöscht if (hunger) {
* werden. */ // Hungernde Einheiten führen NUR den default-Befehl aus
set_order(&u->thisorder, default_order(u->faction->locale));
if (trade) { } else if (!exclusive) {
/* fset(u, UFL_LONGACTION|UFL_NOTMOVING); */ // Wenn die Einheit handelt oder zaubert, muss der Default-Befehl gelöscht werden.
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
} }
} }
@ -3696,6 +3667,7 @@ void defaultorders(void)
free_order(ord); free_order(ord);
if (!neworders) { if (!neworders) {
/* lange Befehle aus orders und old_orders löschen zu gunsten des neuen */ /* lange Befehle aus orders und old_orders löschen zu gunsten des neuen */
// TODO: why only is_exclusive, not is_long? what about CAST, BUY, SELL?
remove_exclusive(&u->orders); remove_exclusive(&u->orders);
remove_exclusive(&u->old_orders); remove_exclusive(&u->old_orders);
neworders = true; neworders = true;
@ -4489,7 +4461,7 @@ void init_processor(void)
add_proc_order(p, K_TEACH, teach_cmd, PROC_THISORDER | PROC_LONGORDER, add_proc_order(p, K_TEACH, teach_cmd, PROC_THISORDER | PROC_LONGORDER,
"Lehren"); "Lehren");
p += 10; p += 10;
add_proc_order(p, K_STUDY, learn_cmd, PROC_THISORDER | PROC_LONGORDER, add_proc_order(p, K_STUDY, study_cmd, PROC_THISORDER | PROC_LONGORDER,
"Lernen"); "Lernen");
p += 10; p += 10;

18
src/laws.h
View File

@ -56,15 +56,15 @@ extern "C" {
extern int *age; extern int *age;
extern void new_units(void); void new_units(void);
extern void defaultorders(void); void defaultorders(void);
extern void quit(void); void quit(void);
extern void monthly_healing(void); void monthly_healing(void);
extern void renumber_factions(void); void renumber_factions(void);
extern void restack_units(void); void restack_units(void);
extern void update_long_order(struct unit *u); void update_long_order(struct unit *u);
extern void sinkships(struct region * r); void sinkships(struct region * r);
extern void do_enter(struct region *r, bool is_final_attempt); void do_enter(struct region *r, bool is_final_attempt);
extern int password_cmd(struct unit *u, struct order *ord); extern int password_cmd(struct unit *u, struct order *ord);
extern int banner_cmd(struct unit *u, struct order *ord); extern int banner_cmd(struct unit *u, struct order *ord);

217
src/laws.test.c
View File

@ -1,6 +1,7 @@
#include <platform.h> #include <platform.h>
#include "laws.h" #include "laws.h"
#include "battle.h" #include "battle.h"
#include "monster.h"
#include <kernel/ally.h> #include <kernel/ally.h>
#include <kernel/config.h> #include <kernel/config.h>
@ -768,9 +769,225 @@ static void test_luck_message(CuTest *tc) {
test_cleanup(); test_cleanup();
} }
static void test_long_order_normal(CuTest *tc) {
// TODO: write more tests
unit *u;
order *ord;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
fset(u, UFL_MOVED);
fset(u, UFL_LONGACTION);
u->faction->locale = get_or_create_locale("de");
ord = create_order(K_MOVE, u->faction->locale, 0);
unit_addorder(u, ord);
update_long_order(u);
CuAssertPtrEquals(tc, ord->data, u->thisorder->data);
CuAssertIntEquals(tc, 0, fval(u, UFL_MOVED));
CuAssertIntEquals(tc, 0, fval(u, UFL_LONGACTION));
CuAssertPtrNotNull(tc, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
CuAssertPtrEquals(tc, 0, u->old_orders);
test_cleanup();
}
static void test_long_order_none(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrEquals(tc, 0, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
test_cleanup();
}
static void test_long_order_cast(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_CAST, u->faction->locale, 0));
unit_addorder(u, create_order(K_CAST, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
test_cleanup();
}
static void test_long_order_buy_sell(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_BUY, u->faction->locale, 0));
unit_addorder(u, create_order(K_SELL, u->faction->locale, 0));
unit_addorder(u, create_order(K_SELL, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
test_cleanup();
}
static void test_long_order_multi_long(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_MOVE, u->faction->locale, 0));
unit_addorder(u, create_order(K_DESTROY, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrNotNull(tc, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertStrEquals(tc, "error52", test_get_messagetype(u->faction->msgs->begin->msg));
test_cleanup();
}
static void test_long_order_multi_buy(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_BUY, u->faction->locale, 0));
unit_addorder(u, create_order(K_BUY, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertStrEquals(tc, "error52", test_get_messagetype(u->faction->msgs->begin->msg));
test_cleanup();
}
static void test_long_order_multi_sell(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_SELL, u->faction->locale, 0));
unit_addorder(u, create_order(K_BUY, u->faction->locale, 0));
unit_addorder(u, create_order(K_SELL, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
test_cleanup();
}
static void test_long_order_buy_cast(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_BUY, u->faction->locale, 0));
unit_addorder(u, create_order(K_CAST, u->faction->locale, 0));
update_long_order(u);
CuAssertPtrEquals(tc, 0, u->thisorder);
CuAssertPtrNotNull(tc, u->orders);
CuAssertStrEquals(tc, "error52", test_get_messagetype(u->faction->msgs->begin->msg));
test_cleanup();
}
static void test_long_order_hungry(CuTest *tc) {
// TODO: write more tests
unit *u;
test_cleanup();
set_param(&global.parameters, "hunger.long", "1");
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
fset(u, UFL_HUNGER);
u->faction->locale = get_or_create_locale("de");
unit_addorder(u, create_order(K_MOVE, u->faction->locale, 0));
unit_addorder(u, create_order(K_DESTROY, u->faction->locale, 0));
set_default_order(K_WORK);
update_long_order(u);
CuAssertIntEquals(tc, K_WORK, getkeyword(u->thisorder));
CuAssertPtrNotNull(tc, u->orders);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
set_default_order(NOKEYWORD);
test_cleanup();
}
static void test_ally_cmd_errors(CuTest *tc) {
unit *u;
int fid;
order *ord;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = get_or_create_locale("de");
fid = u->faction->no + 1;
CuAssertPtrEquals(tc, 0, findfaction(fid));
ord = create_order(K_ALLY, u->faction->locale, itoa36(fid));
ally_cmd(u, ord);
CuAssertStrEquals(tc, "error66", test_get_messagetype(u->faction->msgs->begin->msg));
free_order(ord);
test_cleanup();
}
static void test_ally_cmd(CuTest *tc) {
unit *u;
faction * f;
order *ord;
struct locale *lang;
test_cleanup();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
f = test_create_faction(0);
u->faction->locale = lang = get_or_create_locale("de");
locale_setstring(lang, parameters[P_NOT], "NICHT");
locale_setstring(lang, parameters[P_GUARD], "BEWACHE");
init_parameters(lang);
ord = create_order(K_ALLY, lang, "%s", itoa36(f->no));
ally_cmd(u, ord);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
CuAssertIntEquals(tc, HELP_ALL, alliedfaction(0, u->faction, f, HELP_ALL));
free_order(ord);
ord = create_order(K_ALLY, lang, "%s NICHT", itoa36(f->no));
ally_cmd(u, ord);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
CuAssertIntEquals(tc, 0, alliedfaction(0, u->faction, f, HELP_ALL));
free_order(ord);
ord = create_order(K_ALLY, lang, "%s BEWACHE", itoa36(f->no));
ally_cmd(u, ord);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
CuAssertIntEquals(tc, HELP_GUARD, alliedfaction(0, u->faction, f, HELP_ALL));
free_order(ord);
ord = create_order(K_ALLY, lang, "%s BEWACHE NICHT", itoa36(f->no));
ally_cmd(u, ord);
CuAssertPtrEquals(tc, 0, u->faction->msgs);
CuAssertIntEquals(tc, 0, alliedfaction(0, u->faction, f, HELP_ALL));
free_order(ord);
test_cleanup();
}
CuSuite *get_laws_suite(void) CuSuite *get_laws_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_ally_cmd);
SUITE_ADD_TEST(suite, test_ally_cmd_errors);
SUITE_ADD_TEST(suite, test_long_order_normal);
SUITE_ADD_TEST(suite, test_long_order_none);
SUITE_ADD_TEST(suite, test_long_order_cast);
SUITE_ADD_TEST(suite, test_long_order_buy_sell);
SUITE_ADD_TEST(suite, test_long_order_multi_long);
SUITE_ADD_TEST(suite, test_long_order_multi_buy);
SUITE_ADD_TEST(suite, test_long_order_multi_sell);
SUITE_ADD_TEST(suite, test_long_order_buy_cast);
SUITE_ADD_TEST(suite, test_long_order_hungry);
SUITE_ADD_TEST(suite, test_new_building_can_be_renamed); SUITE_ADD_TEST(suite, test_new_building_can_be_renamed);
SUITE_ADD_TEST(suite, test_rename_building); SUITE_ADD_TEST(suite, test_rename_building);
SUITE_ADD_TEST(suite, test_rename_building_twice); SUITE_ADD_TEST(suite, test_rename_building_twice);

12
src/magic.c
View File

@ -777,7 +777,7 @@ int spellcost(unit * u, const spell * sp)
int count = countspells(u, 0); int count = countspells(u, 0);
const resource_type *r_aura = get_resourcetype(R_AURA); const resource_type *r_aura = get_resourcetype(R_AURA);
for (k = 0; sp->components[k].type; k++) { for (k = 0; sp->components && sp->components[k].type; k++) {
if (sp->components[k].type == r_aura) { if (sp->components[k].type == r_aura) {
aura = sp->components[k].amount; aura = sp->components[k].amount;
} }
@ -798,7 +798,7 @@ static int spl_costtyp(const spell * sp)
int k; int k;
int costtyp = SPC_FIX; int costtyp = SPC_FIX;
for (k = 0; sp->components[k].type; k++) { for (k = 0; sp->components && sp->components[k].type; k++) {
if (costtyp == SPC_LINEAR) if (costtyp == SPC_LINEAR)
return SPC_LINEAR; return SPC_LINEAR;
@ -827,7 +827,7 @@ int eff_spelllevel(unit * u, const spell * sp, int cast_level, int range)
int k, maxlevel, needplevel; int k, maxlevel, needplevel;
int costtyp = SPC_FIX; int costtyp = SPC_FIX;
for (k = 0; sp->components[k].type; k++) { for (k = 0; sp->components && sp->components[k].type; k++) {
if (cast_level == 0) if (cast_level == 0)
return 0; return 0;
@ -894,7 +894,7 @@ void pay_spell(unit * u, const spell * sp, int cast_level, int range)
int resuse; int resuse;
assert(cast_level > 0); assert(cast_level > 0);
for (k = 0; sp->components[k].type; k++) { for (k = 0; sp->components && sp->components[k].type; k++) {
if (sp->components[k].type == r_aura) { if (sp->components[k].type == r_aura) {
resuse = spellcost(u, sp) * range; resuse = spellcost(u, sp) * range;
} }
@ -954,7 +954,7 @@ cancast(unit * u, const spell * sp, int level, int range, struct order * ord)
return false; return false;
} }
for (k = 0; sp->components[k].type; ++k) { for (k = 0; sp->components && sp->components[k].type; ++k) {
if (sp->components[k].amount > 0) { if (sp->components[k].amount > 0) {
const resource_type *rtype = sp->components[k].type; const resource_type *rtype = sp->components[k].type;
int itemhave; int itemhave;
@ -2766,7 +2766,6 @@ void magic(void)
continue; continue;
} }
if (u->thisorder != NULL) {
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (getkeyword(ord) == K_CAST) { if (getkeyword(ord) == K_CAST) {
castorder *co = cast_cmd(u, ord); castorder *co = cast_cmd(u, ord);
@ -2779,7 +2778,6 @@ void magic(void)
} }
} }
} }
}
/* Da sich die Aura und Komponenten in der Zwischenzeit verändert /* Da sich die Aura und Komponenten in der Zwischenzeit verändert
* haben können und sich durch vorherige Sprüche das Zaubern * haben können und sich durch vorherige Sprüche das Zaubern

37
src/magic.test.c
View File

@ -3,6 +3,7 @@
#include "magic.h" #include "magic.h"
#include <kernel/faction.h> #include <kernel/faction.h>
#include <kernel/order.h>
#include <kernel/item.h> #include <kernel/item.h>
#include <kernel/region.h> #include <kernel/region.h>
#include <kernel/spell.h> #include <kernel/spell.h>
@ -382,9 +383,45 @@ void test_hasspell(CuTest * tc)
test_cleanup(); test_cleanup();
} }
static quicklist * casts;
static int cast_fireball(struct castorder * co) {
ql_push(&casts, co);
return 0;
}
void test_multi_cast(CuTest *tc) {
unit *u;
spell *sp;
struct locale * lang;
test_cleanup();
sp = create_spell("fireball", 0);
sp->cast = cast_fireball;
CuAssertPtrEquals(tc, sp, find_spell("fireball"));
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
u->faction->locale = lang = get_or_create_locale("de");
locale_setstring(lang, mkname("spell", sp->sname), "Feuerball");
CuAssertStrEquals(tc, "Feuerball", spell_name(sp, lang));
set_level(u, SK_MAGIC, 10);
unit_add_spell(u, 0, sp, 1);
CuAssertPtrEquals(tc, sp, unit_getspell(u, "Feuerball", lang));
unit_addorder(u, create_order(K_CAST, u->faction->locale, "Feuerball"));
unit_addorder(u, create_order(K_CAST, u->faction->locale, "Feuerball"));
CuAssertPtrEquals(tc, casts, 0);
magic();
CuAssertPtrNotNull(tc, casts);
CuAssertIntEquals(tc, 2, ql_length(casts));
ql_free(casts);
test_cleanup();
}
CuSuite *get_magic_suite(void) CuSuite *get_magic_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_multi_cast);
SUITE_ADD_TEST(suite, test_updatespells); SUITE_ADD_TEST(suite, test_updatespells);
SUITE_ADD_TEST(suite, test_spellbooks); SUITE_ADD_TEST(suite, test_spellbooks);
SUITE_ADD_TEST(suite, test_pay_spell); SUITE_ADD_TEST(suite, test_pay_spell);

2
src/move.c
View File

@ -366,7 +366,7 @@ static int canwalk(unit * u)
return E_CANWALK_TOOMANYCARTS; return E_CANWALK_TOOMANYCARTS;
/* Es muß nicht zwingend an den Wagen liegen, aber egal... (man /* Es muß nicht zwingend an den Wagen liegen, aber egal... (man
* könnte z.B. auch 8 Eisen abladen, damit ein weiterer Wagen als * könnte z.B. auch 8 Eisen abladen, damit ein weiterer Wagen als
* Fracht draufpaßt) */ * Fracht draufpasst) */
return E_CANWALK_TOOHEAVY; return E_CANWALK_TOOHEAVY;
} }

7
src/report.c
View File

@ -1471,14 +1471,12 @@ report_template(const char *filename, report_context * ctx, const char *charset)
newline(out); newline(out);
newline(out); newline(out);
sprintf(buf, "%s %s \"%s\"", LOC(f->locale, "ERESSEA"), factionid(f), sprintf(buf, "%s %s \"%s\"", LOC(f->locale, "ERESSEA"), factionid(f), f->passw);
LOC(f->locale, "enterpasswd"));
rps_nowrap(out, buf); rps_nowrap(out, buf);
newline(out); newline(out);
newline(out); newline(out);
sprintf(buf, "; ECHECK -l -w4 -r%d -v%s", f->race->recruitcost, sprintf(buf, "; ECHECK -l -w4 -r%d -v%s", f->race->recruitcost,
ECHECK_VERSION); ECHECK_VERSION);
/* -v3.4: ECheck Version 3.4.x */
rps_nowrap(out, buf); rps_nowrap(out, buf);
newline(out); newline(out);
@ -1575,7 +1573,8 @@ report_template(const char *filename, report_context * ctx, const char *charset)
newline(out); newline(out);
} }
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (u->old_orders && is_repeated(ord)) keyword_t kwd = getkeyword(ord);
if (u->old_orders && is_repeated(kwd))
continue; /* unit has defaults */ continue; /* unit has defaults */
if (is_persistent(ord)) { if (is_persistent(ord)) {
strcpy(buf, " "); strcpy(buf, " ");

27
src/reports.c
View File

@ -52,6 +52,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/language.h> #include <util/language.h>
#include <util/lists.h> #include <util/lists.h>
#include <util/log.h> #include <util/log.h>
#include <stream.h>
#include <quicklist.h> #include <quicklist.h>
/* libc includes */ /* libc includes */
@ -59,6 +60,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -793,7 +795,8 @@ size_t size)
bool printed = 0; bool printed = 0;
order *ord;; order *ord;;
for (ord = u->old_orders; ord; ord = ord->next) { for (ord = u->old_orders; ord; ord = ord->next) {
if (is_repeated(ord)) { keyword_t kwd = getkeyword(ord);
if (is_repeated(kwd)) {
if (printed < ORDERS_IN_NR) { if (printed < ORDERS_IN_NR) {
bytes = buforder(bufp, size, ord, printed++); bytes = buforder(bufp, size, ord, printed++);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
@ -805,7 +808,8 @@ size_t size)
} }
if (printed < ORDERS_IN_NR) if (printed < ORDERS_IN_NR)
for (ord = u->orders; ord; ord = ord->next) { for (ord = u->orders; ord; ord = ord->next) {
if (is_repeated(ord)) { keyword_t kwd = getkeyword(ord);
if (is_repeated(kwd)) {
if (printed < ORDERS_IN_NR) { if (printed < ORDERS_IN_NR) {
bytes = buforder(bufp, size, ord, printed++); bytes = buforder(bufp, size, ord, printed++);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
@ -2291,7 +2295,7 @@ static void eval_race(struct opstack **stack, const void *userdata)
static void eval_order(struct opstack **stack, const void *userdata) static void eval_order(struct opstack **stack, const void *userdata)
{ /* order -> string */ { /* order -> string */
const struct order *ord = (const struct order *)opop(stack).v; const struct order *ord = (const struct order *)opop(stack).v;
char buf[512]; char buf[4096];
size_t len; size_t len;
variant var; variant var;
@ -2497,6 +2501,23 @@ static void log_orders(const struct message *msg)
} }
} }
int stream_printf(struct stream * out, const char *format, ...) {
va_list args;
int result;
char buffer[4096];
size_t bytes = sizeof(buffer);
// TODO: should be in storage/stream.c (doesn't exist yet)
va_start(args, format);
result = vsnprintf(buffer, bytes, format, args);
if (result >= 0 && (size_t)result < bytes) {
bytes = (size_t)result;
// TODO: else = buffer too small
}
out->api->write(out->handle, buffer, bytes);
va_end(args);
return result;
}
void register_reports(void) void register_reports(void)
{ {
/* register datatypes for the different message objects */ /* register datatypes for the different message objects */

3
src/reports.h
View File

@ -25,6 +25,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <kernel/objtypes.h> #include <kernel/objtypes.h>
#include <kernel/types.h> #include <kernel/types.h>
struct stream;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -153,6 +155,7 @@ extern "C" {
void freestrlist(strlist * s); void freestrlist(strlist * s);
void split_paragraph(strlist ** SP, const char *s, unsigned int indent, unsigned int width, char mark); void split_paragraph(strlist ** SP, const char *s, unsigned int indent, unsigned int width, char mark);
int stream_printf(struct stream * out, const char *format, ...);
#define GR_PLURAL 0x01 /* grammar: plural */ #define GR_PLURAL 0x01 /* grammar: plural */
#define MAX_INVENTORY 128 /* maimum number of different items in an inventory */ #define MAX_INVENTORY 128 /* maimum number of different items in an inventory */

24
src/reports.test.c
View File

@ -2,6 +2,7 @@
#include <config.h> #include <config.h>
#include "reports.h" #include "reports.h"
#include "report.h" #include "report.h"
#include "creport.h"
#include <kernel/building.h> #include <kernel/building.h>
#include <kernel/faction.h> #include <kernel/faction.h>
@ -155,9 +156,32 @@ static void test_sparagraph(CuTest *tc) {
CuAssertPtrEquals(tc, 0, sp->next->next->next); CuAssertPtrEquals(tc, 0, sp->next->next->next);
} }
static void test_cr_unit(CuTest *tc) {
stream strm;
char line[1024];
faction *f;
region *r;
unit *u;
test_cleanup();
f = test_create_faction(0);
r = test_create_region(0, 0, 0);
u = test_create_unit(f, r);
renumber_unit(u, 1234);
mstream_init(&strm);
cr_output_unit(&strm, r, f, u, see_unit);
strm.api->rewind(strm.handle);
CuAssertIntEquals(tc, 0, strm.api->readln(strm.handle, line, sizeof(line)));
CuAssertStrEquals(tc, line, "EINHEIT 1234");
mstream_done(&strm);
test_cleanup();
}
CuSuite *get_reports_suite(void) CuSuite *get_reports_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_cr_unit);
SUITE_ADD_TEST(suite, test_reorder_units); SUITE_ADD_TEST(suite, test_reorder_units);
SUITE_ADD_TEST(suite, test_seen_faction); SUITE_ADD_TEST(suite, test_seen_faction);
SUITE_ADD_TEST(suite, test_regionid); SUITE_ADD_TEST(suite, test_regionid);

15
src/spells.test.c
View File

@ -20,13 +20,10 @@
#include <assert.h> #include <assert.h>
static struct castorder *test_create_castorder(castorder *order, unit *u, const char *name, int level, float force, int range) { static void test_create_castorder(castorder *order, unit *u, int level, float force, int range) {
struct locale * lang; struct locale * lang;
spell *sp;
lang = get_or_create_locale("en"); lang = get_or_create_locale("en");
sp = create_spell(name, 0); create_castorder(order, u, NULL, NULL, u->region, level, force, range, create_order(K_CAST, lang, ""), NULL);
return order = create_castorder(order, u, NULL, sp, u->region, level, force, range, create_order(K_CAST, lang, ""), NULL);
} }
static void test_dreams(CuTest *tc) { static void test_dreams(CuTest *tc) {
@ -39,12 +36,12 @@ static void test_dreams(CuTest *tc) {
test_cleanup(); test_cleanup();
test_create_world(); test_create_world();
r=findregion(0, 0); r=findregion(0, 0);
f1 = test_create_faction(test_create_race("human")); f1 = test_create_faction(0);
f2 = test_create_faction(test_create_race("human")); f2 = test_create_faction(0);
u1 = test_create_unit(f1, r); u1 = test_create_unit(f1, r);
u2 = test_create_unit(f2, r); u2 = test_create_unit(f2, r);
test_create_castorder(&order, u1, "goodreams", 10, 10., 0); test_create_castorder(&order, u1, 10, 10., 0);
level = sp_gooddreams(&order); level = sp_gooddreams(&order);
CuAssertIntEquals(tc, 10, level); CuAssertIntEquals(tc, 10, level);
@ -57,7 +54,7 @@ static void test_dreams(CuTest *tc) {
CuAssertIntEquals(tc, 1, get_modifier(u1, SK_MELEE, 11, r, false)); CuAssertIntEquals(tc, 1, get_modifier(u1, SK_MELEE, 11, r, false));
CuAssertIntEquals(tc, 0, get_modifier(u2, SK_MELEE, 11, r, false)); CuAssertIntEquals(tc, 0, get_modifier(u2, SK_MELEE, 11, r, false));
test_create_castorder(&order, u1, "baddreams", 10, 10., 0); test_create_castorder(&order, u1, 10, 10., 0);
level = sp_baddreams(&order); level = sp_baddreams(&order);
CuAssertIntEquals(tc, 10, level); CuAssertIntEquals(tc, 10, level);

2
src/sqlite.c
View File

@ -123,9 +123,9 @@ static void update_faction(sqlite3 *db, const faction *f) {
"INSERT INTO faction_data (faction_id, code, name, email, lang, turn)" "INSERT INTO faction_data (faction_id, code, name, email, lang, turn)"
" VALUES (?, ?, ?, ?, ?, ?)"; " VALUES (?, ?, ?, ?, ?, ?)";
sqlite3_stmt *stmt = 0; sqlite3_stmt *stmt = 0;
strcpy(code, itoa36(f->no));
sqlite3_prepare_v2(db, sql, -1, &stmt, 0); sqlite3_prepare_v2(db, sql, -1, &stmt, 0);
sqlite3_bind_int(stmt, 1, f->subscription); sqlite3_bind_int(stmt, 1, f->subscription);
strcpy(code, itoa36(f->no));
sqlite3_bind_text(stmt, 2, code, -1, SQLITE_STATIC); sqlite3_bind_text(stmt, 2, code, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 3, f->name, -1, SQLITE_STATIC); sqlite3_bind_text(stmt, 3, f->name, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 4, f->email, -1, SQLITE_STATIC); sqlite3_bind_text(stmt, 4, f->email, -1, SQLITE_STATIC);

4
src/study.c
View File

@ -222,7 +222,7 @@ bool report, int *academy)
teach->teachers[index] = NULL; teach->teachers[index] = NULL;
} }
else { else {
log_warning("MAXTEACHERS is too low at %d", MAXTEACHERS); log_error("MAXTEACHERS=%d is too low for student %s, teacher %s", MAXTEACHERS, unitname(student), unitname(teacher));
} }
teach->value += n; teach->value += n;
@ -527,7 +527,7 @@ static double study_speedup(unit * u, skill_t s, study_rule_t rule)
return 1.0; return 1.0;
} }
int learn_cmd(unit * u, order * ord) int study_cmd(unit * u, order * ord)
{ {
region *r = u->region; region *r = u->region;
int p; int p;

5
src/study.h
View File

@ -20,19 +20,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_STUDY #define H_KRNL_STUDY
#include "skill.h" #include "skill.h"
#include <kernel/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern int teach_cmd(struct unit *u, struct order *ord); extern int teach_cmd(struct unit *u, struct order *ord);
extern int learn_cmd(struct unit *u, struct order *ord); extern int study_cmd(struct unit *u, struct order *ord);
extern magic_t getmagicskill(const struct locale *lang); extern magic_t getmagicskill(const struct locale *lang);
extern bool is_migrant(struct unit *u); extern bool is_migrant(struct unit *u);
extern int study_cost(struct unit *u, skill_t talent); extern int study_cost(struct unit *u, skill_t talent);
#define MAXTEACHERS 16 #define MAXTEACHERS 20
typedef struct teaching_info { typedef struct teaching_info {
struct unit *teachers[MAXTEACHERS]; struct unit *teachers[MAXTEACHERS];
int value; int value;

99
src/study.test.c Normal file
View File

@ -0,0 +1,99 @@
#include <platform.h>
#include "study.h"
#include <kernel/unit.h>
#include <kernel/faction.h>
#include <kernel/order.h>
#include <util/message.h>
#include <util/language.h>
#include <util/base36.h>
#include <tests.h>
#include <assert.h>
#include <CuTest.h>
typedef struct {
unit *u;
unit *teachers[2];
} study_fixture;
static void setup_study(study_fixture *fix, skill_t sk) {
struct region * r;
struct faction *f;
struct locale *lang;
assert(fix);
test_cleanup();
test_create_world();
r = test_create_region(0, 0, 0);
f = test_create_faction(0);
lang = get_or_create_locale(locale_name(f->locale));
locale_setstring(lang, mkname("skill", skillnames[sk]), skillnames[sk]);
init_skills(lang);
fix->u = test_create_unit(f, r);
assert(fix->u);
fix->u->thisorder = create_order(K_STUDY, f->locale, "%s", skillnames[sk]);
fix->teachers[0] = test_create_unit(f, r);
assert(fix->teachers[0]);
fix->teachers[0]->thisorder = create_order(K_TEACH, f->locale, "%s", itoa36(fix->u->no));
fix->teachers[1] = test_create_unit(f, r);
assert(fix->teachers[1]);
fix->teachers[1]->thisorder = create_order(K_TEACH, f->locale, "%s", itoa36(fix->u->no));
}
static void test_study_no_teacher(CuTest *tc) {
study_fixture fix;
skill *sv;
setup_study(&fix, SK_CROSSBOW);
study_cmd(fix.u, fix.u->thisorder);
CuAssertPtrNotNull(tc, sv = unit_skill(fix.u, SK_CROSSBOW));
CuAssertIntEquals(tc, 1, sv->level);
CuAssertIntEquals(tc, 2, sv->weeks);
CuAssertPtrEquals(tc, 0, test_get_last_message(fix.u->faction->msgs));
test_cleanup();
}
static void test_study_with_teacher(CuTest *tc) {
study_fixture fix;
skill *sv;
setup_study(&fix, SK_CROSSBOW);
set_level(fix.teachers[0], SK_CROSSBOW, TEACHDIFFERENCE);
teach_cmd(fix.teachers[0], fix.teachers[0]->thisorder);
CuAssertPtrEquals(tc, 0, test_get_last_message(fix.u->faction->msgs));
study_cmd(fix.u, fix.u->thisorder);
CuAssertPtrNotNull(tc, sv = unit_skill(fix.u, SK_CROSSBOW));
CuAssertIntEquals(tc, 1, sv->level);
CuAssertIntEquals(tc, 1, sv->weeks);
test_cleanup();
}
static void test_study_with_bad_teacher(CuTest *tc) {
study_fixture fix;
skill *sv;
message *msg;
setup_study(&fix, SK_CROSSBOW);
teach_cmd(fix.teachers[0], fix.teachers[0]->thisorder);
CuAssertPtrNotNull(tc, msg = test_get_last_message(fix.u->faction->msgs));
CuAssertStrEquals(tc, "teach_asgood", test_get_messagetype(msg));
study_cmd(fix.u, fix.u->thisorder);
CuAssertPtrNotNull(tc, sv = unit_skill(fix.u, SK_CROSSBOW));
CuAssertIntEquals(tc, 1, sv->level);
CuAssertIntEquals(tc, 2, sv->weeks);
test_cleanup();
}
CuSuite *get_study_suite(void)
{
CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_study_no_teacher);
SUITE_ADD_TEST(suite, test_study_with_teacher);
SUITE_ADD_TEST(suite, test_study_with_bad_teacher);
return suite;
}

1
src/test_eressea.c
View File

@ -89,6 +89,7 @@ int RunAllTests(void)
RUN_TESTS(suite, vortex); RUN_TESTS(suite, vortex);
RUN_TESTS(suite, wormhole); RUN_TESTS(suite, wormhole);
RUN_TESTS(suite, spy); RUN_TESTS(suite, spy);
RUN_TESTS(suite, study);
printf("\ntest summary: %d tests, %d failed\n", suite->count, suite->failCount); printf("\ntest summary: %d tests, %d failed\n", suite->count, suite->failCount);
log_flags = flags; log_flags = flags;

7
src/tests.c
View File

@ -209,15 +209,20 @@ void test_create_world(void)
} }
message * test_get_last_message(message_list *msgs) { message * test_get_last_message(message_list *msgs) {
if (msgs) {
struct mlist *iter = msgs->begin; struct mlist *iter = msgs->begin;
while (iter->next) { while (iter->next) {
iter = iter->next; iter = iter->next;
} }
return iter->msg; return iter->msg;
} }
return 0;
}
const char * test_get_messagetype(const message *msg) { const char * test_get_messagetype(const message *msg) {
const char * name = msg->type->name; const char * name;
assert(msg);
name = msg->type->name;
if (strcmp(name, "missing_message") == 0) { if (strcmp(name, "missing_message") == 0) {
name = (const char *)msg->parameters[0].v; name = (const char *)msg->parameters[0].v;
} }

1
src/util/strings.c
View File

@ -43,6 +43,7 @@ char *set_string(char **s, const char *neu)
unsigned int hashstring(const char *s) unsigned int hashstring(const char *s)
{ {
unsigned int key = 0; unsigned int key = 0;
assert(s);
while (*s) { while (*s) {
key = key * 37 + *s++; key = key * 37 + *s++;
} }

24
src/util/translation.c
View File

@ -31,7 +31,7 @@
typedef struct opstack { typedef struct opstack {
variant *begin; variant *begin;
variant *top; variant *top;
int size; unsigned int size;
} opstack; } opstack;
variant opstack_pop(opstack ** stackp) variant opstack_pop(opstack ** stackp)
@ -53,10 +53,16 @@ void opstack_push(opstack ** stackp, variant data)
stack->top = stack->begin; stack->top = stack->begin;
*stackp = stack; *stackp = stack;
} }
if (stack->top - stack->begin == stack->size) { if (stack->top == stack->begin + stack->size) {
size_t pos = stack->top - stack->begin; size_t pos = stack->top - stack->begin;
void *tmp;
stack->size += stack->size; stack->size += stack->size;
stack->begin = realloc(stack->begin, sizeof(variant) * stack->size); tmp = realloc(stack->begin, sizeof(variant) * stack->size);
if (!tmp) {
log_error("realloc out of memory");
abort();
}
stack->begin = (variant *)tmp;
stack->top = stack->begin + pos; stack->top = stack->begin + pos;
} }
*stack->top++ = data; *stack->top++ = data;
@ -66,7 +72,7 @@ void opstack_push(opstack ** stackp, variant data)
** static buffer malloc ** static buffer malloc
**/ **/
#define BBUFSIZE 128*1024 #define BBUFSIZE 0x20000
static struct { static struct {
char *begin; char *begin;
char *end; char *end;
@ -79,7 +85,7 @@ char *balloc(size_t size)
static int init = 0; /* STATIC_XCALL: used across calls */ static int init = 0; /* STATIC_XCALL: used across calls */
if (!init) { if (!init) {
init = 1; init = 1;
buffer.current = buffer.begin = malloc(BBUFSIZE); buffer.current = buffer.begin = malloc(BBUFSIZE * sizeof(char));
buffer.end = buffer.begin + BBUFSIZE; buffer.end = buffer.begin + BBUFSIZE;
} }
if (buffer.current + size > buffer.end) { if (buffer.current + size > buffer.end) {
@ -269,7 +275,7 @@ static const char *parse_string(opstack ** stack, const char *in,
} }
else { else {
int ch = (unsigned char)(*ic); int ch = (unsigned char)(*ic);
int bytes; size_t bytes;
switch (ch) { switch (ch) {
case '\\': case '\\':
@ -285,8 +291,8 @@ static const char *parse_string(opstack ** stack, const char *in,
if (ic == NULL) if (ic == NULL)
return NULL; return NULL;
c = (char *)opop_v(stack); c = (char *)opop_v(stack);
bytes = (int)(c ? strlcpy(oc, c, size) : 0); bytes = (c ? strlcpy(oc, c, size) : 0);
if (bytes < (int)size) if (bytes < size)
oc += bytes; oc += bytes;
else else
oc += size; oc += size;
@ -363,7 +369,7 @@ static const char *parse(opstack ** stack, const char *inn,
const char *translate(const char *format, const void *userdata, const char *translate(const char *format, const void *userdata,
const char *vars, variant args[]) const char *vars, variant args[])
{ {
int i = 0; unsigned int i = 0;
const char *ic = vars; const char *ic = vars;
char symbol[32]; char symbol[32];
char *oc = symbol; char *oc = symbol;

2
storage

@ -1 +1 @@
Subproject commit 2bcd3b1e64764321773672333bd133a61b35b840 Subproject commit 86b96744157eb08c55998df4c12fa2e073005b49

BIN
tests/data/184.dat
View File

Binary file not shown.

40
tests/write-reports.sh Executable file
View File

@ -0,0 +1,40 @@
cleanup () {
rm -rf reports score
}
setup() {
ln -sf ../scripts/config.lua
}
quit() {
test -n "$2" && echo $2
exit $1
}
ROOT=`pwd`
while [ ! -d $ROOT/.git ]; do
ROOT=`dirname $ROOT`
done
set -e
cd $ROOT/tests
setup
cleanup
VALGRIND=`which valgrind`
SERVER=../Debug/eressea/eressea
if [ -n "$VALGRIND" ]; then
SUPP=../share/ubuntu-12_04.supp
SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
fi
echo "running $SERVER"
$SERVER -t 184 ../scripts/reports.lua
[ -d reports ] || quit 4 "no reports directory created"
CRFILE=184-zvto.cr
grep -q PARTEI reports/$CRFILE || quit 1 "CR did not contain any factions"
grep -q REGION reports/$CRFILE || quit 2 "CR did not contain any regions"
grep -q SCHIFF reports/$CRFILE || quit 3 "CR did not contain any ships"
grep -q BURG reports/$CRFILE || quit 4 "CR did not contain any buildings"
grep -q EINHEIT reports/$CRFILE || quit 5 "CR did not contain any units"
grep -q GEGENSTAENDE reports/$CRFILE || quit 6 "CR did not contain any items"
echo "integration tests: PASS"
cleanup