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.63 by root, Mon Jun 4 13:04:00 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->archname == 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->archname == 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
… …
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
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 (loading_arch && at && !at->stub)
340 {
341 at->unlink ();
342 at = 0;
343 }
344
345 if (!at || (!at->stub && loading_arch))
346 {
347 at = new archetype (name);
348 at->link ();
349 }
350
351 return at;
319} 352}
320 353
321archetype * 354archetype *
322archetype::read (object_thawer &f) 355archetype::read (object_thawer &f)
323{ 356{
324 assert (f.kw == KW_object); 357 assert (f.kw == KW_object);
325 358
326 loading_arch = true; // hack to tell parse_kv et al. to behave 359 loading_arch = true; // hack to tell parse_kv et al. to behave
327 360
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts; 361 std::vector<archetype *> parts;
330 362
331 coroapi::cede_to_tick_every (100); 363 coroapi::cede_to_tick_every (10);
332 364
333 for (;;) 365 for (;;)
334 { 366 {
335 object *op = object::create (); 367 // the archetype might have been referenced earlier
368 // so try to find an existing stub archetype first
336 archetype *at = get (f.get_str ()); 369 archetype *at = find (f.get_str ());
337 f.get (op->name); 370
371 if (!at || !at->stub)
372 at = new archetype (f.get_str ());
373
338 f.next (); 374 f.next ();
339 375
340#if 0 376#if 0
377 // implementing it here in the server does neither allow multiple inheritence
378 // nor does it cleanly "just override". it would allow use in map files, though,
379 // and other resource files dynamically laoded (as opposed to being preprocessed).
380 // not that any of this is relevant as of yet...
341 if (f.kw == KW_inherit) 381 if (f.kw == KW_inherit)
342 { 382 {
343 if (archetype *at = find (f.get_str ())) 383 if (archetype *at = find (f.get_str ()))
344 *op = at->clone; 384 *op = at->clone;
345 else 385 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", 386 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ()); 387 &at->archname, f.get_str ());
348 388
349 f.next (); 389 f.next ();
350 } 390 }
351#endif 391#endif
352 392
353 if (!op->parse_kv (f)) 393 if (!at->parse_kv (f))
354 goto fail; 394 goto fail;
355 395
356 parts.push_back (std::make_pair (at, op)); 396 at->post_load_check ();
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 ();
… …
365 f.parse_error ("more object"); 407 f.parse_error ("more object");
366 goto fail; 408 goto fail;
367 } 409 }
368 } 410 }
369 411
412 loading_arch = false;
413
370 { 414 {
415 auto (at, parts.begin ());
416
371 archetype *head = parts.front ().first; 417 archetype *new_head = parts.front ();
418 archetype *old_head = find (new_head->archname);
372 419
420 for (auto (at, parts.begin ()); at != parts.end (); ++at)
421 fprintf (stderr, "%d: %s\n", at - parts.begin(), &(*at)->archname);//D
422
373 // check that all archetypes belong to the same object or are heads 423 // check that all archetypes belong to the same old object or are new
374 for (auto (p, parts.begin ()); p != parts.end (); ++p) 424 for (auto (at, parts.begin ()); at != parts.end (); ++at)
375 { 425 {
376 archetype *at = p->first; 426 archetype *new_part = *at;
427 archetype *old_part = find (new_part->archname);
377 428
378 if (at->head != head && at->head) 429 if (old_part && old_part->head_ () != old_head)
379 { 430 {
380 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 431 fprintf (stderr, "nhn %s\n", &new_head->archname);//D
381 goto fail; 432 fprintf (stderr, "old_head %p,%p new_head %p,%p ph %p\n", old_head, old_part, new_head, new_part, old_part->head_());
382 } 433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
383 434 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
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 fprintf (stderr, "oh %p %s\n", old_head, &new_head->archname);//D
440
441 // deactivate existing archetype
392 for (archetype *more, *at = head; at; at = more) 442 for (archetype *at = old_head; at; at = (archetype *)at->more)
393 { 443 at->unlink ();
394 more = at->more;
395
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 444
413 // reassemble new chain 445 // reassemble new chain
446 new_head->min_x = new_head->max_x = new_head->x;
447 new_head->min_y = new_head->max_y = new_head->y;
448
414 archetype *prev = head; 449 archetype *less = new_head;
450 archetype *head = 0;
415 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 451 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
416 { 452 {
417 archetype *at = p->first; 453 archetype *at = *p;
418 overwrite (at, p->second);
419 454
420 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 455 if (at->x < new_head->min_x) new_head->min_x = at->x;
421 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 456 if (at->y < new_head->min_y) new_head->min_y = at->y;
457 if (at->x > new_head->max_x) new_head->max_x = at->x;
458 if (at->y > new_head->max_y) new_head->max_y = at->y;
422 459
423 at->head = head; 460 at->head = head; head = new_head;
424 at->clone.head = &head->clone; 461 less->more = at; less = at;
425 prev->more = at;
426 prev->clone.more = &at->clone;
427
428 prev = at;
429 } 462 }
430 463
431 loading_arch = false; 464 // now activate it
465 for (auto (p, parts.begin ()); p != parts.end (); ++p)
466 {
467 archetype *at = *p;
468 at->stub = false;
469 at->link ();
470 }
471
432 return head; 472 return new_head;
433 } 473 }
434 474
435fail: 475fail:
436 for (auto (p, parts.begin ()); p != parts.end (); ++p) 476 for (auto (p, parts.begin ()); p != parts.end (); ++p)
437 p->second->destroy (true); 477 (*p)->destroy (true);
438 478
439 loading_arch = false; 479 loading_arch = false;
440 return 0; 480 return 0;
441} 481}
442 482
… …
464 { 504 {
465 LOG (llevError, "Couldn't find archetype.\n"); 505 LOG (llevError, "Couldn't find archetype.\n");
466 return 0; 506 return 0;
467 } 507 }
468 508
469 object *op = at->clone.clone (); 509 object *op = at->clone ();
470 op->arch = at; 510 op->arch = at;
471 op->instantiate (); 511 op->instantiate ();
472 512
473 return op; 513 return op;
474} 514}
… …
506 546
507 return arch_to_object (at); 547 return arch_to_object (at);
508} 548}
509 549
510/* 550/*
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. 551 * Returns the first archetype using the given type.
560 * Used in treasure-generation. 552 * Used in treasure-generation.
561 */ 553 */
562archetype * 554archetype *
563type_to_archetype (int type) 555type_to_archetype (int type)
564{ 556{
565 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 557 for_all_archetypes (at)
566 if (at->clone.type == type) 558 if (at->type == type && at->head_ () != at)
567 return at; 559 return at;
568 560
569 return 0; 561 return 0;
570} 562}
571 563
… …
583 { 575 {
584 LOG (llevError, "Can't clone archetype %d\n", type); 576 LOG (llevError, "Can't clone archetype %d\n", type);
585 return 0; 577 return 0;
586 } 578 }
587 579
588 object *op = at->clone.clone (); 580 object *op = at->clone ();
589 op->instantiate (); 581 op->instantiate ();
590 return op; 582 return op;
591} 583}
592 584
593/* 585/*
594 * member: make instance from class 586 * member: make instance from class
595 */ 587 */
596
597object * 588object *
598object_create_arch (archetype *at) 589object_create_arch (archetype *at)
599{ 590{
600 object *op, *prev = 0, *head = 0; 591 object *op, *prev = 0, *head = 0;
601 592
602 while (at) 593 while (at)
603 { 594 {
604 op = arch_to_object (at); 595 op = arch_to_object (at);
596
605 op->x = at->clone.x; 597 op->x = at->x;
606 op->y = at->clone.y; 598 op->y = at->y;
607 599
608 if (head) 600 if (head)
609 op->head = head, prev->more = op; 601 op->head = head, prev->more = op;
610 602
611 if (!head) 603 if (!head)
612 head = op; 604 head = op;
613 605
614 prev = op; 606 prev = op;
615 at = at->more; 607 at = (archetype *)at->more;
616 } 608 }
617 609
618 return (head); 610 return head;
619} 611}
620 612

Diff Legend

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