… | |
… | |
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 | #define def(str) const shstr shstr_ ## str (# str); |
133 | #define def2(id,str) const shstr id (str); |
|
|
134 | #define def(id) def2(shstr_ ## id, # id) |
134 | # include "shstrinc.h" |
135 | # include "shstrinc.h" |
135 | #undef def |
136 | #undef def |
|
|
137 | #undef def2 |
136 | |
138 | |
137 | shstr skill_names[NUM_SKILLS]; |
139 | shstr skill_names[NUM_SKILLS]; |
138 | |
140 | |
139 | //TODO: this should of course not be here |
141 | //TODO: this should of course not be here |
140 | |
142 | |