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.55 by root, Tue Apr 17 19:12:32 2007 UTC vs.
Revision 1.68 by root, Sun Jul 1 05:00:17 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>
… …
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 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
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 archetype *at = find (name);
337
338 if (!at)
339 {
340 at = new archetype (name);
341 at->link ();
342 }
343
344 return at;
319} 345}
320 346
321archetype * 347archetype *
322archetype::read (object_thawer &f) 348archetype::read (object_thawer &f)
323{ 349{
324 assert (f.kw == KW_object); 350 assert (f.kw == KW_object);
325 351
326 loading_arch = true; // hack to tell parse_kv et al. to behave 352 loading_arch = true; // hack to tell parse_kv et al. to behave
327 353
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts; 354 std::vector<archetype *> parts;
330 355
331 coroapi::cede_to_tick_every (100); 356 coroapi::cede_to_tick_every (10);
332 357
333 for (;;) 358 for (;;)
334 { 359 {
335 object *op = object::create (); 360 // the archetype might have been referenced earlier
361 // so try to find an existing stub archetype first
336 archetype *at = get (f.get_str ()); 362 archetype *at = find (f.get_str ());
337 f.get (op->name); 363
364 if (!at || !at->stub)
365 at = new archetype (f.get_str ());
366
338 f.next (); 367 f.next ();
339 368
369#if 0
370 // implementing it here in the server does neither allow multiple inheritence
371 // nor does it cleanly "just override". it would allow use in map files, though,
372 // and other resource files dynamically laoded (as opposed to being preprocessed).
373 // not that any of this is relevant as of yet...
340 if (f.kw == KW_inherit) 374 if (f.kw == KW_inherit)
341 { 375 {
342 if (archetype *at = find (f.get_str ())) 376 if (archetype *at = find (f.get_str ()))
343 *op = at->clone; 377 *op = at->clone;
344 else 378 else
345 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", 379 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
346 &at->name, f.get_str ()); 380 &at->archname, f.get_str ());
347 381
348 f.next (); 382 f.next ();
349 } 383 }
384#endif
350 385
351 if (!op->parse_kv (f)) 386 if (!at->parse_kv (f))
352 goto fail; 387 goto fail;
353 388
354 parts.push_back (std::make_pair (at, op)); 389 at->post_load_check ();
390
391 parts.push_back (at);
355 392
356 if (f.kw != KW_more) 393 if (f.kw != KW_more)
357 break; 394 break;
358 395
359 f.next (); 396 f.next ();
… …
363 f.parse_error ("more object"); 400 f.parse_error ("more object");
364 goto fail; 401 goto fail;
365 } 402 }
366 } 403 }
367 404
405 loading_arch = false;
406
368 { 407 {
408 auto (at, parts.begin ());
409
369 archetype *head = parts.front ().first; 410 archetype *new_head = parts.front ();
411 archetype *old_head = find (new_head->archname);
370 412
371 // check that all archetypes belong to the same object or are heads 413 if (old_head && !old_head->is_head ())
372 for (auto (p, parts.begin ()); p != parts.end (); ++p)
373 { 414 {
374 archetype *at = p->first; 415 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
416 &new_head->archname, &old_head->archname);
417 goto fail;
418 }
375 419
376 if (at->head != head && at->head) 420 // check that all archetypes belong to the same old object or are new
421 for (auto (at, parts.begin ()); at != parts.end (); ++at)
422 {
423 archetype *new_part = *at;
424 archetype *old_part = find (new_part->archname);
425
426 if (old_part && old_part->head_ () != old_head)
377 { 427 {
378 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 428 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
379 goto fail; 429 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
380 }
381
382 if (at->next && at != head)
383 {
384 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
385 goto fail; 430 goto fail;
386 } 431 }
387 } 432 }
388 433
389 // sever chain of existing head object 434 // deactivate existing archetype
390 for (archetype *more, *at = head; at; at = more) 435 for (archetype *at = old_head; at; at = (archetype *)at->more)
391 { 436 at->unlink ();
392 more = at->more;
393 437
394 at->head = 0;
395 at->more = 0;
396 }
397
398 // replace/update head
399 overwrite (head, parts.front ().second);
400 head->tail_x = 0;
401 head->tail_y = 0;
402
403 // link into list of heads, if not already there
404 if (!head->linked)
405 {
406 head->linked = true;
407 head->next = first_archetype;
408 first_archetype = head;
409 }
410
411 // reassemble new chain 438 // assemble new chain
439 new_head->min_x = new_head->max_x = new_head->x;
440 new_head->min_y = new_head->max_y = new_head->y;
441
412 archetype *prev = head; 442 archetype *less = new_head;
413 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 443 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
414 { 444 {
415 archetype *at = p->first; 445 archetype *at = *p;
416 overwrite (at, p->second);
417 446
418 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 447 // some flags get inherited formt he head (probably a lot more)
419 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 448 // doing it here doesn't feel too cozy, but it allows code
449 // to ignore head checks for these flags, which saves time
450 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
451 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
452 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
453 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
420 454
455 if (at->x < new_head->min_x) new_head->min_x = at->x;
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;
459
421 at->head = head; 460 at->head = new_head;
422 at->clone.head = &head->clone;
423 prev->more = at; 461 less->more = at;
424 prev->clone.more = &at->clone;
425
426 prev = at; 462 less = at;
427 } 463 }
428 464
429 loading_arch = false; 465 // now activate it
466 for (auto (p, parts.begin ()); p != parts.end (); ++p)
467 {
468 archetype *at = *p;
469 at->stub = false;
470 at->link ();
471 }
472
430 return head; 473 return new_head;
431 } 474 }
432 475
433fail: 476fail:
434 for (auto (p, parts.begin ()); p != parts.end (); ++p) 477 for (auto (p, parts.begin ()); p != parts.end (); ++p)
435 p->second->destroy (true); 478 (*p)->destroy (true);
436 479
437 loading_arch = false; 480 loading_arch = false;
438 return 0; 481 return 0;
439} 482}
440 483
… …
462 { 505 {
463 LOG (llevError, "Couldn't find archetype.\n"); 506 LOG (llevError, "Couldn't find archetype.\n");
464 return 0; 507 return 0;
465 } 508 }
466 509
467 object *op = at->clone.clone (); 510 object *op = at->clone ();
468 op->arch = at; 511 op->arch = at;
469 op->instantiate (); 512 op->instantiate ();
470 513
471 return op; 514 return op;
472} 515}
… …
478 * an object, and never NULL. 521 * an object, and never NULL.
479 */ 522 */
480object * 523object *
481create_singularity (const char *name) 524create_singularity (const char *name)
482{ 525{
483 object *op; 526 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
527
528 if (!strcmp (name, "bug"))
529 abort ();
530
484 char buf[MAX_BUF]; 531 char buf[MAX_BUF];
532 sprintf (buf, "bug, please report (%s)", name);
485 533
486 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 534 object *op = get_archetype ("bug");
487 op = object::create ();
488 op->name = op->name_pl = buf; 535 op->name = op->name_pl = buf;
489 SET_FLAG (op, FLAG_NO_PICK); 536
490 return op; 537 return op;
491} 538}
492 539
493/* 540/*
494 * Finds which archetype matches the given name, and returns a new 541 * Finds which archetype matches the given name, and returns a new
… …
504 551
505 return arch_to_object (at); 552 return arch_to_object (at);
506} 553}
507 554
508/* 555/*
509 * Finds, using the hashtable, which archetype matches the given name.
510 * returns a pointer to the found archetype, otherwise NULL.
511 */
512archetype *
513archetype::find (const char *name)
514{
515 if (!name)
516 return 0;
517
518 auto (i, ht.find (name));
519
520 if (i == ht.end ())
521 return 0;
522 else
523 return i->second;
524}
525
526archetype *
527archetype::get (const char *name)
528{
529 archetype *at = find (name);
530
531 if (!at)
532 {
533 archetypes.push_back (at = new archetype);
534 at->name = name;
535 at->hash_add ();
536 }
537
538 return at;
539}
540
541/*
542 * Adds an archetype to the hashtable.
543 */
544void
545archetype::hash_add ()
546{
547 ht.insert (std::make_pair (name, this));
548}
549
550void
551archetype::hash_del ()
552{
553 ht.erase (name);
554}
555
556/*
557 * Returns the first archetype using the given type. 556 * Returns the first archetype using the given type.
558 * Used in treasure-generation. 557 * Used in treasure-generation.
559 */ 558 */
560archetype * 559archetype *
561type_to_archetype (int type) 560type_to_archetype (int type)
562{ 561{
563 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 562 for_all_archetypes (at)
564 if (at->clone.type == type) 563 if (at->type == type && at->head_ () != at)
565 return at; 564 return at;
566 565
567 return 0; 566 return 0;
568} 567}
569 568
… …
581 { 580 {
582 LOG (llevError, "Can't clone archetype %d\n", type); 581 LOG (llevError, "Can't clone archetype %d\n", type);
583 return 0; 582 return 0;
584 } 583 }
585 584
586 object *op = at->clone.clone (); 585 object *op = at->clone ();
587 op->instantiate (); 586 op->instantiate ();
588 return op; 587 return op;
589} 588}
590 589
591/* 590/*
592 * member: make instance from class 591 * member: make instance from class
593 */ 592 */
594
595object * 593object *
596object_create_arch (archetype *at) 594object_create_arch (archetype *at)
597{ 595{
598 object *op, *prev = 0, *head = 0; 596 object *op, *prev = 0, *head = 0;
599 597
600 while (at) 598 while (at)
601 { 599 {
602 op = arch_to_object (at); 600 op = arch_to_object (at);
601
603 op->x = at->clone.x; 602 op->x = at->x;
604 op->y = at->clone.y; 603 op->y = at->y;
605 604
606 if (head) 605 if (head)
607 op->head = head, prev->more = op; 606 op->head = head, prev->more = op;
608 607
609 if (!head) 608 if (!head)
610 head = op; 609 head = op;
611 610
612 prev = op; 611 prev = op;
613 at = at->more; 612 at = (archetype *)at->more;
614 } 613 }
615 614
616 return (head); 615 return head;
617} 616}
618 617

Diff Legend

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