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

do not read turn file for turn 0

This commit is contained in:
Enno Rehling 2014-04-25 07:47:23 +02:00
parent 1588d31a7e
commit 35c2baafbe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/scripts/init.lua
View File

@ -4,7 +4,7 @@ require "resources"
function run_editor() function run_editor()
local turn = get_turn() local turn = get_turn()
if turn==0 then if turn<0 then
turn = read_turn() turn = read_turn()
set_turn(turn) set_turn(turn)
end end
@ -28,7 +28,7 @@ function run_turn()
require(config.game .. ".main") require(config.game .. ".main")
local turn = get_turn() local turn = get_turn()
if turn==0 then if turn<0 then
turn = read_turn() turn = read_turn()
set_turn(turn) set_turn(turn)
end end

2
scripts/e3a/rules.lua
View File

@ -8,7 +8,7 @@ function item_canuse(u, iname)
end end
end end
if iname=="rep_crossbow" then 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" return race=="dwarf" or race=="halfling"
end end
if iname=="scale" then if iname=="scale" then

2
src/kernel/config.c
View File

@ -98,7 +98,7 @@ FILE *updatelog;
const struct race *new_race[MAXRACES]; const struct race *new_race[MAXRACES];
bool sqlpatch = false; bool sqlpatch = false;
bool battledebug = false; bool battledebug = false;
int turn = 0; int turn = -1;
int NewbieImmunity(void) int NewbieImmunity(void)
{ {