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.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC

… …
232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233 return 0; 233 return 0;
234 234
235 if ((ob1->flag ^ ob2->flag) 235 if ((ob1->flag ^ ob2->flag)
236 .reset (FLAG_INV_LOCKED) 236 .reset (FLAG_INV_LOCKED)
237 .reset (FLAG_CLIENT_SENT)
238 .reset (FLAG_REMOVED) 237 .reset (FLAG_REMOVED)
239 .any ()) 238 .any ())
240 return 0; 239 return 0;
241 240
242 /* This is really a spellbook check - we should in general 241 /* This is really a spellbook check - we should in general
… …
637 } 636 }
638 637
639 if (speed < 0) 638 if (speed < 0)
640 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
641 640
642 dst->set_speed (dst->speed); 641 dst->activate ();
643} 642}
644 643
645void 644void
646object::instantiate () 645object::instantiate ()
647{ 646{
… …
831{ 830{
832 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
833 if (active) 832 if (active)
834 return; 833 return;
835 834
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
837
836 if (has_active_speed ()) 838 if (has_active_speed ())
837 actives.insert (this); 839 actives.insert (this);
838} 840}
839 841
840void 842void
… …
907 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
908 || map->no_drop 910 || map->no_drop
909 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
910 { 912 {
911 while (inv) 913 while (inv)
912 inv->destroy (true); 914 inv->destroy ();
913 } 915 }
914 else 916 else
915 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
916 while (inv) 918 while (inv)
917 { 919 {
… …
921 || op->flag [FLAG_NO_DROP] 923 || op->flag [FLAG_NO_DROP]
922 || op->type == RUNE 924 || op->type == RUNE
923 || op->type == TRAP 925 || op->type == TRAP
924 || op->flag [FLAG_IS_A_TEMPLATE] 926 || op->flag [FLAG_IS_A_TEMPLATE]
925 || op->flag [FLAG_DESTROY_ON_DEATH]) 927 || op->flag [FLAG_DESTROY_ON_DEATH])
926 op->destroy (true); 928 op->destroy ();
927 else 929 else
928 map->insert (op, x, y); 930 map->insert (op, x, y);
929 } 931 }
930 } 932 }
931} 933}
… …
1189 esrv_update_item (UPD_NROF, pl, top); 1191 esrv_update_item (UPD_NROF, pl, top);
1190 1192
1191 op->weight = 0; // cancel the addition above 1193 op->weight = 0; // cancel the addition above
1192 op->carrying = 0; // must be 0 already 1194 op->carrying = 0; // must be 0 already
1193 1195
1194 op->destroy (1); 1196 op->destroy ();
1195 1197
1196 return top; 1198 return top;
1197 } 1199 }
1198 1200
1199 return 0; 1201 return 0;
… …
1273 { 1275 {
1274 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)");
1275 op->remove (); 1277 op->remove ();
1276 } 1278 }
1277 1279
1278 if (op->face && !face_info (op->face))//D TODO: remove soon 1280 if (m == &freed_map)//D TODO: remove soon
1279 {//D 1281 {//D
1280 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
1281 op->face = 1;//D
1282 }//D 1283 }//D
1283 1284
1284 /* Ideally, the caller figures this out. However, it complicates a lot 1285 /* Ideally, the caller figures this out. However, it complicates a lot
1285 * 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
1286 * need extra work 1287 * need extra work
1287 */ 1288 */
1288 if (!xy_normalise (m, op->x, op->y)) 1289 if (!xy_normalise (m, op->x, op->y))
1289 { 1290 {
1290 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1291 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291 return 0; 1292 return 0;
1292 } 1293 }
1293 1294
1294 if (object *more = op->more) 1295 if (object *more = op->more)
1295 if (!insert_ob_in_map (more, m, originator, flag)) 1296 if (!insert_ob_in_map (more, m, originator, flag))
… …
1308 { 1309 {
1309 // TODO: we actually want to update tmp, not op, 1310 // TODO: we actually want to update tmp, not op,
1310 // but some caller surely breaks when we return tmp 1311 // but some caller surely breaks when we return tmp
1311 // from here :/ 1312 // from here :/
1312 op->nrof += tmp->nrof; 1313 op->nrof += tmp->nrof;
1313 tmp->destroy (1); 1314 tmp->destroy ();
1314 } 1315 }
1315 1316
1316 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 */
1317 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1318 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1318 1319
… …
1493{ 1494{
1494 /* first search for itself and remove any old instances */ 1495 /* first search for itself and remove any old instances */
1495 1496
1496 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1497 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1497 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1498 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1498 tmp->destroy (1); 1499 tmp->destroy ();
1499 1500
1500 object *tmp = arch_to_object (archetype::find (arch_string)); 1501 object *tmp = arch_to_object (archetype::find (arch_string));
1501 1502
1502 tmp->x = op->x; 1503 tmp->x = op->x;
1503 tmp->y = op->y; 1504 tmp->y = op->y;
… …
1626 if (object *pl = tmp->visible_to ()) 1627 if (object *pl = tmp->visible_to ())
1627 esrv_update_item (UPD_NROF, pl, tmp); 1628 esrv_update_item (UPD_NROF, pl, tmp);
1628 1629
1629 adjust_weight (this, op->total_weight ()); 1630 adjust_weight (this, op->total_weight ());
1630 1631
1631 op->destroy (1); 1632 op->destroy ();
1632 op = tmp; 1633 op = tmp;
1633 goto inserted; 1634 goto inserted;
1634 } 1635 }
1635 1636
1636 op->owner = 0; // it's his/hers now. period. 1637 op->owner = 0; // it's his/hers now. period.

Diff Legend

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