ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.57 by root, Thu Apr 19 19:24:25 2007 UTC vs.
Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
… …
37 * return an object. Perhaps those should be called 'archob' functions 36 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype. 37 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29 38 * MSW 2003-04-29
40 */ 39 */
41 40
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 41archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43 42
44// the hashtable 43// the hashtable
45typedef std::tr1::unordered_map 44typedef std::tr1::unordered_map
46 < 45 <
47 const char *, 46 const char *,
… …
50 str_equal, 49 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 50 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 51 > HT;
53 52
54static HT ht (5000); 53static HT ht (5000);
55static std::vector<archetype *> archetypes; 54archvec archetypes;
56 55
57/** 56/**
58 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
60 * 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.
… …
68archetype * 67archetype *
69find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
70{ 69{
71 shstr_cmp name_cmp (name); 70 shstr_cmp name_cmp (name);
72 71
73 for (archetype *at = first_archetype; at; at = at->next) 72 for_all_archetypes (at)
74 if (at->clone.name == name_cmp) 73 if (at->name == name_cmp)
75 return at; 74 return at;
76 75
77 return 0; 76 return 0;
78} 77}
79 78
… …
85archetype * 84archetype *
86find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
87{ 86{
88 shstr_cmp name_cmp (name); 87 shstr_cmp name_cmp (name);
89 88
90 for (archetype *at = first_archetype; at; at = at->next) 89 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.type == type) 90 if (at->name == name_cmp && at->type == type)
92 return at; 91 return at;
93 92
94 return 0; 93 return 0;
95} 94}
96 95
… …
102object * 101object *
103get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
104{ 103{
105 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
106 105
107 for (archetype *at = first_archetype; at; at = at->next) 106 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 108 return arch_to_object (at);
110 109
111 return 0; 110 return 0;
112} 111}
113 112
… …
119 * (eg, skills) 118 * (eg, skills)
120 */ 119 */
121archetype * 120archetype *
122get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
123{ 122{
124 for (archetype *at = first_archetype; at; at = at->next) 123 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 125 return at;
127 126
128 return 0; 127 return 0;
129} 128}
130 129
… …
157 } 156 }
158 157
159 return create_singularity (name); 158 return create_singularity (name);
160} 159}
161 160
162 /* This is a subset of the parse_id command. Basically, name can be 161/* This is a subset of the parse_id command. Basically, name can be
163 * a string seperated lists of things to match, with certain keywords. 162 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 163 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 164 * op is the item we are trying to match. Calling function takes care
166 * of what action might need to be done and if it is valid 165 * of what action might need to be done and if it is valid
167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 166 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 167 * value means a better match. 0 means no match.
169 * 168 *
170 * Brief outline of the procedure: 169 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 170 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 171 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 172 * Next, we check for a count (either specified in name, or in the
174 * player object.) 173 * player object.)
175 * If count is 1, make a quick check on the name. 174 * If count is 1, make a quick check on the name.
176 * IF count is >1, we need to make plural name. Return if match. 175 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 176 * Last, make a check on the full name.
178 */ 177 */
179int 178int
180item_matched_string (object *pl, object *op, const char *name) 179item_matched_string (object *pl, object *op, const char *name)
181{ 180{
182 char *cp, local_name[MAX_BUF]; 181 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 182 int count, retval = 0;
… …
275 } 274 }
276 275
277 return 0; 276 return 0;
278} 277}
279 278
280archetype::archetype () 279archetype::archetype (const char *name)
281{ 280{
281 stub = true;
282 clone.arch = this; 282 arch = this;
283 283 this->archname = this->name = this->name_pl = name;
284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286} 284}
287 285
288archetype::~archetype () 286archetype::~archetype ()
289{ 287{
290 //TODO: nuke ->more's 288 unlink ();
291} 289}
292 290
293static void
294unlink (archetype *at)
295{
296 if (at->head)
297 at = at->head;
298
299 // destroy this archetype's link, making singletons out of its parts
300 while (at)
301 {
302 archetype *more = at->more;
303 at->clone.destroy_inv ();
304 at->head = at->more = 0;
305 at = more;
306 }
307}
308
309// dire hack, need to rationalise
310void 291void
311overwrite (archetype *at, object *op) 292archetype::link ()
312{ 293{
313 at->clone = *op; 294 ht.insert (std::make_pair (archname, this));
314 at->clone.arch = at;
315 295
316 at->clone.inv = op->inv; op->inv = 0; 296 if (!archetypes.contains (this))
297 archetypes.insert (this);
298}
317 299
318 op->destroy (); 300void
301archetype::unlink ()
302{
303 ht.erase (archname);
304
305 if (archetypes.contains (this))
306 archetypes.erase (this);
307}
308
309/*
310 * Finds, using the hashtable, which archetype matches the given name.
311 * returns a pointer to the found archetype, otherwise NULL.
312 */
313archetype *
314archetype::find (const char *name)
315{
316 if (!name)
317 return 0;
318
319 auto (i, ht.find (name));
320
321 if (i == ht.end ())
322 return 0;
323 else
324 return i->second;
325}
326
327archetype *
328archetype::get (const char *name)
329{
330 if (!name)
331 {
332 LOG (llevError, "null archetype requested\n");
333 name = "(null)";
334 }
335
336 if (loading_arch && !strcmp (&loading_arch->archname, name))
337 return loading_arch;
338
339 archetype *at = find (name);
340
341 if (!at)
342 {
343 at = new archetype (name);
344 at->link ();
345 }
346
347 return at;
319} 348}
320 349
321archetype * 350archetype *
322archetype::read (object_thawer &f) 351archetype::read (object_thawer &f)
323{ 352{
324 assert (f.kw == KW_object); 353 assert (f.kw == KW_object);
325 354
326 loading_arch = true; // hack to tell parse_kv et al. to behave
327
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts; 355 std::vector<archetype *> parts;
330 356
331 coroapi::cede_to_tick_every (100); 357 coroapi::cede_to_tick_every (10);
332 358
333 for (;;) 359 for (;;)
334 { 360 {
335 object *op = object::create (); 361 // the archetype might have been referenced earlier
362 // so try to find an existing stub archetype first
336 archetype *at = get (f.get_str ()); 363 archetype *at = find (f.get_str ());
337 f.get (op->name); 364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367
338 f.next (); 368 f.next ();
339 369
340#if 0 370#if 0
371 // implementing it here in the server does neither allow multiple inheritence
372 // nor does it cleanly "just override". it would allow use in map files, though,
373 // and other resource files dynamically laoded (as opposed to being preprocessed).
374 // not that any of this is relevant as of yet...
341 if (f.kw == KW_inherit) 375 if (f.kw == KW_inherit)
342 { 376 {
343 if (archetype *at = find (f.get_str ())) 377 if (archetype *at = find (f.get_str ()))
344 *op = at->clone; 378 *op = at->clone;
345 else 379 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", 380 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ()); 381 &at->archname, f.get_str ());
348 382
349 f.next (); 383 f.next ();
350 } 384 }
351#endif 385#endif
352 386
387 loading_arch = at; // hack to tell parse_kv et al. to behave
388 bool parse_ok = at->parse_kv (f);
389 loading_arch = 0;
390
353 if (!op->parse_kv (f)) 391 if (!parse_ok)
354 goto fail; 392 goto fail;
355 393
356 parts.push_back (std::make_pair (at, op)); 394 loading_arch = at; // hack to tell parse_kv et al. to behave
395 at->post_load_check ();
396 loading_arch = 0;
397
398 parts.push_back (at);
357 399
358 if (f.kw != KW_more) 400 if (f.kw != KW_more)
359 break; 401 break;
360 402
361 f.next (); 403 f.next ();
… …
366 goto fail; 408 goto fail;
367 } 409 }
368 } 410 }
369 411
370 { 412 {
413 auto (at, parts.begin ());
414
371 archetype *head = parts.front ().first; 415 archetype *new_head = parts.front ();
416 archetype *old_head = find (new_head->archname);
372 417
373 // check that all archetypes belong to the same object or are heads 418 if (old_head && !old_head->is_head ())
374 for (auto (p, parts.begin ()); p != parts.end (); ++p)
375 { 419 {
376 archetype *at = p->first; 420 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
421 &new_head->archname, &old_head->archname);
422 goto fail;
423 }
377 424
378 if (at->head != head && at->head) 425 // check that all archetypes belong to the same old object or are new
426 for (auto (at, parts.begin ()); at != parts.end (); ++at)
427 {
428 archetype *new_part = *at;
429 archetype *old_part = find (new_part->archname);
430
431 if (old_part && old_part->head_ () != old_head)
379 { 432 {
380 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
381 goto fail; 434 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
382 }
383
384 if (at->next && at != head)
385 {
386 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
387 goto fail; 435 goto fail;
388 } 436 }
389 } 437 }
390 438
391 // sever chain of existing head object 439 // deactivate existing archetype
392 for (archetype *more, *at = head; at; at = more) 440 for (archetype *at = old_head; at; at = (archetype *)at->more)
393 { 441 at->unlink ();
394 more = at->more;
395 442
396 at->head = 0;
397 at->more = 0;
398 }
399
400 // replace/update head
401 overwrite (head, parts.front ().second);
402 head->tail_x = 0;
403 head->tail_y = 0;
404
405 // link into list of heads, if not already there
406 if (!head->linked)
407 {
408 head->linked = true;
409 head->next = first_archetype;
410 first_archetype = head;
411 }
412
413 // reassemble new chain 443 // assemble new chain
444 new_head->min_x = new_head->max_x = new_head->x;
445 new_head->min_y = new_head->max_y = new_head->y;
446
414 archetype *prev = head; 447 archetype *less = new_head;
415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 448 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
416 { 449 {
417 archetype *at = p->first; 450 archetype *at = *p;
418 overwrite (at, p->second);
419 451
420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 452 // some flags get inherited formt he head (probably a lot more)
421 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 453 // doing it here doesn't feel too cozy, but it allows code
454 // to ignore head checks for these flags, which saves time
455 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
456 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
457 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
458 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
422 459
460 if (at->x < new_head->min_x) new_head->min_x = at->x;
461 if (at->y < new_head->min_y) new_head->min_y = at->y;
462 if (at->x > new_head->max_x) new_head->max_x = at->x;
463 if (at->y > new_head->max_y) new_head->max_y = at->y;
464
423 at->head = head; 465 at->head = new_head;
424 at->clone.head = &head->clone;
425 prev->more = at; 466 less->more = at;
426 prev->clone.more = &at->clone;
427
428 prev = at; 467 less = at;
429 } 468 }
430 469
431 loading_arch = false; 470 // now activate it
471 for (auto (p, parts.begin ()); p != parts.end (); ++p)
472 {
473 archetype *at = *p;
474 at->stub = false;
475 at->link ();
476 }
477
432 return head; 478 return new_head;
433 } 479 }
434 480
435fail: 481fail:
436 for (auto (p, parts.begin ()); p != parts.end (); ++p) 482 for (auto (p, parts.begin ()); p != parts.end (); ++p)
437 p->second->destroy (true); 483 (*p)->destroy (true);
438 484
439 loading_arch = false;
440 return 0; 485 return 0;
441} 486}
442 487
443/* 488/*
444 * Initialize global archtype pointers: 489 * Initialize global archtype pointers:
… …
464 { 509 {
465 LOG (llevError, "Couldn't find archetype.\n"); 510 LOG (llevError, "Couldn't find archetype.\n");
466 return 0; 511 return 0;
467 } 512 }
468 513
469 object *op = at->clone.clone (); 514 object *op = at->clone ();
470 op->arch = at; 515 op->arch = at;
471 op->instantiate (); 516 op->instantiate ();
472 517
473 return op; 518 return op;
474} 519}
… …
480 * an object, and never NULL. 525 * an object, and never NULL.
481 */ 526 */
482object * 527object *
483create_singularity (const char *name) 528create_singularity (const char *name)
484{ 529{
485 object *op; 530 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
531
532 if (!strcmp (name, "bug"))
533 abort ();
534
486 char buf[MAX_BUF]; 535 char buf[MAX_BUF];
536 sprintf (buf, "bug, please report (%s)", name);
487 537
488 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 538 object *op = get_archetype ("bug");
489 op = object::create ();
490 op->name = op->name_pl = buf; 539 op->name = op->name_pl = buf;
491 SET_FLAG (op, FLAG_NO_PICK); 540
492 return op; 541 return op;
493} 542}
494 543
495/* 544/*
496 * Finds which archetype matches the given name, and returns a new 545 * Finds which archetype matches the given name, and returns a new
… …
506 555
507 return arch_to_object (at); 556 return arch_to_object (at);
508} 557}
509 558
510/* 559/*
511 * Finds, using the hashtable, which archetype matches the given name.
512 * returns a pointer to the found archetype, otherwise NULL.
513 */
514archetype *
515archetype::find (const char *name)
516{
517 if (!name)
518 return 0;
519
520 auto (i, ht.find (name));
521
522 if (i == ht.end ())
523 return 0;
524 else
525 return i->second;
526}
527
528archetype *
529archetype::get (const char *name)
530{
531 archetype *at = find (name);
532
533 if (!at)
534 {
535 archetypes.push_back (at = new archetype);
536 at->name = at->clone.name = at->clone.name_pl = name;
537 at->hash_add ();
538 }
539
540 return at;
541}
542
543/*
544 * Adds an archetype to the hashtable.
545 */
546void
547archetype::hash_add ()
548{
549 ht.insert (std::make_pair (name, this));
550}
551
552void
553archetype::hash_del ()
554{
555 ht.erase (name);
556}
557
558/*
559 * Returns the first archetype using the given type. 560 * Returns the first archetype using the given type.
560 * Used in treasure-generation. 561 * Used in treasure-generation.
561 */ 562 */
562archetype * 563archetype *
563type_to_archetype (int type) 564type_to_archetype (int type)
564{ 565{
565 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 566 for_all_archetypes (at)
566 if (at->clone.type == type) 567 if (at->type == type && at->head_ () != at)
567 return at; 568 return at;
568 569
569 return 0; 570 return 0;
570} 571}
571 572
… …
583 { 584 {
584 LOG (llevError, "Can't clone archetype %d\n", type); 585 LOG (llevError, "Can't clone archetype %d\n", type);
585 return 0; 586 return 0;
586 } 587 }
587 588
588 object *op = at->clone.clone (); 589 object *op = at->clone ();
589 op->instantiate (); 590 op->instantiate ();
590 return op; 591 return op;
591} 592}
592 593
593/* 594/*
594 * member: make instance from class 595 * member: make instance from class
595 */ 596 */
596
597object * 597object *
598object_create_arch (archetype *at) 598object_create_arch (archetype *at)
599{ 599{
600 object *op, *prev = 0, *head = 0; 600 object *op, *prev = 0, *head = 0;
601 601
602 while (at) 602 while (at)
603 { 603 {
604 op = arch_to_object (at); 604 op = arch_to_object (at);
605
605 op->x = at->clone.x; 606 op->x = at->x;
606 op->y = at->clone.y; 607 op->y = at->y;
607 608
608 if (head) 609 if (head)
609 op->head = head, prev->more = op; 610 op->head = head, prev->more = op;
610 611
611 if (!head) 612 if (!head)
612 head = op; 613 head = op;
613 614
614 prev = op; 615 prev = op;
615 at = at->more; 616 at = (archetype *)at->more;
616 } 617 }
617 618
618 return (head); 619 return head;
619} 620}
620 621

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines