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

fix reading weapon damage.

Browse source
This commit is contained in:
Enno Rehling 2018-05-04 17:57:10 +02:00
parent 704148e4bd
commit 82ba0e62d4
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/exparse.c
View file

@ -357,6 +357,24 @@ static void XMLCALL start_weapon(parseinfo *pi, const XML_Char *el, const XML_Ch
++pi->errors; ++pi->errors;
} }
} }
else if (xml_strcmp(el, "damage") == 0) {
weapon_type *wtype = rtype->wtype;
int i, pos = 0;
for (i = 0; attr[i]; i += 2) {
if (xml_strcmp(attr[i], "type") == 0) {
/* damage vs. rider(1) or not(0)? */
if (xml_strcmp(attr[i + 1], "rider") == 0) {
pos = 1;
}
}
else if (xml_strcmp(attr[i], "value") == 0) {
wtype->damage[pos] = str_strdup(attr[i + 1]);
}
else {
handle_bad_input(pi, el, NULL);
}
}
}
else { else {
handle_bad_input(pi, el, NULL); handle_bad_input(pi, el, NULL);
} }
@ -582,29 +600,6 @@ static void start_resources(parseinfo *pi, const XML_Char *el, const XML_Char **
pi->type = EXP_WEAPON; pi->type = EXP_WEAPON;
handle_weapon(pi, el, attr); handle_weapon(pi, el, attr);
} }
else if (rtype->wtype) {
weapon_type *wtype = rtype->wtype;
if (xml_strcmp(el, "damage") == 0) {
int i, pos = 0;
for (i = 0; attr[i]; i += 2) {
if (xml_strcmp(attr[i], "type") == 0) {
/* damage vs. rider(1) or not(0)? */
if (xml_strcmp(attr[i + 1], "rider") == 0) {
pos = 1;
}
}
else if (xml_strcmp(attr[i], "value") == 0) {
wtype->damage[pos] = str_strdup(attr[i + 1]);
}
else {
handle_bad_input(pi, el, NULL);
}
}
}
else {
handle_bad_input(pi, el, NULL);
}
}
else { else {
handle_bad_input(pi, el, NULL); handle_bad_input(pi, el, NULL);
} }
@ -1028,7 +1023,7 @@ int exparse_readfile(const char * filename) {
XML_SetUserData(xp, &pi); XML_SetUserData(xp, &pi);
memset(&pi, 0, sizeof(pi)); memset(&pi, 0, sizeof(pi));
for (;;) { for (;;) {
size_t len = (int) fread(buf, 1, sizeof(buf), F); size_t len = (int)fread(buf, 1, sizeof(buf), F);
int done; int done;
if (ferror(F)) { if (ferror(F)) {
@ -1039,9 +1034,9 @@ int exparse_readfile(const char * filename) {
done = feof(F); done = feof(F);
if (XML_Parse(xp, buf, len, done) == XML_STATUS_ERROR) { if (XML_Parse(xp, buf, len, done) == XML_STATUS_ERROR) {
log_error("parse error at line %" XML_FMT_INT_MOD " of %s: %" XML_FMT_STR, log_error("parse error at line %" XML_FMT_INT_MOD " of %s: %" XML_FMT_STR,
XML_GetCurrentLineNumber(xp), XML_GetCurrentLineNumber(xp),
filename, filename,
XML_ErrorString(XML_GetErrorCode(xp))); XML_ErrorString(XML_GetErrorCode(xp)));
err = -1; err = -1;
break; break;
} }