X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=4104a042e8d1d901404d03998280d938b26feb7b;hb=a3edb6437b8864290bab53bfc3bd1da9595879c1;hp=5a98416663902600a602bde8e92863a1b278b8ed;hpb=a3ac352389ad4a27a69cf0413eaabccc9eeedd9e;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 5a984166..4104a042 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -3234,7 +3234,7 @@ void setSetupInfo(struct TokenInfo *token_info, break; case TYPE_SWITCH_3_STATES: - *(int *)setup_value = get_switch3_from_string(token_value); + *(int *)setup_value = get_switch_3_state_from_string(token_value); break; case TYPE_KEY: @@ -4863,9 +4863,9 @@ char *getSetupValue(int type, void *value) break; case TYPE_SWITCH_3_STATES: - strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" : - *(int *)value == MODE_ASK ? "ask" : - *(int *)value == FALSE ? "off" : "on")); + strcpy(value_string, (*(int *)value == STATE_AUTO ? "auto" : + *(int *)value == STATE_ASK ? "ask" : + *(int *)value == STATE_FALSE ? "off" : "on")); break; case TYPE_YES_NO: @@ -4873,17 +4873,17 @@ char *getSetupValue(int type, void *value) break; case TYPE_YES_NO_AUTO: - strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" : - *(int *)value == FALSE ? "no" : "yes")); + strcpy(value_string, (*(int *)value == STATE_AUTO ? "auto" : + *(int *)value == STATE_FALSE ? "no" : "yes")); break; case TYPE_YES_NO_ASK: - strcpy(value_string, (*(int *)value == MODE_ASK ? "ask" : - *(int *)value == FALSE ? "no" : "yes")); + strcpy(value_string, (*(int *)value == STATE_ASK ? "ask" : + *(int *)value == STATE_FALSE ? "no" : "yes")); break; case TYPE_ECS_AGA: - strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS")); + strcpy(value_string, (*(boolean *)value ? "new" : "old")); break; case TYPE_KEY: