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.92 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.104 by root, Mon Apr 12 05:22:37 2010 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 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 it under 8 * 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 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
28#include <loader.h>
29 28
30#include <tr1/functional> 29#include <tr1/functional>
31#include <tr1/unordered_map> 30#include <tr1/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
… …
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;
55 54
56//+GPL 55//+GPL
56
57/*
58 * Creates an object. This function is called by get_archetype ()
59 * if it fails to find the appropriate archetype.
60 * Thus get_archetype() 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}
57 76
58/** 77/**
59 * GROS - This function retrieves an archetype given the name that appears 78 * GROS - This function retrieves an archetype given the name that appears
60 * during the game (for example, "writing pen" instead of "stylus"). 79 * during the game (for example, "writing pen" instead of "stylus").
61 * 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.
… …
193 /* All is a very generic match - low match value */ 212 /* All is a very generic match - low match value */
194 if (!strcmp (cp, "all")) 213 if (!strcmp (cp, "all"))
195 return 1; 214 return 1;
196 215
197 /* unpaid is a little more specific */ 216 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 217 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
199 return 2; 218 return 2;
200 219
201 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 220 if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
202 return 2; 221 return 2;
203 222
204 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 223 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
205 return 2; 224 return 2;
206 225
207 /* Allow for things like '100 arrows' */ 226 /* Allow for things like '100 arrows' */
208 if ((count = atoi (cp)) != 0) 227 if ((count = atoi (cp)) != 0)
209 { 228 {
… …
280 return 0; 299 return 0;
281} 300}
282 301
283//-GPL 302//-GPL
284 303
304void
305archetype::do_delete ()
306{
307 delete this;
308}
309
285archetype::archetype (const char *name) 310archetype::archetype (const char *name)
286{ 311{
287 arch = this; 312 arch = this;
288 this->archname = this->name = this->name_pl = name; 313 this->archname = this->name = this->name_pl = name;
289} 314}
… …
329 return 0; 354 return 0;
330 else 355 else
331 return i->second; 356 return i->second;
332} 357}
333 358
359void
360archetype::post_load_check ()
361{
362 object::post_load_check ();
363
364 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
365}
366
334archetype * 367archetype *
335archetype::read (object_thawer &f) 368archetype::read (object_thawer &f)
336{ 369{
337 assert (f.kw == KW_object); 370 assert (f.kw == KW_object);
338 371
… …
347 f.next (); 380 f.next ();
348 381
349#if 0 382#if 0
350 // implementing it here in the server does neither allow multiple inheritence 383 // implementing it here in the server does neither allow multiple inheritence
351 // nor does it cleanly "just override". it would allow use in map files, though, 384 // nor does it cleanly "just override". it would allow use in map files, though,
352 // and other resource files dynamically laoded (as opposed to being preprocessed). 385 // and other resource files dynamically loaded (as opposed to being preprocessed).
353 // not that any of this is relevant as of yet... 386 // not that any of this is relevant as of yet...
354 if (f.kw == KW_inherit) 387 if (f.kw == KW_inherit)
355 { 388 {
356 if (archetype *at = find (f.get_str ())) 389 if (archetype *at = find (f.get_str ()))
357 *op = at->clone; 390 *op = at->clone;
… …
414 goto fail; 447 goto fail;
415 } 448 }
416 } 449 }
417 450
418 // assemble new chain 451 // assemble new chain
419 new_head->min_x = new_head->max_x = new_head->x; 452 new_head->max_x = new_head->x;
420 new_head->min_y = new_head->max_y = new_head->y;
421 453
422 archetype *less = new_head; 454 archetype *less = new_head;
423 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 455 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
424 { 456 {
425 archetype *at = *p; 457 archetype *at = *p;
… …
430 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 462 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
431 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 463 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
432 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 464 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
433 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 465 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
434 466
435 new_head->min_x = min (new_head->min_x, at->x);
436 new_head->min_y = min (new_head->min_y, at->y);
437 new_head->max_x = max (new_head->max_x, at->x); 467 new_head->max_x = max (new_head->max_x, at->x);
438 new_head->max_y = max (new_head->max_y, at->y);
439 468
440 at->head = new_head; 469 at->head = new_head;
441 less->more = at; 470 less->more = at;
442 less = at; 471 less = at;
443 } 472 }
… …
548} 577}
549 578
550//+GPL 579//+GPL
551 580
552/* 581/*
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 object *op = archetype::get (shstr_bug);
567 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
568
569 return op;
570}
571
572/*
573 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
574 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
575 */ 584 */
576object * 585object *
577get_archetype (const char *name) 586get_archetype (const char *name)
… …
592 601
593/* 602/*
594 * Returns the first archetype using the given type. 603 * Returns the first archetype using the given type.
595 * Used in treasure-generation. 604 * Used in treasure-generation.
596 */ 605 */
597archetype * 606static archetype *
598type_to_archetype (int type) 607type_to_archetype (int type)
599{ 608{
600 for_all_archetypes (at) 609 for_all_archetypes (at)
601 if (at->type == type && at->head_ () != at) 610 if (at->type == type && at->head_ () != at)
602 return at; 611 return at;

Diff Legend

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