paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue with diameters.config not using gameid. Update to latest simapi

This commit is contained in:
Paul Dino Jones 2025-10-28 12:18:59 -04:00
parent 98bc0b57c9
commit 10d572f227
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/monocoque/devices/hapticeffect.c
View File

@ -75,15 +75,15 @@ int loadtyreconfig(SimData* simdata, char* configfile)
config_setting_lookup_float(config_car, "tyre1", &tyre1); config_setting_lookup_float(config_car, "tyre1", &tyre1);
config_setting_lookup_float(config_car, "tyre2", &tyre2); config_setting_lookup_float(config_car, "tyre2", &tyre2);
config_setting_lookup_float(config_car, "tyre3", &tyre3); config_setting_lookup_float(config_car, "tyre3", &tyre3);
int found = config_setting_lookup_string(config_car, "sim", &simstr); int found = config_setting_lookup_int(config_car, "sim", &sim);
if(found == CONFIG_FALSE) //if(found == CONFIG_FALSE)
{ //{
int found = config_setting_lookup_int(config_car, "sim", &sim); // int found = config_setting_lookup_int(config_car, "sim", &sim);
} //}
else //else
{ //{
sim = simapi_strtogame(simstr); // sim = simapi_strtogame(simstr);
} //}
if(simdata->car != NULL && car != NULL) 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); setting = config_setting_add(carobject, "car", CONFIG_TYPE_STRING);
config_setting_set_string(setting, simdata->car); config_setting_set_string(setting, simdata->car);
setting = config_setting_add(carobject, "sim", CONFIG_TYPE_STRING); setting = config_setting_add(carobject, "sim", CONFIG_TYPE_INT64);
config_setting_set_string(setting, simapi_gametostr(simdata->simexe)); config_setting_set_int64(setting, simdata->simexe);
setting = config_setting_add(carobject, "tyre0", CONFIG_TYPE_FLOAT); setting = config_setting_add(carobject, "tyre0", CONFIG_TYPE_FLOAT);
config_setting_set_float(setting, simdata->tyrediameter[0]); config_setting_set_float(setting, simdata->tyrediameter[0]);
setting = config_setting_add(carobject, "tyre1", CONFIG_TYPE_FLOAT); setting = config_setting_add(carobject, "tyre1", CONFIG_TYPE_FLOAT);
@ -160,7 +160,7 @@ int savetyreconfig(SimData* simdata, char* configfile)
config_destroy(&cfg); 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); config_destroy(&cfg);

2
src/monocoque/simulatorapi/simapi

@ -1 +1 @@
Subproject commit 6a3fcdb1c207b64fac707043b87cbd194a2ca8c3 Subproject commit 915b272c92da7e81f1c78fd8c80674f6bee1fe24