| … | |
… | |
| 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 | { |
| … | |
… | |
| 299 | return 0; |
299 | return 0; |
| 300 | } |
300 | } |
| 301 | |
301 | |
| 302 | //-GPL |
302 | //-GPL |
| 303 | |
303 | |
|
|
304 | void |
|
|
305 | archetype::do_delete () |
|
|
306 | { |
|
|
307 | delete this; |
|
|
308 | } |
|
|
309 | |
| 304 | archetype::archetype (const char *name) |
310 | archetype::archetype (const char *name) |
| 305 | { |
311 | { |
| 306 | arch = this; |
312 | arch = this; |
| 307 | this->archname = this->name = this->name_pl = name; |
313 | this->archname = this->name = this->name_pl = name; |
| 308 | } |
314 | } |
| … | |
… | |
| 374 | f.next (); |
380 | f.next (); |
| 375 | |
381 | |
| 376 | #if 0 |
382 | #if 0 |
| 377 | // implementing it here in the server does neither allow multiple inheritence |
383 | // 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, |
384 | // 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). |
385 | // and other resource files dynamically loaded (as opposed to being preprocessed). |
| 380 | // not that any of this is relevant as of yet... |
386 | // not that any of this is relevant as of yet... |
| 381 | if (f.kw == KW_inherit) |
387 | if (f.kw == KW_inherit) |
| 382 | { |
388 | { |
| 383 | if (archetype *at = find (f.get_str ())) |
389 | if (archetype *at = find (f.get_str ())) |
| 384 | *op = at->clone; |
390 | *op = at->clone; |
