X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=972e2109bc2a6edeffbc7552ec394d4989caafa5;hb=857e68049be393b09c7066cda9eafdbd05d18cfc;hp=026dfe0da833d47a2be776f27ecfdc56a8a1db94;hpb=e891da4a91ddfd842041acad5e6ecef80caa9c33;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 026dfe0d..972e2109 100644 --- a/src/screens.c +++ b/src/screens.c @@ -6020,7 +6020,7 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) { - static struct TokenInfo *setup_info_hide = NULL; + static struct TokenInfo *setup_info_final = NULL; int list_size = 0; int list_pos = 0; int i; @@ -6029,8 +6029,8 @@ static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) while (setup_info_orig[list_size++].type != 0); /* free, allocate and clear memory for target list */ - checked_free(setup_info_hide); - setup_info_hide = checked_calloc(list_size * sizeof(struct TokenInfo)); + checked_free(setup_info_final); + setup_info_final = checked_calloc(list_size * sizeof(struct TokenInfo)); /* copy setup info list without setup entries marked as hidden */ for (i = 0; setup_info_orig[i].type != 0; i++) @@ -6044,10 +6044,10 @@ static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) setup_info_orig[i].type == TYPE_SKIPPABLE) continue; - setup_info_hide[list_pos++] = setup_info_orig[i]; + setup_info_final[list_pos++] = setup_info_orig[i]; } - return setup_info_hide; + return setup_info_final; } static void DrawSetupScreen_Generic()