diff --git a/src/monocoque/devices/hapticeffect.c b/src/monocoque/devices/hapticeffect.c index d8014b6..14ecd8d 100644 --- a/src/monocoque/devices/hapticeffect.c +++ b/src/monocoque/devices/hapticeffect.c @@ -63,11 +63,13 @@ int loadtyreconfig(SimData* simdata, char* configfile) if(config_car != NULL) { const char* car; + int sim; double tyre0; double tyre1; double tyre2; double tyre3; config_setting_lookup_string(config_car, "car", &car); + config_setting_lookup_int(config_car, "sim", &sim); config_setting_lookup_float(config_car, "tyre0", &tyre0); config_setting_lookup_float(config_car, "tyre1", &tyre1); config_setting_lookup_float(config_car, "tyre2", &tyre2); @@ -77,7 +79,7 @@ int loadtyreconfig(SimData* simdata, char* configfile) { if(simdata->car[0] != '\0' && car[0] != '\0') { - if (strcicmp(car, simdata->car) == 0) + if (strcicmp(car, simdata->car) == 0 && sim == simdata->sim) { slogt("found saved car %s with tyre diameters %f %f %f %f", car, tyre0, tyre1, tyre2, tyre3); simdata->tyrediameter[0] = tyre0; @@ -220,6 +222,8 @@ int savetyreconfig(SimData* simdata, char* configfile) setting = config_setting_add(carobject, "car", CONFIG_TYPE_STRING); config_setting_set_string(setting, simdata->car); + setting = config_setting_add(carobject, "sim", CONFIG_TYPE_INT); + config_setting_set_int(setting, simdata->sim); setting = config_setting_add(carobject, "tyre0", CONFIG_TYPE_FLOAT); config_setting_set_float(setting, simdata->tyrediameter[0]); setting = config_setting_add(carobject, "tyre1", CONFIG_TYPE_FLOAT);