Contents of /trunk/tuxracer/patches/tuxracer-0.61-gcc3.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 5 months ago) by niro
File size: 2027 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 5 months ago) by niro
File size: 2027 byte(s)
-import
1 | diff -ru tuxracer-0.61.old/src/game_config.c tuxracer-0.61.new/src/game_config.c |
2 | --- tuxracer-0.61.old/src/game_config.c 2001-01-30 21:04:43.000000000 +0100 |
3 | +++ tuxracer-0.61.new/src/game_config.c 2003-07-08 01:15:09.000000000 +0200 |
4 | @@ -114,26 +114,26 @@ |
5 | */ |
6 | |
7 | #define INIT_PARAM( nam, val, typename, commnt ) \ |
8 | - Params. ## nam ## .loaded = False; \ |
9 | - Params. ## nam ## .name = #nam; \ |
10 | - Params. ## nam ## .deflt. ## typename ## _val = val; \ |
11 | - Params. ## nam ## .comment = commnt; |
12 | + Params.nam.loaded = False; \ |
13 | + Params.nam.name = #nam; \ |
14 | + Params.nam.deflt.typename ## _val = val; \ |
15 | + Params.nam.comment = commnt; |
16 | |
17 | #define INIT_PARAM_STRING( nam, val, commnt ) \ |
18 | INIT_PARAM( nam, val, string, commnt ); \ |
19 | - Params. ## nam ## .type = PARAM_STRING; |
20 | + Params.nam.type = PARAM_STRING; |
21 | |
22 | #define INIT_PARAM_CHAR( nam, val, commnt ) \ |
23 | INIT_PARAM( nam, val, char, commnt ); \ |
24 | - Params. ## nam ## .type = PARAM_CHAR; |
25 | + Params.nam.type = PARAM_CHAR; |
26 | |
27 | #define INIT_PARAM_INT( nam, val, commnt ) \ |
28 | INIT_PARAM( nam, val, int, commnt ); \ |
29 | - Params. ## nam ## .type = PARAM_INT; |
30 | + Params.nam.type = PARAM_INT; |
31 | |
32 | #define INIT_PARAM_BOOL( nam, val, commnt ) \ |
33 | INIT_PARAM( nam, val, bool, commnt ); \ |
34 | - Params. ## nam ## .type = PARAM_BOOL; |
35 | + Params.nam.type = PARAM_BOOL; |
36 | |
37 | |
38 | /* |
39 | @@ -310,13 +310,13 @@ |
40 | */ |
41 | #define FN_PARAM( name, typename, type ) \ |
42 | type getparam_ ## name() { \ |
43 | - if ( !Params. ## name ## .loaded ) { \ |
44 | - fetch_param_ ## typename( &( Params. ## name ) ); \ |
45 | + if ( !Params.name.loaded ) { \ |
46 | + fetch_param_ ## typename( &( Params.name ) ); \ |
47 | } \ |
48 | - return Params. ## name ## .val. ## typename ## _val; \ |
49 | + return Params.name.val.typename ## _val; \ |
50 | } \ |
51 | void setparam_ ## name( type val) { \ |
52 | - set_param_ ## typename( &( Params. ## name ), val ); } |
53 | + set_param_ ## typename( &( Params.name ), val ); } |
54 | |
55 | #define FN_PARAM_STRING( name ) \ |
56 | FN_PARAM( name, string, char* ) |
57 |