1 --- tuxracer-0.61/src/game_config.c
2 +++ tuxracer-0.61/src/game_config.c
3 @@ -114,26 +114,26 @@
4 */
5
6 #define INIT_PARAM( nam, val, typename, commnt ) \
7 - Params. ## nam ## .loaded = False; \
8 - Params. ## nam ## .name = #nam; \
9 - Params. ## nam ## .deflt. ## typename ## _val = val; \
10 - Params. ## nam ## .comment = commnt;
11 + Params.nam.loaded = False; \
12 + Params.nam.name = #nam; \
13 + Params.nam.deflt.typename ## _val = val; \
14 + Params.nam.comment = commnt;
15
16 #define INIT_PARAM_STRING( nam, val, commnt ) \
17 INIT_PARAM( nam, val, string, commnt ); \
18 - Params. ## nam ## .type = PARAM_STRING;
19 + Params.nam.type = PARAM_STRING;
20
21 #define INIT_PARAM_CHAR( nam, val, commnt ) \
22 INIT_PARAM( nam, val, char, commnt ); \
23 - Params. ## nam ## .type = PARAM_CHAR;
24 + Params.nam.type = PARAM_CHAR;
25
26 #define INIT_PARAM_INT( nam, val, commnt ) \
27 INIT_PARAM( nam, val, int, commnt ); \
28 - Params. ## nam ## .type = PARAM_INT;
29 + Params.nam.type = PARAM_INT;
30
31 #define INIT_PARAM_BOOL( nam, val, commnt ) \
32 INIT_PARAM( nam, val, bool, commnt ); \
33 - Params. ## nam ## .type = PARAM_BOOL;
34 + Params.nam.type = PARAM_BOOL;
35
36
37 /*
38 @@ -310,13 +310,13 @@
39 */
40 #define FN_PARAM( name, typename, type ) \
41 type getparam_ ## name() { \
42 - if ( !Params. ## name ## .loaded ) { \
43 - fetch_param_ ## typename( &( Params. ## name ) ); \
44 + if ( !Params.name.loaded ) { \
45 + fetch_param_ ## typename( &( Params.name ) ); \
46 } \
47 - return Params. ## name ## .val. ## typename ## _val; \
48 + return Params.name.val.typename ## _val; \
49 } \
50 void setparam_ ## name( type val) { \
51 - set_param_ ## typename( &( Params. ## name ), val ); }
52 + set_param_ ## typename( &( Params.name ), val ); }
53
54 #define FN_PARAM_STRING( name ) \
55 FN_PARAM( name, string, char* )
|
