From 1e17981a1f9d6877ac3cc1d58ceb4720a576d43a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 24 Apr 2005 21:46:53 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=480 Folgen von Schiffen funktioniert nicht (Nachtrag). --- src/common/kernel/movement.c | 4 +--- src/eressea/lua/eressea.cpp | 13 +++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 3625e964e..e6fc8b761 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -2259,11 +2259,9 @@ move_hunters(void) while (*up!=NULL) { unit * u = *up; - if (!fval(u, FL_DH)) { + if (!fval(u, UFL_MOVED)) { order * ord; - fset(u, FL_DH); - for (ord=u->orders;ord;ord=ord->next) { if (get_keyword(ord) == K_FOLLOW) { param_t p; diff --git a/src/eressea/lua/eressea.cpp b/src/eressea/lua/eressea.cpp index 920373e46..e833ab348 100644 --- a/src/eressea/lua/eressea.cpp +++ b/src/eressea/lua/eressea.cpp @@ -64,19 +64,12 @@ write_game(const char *filename) return writegame(filename, 0); } -static int -write_reports() -{ - reports(); - return 0; -} - static summary * sum_begin = 0; static int init_summary() { - sum_begin = make_summary(false); + sum_begin = make_summary(); return 0; } @@ -84,7 +77,7 @@ static int write_summary() { if (sum_begin) { - summary * sum_end = make_summary(true); + summary * sum_end = make_summary(); report_summary(sum_end, sum_begin, false); report_summary(sum_end, sum_begin, true); return 0; @@ -205,7 +198,7 @@ bind_eressea(lua_State * L) def("read_game", &read_game), def("write_game", &write_game), def("write_passwords", &writepasswd), - def("write_reports", &write_reports), + def("write_reports", &reports), def("init_summary", &init_summary), def("write_summary", &write_summary), def("read_orders", &readorders),