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

Merge remote-tracking branch 'eressea/server'

This commit is contained in:
TomBraun 2014-07-02 15:01:42 +02:00
parent b70fc76921 ee1d97df19
commit 98354ef3a8
5 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/build.c
View File

@ -66,10 +66,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <attributes/matmod.h> #include <attributes/matmod.h>
#include <attributes/alliance.h> #include <attributes/alliance.h>
#define STONERECYCLE 50
/* Name, MaxGroesse, MinBauTalent, Kapazitaet, {Eisen, Holz, Stein, BauSilber,
* Laen, Mallorn}, UnterSilber, UnterSpezialTyp, UnterSpezial */
struct building *getbuilding(const struct region *r) struct building *getbuilding(const struct region *r)
{ {
building *b = findbuilding(getid()); building *b = findbuilding(getid());
@ -240,7 +236,7 @@ int destroy_cmd(unit * u, struct order *ord)
int c; int c;
for (c = 0; con->materials[c].number; ++c) { for (c = 0; con->materials[c].number; ++c) {
const requirement *rq = con->materials + c; const requirement *rq = con->materials + c;
int recycle = (int)(rq->recycle * rq->number * size / con->reqsize); int recycle = (rq->number * size / con->reqsize)/2;
if (recycle) { if (recycle) {
change_resource(u, rq->rtype, recycle); change_resource(u, rq->rtype, recycle);
} }

1
src/kernel/build.h
View File

@ -37,7 +37,6 @@ extern "C" {
typedef struct requirement { typedef struct requirement {
const struct resource_type *rtype; const struct resource_type *rtype;
int number; int number;
double recycle; /* recycling quota */
} requirement; } requirement;
typedef struct construction { typedef struct construction {

1
src/kernel/jsonconf.c
View File

@ -75,7 +75,6 @@ static void json_requirements(cJSON *json, requirement **matp) {
requirement *mat = calloc(sizeof(requirement), 1+cJSON_GetArraySize(json)); requirement *mat = calloc(sizeof(requirement), 1+cJSON_GetArraySize(json));
for (i=0,child=json->child;child;child=child->next,++i) { for (i=0,child=json->child;child;child=child->next,++i) {
mat[i].number = child->valueint; mat[i].number = child->valueint;
mat[i].recycle = 0.5f;
mat[i].rtype = rt_get_or_create(child->string); mat[i].rtype = rt_get_or_create(child->string);
} }
*matp = mat; *matp = mat;

1
src/kernel/jsonconf.test.c
View File

@ -204,7 +204,6 @@ static void test_buildings(CuTest * tc)
CuAssertPtrNotNull(tc, bt->construction); CuAssertPtrNotNull(tc, bt->construction);
CuAssertPtrNotNull(tc, bt->construction->materials); CuAssertPtrNotNull(tc, bt->construction->materials);
CuAssertIntEquals(tc, 2, bt->construction->materials[0].number); CuAssertIntEquals(tc, 2, bt->construction->materials[0].number);
CuAssertDblEquals(tc, 0.5f, bt->construction->materials[0].recycle, 0.0f);
CuAssertPtrEquals(tc, (void *)get_resourcetype(R_STONE), (void *)bt->construction->materials[0].rtype); CuAssertPtrEquals(tc, (void *)get_resourcetype(R_STONE), (void *)bt->construction->materials[0].rtype);
CuAssertIntEquals(tc, 1, bt->construction->materials[1].number); CuAssertIntEquals(tc, 1, bt->construction->materials[1].number);
CuAssertPtrEquals(tc, (void *)get_resourcetype(R_IRON), (void *)bt->construction->materials[1].rtype); CuAssertPtrEquals(tc, (void *)get_resourcetype(R_IRON), (void *)bt->construction->materials[1].rtype);

1
src/kernel/xmlreader.c
View File

@ -122,7 +122,6 @@ xml_readrequirements(xmlNodePtr * nodeTab, int nodeNr, requirement ** reqArray)
xmlChar *propValue; xmlChar *propValue;
radd->number = xml_ivalue(node, "quantity", 1); radd->number = xml_ivalue(node, "quantity", 1);
radd->recycle = xml_fvalue(node, "recycle", 0.5);
propValue = xmlGetProp(node, BAD_CAST "type"); propValue = xmlGetProp(node, BAD_CAST "type");
radd->rtype = rt_get_or_create((const char *)propValue); radd->rtype = rt_get_or_create((const char *)propValue);