projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020401-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 240fe67f928bd47524ae85afcc7a3113a5598752..9d4aed61fe943256cec6a1686b2f29490a038826 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-1102,6
+1102,10
@@
void setSetupInfo(struct TokenInfo *token_info,
break;
case TYPE_KEY:
break;
case TYPE_KEY:
+ *(Key *)setup_value = getKeyFromKeyName(token_value);
+ break;
+
+ case TYPE_KEY_X11:
*(Key *)setup_value = getKeyFromX11KeyName(token_value);
break;
*(Key *)setup_value = getKeyFromX11KeyName(token_value);
break;
@@
-1403,6
+1407,10
@@
char *getSetupValue(int type, void *value)
break;
case TYPE_KEY:
break;
case TYPE_KEY:
+ strcpy(value_string, getKeyNameFromKey(*(Key *)value));
+ break;
+
+ case TYPE_KEY_X11:
strcpy(value_string, getX11KeyNameFromKey(*(Key *)value));
break;
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);
/* 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);
{
Key key = *(Key *)setup_value;
char *keyname = getKeyNameFromKey(key);