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.66 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.90 by root, Fri Oct 16 00:30:19 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <funcpoint.h>
29#include <loader.h> 28#include <loader.h>
30 29
31#include <tr1/functional> 30#include <tr1/functional>
32#include <tr1/unordered_map> 31#include <tr1/unordered_map>
33 32
34/* The naming of these functions is really poor - they are all
35 * pretty much named '.._arch_...', but they may more may not
36 * return archetypes. Some make the arch_to_object call, and thus
37 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29
40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34arch_ptr archetype::empty;
43 35
44// the hashtable 36// the hashtable
45typedef std::tr1::unordered_map 37typedef std::tr1::unordered_map
46 < 38 <
47 const char *, 39 const char *,
… …
49 str_hash, 41 str_hash,
50 str_equal, 42 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 44 > HT;
53 45
54static HT ht (5000); 46static HT ht (10000);
55archvec archetypes; 47archvec archetypes;
48static unordered_vector<archetype *> allarch;
49static int dirtycnt;
50
51// the vector of other_arch references to be resolved
52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
53// the vector of loaded but not yet committed archetypes
54static std::vector<archetype *> postponed_arch;
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.
… …
104{ 103{
105 shstr_cmp skill_cmp (skill); 104 shstr_cmp skill_cmp (skill);
106 105
107 for_all_archetypes (at) 106 for_all_archetypes (at)
108 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 107 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 108 return at->instance ();
110 109
111 return 0; 110 return 0;
112} 111}
113 112
114/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
… …
135 * - name: The name we're searching for (ex: "writing pen"); 134 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 135 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 136 * - a corresponding object if found; a singularity object if not found.
138 * Note by MSW - it appears that it takes the full name and keeps 137 * Note by MSW - it appears that it takes the full name and keeps
139 * shortening it until it finds a match. I re-wrote this so that it 138 * shortening it until it finds a match. I re-wrote this so that it
140 * doesn't malloc it each time - not that this function is used much, 139 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
142 */ 141 */
143object * 142object *
144get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
145{ 144{
146 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
147 int i;
148 146
149 assign (tmpname, name); 147 assign (tmpname, name);
150 148
151 for (i = strlen (tmpname); i > 0; i--) 149 for (int i = strlen (tmpname); i > 0; i--)
152 { 150 {
153 tmpname[i] = 0; 151 tmpname[i] = 0;
154 152
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 153 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 154 return at->instance ();
157 } 155 }
158 156
159 return create_singularity (name); 157 return create_singularity (name);
160} 158}
161 159
… …
195 return 1; 193 return 1;
196 194
197 /* unpaid is a little more specific */ 195 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
199 return 2; 197 return 2;
198
200 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 199 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
201 return 2; 200 return 2;
202 201
203 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
204 return 2; 203 return 2;
… …
260 retval = 6; 259 retval = 6;
261 /* base name matched - not bad */ 260 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 261 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 262 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 263 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 264 else if (op->custom_name.contains (cp))
266 retval = 3; 265 retval = 3;
267 266
268 if (retval) 267 if (retval)
269 { 268 {
270 if (pl->type == PLAYER) 269 if (pl->type == PLAYER)
… …
277 return 0; 276 return 0;
278} 277}
279 278
280archetype::archetype (const char *name) 279archetype::archetype (const char *name)
281{ 280{
282 stub = true;
283 arch = this; 281 arch = this;
284 this->archname = this->name = this->name_pl = name; 282 this->archname = this->name = this->name_pl = name;
285} 283}
286 284
287archetype::~archetype () 285archetype::~archetype ()
… …
290} 288}
291 289
292void 290void
293archetype::link () 291archetype::link ()
294{ 292{
295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this)) 293 if (!archetypes.contains (this))
294 {
298 archetypes.insert (this); 295 archetypes.insert (this);
296 ht.insert (std::make_pair (archname, this));
297 }
299} 298}
300 299
301void 300void
302archetype::unlink () 301archetype::unlink ()
303{ 302{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this)) 303 if (archetypes.contains (this))
304 {
307 archetypes.erase (this); 305 archetypes.erase (this);
306 ht.erase (archname);
307 }
308} 308}
309 309
310/* 310/*
311 * Finds, using the hashtable, which archetype matches the given name. 311 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL. 312 * returns a pointer to the found archetype, otherwise NULL.
… …
324 else 324 else
325 return i->second; 325 return i->second;
326} 326}
327 327
328archetype * 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;
346}
347
348archetype *
349archetype::read (object_thawer &f) 329archetype::read (object_thawer &f)
350{ 330{
351 assert (f.kw == KW_object); 331 assert (f.kw == KW_object);
352 332
353 loading_arch = true; // hack to tell parse_kv et al. to behave
354
355 std::vector<archetype *> parts; 333 std::vector<archetype *> parts;
356 334
357 coroapi::cede_to_tick_every (10); 335 coroapi::cede_to_tick ();
358 336
359 for (;;) 337 for (;;)
360 { 338 {
361 // the archetype might have been referenced earlier
362 // so try to find an existing stub archetype first
363 archetype *at = find (f.get_str ()); 339 archetype *at = new archetype (f.get_str ());
364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367 340
368 f.next (); 341 f.next ();
369 342
370#if 0 343#if 0
371 // implementing it here in the server does neither allow multiple inheritence 344 // implementing it here in the server does neither allow multiple inheritence
… …
382 355
383 f.next (); 356 f.next ();
384 } 357 }
385#endif 358#endif
386 359
360 loading_arch = at; // hack to tell parse_kv et al. to behave
361 bool parse_ok = at->parse_kv (f);
362 loading_arch = 0;
363
387 if (!at->parse_kv (f)) 364 if (!parse_ok)
388 goto fail; 365 goto fail;
389 366
367 loading_arch = at; // hack to tell parse_kv et al. to behave
390 at->post_load_check (); 368 at->post_load_check ();
369 loading_arch = 0;
391 370
392 parts.push_back (at); 371 parts.push_back (at);
393 372
394 if (f.kw != KW_more) 373 if (f.kw != KW_more)
395 break; 374 break;
… …
400 { 379 {
401 f.parse_error ("more object"); 380 f.parse_error ("more object");
402 goto fail; 381 goto fail;
403 } 382 }
404 } 383 }
405
406 loading_arch = false;
407 384
408 { 385 {
409 auto (at, parts.begin ()); 386 auto (at, parts.begin ());
410 387
411 archetype *new_head = parts.front (); 388 archetype *new_head = parts.front ();
… …
430 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 407 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
431 goto fail; 408 goto fail;
432 } 409 }
433 } 410 }
434 411
435 // deactivate existing archetype
436 for (archetype *at = old_head; at; at = (archetype *)at->more)
437 at->unlink ();
438
439 // assemble new chain 412 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x; 413 new_head->min_x = new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y; 414 new_head->min_y = new_head->max_y = new_head->y;
442 415
443 archetype *less = new_head; 416 archetype *less = new_head;
444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 417 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
445 { 418 {
446 archetype *at = *p; 419 archetype *at = *p;
447 420
421 // some flags get inherited from the head (probably a lot more)
422 // doing it here doesn't feel too cozy, but it allows code
423 // to ignore head checks for these flags, which saves time
424 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
425 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
426 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
427 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
428
448 if (at->x < new_head->min_x) new_head->min_x = at->x; 429 new_head->min_x = min (new_head->min_x, at->x);
449 if (at->y < new_head->min_y) new_head->min_y = at->y; 430 new_head->min_y = min (new_head->min_y, at->y);
450 if (at->x > new_head->max_x) new_head->max_x = at->x; 431 new_head->max_x = max (new_head->max_x, at->x);
451 if (at->y > new_head->max_y) new_head->max_y = at->y; 432 new_head->max_y = max (new_head->max_y, at->y);
452 433
453 at->head = new_head; 434 at->head = new_head;
454 less->more = at; 435 less->more = at;
455 less = at; 436 less = at;
456 } 437 }
457 438
458 // now activate it 439 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
459 for (auto (p, parts.begin ()); p != parts.end (); ++p)
460 {
461 archetype *at = *p;
462 at->stub = false;
463 at->link ();
464 }
465 440
466 return new_head; 441 return new_head;
467 } 442 }
468 443
469fail: 444fail:
470 for (auto (p, parts.begin ()); p != parts.end (); ++p) 445 for (auto (p, parts.begin ()); p != parts.end (); ++p)
471 (*p)->destroy (true); 446 (*p)->destroy ();
472 447
473 loading_arch = false;
474 return 0; 448 return 0;
475} 449}
476 450
477/*
478 * Initialize global archtype pointers:
479 */
480void 451void
481init_archetype_pointers () 452archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
482{ 453{
483 ring_arch = archetype::find ("ring"); 454 ref = 0;
484 amulet_arch = archetype::find ("amulet"); 455 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
485 staff_arch = archetype::find ("staff");
486 crown_arch = archetype::find ("crown");
487 empty_archetype = archetype::find ("empty_archetype");
488} 456}
489 457
490/* 458void
491 * Creates and returns a new object which is a copy of the given archetype. 459archetype::commit_load ()
492 * This function returns NULL on failure.
493 */
494object *
495arch_to_object (archetype *at)
496{ 460{
461 // unlink old archetypes and link in new ones */
462 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
463 {
464 archetype *at = *p;
465
466 if (archetype *old = find (at->archname))
467 old->unlink ();
468
469 allarch.push_back (at);
470
471 at->link ();
472 ++dirtycnt;
473 }
474
475 postponed_arch.clear ();
476
477 // now resolve arch references
478 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
479 {
480 arch_ptr *ap = p->first;
481 archetype *at = find (p->second);
482
497 if (!at) 483 if (!at)
484 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
485
486 *ap = at;
498 { 487 }
499 LOG (llevError, "Couldn't find archetype.\n"); 488
489 postponed_arch_ref.clear ();
490
491 empty = find (shstr_empty_archetype);
492}
493
494void
495archetype::gc ()
496{
497 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
498 dirtycnt = max (0, dirtycnt - cnt);
499
500 do
501 {
502 static int idx;
503
504 if (idx >= allarch.size ())
505 if (idx)
506 idx = 0;
507 else
500 return 0; 508 return;
501 }
502 509
510 archetype *at = allarch [idx];
511
512 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
513 ++idx;
514 else
515 {
516 LOG (llevDebug, "garbage collect arch %s", &at->archname);
517 assert (at->arch == at); // verify that refcnt == 1 is truly valid
518 allarch.erase (idx);
519
520 // break chain
521 for (object *op = at->head_ (); op; )
522 {
523 object *next = op->more;
524 op->head = 0;
525 op->more = 0;
526 op = next;
527 }
528
529 at->destroy ();
530 at->arch = 0;
531 }
532 }
533 while (--cnt);
534}
535
536object *
537archetype::instance ()
538{
503 object *op = at->clone (); 539 object *op = clone ();
504 op->arch = at;
505 op->instantiate (); 540 op->instantiate ();
506
507 return op; 541 return op;
508} 542}
509 543
510/* 544/*
511 * Creates an object. This function is called by get_archetype() 545 * Creates an object. This function is called by get_archetype()
… …
519 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name); 553 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
520 554
521 if (!strcmp (name, "bug")) 555 if (!strcmp (name, "bug"))
522 abort (); 556 abort ();
523 557
524 char buf[MAX_BUF];
525 sprintf (buf, "bug, please report (%s)", name);
526
527 object *op = get_archetype ("bug"); 558 object *op = archetype::get (shstr_bug);
528 op->name = op->name_pl = buf; 559 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
529 560
530 return op; 561 return op;
531} 562}
532 563
533/* 564/*
… …
535 * object containing a copy of the archetype. 566 * object containing a copy of the archetype.
536 */ 567 */
537object * 568object *
538get_archetype (const char *name) 569get_archetype (const char *name)
539{ 570{
571 return archetype::get (name);
572}
573
574object *
575archetype::get (const char *name)
576{
540 archetype *at = archetype::find (name); 577 archetype *at = find (name);
541 578
542 if (!at) 579 if (!at)
543 return create_singularity (name); 580 return create_singularity (name);
544 581
545 return arch_to_object (at); 582 return at->instance ();
546} 583}
547 584
548/* 585/*
549 * Returns the first archetype using the given type. 586 * Returns the first archetype using the given type.
550 * Used in treasure-generation. 587 * Used in treasure-generation.
… …
565 * Used in treasure-generation. 602 * Used in treasure-generation.
566 */ 603 */
567object * 604object *
568clone_arch (int type) 605clone_arch (int type)
569{ 606{
570 archetype *at; 607 archetype *at = type_to_archetype (type);
571 608
572 if ((at = type_to_archetype (type)) == NULL) 609 if (!at)
573 { 610 {
574 LOG (llevError, "Can't clone archetype %d\n", type); 611 LOG (llevError, "Can't clone archetype %d\n", type);
575 return 0; 612 return 0;
576 } 613 }
577 614
578 object *op = at->clone (); 615 return at->instance ();
579 op->instantiate ();
580 return op;
581} 616}
582 617
583/* 618/*
584 * member: make instance from class 619 * member: make instance from class
585 */ 620 */
… …
588{ 623{
589 object *op, *prev = 0, *head = 0; 624 object *op, *prev = 0, *head = 0;
590 625
591 while (at) 626 while (at)
592 { 627 {
593 op = arch_to_object (at); 628 op = at->instance ();
594 629
595 op->x = at->x; 630 op->x = at->x;
596 op->y = at->y; 631 op->y = at->y;
597 632
598 if (head) 633 if (head)

Diff Legend

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