diff --git a/src/eressea/lua/region.cpp b/src/eressea/lua/region.cpp index d569fb293..599fd47b5 100644 --- a/src/eressea/lua/region.cpp +++ b/src/eressea/lua/region.cpp @@ -155,8 +155,8 @@ region_getresource(const region& r, const char * type) { const resource_type * rtype = rt_find(type); if (rtype!=NULL) { - const rawmaterial * rm = r.resources; - while (rm) { + const rawmaterial * rm; + for (rm=r.resources;rm;rm=rm->next) { if (rm->type->rtype==rtype) { return rm->amount; } diff --git a/src/eressea/lua/test.cpp b/src/eressea/lua/test.cpp index 24936c83e..35e894092 100644 --- a/src/eressea/lua/test.cpp +++ b/src/eressea/lua/test.cpp @@ -53,7 +53,7 @@ adamantium_island(region * r) region * ri = rp->data; if (ri->terrain==newterrain(T_MOUNTAIN)) { int base = 1 << (rng_int() % 4); - seed_adamantium(r, base); + seed_adamantium(ri, base); } } free_regionlist(rlist); diff --git a/src/scripts/adamant.lua b/src/scripts/adamant.lua index abf8bd15e..79b6eaa2f 100644 --- a/src/scripts/adamant.lua +++ b/src/scripts/adamant.lua @@ -17,7 +17,9 @@ end function adamant_seeds() for r in regions() do if r:get_key("tnnL") then + print("1 ", r:get_resource("adamantium"), r) test.adamantium_island(r) + print("2 ", r:get_resource("adamantium")) end end end