1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | 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 |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <cassert> |
25 | #include <cassert> |
25 | |
26 | |
26 | #include <global.h> |
27 | #include <global.h> |
27 | #include <funcpoint.h> |
28 | #include <funcpoint.h> |
28 | #include <loader.h> |
29 | #include <loader.h> |
29 | |
30 | |
30 | #define USE_UNORDERED_MAP 0 |
|
|
31 | |
|
|
32 | #if USE_UNORDERED_MAP |
|
|
33 | # include <tr1/functional> |
31 | #include <tr1/functional> |
34 | # include <tr1/unordered_map> |
32 | #include <tr1/unordered_map> |
35 | #endif |
|
|
36 | |
33 | |
37 | int arch_cmp = 0; /* How many strcmp's */ |
|
|
38 | int arch_search = 0; /* How many searches */ |
|
|
39 | int arch_init; /* True if doing arch initialization */ |
34 | int arch_init; /* True if doing arch initialization */ |
40 | |
35 | |
41 | /* The naming of these functions is really poor - they are all |
36 | /* The naming of these functions is really poor - they are all |
42 | * pretty much named '.._arch_...', but they may more may not |
37 | * pretty much named '.._arch_...', but they may more may not |
43 | * return archetypes. Some make the arch_to_object call, and thus |
38 | * return archetypes. Some make the arch_to_object call, and thus |
44 | * return an object. Perhaps those should be called 'archob' functions |
39 | * return an object. Perhaps those should be called 'archob' functions |
45 | * to denote they return an object derived from the archetype. |
40 | * to denote they return an object derived from the archetype. |
46 | * MSW 2003-04-29 |
41 | * MSW 2003-04-29 |
47 | */ |
42 | */ |
48 | |
43 | |
49 | #if USE_UNORDERED_MAP |
|
|
50 | // the hashtable |
44 | // the hashtable |
51 | typedef std::tr1::unordered_map |
45 | typedef std::tr1::unordered_map |
52 | < |
46 | < |
53 | std::size_t, |
47 | const char *, |
54 | arch_ptr, |
48 | arch_ptr, |
55 | std::tr1::hash<size_t>, |
49 | str_hash, |
56 | std::equal_to<size_t>, |
50 | str_equal, |
57 | slice_allocator< std::pair<const std::size_t, archetype *> > |
51 | slice_allocator< std::pair<const char *const, arch_ptr> > |
58 | true, |
|
|
59 | > HT; |
52 | > HT; |
60 | |
53 | |
61 | static HT ht; |
54 | static HT ht (5000); |
62 | #else |
|
|
63 | static arch_ptr arch_table[ARCHTABLE]; |
|
|
64 | #endif |
|
|
65 | |
55 | |
66 | /** |
56 | /** |
67 | * GROS - This function retrieves an archetype given the name that appears |
57 | * GROS - This function retrieves an archetype given the name that appears |
68 | * during the game (for example, "writing pen" instead of "stylus"). |
58 | * during the game (for example, "writing pen" instead of "stylus"). |
69 | * It does not use the hashtable system, but browse the whole archlist each time. |
59 | * It does not use the hashtable system, but browse the whole archlist each time. |
… | |
… | |
75 | * - the archetype found or null if nothing was found. |
65 | * - the archetype found or null if nothing was found. |
76 | */ |
66 | */ |
77 | archetype * |
67 | archetype * |
78 | find_archetype_by_object_name (const char *name) |
68 | find_archetype_by_object_name (const char *name) |
79 | { |
69 | { |
80 | archetype *at; |
70 | shstr_cmp name_cmp (name); |
81 | |
71 | |
82 | if (name == NULL) |
|
|
83 | return (archetype *) NULL; |
|
|
84 | |
|
|
85 | for (at = first_archetype; at != NULL; at = at->next) |
72 | for (archetype *at = first_archetype; at; at = at->next) |
86 | { |
73 | if (at->clone.name == name_cmp) |
87 | if (!strcmp (at->clone.name, name)) |
|
|
88 | return at; |
74 | return at; |
89 | } |
75 | |
90 | return NULL; |
76 | return 0; |
91 | } |
77 | } |
92 | |
78 | |
93 | /** |
79 | /** |
94 | * This function retrieves an archetype by type and name that appears during |
80 | * This function retrieves an archetype by type and name that appears during |
95 | * the game. It is basically the same as find_archetype_by_object_name() |
81 | * the game. It is basically the same as find_archetype_by_object_name() |
96 | * except that it considers only items of the given type. |
82 | * except that it considers only items of the given type. |
97 | */ |
83 | */ |
98 | archetype * |
84 | archetype * |
99 | find_archetype_by_object_type_name (int type, const char *name) |
85 | find_archetype_by_object_type_name (int type, const char *name) |
100 | { |
86 | { |
101 | archetype *at; |
87 | shstr_cmp name_cmp (name); |
102 | |
88 | |
103 | if (name == NULL) |
|
|
104 | return NULL; |
|
|
105 | |
|
|
106 | for (at = first_archetype; at != NULL; at = at->next) |
89 | for (archetype *at = first_archetype; at; at = at->next) |
107 | { |
90 | if (at->clone.name == name_cmp && at->clone.type == type) |
108 | if (at->clone.type == type && strcmp (at->clone.name, name) == 0) |
|
|
109 | return at; |
91 | return at; |
110 | } |
|
|
111 | |
92 | |
112 | return NULL; |
93 | return 0; |
113 | } |
94 | } |
114 | |
95 | |
115 | /* This is a lot like the above function. Instead, we are trying to match |
96 | /* This is a lot like the above function. Instead, we are trying to match |
116 | * the arch->skill values. type is the type of object to match |
97 | * the arch->skill values. type is the type of object to match |
117 | * against (eg, to only match against skills or only skill objects for example). |
98 | * against (eg, to only match against skills or only skill objects for example). |
118 | * If type is -1, ew don't match on type. |
99 | * If type is -1, ew don't match on type. |
119 | */ |
100 | */ |
120 | object * |
101 | object * |
121 | get_archetype_by_skill_name (const char *skill, int type) |
102 | get_archetype_by_skill_name (const char *skill, int type) |
122 | { |
103 | { |
123 | archetype * |
104 | shstr_cmp skill_cmp (skill); |
124 | at; |
|
|
125 | |
105 | |
126 | if (skill == NULL) |
|
|
127 | return NULL; |
|
|
128 | |
|
|
129 | for (at = first_archetype; at != NULL; at = at->next) |
106 | for (archetype *at = first_archetype; at; at = at->next) |
130 | { |
107 | if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) |
131 | if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill))) |
|
|
132 | return arch_to_object (at); |
108 | return arch_to_object (at); |
133 | } |
109 | |
134 | return NULL; |
110 | return 0; |
135 | } |
111 | } |
136 | |
112 | |
137 | /* similiar to above - this returns the first archetype |
113 | /* similiar to above - this returns the first archetype |
138 | * that matches both the type and subtype. type and subtype |
114 | * that matches both the type and subtype. type and subtype |
139 | * can be -1 to say ignore, but in this case, the match it does |
115 | * can be -1 to say ignore, but in this case, the match it does |
… | |
… | |
142 | * (eg, skills) |
118 | * (eg, skills) |
143 | */ |
119 | */ |
144 | archetype * |
120 | archetype * |
145 | get_archetype_by_type_subtype (int type, int subtype) |
121 | get_archetype_by_type_subtype (int type, int subtype) |
146 | { |
122 | { |
147 | archetype * |
|
|
148 | at; |
|
|
149 | |
|
|
150 | for (at = first_archetype; at != NULL; at = at->next) |
123 | for (archetype *at = first_archetype; at; at = at->next) |
151 | { |
|
|
152 | if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) |
124 | if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) |
153 | return at; |
125 | return at; |
154 | } |
126 | |
155 | return NULL; |
127 | return 0; |
156 | } |
128 | } |
157 | |
129 | |
158 | /** |
130 | /** |
159 | * GROS - this returns a new object given the name that appears during the game |
131 | * GROS - this returns a new object given the name that appears during the game |
160 | * (for example, "writing pen" instead of "stylus"). |
132 | * (for example, "writing pen" instead of "stylus"). |
… | |
… | |
168 | * but it otherwise had a big memory leak. |
140 | * but it otherwise had a big memory leak. |
169 | */ |
141 | */ |
170 | object * |
142 | object * |
171 | get_archetype_by_object_name (const char *name) |
143 | get_archetype_by_object_name (const char *name) |
172 | { |
144 | { |
173 | archetype *at; |
|
|
174 | char tmpname[MAX_BUF]; |
145 | char tmpname[MAX_BUF]; |
175 | int i; |
146 | int i; |
176 | |
147 | |
177 | assign (tmpname, name); |
148 | assign (tmpname, name); |
178 | |
149 | |
179 | for (i = strlen (tmpname); i > 0; i--) |
150 | for (i = strlen (tmpname); i > 0; i--) |
180 | { |
151 | { |
181 | tmpname[i] = 0; |
152 | tmpname[i] = 0; |
|
|
153 | |
182 | at = find_archetype_by_object_name (tmpname); |
154 | if (archetype *at = find_archetype_by_object_name (tmpname)) |
183 | |
|
|
184 | if (at != NULL) |
|
|
185 | return arch_to_object (at); |
155 | return arch_to_object (at); |
186 | } |
156 | } |
187 | |
157 | |
188 | return create_singularity (name); |
158 | return create_singularity (name); |
189 | } |
159 | } |
… | |
… | |
209 | item_matched_string (object *pl, object *op, const char *name) |
179 | item_matched_string (object *pl, object *op, const char *name) |
210 | { |
180 | { |
211 | char *cp, local_name[MAX_BUF]; |
181 | char *cp, local_name[MAX_BUF]; |
212 | int count, retval = 0; |
182 | int count, retval = 0; |
213 | |
183 | |
214 | strcpy (local_name, name); /* strtok is destructive to name */ |
184 | assign (local_name, name); /* strtok is destructive to name */ |
215 | |
185 | |
216 | for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) |
186 | for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ",")) |
217 | { |
187 | { |
218 | while (cp[0] == ' ') |
188 | while (cp[0] == ' ') |
219 | ++cp; /* get rid of spaces */ |
189 | ++cp; /* get rid of spaces */ |
… | |
… | |
325 | |
295 | |
326 | /* init_blocksview();*/ |
296 | /* init_blocksview();*/ |
327 | } |
297 | } |
328 | |
298 | |
329 | /* |
299 | /* |
330 | * Stores debug-information about how efficient the hashtable |
|
|
331 | * used for archetypes has been in the static errmsg array. |
|
|
332 | */ |
|
|
333 | |
|
|
334 | void |
|
|
335 | arch_info (object *op) |
|
|
336 | { |
|
|
337 | sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp); |
|
|
338 | new_draw_info (NDI_BLACK, 0, op, errmsg); |
|
|
339 | } |
|
|
340 | |
|
|
341 | /* |
|
|
342 | * Initialise the hashtable used by the archetypes. |
|
|
343 | */ |
|
|
344 | |
|
|
345 | void |
|
|
346 | clear_archetable (void) |
|
|
347 | { |
|
|
348 | memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *)); |
|
|
349 | } |
|
|
350 | |
|
|
351 | /* |
|
|
352 | * An alternative way to init the hashtable which is slower, but _works_... |
300 | * An alternative way to init the hashtable which is slower, but _works_... |
353 | */ |
301 | */ |
354 | |
|
|
355 | void |
302 | void |
356 | init_archetable (void) |
303 | init_archetable (void) |
357 | { |
304 | { |
358 | archetype *at; |
|
|
359 | |
|
|
360 | LOG (llevDebug, " Setting up archetable...\n"); |
305 | LOG (llevDebug, " Setting up archetable...\n"); |
361 | |
306 | |
362 | for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) |
307 | for (archetype *at = first_archetype; at; at = at->next) |
|
|
308 | for (archetype *bt = at; bt; bt = bt->more) |
363 | at->hash_add (); |
309 | bt->hash_add (); |
364 | |
310 | |
365 | LOG (llevDebug, "done\n"); |
311 | LOG (llevDebug, "done\n"); |
366 | } |
312 | } |
367 | |
313 | |
368 | void |
314 | void |
369 | free_all_archs (void) |
315 | free_all_archs (void) |
370 | { |
316 | { |
371 | archetype *at, *next; |
317 | archetype *at, *next; |
372 | int i = 0, f = 0; |
318 | int i = 0, f = 0; |
373 | |
319 | |
374 | for (at = first_archetype; at != NULL; at = next) |
320 | for (at = first_archetype; at; at = next) |
375 | { |
321 | { |
376 | if (at->more) |
322 | if (at->more) |
377 | next = at->more; |
323 | next = at->more; |
378 | else |
324 | else |
379 | next = at->next; |
325 | next = at->next; |
… | |
… | |
387 | LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); |
333 | LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f); |
388 | } |
334 | } |
389 | |
335 | |
390 | archetype::archetype () |
336 | archetype::archetype () |
391 | { |
337 | { |
|
|
338 | clone.arch = this; |
|
|
339 | |
392 | CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ |
340 | CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ |
393 | SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ |
341 | SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */ |
394 | } |
342 | } |
395 | |
343 | |
396 | archetype::~archetype () |
344 | archetype::~archetype () |
397 | { |
345 | { |
|
|
346 | //TODO: nuke ->more's |
|
|
347 | } |
|
|
348 | |
|
|
349 | archetype * |
|
|
350 | archetype::read (object_thawer &f) |
|
|
351 | { |
|
|
352 | assert (f.kw == KW_object); |
|
|
353 | |
|
|
354 | archetype *head = new archetype; |
|
|
355 | f.get (head->name); |
|
|
356 | |
|
|
357 | if (!head->clone.parse_kv (f)) |
|
|
358 | { |
|
|
359 | delete head; |
|
|
360 | return 0; |
|
|
361 | } |
|
|
362 | |
|
|
363 | for (archetype *prev = head; f.kw == KW_more; ) |
|
|
364 | { |
|
|
365 | f.next (); |
|
|
366 | |
|
|
367 | assert (f.kw == KW_object); |
|
|
368 | |
|
|
369 | archetype *more = new archetype; |
|
|
370 | f.get (more->name); |
|
|
371 | |
|
|
372 | if (!more->clone.parse_kv (f)) |
|
|
373 | { |
|
|
374 | delete head; |
|
|
375 | return 0; |
|
|
376 | } |
|
|
377 | |
|
|
378 | assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face)); |
|
|
379 | |
|
|
380 | if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; |
|
|
381 | if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; |
|
|
382 | |
|
|
383 | more->head = head; |
|
|
384 | more->clone.head = &head->clone; |
|
|
385 | prev->more = more; |
|
|
386 | prev->clone.more = &more->clone; |
|
|
387 | |
|
|
388 | prev = more; |
|
|
389 | } |
|
|
390 | |
|
|
391 | head->next = first_archetype; |
|
|
392 | first_archetype = head; |
|
|
393 | |
|
|
394 | return head; |
398 | } |
395 | } |
399 | |
396 | |
400 | /* |
397 | /* |
401 | * Reads/parses the archetype-file, and copies into a linked list |
398 | * Reads/parses the archetype-file, and copies into a linked list |
402 | * of archetype-structures. |
399 | * of archetype-structures. |
403 | */ |
400 | */ |
404 | void |
401 | static bool |
405 | first_arch_pass (object_thawer & fp) |
402 | first_arch_pass (object_thawer &f) |
406 | { |
403 | { |
407 | archetype *head = 0, *last_more = 0; |
404 | for (;;) |
408 | |
|
|
409 | archetype *at = new archetype; |
|
|
410 | at->clone.arch = first_archetype = at; |
|
|
411 | |
|
|
412 | while (int i = load_object (fp, &at->clone, 0)) |
|
|
413 | { |
405 | { |
414 | at->clone.speed_left = (float) (-0.1); |
|
|
415 | /* copy the body_info to the body_used - this is only really |
|
|
416 | * need for monsters, but doesn't hurt to do it for everything. |
|
|
417 | * by doing so, when a monster is created, it has good starting |
|
|
418 | * values for the body_used info, so when items are created |
|
|
419 | * for it, they can be properly equipped. |
|
|
420 | */ |
|
|
421 | memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info)); |
|
|
422 | |
|
|
423 | switch (i) |
406 | switch (f.kw) |
424 | { |
|
|
425 | case LL_NORMAL: /* A new archetype, just link it with the previous */ |
|
|
426 | if (last_more != NULL) |
|
|
427 | last_more->next = at; |
|
|
428 | if (head != NULL) |
|
|
429 | head->next = at; |
|
|
430 | head = last_more = at; |
|
|
431 | #if 0 |
|
|
432 | if (!op->type) |
|
|
433 | LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name); |
|
|
434 | #endif |
|
|
435 | at->tail_x = 0; |
|
|
436 | at->tail_y = 0; |
|
|
437 | break; |
|
|
438 | |
|
|
439 | case LL_MORE: /* Another part of the previous archetype, link it correctly */ |
|
|
440 | |
|
|
441 | at->head = head; |
|
|
442 | at->clone.head = &head->clone; |
|
|
443 | if (last_more != NULL) |
|
|
444 | { |
|
|
445 | last_more->more = at; |
|
|
446 | last_more->clone.more = &at->clone; |
|
|
447 | } |
|
|
448 | last_more = at; |
|
|
449 | |
|
|
450 | /* If this multipart image is still composed of individual small |
|
|
451 | * images, don't set the tail_.. values. We can't use them anyways, |
|
|
452 | * and setting these to zero makes the map sending to the client much |
|
|
453 | * easier as just looking at the head, we know what to do. |
|
|
454 | */ |
|
|
455 | if (at->clone.face != head->clone.face) |
|
|
456 | { |
|
|
457 | head->tail_x = 0; |
|
|
458 | head->tail_y = 0; |
|
|
459 | } |
|
|
460 | else |
|
|
461 | { |
|
|
462 | if (at->clone.x > head->tail_x) |
|
|
463 | head->tail_x = at->clone.x; |
|
|
464 | if (at->clone.y > head->tail_y) |
|
|
465 | head->tail_y = at->clone.y; |
|
|
466 | } |
|
|
467 | break; |
|
|
468 | |
|
|
469 | } |
407 | { |
|
|
408 | case KW_object: |
|
|
409 | if (!archetype::read (f)) |
|
|
410 | return false; |
|
|
411 | continue; |
470 | |
412 | |
471 | at = new archetype; |
413 | case KW_EOF: |
|
|
414 | return true; |
472 | |
415 | |
473 | at->clone.arch = at; |
416 | default: |
474 | } |
417 | if (!f.parse_error ("archetypes file")) |
|
|
418 | return false; |
|
|
419 | } |
475 | |
420 | |
476 | delete at; |
421 | f.next (); |
|
|
422 | } |
477 | } |
423 | } |
478 | |
424 | |
479 | /* |
425 | /* |
480 | * Reads the archetype file once more, and links all pointers between |
426 | * Reads the archetype file once more, and links all pointers between |
481 | * archetypes. |
427 | * archetypes. |
482 | */ |
428 | */ |
483 | |
|
|
484 | void |
429 | void |
485 | second_arch_pass (object_thawer & thawer) |
430 | second_arch_pass (object_thawer & thawer) |
486 | { |
431 | { |
487 | char buf[MAX_BUF], *variable = buf, *argument, *cp; |
432 | char buf[MAX_BUF], *variable = buf, *argument, *cp; |
488 | archetype *at = NULL, *other; |
433 | archetype *at = NULL, *other; |
489 | |
434 | |
490 | while (fgets (buf, MAX_BUF, thawer) != NULL) |
435 | while (fgets (buf, MAX_BUF, thawer) != NULL) |
491 | { |
436 | { |
492 | if (*buf == '#') |
437 | if (*buf == '#') |
493 | continue; |
438 | continue; |
|
|
439 | |
494 | if ((argument = strchr (buf, ' ')) != NULL) |
440 | if ((argument = strchr (buf, ' ')) != NULL) |
495 | { |
441 | { |
496 | *argument = '\0', argument++; |
442 | *argument = '\0', argument++; |
497 | cp = argument + strlen (argument) - 1; |
443 | cp = argument + strlen (argument) - 1; |
498 | while (isspace (*cp)) |
444 | while (isspace (*cp)) |
499 | { |
445 | { |
500 | *cp = '\0'; |
446 | *cp = '\0'; |
501 | cp--; |
447 | cp--; |
502 | } |
448 | } |
503 | } |
449 | } |
|
|
450 | |
504 | if (!strcmp ("Object", variable)) |
451 | if (!strcmp ("object", variable)) |
505 | { |
452 | { |
506 | if ((at = archetype::find (argument)) == NULL) |
453 | if ((at = archetype::find (argument)) == NULL) |
507 | LOG (llevError, "Warning: failed to find arch %s\n", argument); |
454 | LOG (llevError, "Warning: failed to find arch %s\n", argument); |
508 | } |
455 | } |
509 | else if (!strcmp ("other_arch", variable)) |
456 | else if (!strcmp ("other_arch", variable)) |
… | |
… | |
516 | at->clone.other_arch = other; |
463 | at->clone.other_arch = other; |
517 | } |
464 | } |
518 | } |
465 | } |
519 | else if (!strcmp ("randomitems", variable)) |
466 | else if (!strcmp ("randomitems", variable)) |
520 | { |
467 | { |
521 | if (at != NULL) |
468 | if (at) |
522 | { |
469 | { |
523 | treasurelist *tl = find_treasurelist (argument); |
470 | treasurelist *tl = find_treasurelist (argument); |
524 | |
471 | |
525 | if (tl == NULL) |
472 | if (tl == NULL) |
526 | LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); |
473 | LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument); |
… | |
… | |
557 | |
504 | |
558 | sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); |
505 | sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); |
559 | LOG (llevDebug, "Reading archetypes from %s:\n", filename); |
506 | LOG (llevDebug, "Reading archetypes from %s:\n", filename); |
560 | |
507 | |
561 | { |
508 | { |
562 | object_thawer |
|
|
563 | thawer (filename); |
509 | object_thawer f (filename); |
564 | |
510 | |
565 | clear_archetable (); |
511 | f.next (); |
|
|
512 | |
566 | LOG (llevDebug, " arch-pass 1...\n"); |
513 | LOG (llevDebug, " arch-pass 1...\n"); |
567 | first_arch_pass (thawer); |
514 | if (!first_arch_pass (f)) |
|
|
515 | cleanup ("errors during first arch pass are fatal"); |
568 | LOG (llevDebug, " done\n"); |
516 | LOG (llevDebug, " done\n"); |
569 | } |
517 | } |
570 | |
518 | |
571 | init_archetable (); |
519 | init_archetable (); |
572 | warn_archetypes = 1; |
520 | warn_archetypes = 1; |
573 | |
521 | |
574 | { |
522 | { |
575 | object_thawer |
|
|
576 | thawer (filename); |
523 | object_thawer f (filename); |
577 | |
524 | |
578 | LOG (llevDebug, " loading treasure...\n"); |
525 | LOG (llevDebug, " loading treasure...\n"); |
579 | load_treasures (); |
526 | load_treasures (); |
|
|
527 | LOG (llevDebug, " done\n"); |
580 | LOG (llevDebug, " done\n arch-pass 2...\n"); |
528 | LOG (llevDebug, " arch-pass 2...\n"); |
581 | second_arch_pass (thawer); |
529 | second_arch_pass (f); |
582 | LOG (llevDebug, " done\n"); |
530 | LOG (llevDebug, " done\n"); |
583 | #ifdef DEBUG |
531 | #ifdef DEBUG |
584 | check_generators (); |
532 | check_generators (); |
585 | #endif |
533 | #endif |
586 | } |
534 | } |
… | |
… | |
592 | * This function returns NULL on failure. |
540 | * This function returns NULL on failure. |
593 | */ |
541 | */ |
594 | object * |
542 | object * |
595 | arch_to_object (archetype *at) |
543 | arch_to_object (archetype *at) |
596 | { |
544 | { |
597 | object *op; |
545 | if (!at) |
598 | |
|
|
599 | if (at == NULL) |
|
|
600 | { |
546 | { |
601 | if (warn_archetypes) |
547 | if (warn_archetypes) |
602 | LOG (llevError, "Couldn't find archetype.\n"); |
548 | LOG (llevError, "Couldn't find archetype.\n"); |
603 | |
549 | |
604 | return NULL; |
550 | return NULL; |
605 | } |
551 | } |
606 | |
552 | |
607 | op = at->clone.clone (); |
553 | object *op = at->clone.clone (); |
608 | op->arch = at; |
554 | op->arch = at; |
609 | op->instantiate (); |
555 | op->instantiate (); |
610 | return op; |
556 | return op; |
611 | } |
557 | } |
612 | |
558 | |
… | |
… | |
676 | |
622 | |
677 | /* |
623 | /* |
678 | * Finds, using the hashtable, which archetype matches the given name. |
624 | * Finds, using the hashtable, which archetype matches the given name. |
679 | * returns a pointer to the found archetype, otherwise NULL. |
625 | * returns a pointer to the found archetype, otherwise NULL. |
680 | */ |
626 | */ |
681 | |
|
|
682 | archetype * |
627 | archetype * |
683 | archetype::find (const char *name) |
628 | archetype::find (const char *name) |
684 | { |
629 | { |
685 | if (!name) |
630 | if (!name) |
686 | return 0; |
631 | return 0; |
687 | |
632 | |
688 | #if USE_UNORDERED_MAP |
|
|
689 | AUTODECL (i, ht.find ((size_t) name)); |
633 | AUTODECL (i, ht.find (name)); |
690 | |
634 | |
691 | if (i == ht.end ()) |
635 | if (i == ht.end ()) |
692 | return 0; |
636 | return 0; |
693 | else |
637 | else |
694 | return i->second; |
638 | return i->second; |
695 | #endif |
|
|
696 | |
|
|
697 | archetype *at; |
|
|
698 | unsigned long index; |
|
|
699 | |
|
|
700 | index = hasharch (name, ARCHTABLE); |
|
|
701 | arch_search++; |
|
|
702 | for (;;) |
|
|
703 | { |
|
|
704 | at = arch_table[index]; |
|
|
705 | |
|
|
706 | if (at == NULL) |
|
|
707 | { |
|
|
708 | if (warn_archetypes) |
|
|
709 | LOG (llevError, "Couldn't find archetype %s\n", name); |
|
|
710 | |
|
|
711 | return NULL; |
|
|
712 | } |
|
|
713 | |
|
|
714 | arch_cmp++; |
|
|
715 | |
|
|
716 | if (!strcmp ((const char *) at->name, name)) |
|
|
717 | return at; |
|
|
718 | |
|
|
719 | if (++index >= ARCHTABLE) |
|
|
720 | index = 0; |
|
|
721 | } |
|
|
722 | } |
639 | } |
723 | |
640 | |
724 | /* |
641 | /* |
725 | * Adds an archetype to the hashtable. |
642 | * Adds an archetype to the hashtable. |
726 | */ |
643 | */ |
727 | void |
644 | void |
728 | archetype::hash_add () |
645 | archetype::hash_add () |
729 | { |
646 | { |
730 | #if USE_UNORDERED_MAP |
|
|
731 | ht.insert (std::make_pair ((size_t) (const char *) name, this)); |
647 | ht.insert (std::make_pair (name, this)); |
732 | #else |
|
|
733 | |
|
|
734 | int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; |
|
|
735 | |
|
|
736 | for (;;) |
|
|
737 | { |
|
|
738 | if (!arch_table[index]) |
|
|
739 | { |
|
|
740 | arch_table[index] = this; |
|
|
741 | break; |
|
|
742 | } |
|
|
743 | |
|
|
744 | if (++index == ARCHTABLE) |
|
|
745 | index = 0; |
|
|
746 | |
|
|
747 | if (index == org_index) |
|
|
748 | fatal (ARCHTABLE_TOO_SMALL); |
|
|
749 | } |
|
|
750 | #endif |
|
|
751 | } |
648 | } |
752 | |
649 | |
753 | void |
650 | void |
754 | archetype::hash_del () |
651 | archetype::hash_del () |
755 | { |
652 | { |
756 | #if USE_UNORDERED_MAP |
653 | ht.erase (name); |
757 | # error remove this from HT |
|
|
758 | #else |
|
|
759 | |
|
|
760 | int index = hasharch ((const char *) name, ARCHTABLE), org_index = index; |
|
|
761 | |
|
|
762 | for (;;) |
|
|
763 | { |
|
|
764 | if (arch_table[index] == this) |
|
|
765 | { |
|
|
766 | arch_table[index] = 0; |
|
|
767 | break; |
|
|
768 | } |
|
|
769 | |
|
|
770 | if (++index == ARCHTABLE) |
|
|
771 | index = 0; |
|
|
772 | |
|
|
773 | if (index == org_index) |
|
|
774 | break; |
|
|
775 | } |
|
|
776 | #endif |
|
|
777 | } |
654 | } |
778 | |
655 | |
779 | /* |
656 | /* |
780 | * Returns the first archetype using the given type. |
657 | * Returns the first archetype using the given type. |
781 | * Used in treasure-generation. |
658 | * Used in treasure-generation. |
782 | */ |
659 | */ |
783 | |
|
|
784 | archetype * |
660 | archetype * |
785 | type_to_archetype (int type) |
661 | type_to_archetype (int type) |
786 | { |
662 | { |
787 | archetype *at; |
663 | archetype *at; |
788 | |
664 | |