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.256 by root, Sun Aug 31 05:47:14 2008 UTC vs.
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC

… …
830{ 830{
831 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
832 if (active) 832 if (active)
833 return; 833 return;
834 834
835 if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D 835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
836 837
837 if (has_active_speed ()) 838 if (has_active_speed ())
838 actives.insert (this); 839 actives.insert (this);
839} 840}
840 841
… …
982 x = 1; 983 x = 1;
983 y = 1; 984 y = 1;
984 985
985 if (more) 986 if (more)
986 { 987 {
987 more->destroy (); 988 more->destroy (true);
988 more = 0; 989 more = 0;
989 } 990 }
990 991
991 head = 0; 992 head = 0;
992 993
… …
1190 esrv_update_item (UPD_NROF, pl, top); 1191 esrv_update_item (UPD_NROF, pl, top);
1191 1192
1192 op->weight = 0; // cancel the addition above 1193 op->weight = 0; // cancel the addition above
1193 op->carrying = 0; // must be 0 already 1194 op->carrying = 0; // must be 0 already
1194 1195
1195 op->destroy (1); 1196 op->destroy (true);
1196 1197
1197 return top; 1198 return top;
1198 } 1199 }
1199 1200
1200 return 0; 1201 return 0;
… …
1274 { 1275 {
1275 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); 1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1276 op->remove (); 1277 op->remove ();
1277 } 1278 }
1278 1279
1279 if (op->face && !face_info (op->face))//D TODO: remove soon 1280 if (m == &freed_map)//D TODO: remove soon
1280 {//D 1281 {//D
1281 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1282 op->face = 1;//D
1283 }//D 1283 }//D
1284 1284
1285 /* Ideally, the caller figures this out. However, it complicates a lot 1285 /* Ideally, the caller figures this out. However, it complicates a lot
1286 * of areas of callers (eg, anything that uses find_free_spot would now 1286 * of areas of callers (eg, anything that uses find_free_spot would now
1287 * need extra work 1287 * need extra work
1288 */ 1288 */
1289 if (!xy_normalise (m, op->x, op->y)) 1289 if (!xy_normalise (m, op->x, op->y))
1290 { 1290 {
1291 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1291 op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found
1292 return 0; 1292 return 0;
1293 } 1293 }
1294 1294
1295 if (object *more = op->more) 1295 if (object *more = op->more)
1296 if (!insert_ob_in_map (more, m, originator, flag)) 1296 if (!insert_ob_in_map (more, m, originator, flag))
… …
1309 { 1309 {
1310 // TODO: we actually want to update tmp, not op, 1310 // TODO: we actually want to update tmp, not op,
1311 // but some caller surely breaks when we return tmp 1311 // but some caller surely breaks when we return tmp
1312 // from here :/ 1312 // from here :/
1313 op->nrof += tmp->nrof; 1313 op->nrof += tmp->nrof;
1314 tmp->destroy (1); 1314 tmp->destroy (true);
1315 } 1315 }
1316 1316
1317 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1317 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1318 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1318 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1319 1319
… …
1494{ 1494{
1495 /* first search for itself and remove any old instances */ 1495 /* first search for itself and remove any old instances */
1496 1496
1497 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1497 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1498 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1498 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1499 tmp->destroy (1); 1499 tmp->destroy (true);
1500 1500
1501 object *tmp = arch_to_object (archetype::find (arch_string)); 1501 object *tmp = arch_to_object (archetype::find (arch_string));
1502 1502
1503 tmp->x = op->x; 1503 tmp->x = op->x;
1504 tmp->y = op->y; 1504 tmp->y = op->y;
… …
1627 if (object *pl = tmp->visible_to ()) 1627 if (object *pl = tmp->visible_to ())
1628 esrv_update_item (UPD_NROF, pl, tmp); 1628 esrv_update_item (UPD_NROF, pl, tmp);
1629 1629
1630 adjust_weight (this, op->total_weight ()); 1630 adjust_weight (this, op->total_weight ());
1631 1631
1632 op->destroy (1); 1632 op->destroy (true);
1633 op = tmp; 1633 op = tmp;
1634 goto inserted; 1634 goto inserted;
1635 } 1635 }
1636 1636
1637 op->owner = 0; // it's his/hers now. period. 1637 op->owner = 0; // it's his/hers now. period.
… …
2486 2486
2487#if 0 2487#if 0
2488 // remove the "Close old_container" object. 2488 // remove the "Close old_container" object.
2489 if (object *closer = old_container->inv) 2489 if (object *closer = old_container->inv)
2490 if (closer->type == CLOSE_CON) 2490 if (closer->type == CLOSE_CON)
2491 closer->destroy (); 2491 closer->destroy (true);
2492#endif 2492#endif
2493 2493
2494 // make sure the container is available 2494 // make sure the container is available
2495 esrv_send_item (this, old_container); 2495 esrv_send_item (this, old_container);
2496 2496
… …
2552 2552
2553void 2553void
2554object::force_add (const shstr name, int duration) 2554object::force_add (const shstr name, int duration)
2555{ 2555{
2556 if (object *force = force_find (name)) 2556 if (object *force = force_find (name))
2557 force->destroy (); 2557 force->destroy (true);
2558 2558
2559 object *force = get_archetype (FORCE_NAME); 2559 object *force = get_archetype (FORCE_NAME);
2560 2560
2561 force->slaying = name; 2561 force->slaying = name;
2562 force->stats.food = 1; 2562 force->stats.food = 1;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines