From 10d572f227ad9477e3b803e377736c3ea7a66d8e Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Tue, 28 Oct 2025 12:18:59 -0400 Subject: [PATCH] fix issue with diameters.config not using gameid. Update to latest simapi --- src/monocoque/devices/hapticeffect.c | 24 ++++++++++++------------ src/monocoque/simulatorapi/simapi | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/monocoque/devices/hapticeffect.c b/src/monocoque/devices/hapticeffect.c index 32b84ce..461b97a 100644 --- a/src/monocoque/devices/hapticeffect.c +++ b/src/monocoque/devices/hapticeffect.c @@ -75,15 +75,15 @@ int loadtyreconfig(SimData* simdata, char* configfile) config_setting_lookup_float(config_car, "tyre1", &tyre1); config_setting_lookup_float(config_car, "tyre2", &tyre2); config_setting_lookup_float(config_car, "tyre3", &tyre3); - int found = config_setting_lookup_string(config_car, "sim", &simstr); - if(found == CONFIG_FALSE) - { - int found = config_setting_lookup_int(config_car, "sim", &sim); - } - else - { - sim = simapi_strtogame(simstr); - } + int found = config_setting_lookup_int(config_car, "sim", &sim); + //if(found == CONFIG_FALSE) + //{ + // int found = config_setting_lookup_int(config_car, "sim", &sim); + //} + //else + //{ + // sim = simapi_strtogame(simstr); + //} if(simdata->car != NULL && car != NULL) @@ -142,8 +142,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_STRING); - config_setting_set_string(setting, simapi_gametostr(simdata->simexe)); + setting = config_setting_add(carobject, "sim", CONFIG_TYPE_INT64); + config_setting_set_int64(setting, simdata->simexe); 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); @@ -160,7 +160,7 @@ int savetyreconfig(SimData* simdata, char* configfile) config_destroy(&cfg); } - slogi("New configuration successfully written to: %s\n", configfile); + slogi("New configuration successfully written to: %s for sim %i, car %s\n", configfile, simdata->simexe, simdata->car); config_destroy(&cfg); diff --git a/src/monocoque/simulatorapi/simapi b/src/monocoque/simulatorapi/simapi index 6a3fcdb..915b272 160000 --- a/src/monocoque/simulatorapi/simapi +++ b/src/monocoque/simulatorapi/simapi @@ -1 +1 @@ -Subproject commit 6a3fcdb1c207b64fac707043b87cbd194a2ca8c3 +Subproject commit 915b272c92da7e81f1c78fd8c80674f6bee1fe24