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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.64 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.66 by root, Wed Sep 12 11:10:10 2007 UTC

243 return; 243 return;
244 } 244 }
245 245
246 op->expand_tail (); 246 op->expand_tail ();
247 247
248 if (ob_blocked (op, creator->map, creator->x, creator->y)) 248 if (op->blocked (creator->map, creator->x, creator->y))
249 op->destroy (); 249 op->destroy ();
250 else 250 else
251 { 251 {
252 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 252 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
1303 object_thawer f (filename); 1303 object_thawer f (filename);
1304 1304
1305 if (!f) 1305 if (!f)
1306 return; 1306 return;
1307 1307
1308 f.next ();
1309
1310 for (;;) 1308 for (;;)
1311 { 1309 {
1312 switch (f.kw) 1310 switch (f.kw)
1313 { 1311 {
1314 case KW_allowed: 1312 case KW_allowed:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines