From 35c2baafbe7c0905b52e4c2b77c412f2a2ee3b1e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 25 Apr 2014 07:47:23 +0200 Subject: [PATCH] do not read turn file for turn 0 --- core/scripts/init.lua | 4 ++-- scripts/e3a/rules.lua | 2 +- src/kernel/config.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/scripts/init.lua b/core/scripts/init.lua index 83bcc4f63..b184887c3 100755 --- a/core/scripts/init.lua +++ b/core/scripts/init.lua @@ -4,7 +4,7 @@ require "resources" function run_editor() local turn = get_turn() - if turn==0 then + if turn<0 then turn = read_turn() set_turn(turn) end @@ -28,7 +28,7 @@ function run_turn() require(config.game .. ".main") local turn = get_turn() - if turn==0 then + if turn<0 then turn = read_turn() set_turn(turn) end diff --git a/scripts/e3a/rules.lua b/scripts/e3a/rules.lua index 2d137d2d0..0c5e9be85 100644 --- a/scripts/e3a/rules.lua +++ b/scripts/e3a/rules.lua @@ -8,7 +8,7 @@ function item_canuse(u, iname) end end if iname=="rep_crossbow" then - -- only dwarves and halflings allowed to use towershield + -- only dwarves and halflings allowed to use repeating crossbow return race=="dwarf" or race=="halfling" end if iname=="scale" then diff --git a/src/kernel/config.c b/src/kernel/config.c index e1647d7e4..5c285bec6 100644 --- a/src/kernel/config.c +++ b/src/kernel/config.c @@ -98,7 +98,7 @@ FILE *updatelog; const struct race *new_race[MAXRACES]; bool sqlpatch = false; bool battledebug = false; -int turn = 0; +int turn = -1; int NewbieImmunity(void) {