From 87548a276d14b04cdcd42822fbbac0c723d993a3 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 17 Dec 2003 23:11:52 +0000 Subject: [PATCH] =?UTF-8?q?Befehlsskript=20um=20Zug=20auszuf=C3=BChren.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/wdw-run.lua | 11 +++++++---- src/scripts/wdw-setup.lua | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/scripts/wdw-run.lua b/src/scripts/wdw-run.lua index 5331971fc..4a93ffac1 100644 --- a/src/scripts/wdw-run.lua +++ b/src/scripts/wdw-run.lua @@ -24,13 +24,16 @@ function run_wdw() end end + local outfile="wdw-setup" -- run the alliances setup if list_empty(alliances) then dofile("wdw-setup.lua") + else + -- run the turn (not yet) + read_orders(orders) + process_orders() + outfile = "" .. get_turn() end - -- -- run the turn (not yet) - -- read_orders(orders) - -- process_orders() -- siegbedingungen ausgeben dofile("wdw-standings.lua") @@ -41,7 +44,7 @@ function run_wdw() -- write the resulting file to 'wdw-setup' - if write_game("wdw-setup")~=0 then + if write_game(outfile)~=0 then print("could not write game") return -1 end diff --git a/src/scripts/wdw-setup.lua b/src/scripts/wdw-setup.lua index c7c48e982..089ea6464 100644 --- a/src/scripts/wdw-setup.lua +++ b/src/scripts/wdw-setup.lua @@ -16,6 +16,7 @@ end function get_position(aid) -- return the position at which alliance 'aid' will start. + print("Alliance " .. aid) local pos = positions[aid] -- hack, because i have no coordinates yet: