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.99 by root, Sun Mar 21 23:47:16 2010 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.
212 /* All is a very generic match - low match value */ 212 /* All is a very generic match - low match value */
213 if (!strcmp (cp, "all")) 213 if (!strcmp (cp, "all"))
214 return 1; 214 return 1;
215 215
216 /* unpaid is a little more specific */ 216 /* unpaid is a little more specific */
217 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 217 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
218 return 2; 218 return 2;
219 219
220 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]))
221 return 2; 221 return 2;
222 222
223 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 223 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
224 return 2; 224 return 2;
225 225
226 /* Allow for things like '100 arrows' */ 226 /* Allow for things like '100 arrows' */
227 if ((count = atoi (cp)) != 0) 227 if ((count = atoi (cp)) != 0)
228 { 228 {
374 f.next (); 374 f.next ();
375 375
376#if 0 376#if 0
377 // implementing it here in the server does neither allow multiple inheritence 377 // implementing it here in the server does neither allow multiple inheritence
378 // 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,
379 // and other resource files dynamically laoded (as opposed to being preprocessed). 379 // and other resource files dynamically loaded (as opposed to being preprocessed).
380 // not that any of this is relevant as of yet... 380 // not that any of this is relevant as of yet...
381 if (f.kw == KW_inherit) 381 if (f.kw == KW_inherit)
382 { 382 {
383 if (archetype *at = find (f.get_str ())) 383 if (archetype *at = find (f.get_str ()))
384 *op = at->clone; 384 *op = at->clone;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines