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.56 by root, Wed Apr 18 07:59:55 2007 UTC vs.
Revision 1.67 by root, Sat Jun 9 21:16:12 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
… …
50 str_equal, 50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 52 > HT;
53 53
54static HT ht (5000); 54static HT ht (5000);
55static std::vector<archetype *> archetypes; 55archvec archetypes;
56 56
57/** 57/**
58 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 59 * 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. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
68archetype * 68archetype *
69find_archetype_by_object_name (const char *name) 69find_archetype_by_object_name (const char *name)
70{ 70{
71 shstr_cmp name_cmp (name); 71 shstr_cmp name_cmp (name);
72 72
73 for (archetype *at = first_archetype; at; at = at->next) 73 for_all_archetypes (at)
74 if (at->clone.name == name_cmp) 74 if (at->name == name_cmp)
75 return at; 75 return at;
76 76
77 return 0; 77 return 0;
78} 78}
79 79
… …
85archetype * 85archetype *
86find_archetype_by_object_type_name (int type, const char *name) 86find_archetype_by_object_type_name (int type, const char *name)
87{ 87{
88 shstr_cmp name_cmp (name); 88 shstr_cmp name_cmp (name);
89 89
90 for (archetype *at = first_archetype; at; at = at->next) 90 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.type == type) 91 if (at->name == name_cmp && at->type == type)
92 return at; 92 return at;
93 93
94 return 0; 94 return 0;
95} 95}
96 96
… …
102object * 102object *
103get_archetype_by_skill_name (const char *skill, int type) 103get_archetype_by_skill_name (const char *skill, int type)
104{ 104{
105 shstr_cmp skill_cmp (skill); 105 shstr_cmp skill_cmp (skill);
106 106
107 for (archetype *at = first_archetype; at; at = at->next) 107 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type)) 108 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 109 return arch_to_object (at);
110 110
111 return 0; 111 return 0;
112} 112}
113 113
… …
119 * (eg, skills) 119 * (eg, skills)
120 */ 120 */
121archetype * 121archetype *
122get_archetype_by_type_subtype (int type, int subtype) 122get_archetype_by_type_subtype (int type, int subtype)
123{ 123{
124 for (archetype *at = first_archetype; at; at = at->next) 124 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 125 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 126 return at;
127 127
128 return 0; 128 return 0;
129} 129}
130 130
… …
157 } 157 }
158 158
159 return create_singularity (name); 159 return create_singularity (name);
160} 160}
161 161
162 /* This is a subset of the parse_id command. Basically, name can be 162/* 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. 163 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 164 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 165 * 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 166 * 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 167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 168 * value means a better match. 0 means no match.
169 * 169 *
170 * Brief outline of the procedure: 170 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 171 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 172 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 173 * Next, we check for a count (either specified in name, or in the
174 * player object.) 174 * player object.)
175 * If count is 1, make a quick check on the name. 175 * 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. 176 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 177 * Last, make a check on the full name.
178 */ 178 */
179int 179int
180item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
181{ 181{
182 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 183 int count, retval = 0;
… …
275 } 275 }
276 276
277 return 0; 277 return 0;
278} 278}
279 279
280archetype::archetype () 280archetype::archetype (const char *name)
281{ 281{
282 stub = true;
282 clone.arch = this; 283 arch = this;
283 284 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} 285}
287 286
288archetype::~archetype () 287archetype::~archetype ()
289{ 288{
290 //TODO: nuke ->more's 289 unlink ();
291} 290}
292 291
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 292void
311overwrite (archetype *at, object *op) 293archetype::link ()
312{ 294{
313 at->clone = *op; 295 ht.insert (std::make_pair (archname, this));
314 at->clone.arch = at;
315 296
316 at->clone.inv = op->inv; op->inv = 0; 297 if (!archetypes.contains (this))
298 archetypes.insert (this);
299}
317 300
318 op->destroy (); 301void
302archetype::unlink ()
303{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this))
307 archetypes.erase (this);
308}
309
310/*
311 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL.
313 */
314archetype *
315archetype::find (const char *name)
316{
317 if (!name)
318 return 0;
319
320 auto (i, ht.find (name));
321
322 if (i == ht.end ())
323 return 0;
324 else
325 return i->second;
326}
327
328archetype *
329archetype::get (const char *name)
330{
331 if (!name)
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336
337 archetype *at = find (name);
338
339 if (!at)
340 {
341 at = new archetype (name);
342 at->link ();
343 }
344
345 return at;
319} 346}
320 347
321archetype * 348archetype *
322archetype::read (object_thawer &f) 349archetype::read (object_thawer &f)
323{ 350{
324 assert (f.kw == KW_object); 351 assert (f.kw == KW_object);
325 352
326 loading_arch = true; // hack to tell parse_kv et al. to behave 353 loading_arch = true; // hack to tell parse_kv et al. to behave
327 354
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
353 if (!op->parse_kv (f)) 387 if (!at->parse_kv (f))
354 goto fail; 388 goto fail;
355 389
356 parts.push_back (std::make_pair (at, op)); 390 at->post_load_check ();
391
392 parts.push_back (at);
357 393
358 if (f.kw != KW_more) 394 if (f.kw != KW_more)
359 break; 395 break;
360 396
361 f.next (); 397 f.next ();
… …
365 f.parse_error ("more object"); 401 f.parse_error ("more object");
366 goto fail; 402 goto fail;
367 } 403 }
368 } 404 }
369 405
406 loading_arch = false;
407
370 { 408 {
409 auto (at, parts.begin ());
410
371 archetype *head = parts.front ().first; 411 archetype *new_head = parts.front ();
412 archetype *old_head = find (new_head->archname);
372 413
373 // check that all archetypes belong to the same object or are heads 414 if (old_head && !old_head->is_head ())
374 for (auto (p, parts.begin ()); p != parts.end (); ++p)
375 { 415 {
376 archetype *at = p->first; 416 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
417 &new_head->archname, &old_head->archname);
418 goto fail;
419 }
377 420
378 if (at->head != head && at->head) 421 // check that all archetypes belong to the same old object or are new
422 for (auto (at, parts.begin ()); at != parts.end (); ++at)
423 {
424 archetype *new_part = *at;
425 archetype *old_part = find (new_part->archname);
426
427 if (old_part && old_part->head_ () != old_head)
379 { 428 {
380 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 429 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
381 goto fail; 430 &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; 431 goto fail;
388 } 432 }
389 } 433 }
390 434
391 // sever chain of existing head object 435 // deactivate existing archetype
392 for (archetype *more, *at = head; at; at = more) 436 for (archetype *at = old_head; at; at = (archetype *)at->more)
393 { 437 at->unlink ();
394 more = at->more;
395 438
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 439 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y;
442
414 archetype *prev = head; 443 archetype *less = new_head;
415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
416 { 445 {
417 archetype *at = p->first; 446 archetype *at = *p;
418 overwrite (at, p->second);
419 447
420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 448 // 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; 449 // doing it here doesn't feel too cozy, but it allows code
450 // to ignore head checks for these flags, which saves time
451 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
452 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
453 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
454 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
422 455
456 if (at->x < new_head->min_x) new_head->min_x = at->x;
457 if (at->y < new_head->min_y) new_head->min_y = at->y;
458 if (at->x > new_head->max_x) new_head->max_x = at->x;
459 if (at->y > new_head->max_y) new_head->max_y = at->y;
460
423 at->head = head; 461 at->head = new_head;
424 at->clone.head = &head->clone;
425 prev->more = at; 462 less->more = at;
426 prev->clone.more = &at->clone;
427
428 prev = at; 463 less = at;
429 } 464 }
430 465
431 loading_arch = false; 466 // now activate it
467 for (auto (p, parts.begin ()); p != parts.end (); ++p)
468 {
469 archetype *at = *p;
470 at->stub = false;
471 at->link ();
472 }
473
432 return head; 474 return new_head;
433 } 475 }
434 476
435fail: 477fail:
436 for (auto (p, parts.begin ()); p != parts.end (); ++p) 478 for (auto (p, parts.begin ()); p != parts.end (); ++p)
437 p->second->destroy (true); 479 (*p)->destroy (true);
438 480
439 loading_arch = false; 481 loading_arch = false;
440 return 0; 482 return 0;
441} 483}
442 484
… …
464 { 506 {
465 LOG (llevError, "Couldn't find archetype.\n"); 507 LOG (llevError, "Couldn't find archetype.\n");
466 return 0; 508 return 0;
467 } 509 }
468 510
469 object *op = at->clone.clone (); 511 object *op = at->clone ();
470 op->arch = at; 512 op->arch = at;
471 op->instantiate (); 513 op->instantiate ();
472 514
473 return op; 515 return op;
474} 516}
… …
480 * an object, and never NULL. 522 * an object, and never NULL.
481 */ 523 */
482object * 524object *
483create_singularity (const char *name) 525create_singularity (const char *name)
484{ 526{
485 object *op; 527 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
528
529 if (!strcmp (name, "bug"))
530 abort ();
531
486 char buf[MAX_BUF]; 532 char buf[MAX_BUF];
533 sprintf (buf, "bug, please report (%s)", name);
487 534
488 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 535 object *op = get_archetype ("bug");
489 op = object::create ();
490 op->name = op->name_pl = buf; 536 op->name = op->name_pl = buf;
491 SET_FLAG (op, FLAG_NO_PICK); 537
492 return op; 538 return op;
493} 539}
494 540
495/* 541/*
496 * Finds which archetype matches the given name, and returns a new 542 * Finds which archetype matches the given name, and returns a new
… …
506 552
507 return arch_to_object (at); 553 return arch_to_object (at);
508} 554}
509 555
510/* 556/*
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 = 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. 557 * Returns the first archetype using the given type.
560 * Used in treasure-generation. 558 * Used in treasure-generation.
561 */ 559 */
562archetype * 560archetype *
563type_to_archetype (int type) 561type_to_archetype (int type)
564{ 562{
565 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 563 for_all_archetypes (at)
566 if (at->clone.type == type) 564 if (at->type == type && at->head_ () != at)
567 return at; 565 return at;
568 566
569 return 0; 567 return 0;
570} 568}
571 569
… …
583 { 581 {
584 LOG (llevError, "Can't clone archetype %d\n", type); 582 LOG (llevError, "Can't clone archetype %d\n", type);
585 return 0; 583 return 0;
586 } 584 }
587 585
588 object *op = at->clone.clone (); 586 object *op = at->clone ();
589 op->instantiate (); 587 op->instantiate ();
590 return op; 588 return op;
591} 589}
592 590
593/* 591/*
594 * member: make instance from class 592 * member: make instance from class
595 */ 593 */
596
597object * 594object *
598object_create_arch (archetype *at) 595object_create_arch (archetype *at)
599{ 596{
600 object *op, *prev = 0, *head = 0; 597 object *op, *prev = 0, *head = 0;
601 598
602 while (at) 599 while (at)
603 { 600 {
604 op = arch_to_object (at); 601 op = arch_to_object (at);
602
605 op->x = at->clone.x; 603 op->x = at->x;
606 op->y = at->clone.y; 604 op->y = at->y;
607 605
608 if (head) 606 if (head)
609 op->head = head, prev->more = op; 607 op->head = head, prev->more = op;
610 608
611 if (!head) 609 if (!head)
612 head = op; 610 head = op;
613 611
614 prev = op; 612 prev = op;
615 at = at->more; 613 at = (archetype *)at->more;
616 } 614 }
617 615
618 return (head); 616 return head;
619} 617}
620 618

Diff Legend

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