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.63 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.79 by root, Sun May 4 11:12:40 2008 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
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, 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 GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
28#include <funcpoint.h>
29#include <loader.h> 27#include <loader.h>
30 28
31#include <tr1/functional> 29#include <tr1/functional>
32#include <tr1/unordered_map> 30#include <tr1/unordered_map>
33 31
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 32archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
33arch_ptr archetype::empty;
43 34
44// the hashtable 35// the hashtable
45typedef std::tr1::unordered_map 36typedef std::tr1::unordered_map
46 < 37 <
47 const char *, 38 const char *,
… …
49 str_hash, 40 str_hash,
50 str_equal, 41 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 42 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 43 > HT;
53 44
54static HT ht (5000); 45static HT ht (10000);
55archvec archetypes; 46archvec archetypes;
47static unordered_vector<archetype *> allarch;
48static int dirtycnt;
49
50// the vector of other_arch references to be resolved
51static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
52// the vector of loaded but not yet committed archetypes
53static std::vector<archetype *> postponed_arch;
56 54
57/** 55/**
58 * GROS - This function retrieves an archetype given the name that appears 56 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 57 * 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. 58 * It does not use the hashtable system, but browse the whole archlist each time.
… …
69find_archetype_by_object_name (const char *name) 67find_archetype_by_object_name (const char *name)
70{ 68{
71 shstr_cmp name_cmp (name); 69 shstr_cmp name_cmp (name);
72 70
73 for_all_archetypes (at) 71 for_all_archetypes (at)
74 if (at->archname == name_cmp) 72 if (at->name == name_cmp)
75 return at; 73 return at;
76 74
77 return 0; 75 return 0;
78} 76}
79 77
… …
86find_archetype_by_object_type_name (int type, const char *name) 84find_archetype_by_object_type_name (int type, const char *name)
87{ 85{
88 shstr_cmp name_cmp (name); 86 shstr_cmp name_cmp (name);
89 87
90 for_all_archetypes (at) 88 for_all_archetypes (at)
91 if (at->archname == name_cmp && at->type == type) 89 if (at->name == name_cmp && at->type == type)
92 return at; 90 return at;
93 91
94 return 0; 92 return 0;
95} 93}
96 94
… …
135 * - name: The name we're searching for (ex: "writing pen"); 133 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 134 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 135 * - 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 136 * 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 137 * 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, 138 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 139 * but it otherwise had a big memory leak.
142 */ 140 */
143object * 141object *
144get_archetype_by_object_name (const char *name) 142get_archetype_by_object_name (const char *name)
145{ 143{
… …
157 } 155 }
158 156
159 return create_singularity (name); 157 return create_singularity (name);
160} 158}
161 159
162 /* This is a subset of the parse_id command. Basically, name can be 160/* 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. 161 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 162 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 163 * 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 164 * 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 165 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 166 * value means a better match. 0 means no match.
169 * 167 *
170 * Brief outline of the procedure: 168 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 169 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 170 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 171 * Next, we check for a count (either specified in name, or in the
174 * player object.) 172 * player object.)
175 * If count is 1, make a quick check on the name. 173 * 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. 174 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 175 * Last, make a check on the full name.
178 */ 176 */
179int 177int
180item_matched_string (object *pl, object *op, const char *name) 178item_matched_string (object *pl, object *op, const char *name)
181{ 179{
182 char *cp, local_name[MAX_BUF]; 180 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 181 int count, retval = 0;
… …
277 return 0; 275 return 0;
278} 276}
279 277
280archetype::archetype (const char *name) 278archetype::archetype (const char *name)
281{ 279{
282 stub = true;
283 arch = this; 280 arch = this;
284 this->archname = this->name = this->name_pl = name; 281 this->archname = this->name = this->name_pl = name;
285} 282}
286 283
287archetype::~archetype () 284archetype::~archetype ()
… …
290} 287}
291 288
292void 289void
293archetype::link () 290archetype::link ()
294{ 291{
295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this)) 292 if (!archetypes.contains (this))
293 {
298 archetypes.insert (this); 294 archetypes.insert (this);
295 ht.insert (std::make_pair (archname, this));
296 }
299} 297}
300 298
301void 299void
302archetype::unlink () 300archetype::unlink ()
303{ 301{
304 ht.erase (archname);
305
306 if (archetypes.contains (this)) 302 if (archetypes.contains (this))
303 {
307 archetypes.erase (this); 304 archetypes.erase (this);
305 ht.erase (archname);
306 }
308} 307}
309 308
310/* 309/*
311 * Finds, using the hashtable, which archetype matches the given name. 310 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL. 311 * returns a pointer to the found archetype, otherwise NULL.
… …
324 else 323 else
325 return i->second; 324 return i->second;
326} 325}
327 326
328archetype * 327archetype *
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;
352}
353
354archetype *
355archetype::read (object_thawer &f) 328archetype::read (object_thawer &f)
356{ 329{
357 assert (f.kw == KW_object); 330 assert (f.kw == KW_object);
358 331
359 loading_arch = true; // hack to tell parse_kv et al. to behave
360
361 std::vector<archetype *> parts; 332 std::vector<archetype *> parts;
362 333
363 coroapi::cede_to_tick_every (10); 334 coroapi::cede_to_tick ();
364 335
365 for (;;) 336 for (;;)
366 { 337 {
367 // the archetype might have been referenced earlier
368 // so try to find an existing stub archetype first
369 archetype *at = find (f.get_str ()); 338 archetype *at = new archetype (f.get_str ());
370
371 if (!at || !at->stub)
372 at = new archetype (f.get_str ());
373 339
374 f.next (); 340 f.next ();
375 341
376#if 0 342#if 0
377 // implementing it here in the server does neither allow multiple inheritence 343 // implementing it here in the server does neither allow multiple inheritence
… …
388 354
389 f.next (); 355 f.next ();
390 } 356 }
391#endif 357#endif
392 358
359 loading_arch = at; // hack to tell parse_kv et al. to behave
360 bool parse_ok = at->parse_kv (f);
361 loading_arch = 0;
362
393 if (!at->parse_kv (f)) 363 if (!parse_ok)
394 goto fail; 364 goto fail;
395 365
366 loading_arch = at; // hack to tell parse_kv et al. to behave
396 at->post_load_check (); 367 at->post_load_check ();
368 loading_arch = 0;
397 369
398 parts.push_back (at); 370 parts.push_back (at);
399 371
400 if (f.kw != KW_more) 372 if (f.kw != KW_more)
401 break; 373 break;
… …
407 f.parse_error ("more object"); 379 f.parse_error ("more object");
408 goto fail; 380 goto fail;
409 } 381 }
410 } 382 }
411 383
412 loading_arch = false;
413
414 { 384 {
415 auto (at, parts.begin ()); 385 auto (at, parts.begin ());
416 386
417 archetype *new_head = parts.front (); 387 archetype *new_head = parts.front ();
418 archetype *old_head = find (new_head->archname); 388 archetype *old_head = find (new_head->archname);
419 389
420 for (auto (at, parts.begin ()); at != parts.end (); ++at) 390 if (old_head && !old_head->is_head ())
421 fprintf (stderr, "%d: %s\n", at - parts.begin(), &(*at)->archname);//D 391 {
392 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
393 &new_head->archname, &old_head->archname);
394 goto fail;
395 }
422 396
423 // check that all archetypes belong to the same old object or are new 397 // check that all archetypes belong to the same old object or are new
424 for (auto (at, parts.begin ()); at != parts.end (); ++at) 398 for (auto (at, parts.begin ()); at != parts.end (); ++at)
425 { 399 {
426 archetype *new_part = *at; 400 archetype *new_part = *at;
427 archetype *old_part = find (new_part->archname); 401 archetype *old_part = find (new_part->archname);
428 402
429 if (old_part && old_part->head_ () != old_head) 403 if (old_part && old_part->head_ () != old_head)
430 { 404 {
431 fprintf (stderr, "nhn %s\n", &new_head->archname);//D
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_());
433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", 405 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
434 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 406 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
435 goto fail; 407 goto fail;
436 } 408 }
437 } 409 }
438 410
439 fprintf (stderr, "oh %p %s\n", old_head, &new_head->archname);//D
440
441 // deactivate existing archetype
442 for (archetype *at = old_head; at; at = (archetype *)at->more)
443 at->unlink ();
444
445 // reassemble new chain 411 // assemble new chain
446 new_head->min_x = new_head->max_x = new_head->x; 412 new_head->min_x = new_head->max_x = new_head->x;
447 new_head->min_y = new_head->max_y = new_head->y; 413 new_head->min_y = new_head->max_y = new_head->y;
448 414
449 archetype *less = new_head; 415 archetype *less = new_head;
450 archetype *head = 0;
451 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 416 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
452 { 417 {
453 archetype *at = *p; 418 archetype *at = *p;
454 419
420 // some flags get inherited from the head (probably a lot more)
421 // doing it here doesn't feel too cozy, but it allows code
422 // to ignore head checks for these flags, which saves time
423 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
424 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
425 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
426 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
427
455 if (at->x < new_head->min_x) new_head->min_x = at->x; 428 new_head->min_x = min (new_head->min_x, at->x);
456 if (at->y < new_head->min_y) new_head->min_y = at->y; 429 new_head->min_y = min (new_head->min_y, at->y);
457 if (at->x > new_head->max_x) new_head->max_x = at->x; 430 new_head->max_x = max (new_head->max_x, at->x);
458 if (at->y > new_head->max_y) new_head->max_y = at->y; 431 new_head->max_y = max (new_head->max_y, at->y);
459 432
460 at->head = head; head = new_head; 433 at->head = new_head;
461 less->more = at; less = at; 434 less->more = at;
435 less = at;
462 } 436 }
463 437
464 // now activate it 438 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
465 for (auto (p, parts.begin ()); p != parts.end (); ++p)
466 {
467 archetype *at = *p;
468 at->stub = false;
469 at->link ();
470 }
471 439
472 return new_head; 440 return new_head;
473 } 441 }
474 442
475fail: 443fail:
476 for (auto (p, parts.begin ()); p != parts.end (); ++p) 444 for (auto (p, parts.begin ()); p != parts.end (); ++p)
477 (*p)->destroy (true); 445 (*p)->destroy (true);
478 446
479 loading_arch = false;
480 return 0; 447 return 0;
481} 448}
482 449
483/*
484 * Initialize global archtype pointers:
485 */
486void 450void
487init_archetype_pointers () 451archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
488{ 452{
489 ring_arch = archetype::find ("ring"); 453 ref = 0;
490 amulet_arch = archetype::find ("amulet"); 454 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
491 staff_arch = archetype::find ("staff"); 455}
492 crown_arch = archetype::find ("crown"); 456
493 empty_archetype = archetype::find ("empty_archetype"); 457void
458archetype::commit_load ()
459{
460 // unlink old archetypes and link in new ones */
461 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
462 {
463 archetype *at = *p;
464
465 if (archetype *old = find (at->archname))
466 old->unlink ();
467
468 allarch.push_back (at);
469
470 at->link ();
471 ++dirtycnt;
472 }
473
474 postponed_arch.clear ();
475
476 // now resolve arch references
477 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
478 {
479 arch_ptr *ap = p->first;
480 archetype *at = find (p->second);
481
482 if (!at)
483 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
484
485 *ap = at;
486 }
487
488 postponed_arch_ref.clear ();
489
490 empty = find (shstr_empty_archetype);
491}
492
493void
494archetype::gc ()
495{
496 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
497 dirtycnt = max (0, dirtycnt - cnt);
498
499 do
500 {
501 static int idx;
502
503 if (idx >= allarch.size ())
504 if (idx)
505 idx = 0;
506 else
507 return;
508
509 archetype *at = allarch [idx];
510
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx;
513 else
514 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
516 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx);
518
519 // break chain
520 for (object *op = at->head_ (); op; )
521 {
522 object *next = op->more;
523 op->head = 0;
524 op->more = 0;
525 op = next;
526 }
527
528 at->destroy ();
529 at->arch = 0;
530 }
531 }
532 while (--cnt);
494} 533}
495 534
496/* 535/*
497 * Creates and returns a new object which is a copy of the given archetype. 536 * Creates and returns a new object which is a copy of the given archetype.
498 * This function returns NULL on failure. 537 * This function returns NULL on failure.
… …
509 object *op = at->clone (); 548 object *op = at->clone ();
510 op->arch = at; 549 op->arch = at;
511 op->instantiate (); 550 op->instantiate ();
512 551
513 return op; 552 return op;
553}
554
555object *
556archetype::instance ()
557{
558 return arch_to_object (this);
514} 559}
515 560
516/* 561/*
517 * Creates an object. This function is called by get_archetype() 562 * Creates an object. This function is called by get_archetype()
518 * if it fails to find the appropriate archetype. 563 * if it fails to find the appropriate archetype.
… …
520 * an object, and never NULL. 565 * an object, and never NULL.
521 */ 566 */
522object * 567object *
523create_singularity (const char *name) 568create_singularity (const char *name)
524{ 569{
525 object *op; 570 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
571
572 if (!strcmp (name, "bug"))
573 abort ();
574
526 char buf[MAX_BUF]; 575 char buf[MAX_BUF];
576 sprintf (buf, "bug, please report (%s)", name);
527 577
528 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 578 object *op = get_archetype ("bug");
529 op = object::create ();
530 op->name = op->name_pl = buf; 579 op->name = op->name_pl = buf;
531 SET_FLAG (op, FLAG_NO_PICK); 580
532 return op; 581 return op;
533} 582}
534 583
535/* 584/*
536 * Finds which archetype matches the given name, and returns a new 585 * Finds which archetype matches the given name, and returns a new
… …
543 592
544 if (!at) 593 if (!at)
545 return create_singularity (name); 594 return create_singularity (name);
546 595
547 return arch_to_object (at); 596 return arch_to_object (at);
597}
598
599object *
600archetype::get (const char *name)
601{
602 return get_archetype (name);
548} 603}
549 604
550/* 605/*
551 * Returns the first archetype using the given type. 606 * Returns the first archetype using the given type.
552 * Used in treasure-generation. 607 * Used in treasure-generation.

Diff Legend

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