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

implement quick-and-dirty gcd

This commit is contained in:
Enno Rehling 2017-02-18 15:45:57 +01:00
parent aee68fbd0f
commit 9682d6b48c
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/kernel/xmlreader.c
View File

@ -905,6 +905,22 @@ static int parse_rules(xmlDocPtr doc)
return 0; return 0;
} }
static int gcd(int num, int den) {
const int primes[] = { 3, 5, 7, 11, 0 };
int i=0, g = 1, p = 2;
while (p && p<=den && p<=num) {
if (num % p == 0 && den % p == 0) {
num /= p;
den /= p;
g *= p;
}
else {
p = primes[i++];
}
}
return g;
}
static int parse_resources(xmlDocPtr doc) static int parse_resources(xmlDocPtr doc)
{ {
xmlXPathContextPtr xpath = xmlXPathNewContext(doc); xmlXPathContextPtr xpath = xmlXPathNewContext(doc);
@ -1025,15 +1041,13 @@ static int parse_resources(xmlDocPtr doc)
rdata->modifiers[k].flags = RMF_SKILL; rdata->modifiers[k].flags = RMF_SKILL;
} }
else if (strcmp((const char *)propValue, "material") == 0) { else if (strcmp((const char *)propValue, "material") == 0) {
int num, den = 100; int g, num, den = 100;
double fval = xml_fvalue(node, "value", 0); double fval = xml_fvalue(node, "value", 0);
// TODO: extract into a function for reading fractions? // TODO: extract into a function for reading fractions?
num = (int)(fval * den + 0.5); num = (int)(fval * den + 0.5);
if (num % 10 == 0) { g = gcd(num, den);
// TODO: calculating a GCD would be better than this num /= g;
num /= 10; den /= g;
den /= 10;
}
rdata->modifiers[k].value.sa[0] = (short)num; rdata->modifiers[k].value.sa[0] = (short)num;
rdata->modifiers[k].value.sa[1] = (short)den; rdata->modifiers[k].value.sa[1] = (short)den;
rdata->modifiers[k].flags = RMF_SAVEMATERIAL; rdata->modifiers[k].flags = RMF_SAVEMATERIAL;