From cb56a820b5607906d07f89b72409e79fc60a62ca Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 9 Jul 2012 01:25:09 +0200 Subject: [PATCH] fix gcc compilation fix broken test for duplicate orders --- scripts/tests/common.lua | 4 ++-- src/gamecode/report.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/tests/common.lua b/scripts/tests/common.lua index 34f46b169..1b21a0390 100755 --- a/scripts/tests/common.lua +++ b/scripts/tests/common.lua @@ -980,8 +980,8 @@ function test_bug_1679() local file = io.open(filename, "w") file:write('ERESSEA ' .. itoa36(f.id) .. ' "' .. f.password .. '"\n') file:write('EINHEIT ' .. itoa36(u.id) .. "\n") - file:write("NACH W\n") file:write("ARBEITEN\n") + file:write("NACH W\n") file:close() eressea.read_orders(filename) @@ -989,7 +989,7 @@ function test_bug_1679() init_reports() write_report(f) assert_true(find_in_report(f, "Die Einheit kann keine weiteren langen Befehle", "cr")) - assert_true(find_in_report(f, "entdeckt, dass es keinen Weg nach Westen gibt")) + assert_false(find_in_report(f, "entdeckt, dass es keinen Weg nach Westen gibt")) end function test_building_unique0() diff --git a/src/gamecode/report.c b/src/gamecode/report.c index 898b06c20..1a253cadb 100644 --- a/src/gamecode/report.c +++ b/src/gamecode/report.c @@ -221,7 +221,6 @@ rparagraph(FILE * F, const char *str, ptrdiff_t indent, int hanging_indent, static void nr_spell(FILE * F, spellbook_entry * sbe, const struct locale *lang) { int bytes, k, itemanz, costtyp; - int dh = 0; char buf[4096]; char *bufp = buf; size_t size = sizeof(buf) - 1;