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.102 by root, Sun Apr 11 00:34:05 2010 UTC vs.
Revision 1.103 by root, Sun Apr 11 02:04:54 2010 UTC

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