X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=9d4aed61fe943256cec6a1686b2f29490a038826;hp=240fe67f928bd47524ae85afcc7a3113a5598752;hb=b59a0eedca464cba38e8a6bcfae54db32ac6b15e;hpb=4a137589031aa2c7effd6b020170098a976c566b diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 240fe67f..9d4aed61 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -1102,6 +1102,10 @@ void setSetupInfo(struct TokenInfo *token_info, break; case TYPE_KEY: + *(Key *)setup_value = getKeyFromKeyName(token_value); + break; + + case TYPE_KEY_X11: *(Key *)setup_value = getKeyFromX11KeyName(token_value); break; @@ -1403,6 +1407,10 @@ char *getSetupValue(int type, void *value) break; case TYPE_KEY: + strcpy(value_string, getKeyNameFromKey(*(Key *)value)); + break; + + case TYPE_KEY_X11: strcpy(value_string, getX11KeyNameFromKey(*(Key *)value)); break; @@ -1439,7 +1447,7 @@ char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr) /* continue with the token's value (which can have different types) */ strcat(entry, value_string); - if (token_type == TYPE_KEY) + if (token_type == TYPE_KEY_X11) { Key key = *(Key *)setup_value; char *keyname = getKeyNameFromKey(key);