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

Merge pull request #209 from badgerman/release-3-5 

Release 3.5.1
This commit is contained in:
Enno Rehling 2015-05-24 08:00:57 +02:00
parent e99db198eb 9780ec845f
commit fb39835cf0
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s/runtests
View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
set -e
ROOT=$(pwd) ROOT=$(pwd)
while [ ! -d $ROOT/.git ]; do while [ ! -d $ROOT/.git ]; do
ROOT=$(dirname $ROOT) ROOT=$(dirname $ROOT)

1
scripts/tests/pool.lua
View File

@ -61,6 +61,7 @@ end
function test_give_divisor() function test_give_divisor()
eressea.settings.set("rules.items.give_divisor", 2) eressea.settings.set("rules.items.give_divisor", 2)
eressea.settings.set("GiveRestriction", 0)
local r = region.create(1, 1, "plain") local r = region.create(1, 1, "plain")
local f1 = faction.create("test@example.com", "human", "de") local f1 = faction.create("test@example.com", "human", "de")
local f2 = faction.create("test@example.com", "human", "de") local f2 = faction.create("test@example.com", "human", "de")

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)

10
src/laws.c
View File

@ -3501,8 +3501,7 @@ void update_long_order(unit * u)
} }
} }
static int static int use_item(unit * u, const item_type * itype, int amount, struct order *ord)
use_item(unit * u, const item_type * itype, int amount, struct order *ord)
{ {
int i; int i;
int target = read_unitid(u->faction, u->region); int target = read_unitid(u->faction, u->region);
@ -3795,10 +3794,6 @@ int use_cmd(unit * u, struct order *ord)
if (itype != NULL) { if (itype != NULL) {
err = use_item(u, itype, n, ord); err = use_item(u, itype, n, ord);
assert(err <= 0 || !"use_item should not return positive values.");
if (err > 0) {
log_error("use_item returned a value>0 for %s\n", resourcename(itype->rtype, 0));
}
} }
switch (err) { switch (err) {
case ENOITEM: case ENOITEM:
@ -3810,6 +3805,9 @@ int use_cmd(unit * u, struct order *ord)
case ENOSKILL: case ENOSKILL:
cmistake(u, ord, 50, MSG_PRODUCE); cmistake(u, ord, 50, MSG_PRODUCE);
break; break;
default:
// no error
break;
} }
return err; return err;
} }