X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=65f0eec425d1fecfa890714d67c86f71196a4e32;hb=016e6a754b47cf2d4f67ee754d66213d9e5115ee;hp=a9a62d4e44df0968e1c998a44083949769840471;hpb=c128739405acf7f7fc4414cb68803e9b966ade69;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index a9a62d4e..65f0eec4 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 == MODE_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,13 +4873,13 @@ char *getSetupValue(int type, void *value) break; case TYPE_YES_NO_AUTO: - strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" : - *(int *)value == MODE_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 == MODE_FALSE ? "no" : "yes")); + strcpy(value_string, (*(int *)value == STATE_ASK ? "ask" : + *(int *)value == STATE_FALSE ? "no" : "yes")); break; case TYPE_ECS_AGA: