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.80 by root, Sun May 4 18:46:01 2008 UTC vs.
Revision 1.117 by root, Sun Nov 18 00:37:11 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.
… …
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 at->instance (); 175 return at->instance ();
… …
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;
… …
380 goto fail; 423 goto fail;
381 } 424 }
382 } 425 }
383 426
384 { 427 {
385 auto (at, parts.begin ());
386
387 archetype *new_head = parts.front (); 428 archetype *new_head = parts.front ();
388 archetype *old_head = find (new_head->archname); 429 archetype *old_head = find (new_head->archname);
389 430
390 if (old_head && !old_head->is_head ()) 431 if (old_head && !old_head->is_head ())
391 { 432 {
… …
393 &new_head->archname, &old_head->archname); 434 &new_head->archname, &old_head->archname);
394 goto fail; 435 goto fail;
395 } 436 }
396 437
397 // check that all archetypes belong to the same old object or are new 438 // check that all archetypes belong to the same old object or are new
398 for (auto (at, parts.begin ()); at != parts.end (); ++at) 439 for (auto &&at : parts)
399 { 440 {
400 archetype *new_part = *at; 441 archetype *new_part = at;
401 archetype *old_part = find (new_part->archname); 442 archetype *old_part = find (new_part->archname);
402 443
403 if (old_part && old_part->head_ () != old_head) 444 if (old_part && old_part->head_ () != old_head)
404 { 445 {
405 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", 446 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
… …
407 goto fail; 448 goto fail;
408 } 449 }
409 } 450 }
410 451
411 // assemble new chain 452 // assemble new chain
412 new_head->min_x = new_head->max_x = new_head->x; 453 new_head->max_x = new_head->x;
413 new_head->min_y = new_head->max_y = new_head->y;
414 454
415 archetype *less = new_head; 455 archetype *less = new_head;
416 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 456 for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
417 { 457 {
418 archetype *at = *p; 458 archetype *at = *p;
419 459
420 // some flags get inherited from the head (probably a lot more) 460 // some flags get inherited from the head (probably a lot more)
421 // doing it here doesn't feel too cozy, but it allows code 461 // doing it here doesn't feel too cozy, but it allows code
… …
423 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 463 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
424 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 464 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
425 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 465 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
426 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 466 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
427 467
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); 468 new_head->max_x = max (new_head->max_x, at->x);
431 new_head->max_y = max (new_head->max_y, at->y);
432 469
433 at->head = new_head; 470 at->head = new_head;
434 less->more = at; 471 less->more = at;
435 less = at; 472 less = at;
436 } 473 }
… …
439 476
440 return new_head; 477 return new_head;
441 } 478 }
442 479
443fail: 480fail:
444 for (auto (p, parts.begin ()); p != parts.end (); ++p) 481 for (auto &&at : parts)
445 (*p)->destroy (true); 482 at->destroy ();
446 483
447 return 0; 484 return 0;
448} 485}
449 486
450void 487void
… …
456 493
457void 494void
458archetype::commit_load () 495archetype::commit_load ()
459{ 496{
460 // unlink old archetypes and link in new ones */ 497 // unlink old archetypes and link in new ones */
461 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p) 498 for (auto &&at : postponed_arch)
462 { 499 {
463 archetype *at = *p;
464
465 if (archetype *old = find (at->archname)) 500 if (archetype *old = find (at->archname))
466 old->unlink (); 501 old->unlink ();
467 502
468 allarch.push_back (at); 503 allarch.push_back (at);
469 504
… …
472 } 507 }
473 508
474 postponed_arch.clear (); 509 postponed_arch.clear ();
475 510
476 // now resolve arch references 511 // now resolve arch references
477 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p) 512 for (auto &&p : postponed_arch_ref) // not yet C++17
478 { 513 {
479 arch_ptr *ap = p->first; 514 arch_ptr *ap = p.first;
480 archetype *at = find (p->second); 515 archetype *at = find (p.second);
481 516
482 if (!at) 517 if (!at)
483 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second); 518 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
484 519
485 *ap = at; 520 *ap = at;
486 } 521 }
487 522
488 postponed_arch_ref.clear (); 523 postponed_arch_ref.clear ();
… …
491} 526}
492 527
493void 528void
494archetype::gc () 529archetype::gc ()
495{ 530{
496 int cnt = max (1, min (allarch.size () / 128, dirtycnt)); 531 int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
497 dirtycnt = max (0, dirtycnt - cnt); 532 dirtycnt = max (0, dirtycnt - cnt);
498 533
499 do 534 do
500 { 535 {
501 static int idx; 536 static int idx;
… …
510 545
511 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object 546 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
512 ++idx; 547 ++idx;
513 else 548 else
514 { 549 {
515 LOG (llevDebug, "garbage collect arch %s", at->debug_desc ()); 550 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
516 assert (at->arch == at); // verify that refcnt == 1 is truly valid 551 assert (at->arch == at); // verify that refcnt == 1 is truly valid
517 allarch.erase (idx); 552 allarch.erase (idx);
518 553
519 // break chain 554 // break chain
520 for (object *op = at->head_ (); op; ) 555 for (object *op = at->head_ (); op; )
… …
530 } 565 }
531 } 566 }
532 while (--cnt); 567 while (--cnt);
533} 568}
534 569
535/*
536 * Creates and returns a new object which is a copy of the given archetype.
537 * This function returns NULL on failure.
538 */
539object *
540arch_to_object (archetype *at)
541{
542 if (!at)
543 {
544 LOG (llevError, "Couldn't find archetype.\n");
545 return 0;
546 }
547
548 return at->instance ();
549}
550
551object * 570object *
552archetype::instance () 571archetype::instance ()
553{ 572{
554 object *op = clone (); 573 object *op = clone ();
555 op->instantiate (); 574 op->instantiate ();
556 return op; 575 return op;
557} 576}
558 577
559/* 578//+GPL
560 * Creates an object. This function is called by get_archetype()
561 * if it fails to find the appropriate archetype.
562 * Thus get_archetype() will be guaranteed to always return
563 * an object, and never NULL.
564 */
565object *
566create_singularity (const char *name)
567{
568 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
569
570 if (!strcmp (name, "bug"))
571 abort ();
572
573 object *op = archetype::get ("bug");
574 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
575
576 return op;
577}
578 579
579/* 580/*
580 * Finds which archetype matches the given name, and returns a new 581 * Finds which archetype matches the given name, and returns a new
581 * object containing a copy of the archetype. 582 * object containing a copy of the archetype.
582 */ 583 */
583object * 584object *
584get_archetype (const char *name)
585{
586 return archetype::get (name);
587}
588
589object *
590archetype::get (const char *name) 585archetype::get (const char *name)
591{ 586{
592 archetype *at = find (name); 587 archetype *at = find (name);
593 588
594 if (!at) 589 if (!at)
… …
599 594
600/* 595/*
601 * Returns the first archetype using the given type. 596 * Returns the first archetype using the given type.
602 * Used in treasure-generation. 597 * Used in treasure-generation.
603 */ 598 */
604archetype * 599static archetype *
605type_to_archetype (int type) 600type_to_archetype (int type)
606{ 601{
607 for_all_archetypes (at) 602 for_all_archetypes (at)
608 if (at->type == type && at->head_ () != at) 603 if (at->type == type && at->head_ () != at)
609 return at; 604 return at;
… …
656 } 651 }
657 652
658 return head; 653 return head;
659} 654}
660 655
656//-GPL
657

Diff Legend

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