ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC vs.
Revision 1.309 by root, Sun Nov 29 17:41:07 2009 UTC

1269 1269
1270 object *prev = this; 1270 object *prev = this;
1271 1271
1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1273 { 1273 {
1274 object *op = arch_to_object (at); 1274 object *op = at->instance ();
1275 1275
1276 op->name = name; 1276 op->name = name;
1277 op->name_pl = name_pl; 1277 op->name_pl = name_pl;
1278 op->title = title; 1278 op->title = title;
1279 1279
2563 // TODO: this does not seem to serve any purpose anymore? 2563 // TODO: this does not seem to serve any purpose anymore?
2564#if 0 2564#if 0
2565 // insert the "Close Container" object. 2565 // insert the "Close Container" object.
2566 if (archetype *closer = new_container->other_arch) 2566 if (archetype *closer = new_container->other_arch)
2567 { 2567 {
2568 object *closer = arch_to_object (new_container->other_arch); 2568 object *closer = new_container->other_arch->instance ();
2569 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2569 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2570 new_container->insert (closer); 2570 new_container->insert (closer);
2571 } 2571 }
2572#endif 2572#endif
2573 2573

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines