Mercurial > repos > blastem
diff nuklear_ui/blastem_nuklear.c @ 1604:68b05322d971
Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 31 Jul 2018 23:19:39 -0700 |
| parents | b452887f85b4 |
| children | f7b1d983d5c0 |
line wrap: on
line diff
--- a/nuklear_ui/blastem_nuklear.c Tue Jul 31 23:08:52 2018 -0700 +++ b/nuklear_ui/blastem_nuklear.c Tue Jul 31 23:19:39 2018 -0700 @@ -839,10 +839,14 @@ const char *name = SDL_JoystickName(joy); size_t namesz = strlen(name); mapping_string = malloc(512 + namesz); - SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), mapping_string, 33); - mapping_string[32] = ','; - memcpy(mapping_string + 33, name, namesz); - mapping_pos = 33+namesz; + for (mapping_pos = 0; mapping_pos < namesz; mapping_pos++) + { + char c = name[mapping_pos]; + if (c == ',' || c == '\n' || c == '\r') { + c = ' '; + } + mapping_string[mapping_pos] = c; + } push_view(view_controller_mappings); }