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

fix loading data where embassy uses floats.

This commit is contained in:
Enno Rehling 2017-02-18 17:52:25 +01:00
parent d5dcf14a56
commit a754975ef9
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/attributes/dict.c
View File

@ -43,7 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <assert.h> #include <assert.h>
typedef enum { typedef enum {
TNONE = 0, TINTEGER = 1 TNONE = 0, TINTEGER = 1, TREAL = 2
} dict_type; } dict_type;
typedef struct dict_data { typedef struct dict_data {
@ -72,11 +72,18 @@ static int dict_read(attrib * a, void *owner, gamedata *data)
dd->name = strdup(name); dd->name = strdup(name);
READ_INT(store, &n); READ_INT(store, &n);
dd->type = (dict_type)n; dd->type = (dict_type)n;
if (dd->type != TINTEGER) { if (dd->type == TINTEGER) {
READ_INT(store, &dd->data.i);
}
else if (dd->type == TREAL) {
float flt;
READ_FLT(store, &flt);
dd->data.real = flt;
}
else {
log_error("read dict, invalid type %d", n); log_error("read dict, invalid type %d", n);
return AT_READ_FAIL; return AT_READ_FAIL;
} }
READ_INT(store, &dd->data.i);
return AT_READ_DEPR; return AT_READ_DEPR;
} }
@ -95,6 +102,16 @@ static void dict_done(attrib * a)
free(a->data.v); free(a->data.v);
} }
static void upgrade_keyval(const dict_data *dd, int keyval[], int v) {
if (strcmp(dd->name, "embassy_muschel") == 0) {
keyval[0] = atoi36("mupL");
keyval[1] = v;
}
else {
log_error("dict conversion, bad entry %s", dd->name);
}
}
static void dict_upgrade(attrib **alist, attrib *abegin) { static void dict_upgrade(attrib **alist, attrib *abegin) {
int n = 0, *keys = 0; int n = 0, *keys = 0;
int i = 0, val[8]; int i = 0, val[8];
@ -105,18 +122,17 @@ static void dict_upgrade(attrib **alist, attrib *abegin) {
} }
for (a = abegin; a && a->type == abegin->type; a = a->next) { for (a = abegin; a && a->type == abegin->type; a = a->next) {
dict_data *dd = (dict_data *)a->data.v; dict_data *dd = (dict_data *)a->data.v;
if (dd->type != TINTEGER) { if (dd->type == TINTEGER) {
log_error("dict conversion, bad type %d for %s", dd->type, dd->name); upgrade_keyval(dd, val + i * 2, dd->data.i);
++i;
}
else if (dd->type == TREAL) {
upgrade_keyval(dd, val + i * 2, (int)dd->data.real);
++i;
} }
else { else {
if (strcmp(dd->name, "embassy_muschel")==0) { log_error("dict conversion, bad type %d for %s", dd->type, dd->name);
val[i * 2] = atoi36("mupL"); assert(!"invalid input");
val[i * 2 + 1] = dd->data.i;
++i;
}
else {
log_error("dict conversion, bad entry %s", dd->name);
}
} }
if (i == 4) { if (i == 4) {
keys = realloc(keys, sizeof(int) * (n + i + 1)); keys = realloc(keys, sizeof(int) * (n + i + 1));