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.91 by root, Tue Oct 27 01:38:39 2009 UTC vs.
Revision 1.118 by root, Tue Nov 27 18:50:22 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <cassert> 26#include <cassert>
27#include <functional>
28
29#include <flat_hash_map.hpp>
26 30
27#include <global.h> 31#include <global.h>
28#include <loader.h>
29
30#include <tr1/functional>
31#include <tr1/unordered_map>
32 32
33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34arch_ptr archetype::empty; 34arch_ptr archetype::empty;
35 35
36// the hashtable 36// the hashtable
37typedef std::tr1::unordered_map 37typedef ska::flat_hash_map
38 < 38 <
39 const char *, 39 const char *,
40 arch_ptr, 40 arch_ptr,
41 str_hash, 41 str_hash,
42 str_equal, 42 str_equal,
… …
50 50
51// the vector of other_arch references to be resolved 51// the vector of other_arch references to be resolved
52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref; 52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
53// the vector of loaded but not yet committed archetypes 53// the vector of loaded but not yet committed archetypes
54static std::vector<archetype *> postponed_arch; 54static std::vector<archetype *> postponed_arch;
55
56//+GPL
57
58/*
59 * Creates an object. This function is called by archetype::get ()
60 * if it fails to find the appropriate archetype.
61 * Thus archetype::get() will be guaranteed to always return
62 * an object, and never NULL.
63 */
64static object *
65create_singularity (const char *name)
66{
67 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
68
69 if (!strcmp (name, "bug"))
70 abort ();
71
72 object *op = archetype::get (shstr_bug);
73 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
74
75 return op;
76}
55 77
56/** 78/**
57 * GROS - This function retrieves an archetype given the name that appears 79 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 80 * during the game (for example, "writing pen" instead of "stylus").
59 * It does not use the hashtable system, but browse the whole archlist each time. 81 * It does not use the hashtable system, but browse the whole archlist each time.
… …
191 /* All is a very generic match - low match value */ 213 /* All is a very generic match - low match value */
192 if (!strcmp (cp, "all")) 214 if (!strcmp (cp, "all"))
193 return 1; 215 return 1;
194 216
195 /* unpaid is a little more specific */ 217 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 218 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
197 return 2; 219 return 2;
198 220
199 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 221 if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
200 return 2; 222 return 2;
201 223
202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 224 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
203 return 2; 225 return 2;
204 226
205 /* Allow for things like '100 arrows' */ 227 /* Allow for things like '100 arrows' */
206 if ((count = atoi (cp)) != 0) 228 if ((count = atoi (cp)) != 0)
207 { 229 {
… …
276 } 298 }
277 299
278 return 0; 300 return 0;
279} 301}
280 302
303//-GPL
304
305void
306archetype::do_delete ()
307{
308 delete this;
309}
310
281archetype::archetype (const char *name) 311archetype::archetype (const char *name)
282{ 312{
283 arch = this; 313 arch = this;
284 this->archname = this->name = this->name_pl = name; 314 this->archname = this->name = this->name_pl = name;
285} 315}
… …
325 return 0; 355 return 0;
326 else 356 else
327 return i->second; 357 return i->second;
328} 358}
329 359
360void
361archetype::post_load_check ()
362{
363 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
364
365 if (type == SKILL)
366 add_skill_archetype (this);
367
368 object::post_load_check ();
369}
370
330archetype * 371archetype *
331archetype::read (object_thawer &f) 372archetype::read (object_thawer &f)
332{ 373{
333 assert (f.kw == KW_object); 374 assert (f.kw == KW_object);
334 375
… …
343 f.next (); 384 f.next ();
344 385
345#if 0 386#if 0
346 // implementing it here in the server does neither allow multiple inheritence 387 // implementing it here in the server does neither allow multiple inheritence
347 // nor does it cleanly "just override". it would allow use in map files, though, 388 // nor does it cleanly "just override". it would allow use in map files, though,
348 // and other resource files dynamically laoded (as opposed to being preprocessed). 389 // and other resource files dynamically loaded (as opposed to being preprocessed).
349 // not that any of this is relevant as of yet... 390 // not that any of this is relevant as of yet...
350 if (f.kw == KW_inherit) 391 if (f.kw == KW_inherit)
351 { 392 {
352 if (archetype *at = find (f.get_str ())) 393 if (archetype *at = find (f.get_str ()))
353 *op = at->clone; 394 *op = at->clone;
… …
383 goto fail; 424 goto fail;
384 } 425 }
385 } 426 }
386 427
387 { 428 {
388 auto (at, parts.begin ());
389
390 archetype *new_head = parts.front (); 429 archetype *new_head = parts.front ();
391 archetype *old_head = find (new_head->archname); 430 archetype *old_head = find (new_head->archname);
392 431
393 if (old_head && !old_head->is_head ()) 432 if (old_head && !old_head->is_head ())
394 { 433 {
… …
396 &new_head->archname, &old_head->archname); 435 &new_head->archname, &old_head->archname);
397 goto fail; 436 goto fail;
398 } 437 }
399 438
400 // check that all archetypes belong to the same old object or are new 439 // check that all archetypes belong to the same old object or are new
401 for (auto (at, parts.begin ()); at != parts.end (); ++at) 440 for (auto &&at : parts)
402 { 441 {
403 archetype *new_part = *at; 442 archetype *new_part = at;
404 archetype *old_part = find (new_part->archname); 443 archetype *old_part = find (new_part->archname);
405 444
406 if (old_part && old_part->head_ () != old_head) 445 if (old_part && old_part->head_ () != old_head)
407 { 446 {
408 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", 447 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
… …
410 goto fail; 449 goto fail;
411 } 450 }
412 } 451 }
413 452
414 // assemble new chain 453 // assemble new chain
415 new_head->min_x = new_head->max_x = new_head->x; 454 new_head->max_x = new_head->x;
416 new_head->min_y = new_head->max_y = new_head->y;
417 455
418 archetype *less = new_head; 456 archetype *less = new_head;
419 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 457 for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
420 { 458 {
421 archetype *at = *p; 459 archetype *at = *p;
422 460
423 // some flags get inherited from the head (probably a lot more) 461 // some flags get inherited from the head (probably a lot more)
424 // doing it here doesn't feel too cozy, but it allows code 462 // doing it here doesn't feel too cozy, but it allows code
… …
426 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 464 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
427 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 465 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
428 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 466 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
429 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 467 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
430 468
431 new_head->min_x = min (new_head->min_x, at->x);
432 new_head->min_y = min (new_head->min_y, at->y);
433 new_head->max_x = max (new_head->max_x, at->x); 469 new_head->max_x = max (new_head->max_x, at->x);
434 new_head->max_y = max (new_head->max_y, at->y);
435 470
436 at->head = new_head; 471 at->head = new_head;
437 less->more = at; 472 less->more = at;
438 less = at; 473 less = at;
439 } 474 }
… …
442 477
443 return new_head; 478 return new_head;
444 } 479 }
445 480
446fail: 481fail:
447 for (auto (p, parts.begin ()); p != parts.end (); ++p) 482 for (auto &&at : parts)
448 (*p)->destroy (); 483 at->destroy ();
449 484
450 return 0; 485 return 0;
451} 486}
452 487
453void 488void
… …
459 494
460void 495void
461archetype::commit_load () 496archetype::commit_load ()
462{ 497{
463 // unlink old archetypes and link in new ones */ 498 // unlink old archetypes and link in new ones */
464 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) 499 for (auto &&at : postponed_arch)
465 { 500 {
466 archetype *at = *p;
467
468 if (archetype *old = find (at->archname)) 501 if (archetype *old = find (at->archname))
469 old->unlink (); 502 old->unlink ();
470 503
471 allarch.push_back (at); 504 allarch.push_back (at);
472 505
… …
475 } 508 }
476 509
477 postponed_arch.clear (); 510 postponed_arch.clear ();
478 511
479 // now resolve arch references 512 // now resolve arch references
480 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) 513 for (auto &&p : postponed_arch_ref) // not yet C++17
481 { 514 {
482 arch_ptr *ap = p->first; 515 arch_ptr *ap = p.first;
483 archetype *at = find (p->second); 516 archetype *at = find (p.second);
484 517
485 if (!at) 518 if (!at)
486 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second); 519 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
487 520
488 *ap = at; 521 *ap = at;
489 } 522 }
490 523
491 postponed_arch_ref.clear (); 524 postponed_arch_ref.clear ();
… …
494} 527}
495 528
496void 529void
497archetype::gc () 530archetype::gc ()
498{ 531{
499 int cnt = max (1, min (allarch.size () / 128, dirtycnt)); 532 int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
500 dirtycnt = max (0, dirtycnt - cnt); 533 dirtycnt = max (0, dirtycnt - cnt);
501 534
502 do 535 do
503 { 536 {
504 static int idx; 537 static int idx;
… …
513 546
514 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 547 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
515 ++idx; 548 ++idx;
516 else 549 else
517 { 550 {
518 LOG (llevDebug, "garbage collect arch %s", &at->archname); 551 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
519 assert (at->arch == at); // verify that refcnt == 1 is truly valid 552 assert (at->arch == at); // verify that refcnt == 1 is truly valid
520 allarch.erase (idx); 553 allarch.erase (idx);
521 554
522 // break chain 555 // break chain
523 for (object *op = at->head_ (); op; ) 556 for (object *op = at->head_ (); op; )
… …
541 object *op = clone (); 574 object *op = clone ();
542 op->instantiate (); 575 op->instantiate ();
543 return op; 576 return op;
544} 577}
545 578
546/* 579//+GPL
547 * Creates an object. This function is called by get_archetype()
548 * if it fails to find the appropriate archetype.
549 * Thus get_archetype() will be guaranteed to always return
550 * an object, and never NULL.
551 */
552object *
553create_singularity (const char *name)
554{
555 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
556
557 if (!strcmp (name, "bug"))
558 abort ();
559
560 object *op = archetype::get (shstr_bug);
561 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
562
563 return op;
564}
565 580
566/* 581/*
567 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
568 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
569 */ 584 */
570object * 585object *
571get_archetype (const char *name)
572{
573 return archetype::get (name);
574}
575
576object *
577archetype::get (const char *name) 586archetype::get (const char *name)
578{ 587{
579 archetype *at = find (name); 588 archetype *at = find (name);
580 589
581 if (!at) 590 if (!at)
… …
586 595
587/* 596/*
588 * Returns the first archetype using the given type. 597 * Returns the first archetype using the given type.
589 * Used in treasure-generation. 598 * Used in treasure-generation.
590 */ 599 */
591archetype * 600static archetype *
592type_to_archetype (int type) 601type_to_archetype (int type)
593{ 602{
594 for_all_archetypes (at) 603 for_all_archetypes (at)
595 if (at->type == type && at->head_ () != at) 604 if (at->type == type && at->head_ () != at)
596 return at; 605 return at;
… …
643 } 652 }
644 653
645 return head; 654 return head;
646} 655}
647 656
657//-GPL
658

Diff Legend

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