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.96 by root, Sat Nov 7 18:30:05 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
… …
213 /* All is a very generic match - low match value */ 212 /* All is a very generic match - low match value */
214 if (!strcmp (cp, "all")) 213 if (!strcmp (cp, "all"))
215 return 1; 214 return 1;
216 215
217 /* unpaid is a little more specific */ 216 /* unpaid is a little more specific */
218 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 217 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
219 return 2; 218 return 2;
220 219
221 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]))
222 return 2; 221 return 2;
223 222
224 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 223 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
225 return 2; 224 return 2;
226 225
227 /* Allow for things like '100 arrows' */ 226 /* Allow for things like '100 arrows' */
228 if ((count = atoi (cp)) != 0) 227 if ((count = atoi (cp)) != 0)
229 { 228 {
… …
349 return 0; 348 return 0;
350 else 349 else
351 return i->second; 350 return i->second;
352} 351}
353 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
354archetype * 361archetype *
355archetype::read (object_thawer &f) 362archetype::read (object_thawer &f)
356{ 363{
357 assert (f.kw == KW_object); 364 assert (f.kw == KW_object);
358 365
… …
367 f.next (); 374 f.next ();
368 375
369#if 0 376#if 0
370 // implementing it here in the server does neither allow multiple inheritence 377 // implementing it here in the server does neither allow multiple inheritence
371 // 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,
372 // and other resource files dynamically laoded (as opposed to being preprocessed). 379 // and other resource files dynamically loaded (as opposed to being preprocessed).
373 // not that any of this is relevant as of yet... 380 // not that any of this is relevant as of yet...
374 if (f.kw == KW_inherit) 381 if (f.kw == KW_inherit)
375 { 382 {
376 if (archetype *at = find (f.get_str ())) 383 if (archetype *at = find (f.get_str ()))
377 *op = at->clone; 384 *op = at->clone;
… …
434 goto fail; 441 goto fail;
435 } 442 }
436 } 443 }
437 444
438 // assemble new chain 445 // assemble new chain
439 new_head->min_x = new_head->max_x = new_head->x; 446 new_head->max_x = new_head->x;
440 new_head->min_y = new_head->max_y = new_head->y;
441 447
442 archetype *less = new_head; 448 archetype *less = new_head;
443 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 449 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
444 { 450 {
445 archetype *at = *p; 451 archetype *at = *p;
… …
450 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 456 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
451 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 457 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
452 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 458 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
453 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 459 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
454 460
455 new_head->min_x = min (new_head->min_x, at->x);
456 new_head->min_y = min (new_head->min_y, at->y);
457 new_head->max_x = max (new_head->max_x, at->x); 461 new_head->max_x = max (new_head->max_x, at->x);
458 new_head->max_y = max (new_head->max_y, at->y);
459 462
460 at->head = new_head; 463 at->head = new_head;
461 less->more = at; 464 less->more = at;
462 less = at; 465 less = at;
463 } 466 }

Diff Legend

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