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

Merge pull request #206 from badgerman/feature-giverestriction-default 

Make GiveRestriction default to 0, do not cache
This commit is contained in:
Enno Rehling 2015-05-22 17:25:15 +02:00
parent 1a8c95dc61 73fa9a276d
commit 3e93ebfcb7
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/tests/pool.lua
View File

@ -8,7 +8,6 @@ function setup()
eressea.settings.set("rules.economy.food", "0") eressea.settings.set("rules.economy.food", "0")
eressea.settings.set("nmr.removenewbie", "0") eressea.settings.set("nmr.removenewbie", "0")
eressea.settings.set("nmr.timeout", "0") eressea.settings.set("nmr.timeout", "0")
eressea.settings.set("GiveRestriction", "0")
eressea.settings.set("rules.magic.playerschools", "") eressea.settings.set("rules.magic.playerschools", "")
conf = [[{ conf = [[{
"races": { "races": {

7
src/give.c
View File

@ -57,12 +57,7 @@ static int max_transfers(void) {
static int GiveRestriction(void) static int GiveRestriction(void)
{ {
static int value = -1; return get_param_int(global.parameters, "GiveRestriction", 0);
if (value < 0) {
const char *str = get_param(global.parameters, "GiveRestriction");
value = str ? atoi(str) : 0;
}
return value;
} }
static void feedback_give_not_allowed(unit * u, order * ord) static void feedback_give_not_allowed(unit * u, order * ord)