projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e891da4
)
changed variable name
author
Holger Schemel
<info@artsoft.org>
Fri, 20 Apr 2018 22:26:33 +0000
(
00:26
+0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 20 Apr 2018 22:26:33 +0000
(
00:26
+0200)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index 026dfe0da833d47a2be776f27ecfdc56a8a1db94..972e2109bc2a6edeffbc7552ec394d4989caafa5 100644
(file)
--- 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 *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;
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 */
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++)
/* 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_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()
}
static void DrawSetupScreen_Generic()