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.76 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.116 by root, Sat Nov 17 23:39:59 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 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * 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>
22 */ 24 */
23 25
24#include <cassert> 26#include <cassert>
27#include <functional>
28
29#include <flat_hash_map.hpp>
25 30
26#include <global.h> 31#include <global.h>
27#include <loader.h>
28
29#include <tr1/functional>
30#include <tr1/unordered_map>
31 32
32archetype *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
33arch_ptr archetype::empty; 34arch_ptr archetype::empty;
34 35
35// the hashtable 36// the hashtable
36typedef std::tr1::unordered_map 37typedef ska::flat_hash_map<
37 <
38 const char *, 38 const char *,
39 arch_ptr, 39 arch_ptr,
40 str_hash, 40 str_hash,
41 str_equal, 41 str_equal,
42 slice_allocator< std::pair<const char *const, arch_ptr> > 42 slice_allocator< std::pair<const char *const, arch_ptr> >
43 > HT; 43> HT;
44 44
45static HT ht (10000); 45static HT ht (10000);
46archvec archetypes; 46archvec archetypes;
47static unordered_vector<archetype *> allarch; 47static unordered_vector<archetype *> allarch;
48static int dirtycnt; 48static int dirtycnt;
49 49
50// the vector of other_arch references to be resolved 50// the vector of other_arch references to be resolved
51static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref; 51static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
52// the vector of loaded but not yet committed archetypes 52// the vector of loaded but not yet committed archetypes
53static std::vector<archetype *> postponed_arch; 53static std::vector<archetype *> postponed_arch;
54
55//+GPL
56
57/*
58 * Creates an object. This function is called by archetype::get ()
59 * if it fails to find the appropriate archetype.
60 * Thus archetype::get() will be guaranteed to always return
61 * an object, and never NULL.
62 */
63static object *
64create_singularity (const char *name)
65{
66 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
67
68 if (!strcmp (name, "bug"))
69 abort ();
70
71 object *op = archetype::get (shstr_bug);
72 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
73
74 return op;
75}
54 76
55/** 77/**
56 * GROS - This function retrieves an archetype given the name that appears 78 * GROS - This function retrieves an archetype given the name that appears
57 * during the game (for example, "writing pen" instead of "stylus"). 79 * during the game (for example, "writing pen" instead of "stylus").
58 * It does not use the hashtable system, but browse the whole archlist each time. 80 * It does not use the hashtable system, but browse the whole archlist each time.
… …
102{ 124{
103 shstr_cmp skill_cmp (skill); 125 shstr_cmp skill_cmp (skill);
104 126
105 for_all_archetypes (at) 127 for_all_archetypes (at)
106 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 128 if (at->skill == skill_cmp && (type == -1 || type == at->type))
107 return arch_to_object (at); 129 return at->instance ();
108 130
109 return 0; 131 return 0;
110} 132}
111 133
112/* similiar to above - this returns the first archetype 134/* similiar to above - this returns the first archetype
… …
133 * - name: The name we're searching for (ex: "writing pen"); 155 * - name: The name we're searching for (ex: "writing pen");
134 * Return value: 156 * Return value:
135 * - a corresponding object if found; a singularity object if not found. 157 * - a corresponding object if found; a singularity object if not found.
136 * Note by MSW - it appears that it takes the full name and keeps 158 * Note by MSW - it appears that it takes the full name and keeps
137 * shortening it until it finds a match. I re-wrote this so that it 159 * shortening it until it finds a match. I re-wrote this so that it
138 * doesn't malloc it each time - not that this function is used much, 160 * doesn't allocate it each time - not that this function is used much,
139 * but it otherwise had a big memory leak. 161 * but it otherwise had a big memory leak.
140 */ 162 */
141object * 163object *
142get_archetype_by_object_name (const char *name) 164get_archetype_by_object_name (const char *name)
143{ 165{
144 char tmpname[MAX_BUF]; 166 char tmpname[MAX_BUF];
145 int i;
146 167
147 assign (tmpname, name); 168 assign (tmpname, name);
148 169
149 for (i = strlen (tmpname); i > 0; i--) 170 for (int i = strlen (tmpname); i > 0; i--)
150 { 171 {
151 tmpname[i] = 0; 172 tmpname[i] = 0;
152 173
153 if (archetype *at = find_archetype_by_object_name (tmpname)) 174 if (archetype *at = find_archetype_by_object_name (tmpname))
154 return arch_to_object (at); 175 return at->instance ();
155 } 176 }
156 177
157 return create_singularity (name); 178 return create_singularity (name);
158} 179}
159 180
… …
191 /* All is a very generic match - low match value */ 212 /* All is a very generic match - low match value */
192 if (!strcmp (cp, "all")) 213 if (!strcmp (cp, "all"))
193 return 1; 214 return 1;
194 215
195 /* unpaid is a little more specific */ 216 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 217 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
197 return 2; 218 return 2;
198 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 219
220 if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
199 return 2; 221 return 2;
200 222
201 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 223 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
202 return 2; 224 return 2;
203 225
204 /* Allow for things like '100 arrows' */ 226 /* Allow for things like '100 arrows' */
205 if ((count = atoi (cp)) != 0) 227 if ((count = atoi (cp)) != 0)
206 { 228 {
… …
224 * is because of the 'else' handling - we don't want to match on 246 * is because of the 'else' handling - we don't want to match on
225 * something and set a low retval, even though it may match a higher retcal 247 * something and set a low retval, even though it may match a higher retcal
226 * later. So keep it in descending order here, so we try for the best 248 * later. So keep it in descending order here, so we try for the best
227 * match first, and work downward. 249 * match first, and work downward.
228 */ 250 */
251 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
252
229 if (!strcasecmp (cp, query_name (op))) 253 if (!strcasecmp (cp, query_name (op)))
230 retval = 20; 254 retval = 20;
231 else if (!strcasecmp (cp, query_short_name (op))) 255 else if (!strcasecmp (cp, qsn = query_short_name (op)))
232 retval = 18; 256 retval = 18;
233 else if (!strcasecmp (cp, query_base_name (op, 0))) 257 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
234 retval = 16; 258 retval = 16;
235 else if (!strcasecmp (cp, query_base_name (op, 1))) 259 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
236 retval = 16; 260 retval = 16;
237 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 261 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
238 retval = 15; 262 retval = 15;
239 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 263 else if (!strncasecmp (cp, qbn0, strlen (cp)))
240 retval = 14; 264 retval = 14;
241 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 265 else if (!strncasecmp (cp, qbn1, strlen (cp)))
242 retval = 14; 266 retval = 14;
243 /* Do substring checks, so things like 'Str+1' will match. 267 /* Do substring checks, so things like 'Str+1' will match.
244 * retval of these should perhaps be lower - they are lower 268 * retval of these should perhaps be lower - they are lower
245 * then the specific strcasecmp aboves, but still higher than 269 * then the specific strcasecmp aboves, but still higher than
246 * some other match criteria. 270 * some other match criteria.
247 */ 271 */
248 else if (strstr (query_base_name (op, 1), cp)) 272 else if (strstr (qbn1, cp))
249 retval = 12; 273 retval = 12;
250 else if (strstr (query_base_name (op, 0), cp)) 274 else if (strstr (qbn0, cp))
251 retval = 12; 275 retval = 12;
252 else if (strstr (query_short_name (op), cp)) 276 else if (strstr (qsn, cp))
253 retval = 12; 277 retval = 12;
254 /* Check against plural/non plural based on count. */ 278 /* Check against plural/non plural based on count. */
255 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 279 else if (count > 1 && !strcasecmp (cp, op->name_pl))
256 retval = 6; 280 retval = 6;
257 else if (count == 1 && !strcasecmp (op->name, cp)) 281 else if (count == 1 && !strcasecmp (op->name, cp))
258 retval = 6; 282 retval = 6;
259 /* base name matched - not bad */ 283 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 284 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 285 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 286 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 287 else if (op->custom_name.contains (cp))
264 retval = 3; 288 retval = 3;
265 289
266 if (retval) 290 if (retval)
267 { 291 {
268 if (pl->type == PLAYER) 292 if (pl->type == PLAYER)
… …
273 } 297 }
274 298
275 return 0; 299 return 0;
276} 300}
277 301
302//-GPL
303
304void
305archetype::do_delete ()
306{
307 delete this;
308}
309
278archetype::archetype (const char *name) 310archetype::archetype (const char *name)
279{ 311{
280 arch = this; 312 arch = this;
281 this->archname = this->name = this->name_pl = name; 313 this->archname = this->name = this->name_pl = name;
282} 314}
… …
322 return 0; 354 return 0;
323 else 355 else
324 return i->second; 356 return i->second;
325} 357}
326 358
359void
360archetype::post_load_check ()
361{
362 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
363
364 if (type == SKILL)
365 add_skill_archetype (this);
366
367 object::post_load_check ();
368}
369
327archetype * 370archetype *
328archetype::read (object_thawer &f) 371archetype::read (object_thawer &f)
329{ 372{
330 assert (f.kw == KW_object); 373 assert (f.kw == KW_object);
331 374
… …
340 f.next (); 383 f.next ();
341 384
342#if 0 385#if 0
343 // implementing it here in the server does neither allow multiple inheritence 386 // implementing it here in the server does neither allow multiple inheritence
344 // nor does it cleanly "just override". it would allow use in map files, though, 387 // nor does it cleanly "just override". it would allow use in map files, though,
345 // and other resource files dynamically laoded (as opposed to being preprocessed). 388 // and other resource files dynamically loaded (as opposed to being preprocessed).
346 // not that any of this is relevant as of yet... 389 // not that any of this is relevant as of yet...
347 if (f.kw == KW_inherit) 390 if (f.kw == KW_inherit)
348 { 391 {
349 if (archetype *at = find (f.get_str ())) 392 if (archetype *at = find (f.get_str ()))
350 *op = at->clone; 393 *op = at->clone;
… …
407 goto fail; 450 goto fail;
408 } 451 }
409 } 452 }
410 453
411 // assemble new chain 454 // assemble new chain
412 new_head->min_x = new_head->max_x = new_head->x; 455 new_head->max_x = new_head->x;
413 new_head->min_y = new_head->max_y = new_head->y;
414 456
415 archetype *less = new_head; 457 archetype *less = new_head;
416 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 458 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
417 { 459 {
418 archetype *at = *p; 460 archetype *at = *p;
… …
423 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 465 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
424 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 466 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
425 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 467 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
426 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 468 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
427 469
428 new_head->min_x = min (new_head->min_x, at->x);
429 new_head->min_y = min (new_head->min_y, at->y);
430 new_head->max_x = max (new_head->max_x, at->x); 470 new_head->max_x = max (new_head->max_x, at->x);
431 new_head->max_y = max (new_head->max_y, at->y);
432 471
433 at->head = new_head; 472 at->head = new_head;
434 less->more = at; 473 less->more = at;
435 less = at; 474 less = at;
436 } 475 }
… …
440 return new_head; 479 return new_head;
441 } 480 }
442 481
443fail: 482fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 483 for (auto (p, parts.begin ()); p != parts.end (); ++p)
445 (*p)->destroy (true); 484 (*p)->destroy ();
446 485
447 return 0; 486 return 0;
448} 487}
449 488
450void 489void
… …
491} 530}
492 531
493void 532void
494archetype::gc () 533archetype::gc ()
495{ 534{
496 int cnt = max (1, min (allarch.size () / 128, dirtycnt)); 535 int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
497 dirtycnt = max (0, dirtycnt - cnt); 536 dirtycnt = max (0, dirtycnt - cnt);
498 537
499 do 538 do
500 { 539 {
501 static int idx; 540 static int idx;
… …
510 549
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 550 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 551 ++idx;
513 else 552 else
514 { 553 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 554 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truely valid 555 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 556 allarch.erase (idx);
557
558 // break chain
559 for (object *op = at->head_ (); op; )
560 {
561 object *next = op->more;
562 op->head = 0;
563 op->more = 0;
564 op = next;
565 }
566
567 at->destroy ();
518 at->arch = 0; 568 at->arch = 0;
519 at->more = 0;
520 at->destroy ();
521 } 569 }
522 } 570 }
523 while (--cnt); 571 while (--cnt);
524}
525
526/*
527 * Creates and returns a new object which is a copy of the given archetype.
528 * This function returns NULL on failure.
529 */
530object *
531arch_to_object (archetype *at)
532{
533 if (!at)
534 {
535 LOG (llevError, "Couldn't find archetype.\n");
536 return 0;
537 }
538
539 object *op = at->clone ();
540 op->arch = at;
541 op->instantiate ();
542
543 return op;
544} 572}
545 573
546object * 574object *
547archetype::instance () 575archetype::instance ()
548{ 576{
549 return arch_to_object (this); 577 object *op = clone ();
550} 578 op->instantiate ();
551
552/*
553 * Creates an object. This function is called by get_archetype()
554 * if it fails to find the appropriate archetype.
555 * Thus get_archetype() will be guaranteed to always return
556 * an object, and never NULL.
557 */
558object *
559create_singularity (const char *name)
560{
561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
562
563 if (!strcmp (name, "bug"))
564 abort ();
565
566 char buf[MAX_BUF];
567 sprintf (buf, "bug, please report (%s)", name);
568
569 object *op = get_archetype ("bug");
570 op->name = op->name_pl = buf;
571
572 return op; 579 return op;
573} 580}
581
582//+GPL
574 583
575/* 584/*
576 * Finds which archetype matches the given name, and returns a new 585 * Finds which archetype matches the given name, and returns a new
577 * object containing a copy of the archetype. 586 * object containing a copy of the archetype.
578 */ 587 */
579object * 588object *
580get_archetype (const char *name) 589archetype::get (const char *name)
581{ 590{
582 archetype *at = archetype::find (name); 591 archetype *at = find (name);
583 592
584 if (!at) 593 if (!at)
585 return create_singularity (name); 594 return create_singularity (name);
586 595
587 return arch_to_object (at); 596 return at->instance ();
588}
589
590object *
591archetype::get (const char *name)
592{
593 return get_archetype (name);
594} 597}
595 598
596/* 599/*
597 * Returns the first archetype using the given type. 600 * Returns the first archetype using the given type.
598 * Used in treasure-generation. 601 * Used in treasure-generation.
599 */ 602 */
600archetype * 603static archetype *
601type_to_archetype (int type) 604type_to_archetype (int type)
602{ 605{
603 for_all_archetypes (at) 606 for_all_archetypes (at)
604 if (at->type == type && at->head_ () != at) 607 if (at->type == type && at->head_ () != at)
605 return at; 608 return at;
… …
613 * Used in treasure-generation. 616 * Used in treasure-generation.
614 */ 617 */
615object * 618object *
616clone_arch (int type) 619clone_arch (int type)
617{ 620{
618 archetype *at; 621 archetype *at = type_to_archetype (type);
619 622
620 if ((at = type_to_archetype (type)) == NULL) 623 if (!at)
621 { 624 {
622 LOG (llevError, "Can't clone archetype %d\n", type); 625 LOG (llevError, "Can't clone archetype %d\n", type);
623 return 0; 626 return 0;
624 } 627 }
625 628
626 object *op = at->clone (); 629 return at->instance ();
627 op->instantiate ();
628 return op;
629} 630}
630 631
631/* 632/*
632 * member: make instance from class 633 * member: make instance from class
633 */ 634 */
… …
636{ 637{
637 object *op, *prev = 0, *head = 0; 638 object *op, *prev = 0, *head = 0;
638 639
639 while (at) 640 while (at)
640 { 641 {
641 op = arch_to_object (at); 642 op = at->instance ();
642 643
643 op->x = at->x; 644 op->x = at->x;
644 op->y = at->y; 645 op->y = at->y;
645 646
646 if (head) 647 if (head)
… …
654 } 655 }
655 656
656 return head; 657 return head;
657} 658}
658 659
660//-GPL
661

Diff Legend

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