… | |
… | |
128 | |
128 | |
129 | curpos = *i; |
129 | curpos = *i; |
130 | } |
130 | } |
131 | |
131 | |
132 | // declare these here to get correct initialisation order |
132 | // declare these here to get correct initialisation order |
133 | |
133 | #define def2(id,str) const shstr shstr_ ## id (str); |
134 | #define def(str) \ |
134 | #define def(id) def2(id, # id) |
135 | shstr_vec<sizeof (# str)> shstr_vec_ ## str = { sizeof (# str) - 1, 0xffffffff, # str }; \ |
|
|
136 | const shstr_const shstr_ ## str (shstr_vec_ ## str.string); |
|
|
137 | # include "shstrinc.h" |
135 | # include "shstrinc.h" |
138 | #undef def |
136 | #undef def |
|
|
137 | #undef def2 |
139 | |
138 | |
140 | shstr skill_names[NUM_SKILLS]; |
139 | shstr skill_names[NUM_SKILLS]; |
141 | |
140 | |
142 | //TODO: this should of course not be here |
141 | //TODO: this should of course not be here |
143 | |
142 | |