1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
… | |
… | |
24 | #include <global.h> |
24 | #include <global.h> |
25 | #include <material.h> |
25 | #include <material.h> |
26 | #include <loader.h> |
26 | #include <loader.h> |
27 | #include <sproto.h> |
27 | #include <sproto.h> |
28 | |
28 | |
29 | void |
|
|
30 | set_logfile (char *val) |
|
|
31 | { |
|
|
32 | settings.logfilename = val; |
|
|
33 | } |
|
|
34 | |
|
|
35 | void |
|
|
36 | call_version (void) |
|
|
37 | { |
|
|
38 | version (NULL); |
|
|
39 | exit (0); |
|
|
40 | } |
|
|
41 | |
|
|
42 | void |
|
|
43 | showscores (void) |
|
|
44 | { |
|
|
45 | display_high_score (NULL, 9999, NULL); |
|
|
46 | exit (0); |
|
|
47 | } |
|
|
48 | |
|
|
49 | void |
|
|
50 | set_debug (void) |
|
|
51 | { |
|
|
52 | settings.debug = llevDebug; |
|
|
53 | } |
|
|
54 | |
|
|
55 | void |
|
|
56 | unset_debug (void) |
|
|
57 | { |
|
|
58 | settings.debug = llevInfo; |
|
|
59 | } |
|
|
60 | |
|
|
61 | void |
|
|
62 | set_mondebug (void) |
|
|
63 | { |
|
|
64 | settings.debug = llevMonster; |
|
|
65 | } |
|
|
66 | |
|
|
67 | void |
|
|
68 | set_dumpmon1 (void) |
|
|
69 | { |
|
|
70 | settings.dumpvalues = 1; |
|
|
71 | } |
|
|
72 | |
|
|
73 | void |
|
|
74 | set_dumpmon2 (void) |
|
|
75 | { |
|
|
76 | settings.dumpvalues = 2; |
|
|
77 | } |
|
|
78 | |
|
|
79 | void |
|
|
80 | set_dumpmon3 (void) |
|
|
81 | { |
|
|
82 | settings.dumpvalues = 3; |
|
|
83 | } |
|
|
84 | |
|
|
85 | void |
|
|
86 | set_dumpmon4 (void) |
|
|
87 | { |
|
|
88 | settings.dumpvalues = 4; |
|
|
89 | } |
|
|
90 | |
|
|
91 | void |
|
|
92 | set_dumpmon5 (void) |
|
|
93 | { |
|
|
94 | settings.dumpvalues = 5; |
|
|
95 | } |
|
|
96 | |
|
|
97 | void |
|
|
98 | set_dumpmon6 (void) |
|
|
99 | { |
|
|
100 | settings.dumpvalues = 6; |
|
|
101 | } |
|
|
102 | |
|
|
103 | void |
|
|
104 | set_dumpmon7 (void) |
|
|
105 | { |
|
|
106 | settings.dumpvalues = 7; |
|
|
107 | } |
|
|
108 | |
|
|
109 | void |
|
|
110 | set_dumpmon8 (void) |
|
|
111 | { |
|
|
112 | settings.dumpvalues = 8; |
|
|
113 | } |
|
|
114 | |
|
|
115 | void |
|
|
116 | set_dumpmon9 (void) |
|
|
117 | { |
|
|
118 | settings.dumpvalues = 9; |
|
|
119 | } |
|
|
120 | |
|
|
121 | void |
|
|
122 | set_dumpmont (char *name) |
|
|
123 | { |
|
|
124 | settings.dumpvalues = 10; |
|
|
125 | settings.dumparg = name; |
|
|
126 | } |
|
|
127 | |
|
|
128 | void |
|
|
129 | set_daemon (void) |
|
|
130 | { |
|
|
131 | settings.daemonmode = 1; |
|
|
132 | } |
|
|
133 | |
|
|
134 | void |
|
|
135 | set_datadir (char *path) |
|
|
136 | { |
|
|
137 | settings.datadir = path; |
|
|
138 | } |
|
|
139 | |
|
|
140 | void |
|
|
141 | set_confdir (char *path) |
|
|
142 | { |
|
|
143 | settings.confdir = path; |
|
|
144 | } |
|
|
145 | |
|
|
146 | void |
|
|
147 | set_localdir (char *path) |
|
|
148 | { |
|
|
149 | settings.localdir = path; |
|
|
150 | } |
|
|
151 | |
|
|
152 | void |
|
|
153 | set_mapdir (char *path) |
|
|
154 | { |
|
|
155 | settings.mapdir = path; |
|
|
156 | } |
|
|
157 | |
|
|
158 | void |
|
|
159 | set_archetypes (char *path) |
|
|
160 | { |
|
|
161 | settings.archetypes = path; |
|
|
162 | } |
|
|
163 | |
|
|
164 | void |
|
|
165 | set_regions (char *path) |
|
|
166 | { |
|
|
167 | settings.regions = path; |
|
|
168 | } |
|
|
169 | |
|
|
170 | void |
|
|
171 | set_treasures (char *path) |
|
|
172 | { |
|
|
173 | settings.treasures = path; |
|
|
174 | } |
|
|
175 | |
|
|
176 | void |
|
|
177 | set_uniquedir (char *path) |
|
|
178 | { |
|
|
179 | settings.uniquedir = path; |
|
|
180 | } |
|
|
181 | |
|
|
182 | void |
|
|
183 | set_templatedir (char *path) |
|
|
184 | { |
|
|
185 | settings.templatedir = path; |
|
|
186 | } |
|
|
187 | |
|
|
188 | void |
|
|
189 | set_playerdir (char *path) |
|
|
190 | { |
|
|
191 | settings.playerdir = path; |
|
|
192 | } |
|
|
193 | |
|
|
194 | void |
|
|
195 | set_tmpdir (char *path) |
|
|
196 | { |
|
|
197 | settings.tmpdir = path; |
|
|
198 | } |
|
|
199 | |
|
|
200 | void |
|
|
201 | showscoresparm (char *data) |
|
|
202 | { |
|
|
203 | display_high_score (NULL, 9999, data); |
|
|
204 | exit (0); |
|
|
205 | } |
|
|
206 | |
|
|
207 | void |
|
|
208 | set_csport (char *val) |
|
|
209 | { |
|
|
210 | settings.csport = atoi (val); |
|
|
211 | if (settings.csport <= 0 || settings.csport > 32765 || (settings.csport < 1024 && getuid () != 0)) |
|
|
212 | { |
|
|
213 | LOG (llevError, "%d is an invalid csport number.\n", settings.csport); |
|
|
214 | exit (1); |
|
|
215 | } |
|
|
216 | } |
|
|
217 | |
|
|
218 | /* Most of this is shamelessly stolen from XSysStats. But since that is |
|
|
219 | * also my program, no problem. |
|
|
220 | */ |
|
|
221 | struct Command_Line_Options |
|
|
222 | { |
|
|
223 | const char *cmd_option; /* how it is called on the command line */ |
|
|
224 | uint8 num_args; /* Number or args it takes */ |
|
|
225 | uint8 pass; /* What pass this should be processed on. */ |
|
|
226 | void (*func) (); /* function to call when we match this. |
|
|
227 | * if num_args is true, than that gets passed |
|
|
228 | * to the function, otherwise nothing is passed |
|
|
229 | */ |
|
|
230 | }; |
|
|
231 | |
|
|
232 | /* The way this system works is pretty simple - parse_args takes |
|
|
233 | * the options passed to the program and a pass number. If an option |
|
|
234 | * matches both in name and in pass (and we have enough options), |
|
|
235 | * we call the associated function. This makes writing a multi |
|
|
236 | * pass system very easy, and it is very easy to add in new options. |
|
|
237 | */ |
|
|
238 | struct Command_Line_Options options[] = { |
|
|
239 | |
|
|
240 | /* Pass 1 functions - STuff that can/should be called before we actually |
|
|
241 | * initialise any data. |
|
|
242 | */ |
|
|
243 | {"-h", 0, 1, help}, |
|
|
244 | |
|
|
245 | /* Honor -help also, since it is somewhat common */ |
|
|
246 | {"-help", 0, 1, help}, |
|
|
247 | {"-v", 0, 1, call_version}, |
|
|
248 | {"-d", 0, 1, set_debug}, |
|
|
249 | {"+d", 0, 1, unset_debug}, |
|
|
250 | {"-mon", 0, 1, set_mondebug}, |
|
|
251 | {"-data", 1, 1, (void (*)()) set_datadir}, |
|
|
252 | {"-conf", 1, 1, (void (*)()) set_confdir}, |
|
|
253 | {"-local", 1, 1, (void (*)()) set_localdir}, |
|
|
254 | {"-maps", 1, 1, (void (*)()) set_mapdir}, |
|
|
255 | {"-arch", 1, 1, (void (*)()) set_archetypes}, |
|
|
256 | {"-regions", 1, 1, (void (*)()) set_regions}, |
|
|
257 | {"-playerdir", 1, 1, (void (*)()) set_playerdir}, |
|
|
258 | {"-treasures", 1, 1, (void (*)()) set_treasures}, |
|
|
259 | {"-uniquedir", 1, 1, (void (*)()) set_uniquedir}, |
|
|
260 | {"-templatedir", 1, 1, (void (*)()) set_templatedir}, |
|
|
261 | {"-tmpdir", 1, 1, (void (*)()) set_tmpdir}, |
|
|
262 | {"-log", 1, 1, (void (*)()) set_logfile}, |
|
|
263 | |
|
|
264 | /* Pass 2 functions. Most of these could probably be in pass 1, |
|
|
265 | * as they don't require much of anything to bet set up. |
|
|
266 | */ |
|
|
267 | {"-csport", 1, 2, (void (*)()) set_csport}, |
|
|
268 | {"-detach", 0, 2, set_daemon}, |
|
|
269 | |
|
|
270 | /* Start of pass 3 information. In theory, by pass 3, all data paths |
|
|
271 | * and defaults should have been set up. |
|
|
272 | */ |
|
|
273 | {"-m", 0, 3, set_dumpmon1}, |
|
|
274 | {"-m2", 0, 3, set_dumpmon2}, |
|
|
275 | {"-m3", 0, 3, set_dumpmon3}, |
|
|
276 | {"-m4", 0, 3, set_dumpmon4}, |
|
|
277 | {"-m5", 0, 3, set_dumpmon5}, |
|
|
278 | {"-m6", 0, 3, set_dumpmon6}, |
|
|
279 | {"-m7", 0, 3, set_dumpmon7}, |
|
|
280 | {"-m8", 0, 3, set_dumpmon8}, |
|
|
281 | {"-m9", 0, 3, set_dumpmon9}, |
|
|
282 | {"-mt", 1, 3, (void (*)()) set_dumpmont}, |
|
|
283 | {"-mexp", 0, 3, dump_experience}, |
|
|
284 | {"-s", 0, 3, showscores}, |
|
|
285 | {"-score", 1, 3, (void (*)()) showscoresparm} |
|
|
286 | }; |
|
|
287 | |
|
|
288 | |
|
|
289 | /* Note since this may be called before the library has been set up, |
|
|
290 | * we don't use any of deliantras built in logging functions. |
|
|
291 | */ |
|
|
292 | static void |
|
|
293 | parse_args (int argc, char *argv[], int pass) |
|
|
294 | { |
|
|
295 | size_t i; |
|
|
296 | int on_arg = 1; |
|
|
297 | |
|
|
298 | while (on_arg < argc) |
|
|
299 | { |
|
|
300 | for (i = 0; i < sizeof (options) / sizeof (struct Command_Line_Options); i++) |
|
|
301 | { |
|
|
302 | if (!strcmp (options[i].cmd_option, argv[on_arg])) |
|
|
303 | { |
|
|
304 | /* Found a matching option, but should not be processed on |
|
|
305 | * this pass. Just skip over it |
|
|
306 | */ |
|
|
307 | if (options[i].pass != pass) |
|
|
308 | { |
|
|
309 | on_arg += options[i].num_args + 1; |
|
|
310 | break; |
|
|
311 | } |
|
|
312 | if (options[i].num_args) |
|
|
313 | { |
|
|
314 | if ((on_arg + options[i].num_args) >= argc) |
|
|
315 | { |
|
|
316 | fprintf (stderr, "%s requires an argument.\n", options[i].cmd_option); |
|
|
317 | exit (1); |
|
|
318 | } |
|
|
319 | else |
|
|
320 | { |
|
|
321 | if (options[i].num_args == 1) |
|
|
322 | ((void (*)(char *)) options[i].func) (argv[on_arg + 1]); |
|
|
323 | if (options[i].num_args == 2) |
|
|
324 | ((void (*)(char *, char *)) options[i].func) (argv[on_arg + 1], argv[on_arg + 2]); |
|
|
325 | on_arg += options[i].num_args + 1; |
|
|
326 | } |
|
|
327 | } |
|
|
328 | else |
|
|
329 | { /* takes no args */ |
|
|
330 | options[i].func (); |
|
|
331 | on_arg++; |
|
|
332 | } |
|
|
333 | break; |
|
|
334 | } |
|
|
335 | } |
|
|
336 | if (i == sizeof (options) / sizeof (struct Command_Line_Options)) |
|
|
337 | { |
|
|
338 | fprintf (stderr, "Unknown option: %s\n", argv[on_arg]); |
|
|
339 | usage (); |
|
|
340 | exit (1); |
|
|
341 | } |
|
|
342 | } |
|
|
343 | } |
|
|
344 | |
|
|
345 | //TODO: make this a constructor |
29 | //TODO: make this a constructor |
346 | static materialtype_t * |
30 | static materialtype_t * |
347 | get_empty_mat (void) |
31 | get_empty_mat (void) |
348 | { |
32 | { |
349 | materialtype_t *mt; |
33 | materialtype_t *mt; |
350 | int i; |
34 | int i; |
351 | |
35 | |
352 | mt = new materialtype_t; |
36 | mt = new materialtype_t; |
353 | |
37 | |
354 | mt->name = NULL; |
38 | mt->name = shstr_unknown; |
355 | mt->description = NULL; |
39 | mt->description = 0; |
|
|
40 | |
356 | for (i = 0; i < NROFATTACKS; i++) |
41 | for (i = 0; i < NROFATTACKS; i++) |
357 | { |
42 | { |
358 | mt->save[i] = 0; |
43 | mt->save[i] = 0; |
359 | mt->mod[i] = 0; |
44 | mt->mod[i] = 0; |
360 | } |
45 | } |
|
|
46 | |
361 | mt->chance = 0; |
47 | mt->chance = 0; |
362 | mt->difficulty = 0; |
48 | mt->difficulty = 0; |
363 | mt->magic = 0; |
49 | mt->magic = 0; |
364 | mt->damage = 0; |
50 | mt->damage = 0; |
365 | mt->wc = 0; |
51 | mt->wc = 0; |
366 | mt->ac = 0; |
52 | mt->ac = 0; |
367 | mt->sp = 0; |
53 | mt->sp = 0; |
368 | mt->weight = 100; |
54 | mt->weight = 100; |
369 | mt->value = 100; |
55 | mt->value = 100; |
370 | mt->next = NULL; |
56 | mt->density = 1; |
|
|
57 | mt->next = 0; |
|
|
58 | |
371 | return mt; |
59 | return mt; |
372 | } |
60 | } |
373 | |
61 | |
374 | static void |
62 | void |
375 | load_materials (void) |
63 | load_materials (void) |
376 | { |
64 | { |
377 | char filename[MAX_BUF]; |
65 | char filename[MAX_BUF]; |
378 | materialtype_t *mt; |
|
|
379 | |
66 | |
380 | sprintf (filename, "%s/materials", settings.datadir); |
67 | sprintf (filename, "%s/materials", settings.datadir); |
381 | LOG (llevDebug, "Reading material type data from %s...\n", filename); |
68 | LOG (llevDebug, "Reading material type data from %s...\n", filename); |
|
|
69 | |
|
|
70 | //TODO: somehow free old materials, or update them in-place |
|
|
71 | materialt = 0; |
382 | |
72 | |
383 | object_thawer thawer (filename); |
73 | object_thawer thawer (filename); |
384 | |
74 | |
385 | if (!thawer) |
75 | if (!thawer) |
386 | { |
76 | { |
387 | LOG (llevError, "Cannot open %s for reading\n", filename); |
77 | LOG (llevError, "Cannot open %s for reading\n", filename); |
388 | mt = get_empty_mat (); |
78 | goto done; |
389 | mt->next = 0; |
79 | } |
390 | materialt = mt; |
80 | |
391 | return; |
81 | while (thawer.kw != KW_name) |
392 | } |
82 | { |
|
|
83 | thawer.next (); |
393 | |
84 | |
394 | mt = get_empty_mat (); |
85 | if (thawer.kw == KW_EOF) |
395 | materialt = mt; |
86 | goto done; |
|
|
87 | } |
|
|
88 | |
|
|
89 | materialtype_t *mt; |
396 | |
90 | |
397 | for (;;) |
91 | for (;;) |
398 | { |
92 | { |
399 | thawer.next (); |
|
|
400 | |
|
|
401 | switch (thawer.kw) |
93 | switch (thawer.kw) |
402 | { |
94 | { |
403 | case KW_name: |
95 | case KW_name: |
404 | /* clean up the previous entry */ |
|
|
405 | if (mt->next) |
|
|
406 | { |
|
|
407 | if (!mt->description) |
|
|
408 | mt->description = mt->name; |
|
|
409 | |
|
|
410 | mt = mt->next; |
|
|
411 | } |
|
|
412 | |
|
|
413 | mt->next = get_empty_mat (); |
96 | mt = get_empty_mat (); |
|
|
97 | mt->next = materialt; |
|
|
98 | materialt = mt; |
|
|
99 | |
414 | thawer.get (mt->name); |
100 | thawer.get (mt->name); |
|
|
101 | mt->description = mt->name; |
415 | break; |
102 | break; |
416 | |
103 | |
417 | case KW_description: |
104 | case KW_description: |
418 | thawer.get (mt->description); |
105 | thawer.get (mt->description); |
419 | break; |
106 | break; |
… | |
… | |
483 | default: |
170 | default: |
484 | if (!thawer.parse_error ("materials file", "materials")) |
171 | if (!thawer.parse_error ("materials file", "materials")) |
485 | goto done; |
172 | goto done; |
486 | break; |
173 | break; |
487 | } |
174 | } |
|
|
175 | |
|
|
176 | thawer.next (); |
488 | } |
177 | } |
489 | |
178 | |
490 | done: |
179 | done: |
491 | if (mt->next) |
180 | if (!materialt) |
492 | { |
181 | materialt = get_empty_mat (); |
493 | delete mt->next; |
|
|
494 | |
|
|
495 | mt->next = 0; |
|
|
496 | } |
|
|
497 | |
182 | |
498 | LOG (llevDebug, "Done.\n"); |
183 | LOG (llevDebug, "Done.\n"); |
499 | } |
184 | } |
500 | |
185 | |
501 | /* This loads the settings file. There could be debate whether this should |
186 | /* This loads the settings file. There could be debate whether this should |
502 | * be here or in the common directory - but since only the server needs this |
187 | * be here or in the common directory - but since only the server needs this |
503 | * information, having it here probably makes more sense. |
188 | * information, having it here probably makes more sense. |
504 | */ |
189 | */ |
505 | static void |
190 | void |
506 | load_settings (void) |
191 | load_settings (void) |
507 | { |
192 | { |
508 | char buf[MAX_BUF], *cp; |
193 | char buf[MAX_BUF], *cp; |
509 | int has_val, comp; |
194 | int has_val, comp; |
510 | FILE *fp; |
195 | FILE *fp; |
… | |
… | |
913 | */ |
598 | */ |
914 | void |
599 | void |
915 | init (int argc, char **argv) |
600 | init (int argc, char **argv) |
916 | { |
601 | { |
917 | init_done = 0; /* Must be done before init_signal() */ |
602 | init_done = 0; /* Must be done before init_signal() */ |
918 | rndm.seed (time (0)); |
|
|
919 | |
603 | |
920 | logfile = stderr; |
|
|
921 | init_environ (); |
604 | init_environ (); |
922 | parse_args (argc, argv, 1); /* First arg pass - right now it does |
|
|
923 | * nothing, but in future specifying the |
|
|
924 | * LibDir in this pass would be reasonable*/ |
|
|
925 | |
|
|
926 | init_anim (); // Must be called before perl |
|
|
927 | init_globals (); |
|
|
928 | init_experience (); |
|
|
929 | init_attackmess (); |
|
|
930 | init_dynamic (); |
|
|
931 | init_block (); |
|
|
932 | cfperl_init (); |
605 | cfperl_init (); |
933 | load_settings (); /* Load the settings file */ |
|
|
934 | load_materials (); |
|
|
935 | parse_args (argc, argv, 2); |
|
|
936 | fprintf (logfile, "Welcome to Deliantra, v%s\n", VERSION); |
|
|
937 | fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n"); |
|
|
938 | fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); |
|
|
939 | fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); |
|
|
940 | |
|
|
941 | if (strcmp (settings.dm_mail, "") != 0) |
|
|
942 | { |
|
|
943 | fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); |
|
|
944 | fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); |
|
|
945 | } |
|
|
946 | |
|
|
947 | UUID::init (); |
|
|
948 | init_signals (); /* Sets up signal interceptions */ |
|
|
949 | init_commands (); /* Sort command tables */ |
|
|
950 | init_skills (); |
|
|
951 | |
|
|
952 | parse_args (argc, argv, 3); |
|
|
953 | |
|
|
954 | init_beforeplay (); |
|
|
955 | init_done = 1; |
606 | init_done = 1; |
956 | } |
607 | } |
957 | |
608 | |
958 | void |
609 | void |
959 | usage (void) |
610 | usage (void) |
960 | { |
611 | { |
961 | (void) fprintf (logfile, "Usage: deliantra-server [-h] [-<flags>]...\n"); |
612 | fprintf (stderr, "Usage: deliantra-server [-h] [-<flags>]...\n"); |
962 | } |
613 | } |
963 | |
614 | |
964 | void |
615 | void |
965 | help (void) |
616 | help (void) |
966 | { |
617 | { |
… | |
… | |
1008 | |
659 | |
1009 | void |
660 | void |
1010 | init_beforeplay (void) |
661 | init_beforeplay (void) |
1011 | { |
662 | { |
1012 | init_artifacts (); /* If not called before, reads all artifacts from file */ |
663 | init_artifacts (); /* If not called before, reads all artifacts from file */ |
1013 | init_spells (); /* If not called before, links archtypes used by spells */ |
|
|
1014 | init_archetype_pointers (); /* Setup global pointers to archetypes */ |
|
|
1015 | init_races (); /* overwrite race designations using entries in lib/races file */ |
664 | init_races (); /* overwrite race designations using entries in lib/races file */ |
1016 | init_gods (); /* init linked list of gods from archs */ |
665 | init_gods (); /* init linked list of gods from archs */ |
1017 | init_readable (); /* inits useful arrays for readable texts */ |
666 | init_readable (); /* inits useful arrays for readable texts */ |
1018 | init_formulae (); /* If not called before, reads formulae from file */ |
667 | init_formulae (); /* If not called before, reads formulae from file */ |
1019 | } |
668 | } |
… | |
… | |
1131 | *cp = '\0'; |
780 | *cp = '\0'; |
1132 | |
781 | |
1133 | cp = buf; |
782 | cp = buf; |
1134 | while (*cp == ' ' || *cp == '!' || *cp == '@') |
783 | while (*cp == ' ' || *cp == '!' || *cp == '@') |
1135 | { |
784 | { |
1136 | if (*cp == '!') |
785 | if (*cp == '!') set_race = 0; |
1137 | set_race = 0; |
|
|
1138 | if (*cp == '@') |
786 | if (*cp == '@') set_list = 0; |
1139 | set_list = 0; |
787 | |
1140 | cp++; |
788 | cp++; |
1141 | } |
789 | } |
1142 | |
790 | |
1143 | if (sscanf (cp, "RACE %s", variable)) |
791 | if (sscanf (cp, "RACE %s", variable)) |
1144 | /* set new race value */ |
792 | /* set new race value */ |
… | |
… | |
1164 | /* set creature race to race value */ |
812 | /* set creature race to race value */ |
1165 | if ((mon = archetype::find (cp)) == NULL) |
813 | if ((mon = archetype::find (cp)) == NULL) |
1166 | LOG (llevError, "Creature %s in race file lacks archetype\n", cp); |
814 | LOG (llevError, "Creature %s in race file lacks archetype\n", cp); |
1167 | else |
815 | else |
1168 | { |
816 | { |
1169 | if (set_race && (!mon->race || strcmp (mon->race, race))) |
817 | if (set_race && (!mon->race || strcmp (&mon->race, race))) |
1170 | { |
818 | { |
1171 | if (mon->race) |
819 | if (mon->race) |
1172 | LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname); |
820 | LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname); |
1173 | |
821 | |
1174 | mon->race = race; |
822 | mon->race = race; |