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

Diff Legend

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