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.103 by root, Sun Apr 11 02:04:54 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
… …
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 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}
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.
… …
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 219
199 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]))
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 {
… …
276 } 297 }
277 298
278 return 0; 299 return 0;
279} 300}
280 301
302//-GPL
303
281archetype::archetype (const char *name) 304archetype::archetype (const char *name)
282{ 305{
283 arch = this; 306 arch = this;
284 this->archname = this->name = this->name_pl = name; 307 this->archname = this->name = this->name_pl = name;
285} 308}
… …
325 return 0; 348 return 0;
326 else 349 else
327 return i->second; 350 return i->second;
328} 351}
329 352
353void
354archetype::post_load_check ()
355{
356 object::post_load_check ();
357
358 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
359}
360
330archetype * 361archetype *
331archetype::read (object_thawer &f) 362archetype::read (object_thawer &f)
332{ 363{
333 assert (f.kw == KW_object); 364 assert (f.kw == KW_object);
334 365
… …
343 f.next (); 374 f.next ();
344 375
345#if 0 376#if 0
346 // implementing it here in the server does neither allow multiple inheritence 377 // 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, 378 // 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). 379 // and other resource files dynamically loaded (as opposed to being preprocessed).
349 // not that any of this is relevant as of yet... 380 // not that any of this is relevant as of yet...
350 if (f.kw == KW_inherit) 381 if (f.kw == KW_inherit)
351 { 382 {
352 if (archetype *at = find (f.get_str ())) 383 if (archetype *at = find (f.get_str ()))
353 *op = at->clone; 384 *op = at->clone;
… …
410 goto fail; 441 goto fail;
411 } 442 }
412 } 443 }
413 444
414 // assemble new chain 445 // assemble new chain
415 new_head->min_x = new_head->max_x = new_head->x; 446 new_head->max_x = new_head->x;
416 new_head->min_y = new_head->max_y = new_head->y;
417 447
418 archetype *less = new_head; 448 archetype *less = new_head;
419 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 449 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
420 { 450 {
421 archetype *at = *p; 451 archetype *at = *p;
… …
426 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 456 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
427 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 457 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
428 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 458 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
429 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 459 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
430 460
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); 461 new_head->max_x = max (new_head->max_x, at->x);
434 new_head->max_y = max (new_head->max_y, at->y);
435 462
436 at->head = new_head; 463 at->head = new_head;
437 less->more = at; 464 less->more = at;
438 less = at; 465 less = at;
439 } 466 }
… …
541 object *op = clone (); 568 object *op = clone ();
542 op->instantiate (); 569 op->instantiate ();
543 return op; 570 return op;
544} 571}
545 572
546/* 573//+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 574
566/* 575/*
567 * Finds which archetype matches the given name, and returns a new 576 * Finds which archetype matches the given name, and returns a new
568 * object containing a copy of the archetype. 577 * object containing a copy of the archetype.
569 */ 578 */
… …
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