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.248 by root, Mon Jul 14 23:47:06 2008 UTC vs.
Revision 1.257 by root, Tue Sep 16 16:03:02 2008 UTC

… …
186 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
187 || ob1->value != ob2->value 187 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
189 return 0; 189 return 0;
190 190
191 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow, assume nrof
192 * for unsigned overflow (2c), second part checks whether the result 192 * is always 0 .. 2**31-1 */
193 * would fit into a 32 bit signed int, which is often used to hold 193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
194 * nrof values.
195 */
196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197 return 0; 194 return 0;
198 195
199 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
200 * This is to the comparison of the flags below will be OK. We 197 * This is to the comparison of the flags below will be OK. We
201 * just can't ignore the been applied or identified flags, as they 198 * just can't ignore the been applied or identified flags, as they
… …
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236 return 0; 233 return 0;
237 234
238 if ((ob1->flag ^ ob2->flag) 235 if ((ob1->flag ^ ob2->flag)
239 .reset (FLAG_INV_LOCKED) 236 .reset (FLAG_INV_LOCKED)
240 .reset (FLAG_CLIENT_SENT)
241 .reset (FLAG_REMOVED) 237 .reset (FLAG_REMOVED)
242 .any ()) 238 .any ())
243 return 0; 239 return 0;
244 240
245 /* This is really a spellbook check - we should in general 241 /* This is really a spellbook check - we should in general
… …
640 } 636 }
641 637
642 if (speed < 0) 638 if (speed < 0)
643 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
644 640
645 dst->set_speed (dst->speed); 641 dst->activate ();
646} 642}
647 643
648void 644void
649object::instantiate () 645object::instantiate ()
650{ 646{
… …
770 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
772 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
773 || (m.move_slow | op->move_slow) != m.move_slow 769 || (m.move_slow | op->move_slow) != m.move_slow
774 /* This isn't perfect, but I don't expect a lot of objects to 770 /* This isn't perfect, but I don't expect a lot of objects to
775 * to have move_allow right now. 771 * have move_allow right now.
776 */ 772 */
777 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
778 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
779 m.flags_ = 0; 775 m.flags_ = 0;
780 } 776 }
… …
834{ 830{
835 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
836 if (active) 832 if (active)
837 return; 833 return;
838 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
839 if (has_active_speed ()) 838 if (has_active_speed ())
840 actives.insert (this); 839 actives.insert (this);
841} 840}
842 841
843void 842void
… …
910 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
911 || map->no_drop 910 || map->no_drop
912 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
913 { 912 {
914 while (inv) 913 while (inv)
915 {
916 inv->destroy_inv (false);
917 inv->destroy (); 914 inv->destroy (true);
918 }
919 } 915 }
920 else 916 else
921 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
922 while (inv) 918 while (inv)
923 { 919 {
… …
1118 *(below ? &below->above : &ms.bot) = above; 1114 *(below ? &below->above : &ms.bot) = above;
1119 1115
1120 above = 0; 1116 above = 0;
1121 below = 0; 1117 below = 0;
1122 1118
1119 ms.flags_ = 0;
1120
1123 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
1124 return; 1122 return;
1125 1123
1126 int check_walk_off = !flag [FLAG_NO_APPLY]; 1124 int check_walk_off = !flag [FLAG_NO_APPLY];
1127 1125
… …
1158 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1159 } 1157 }
1160 1158
1161 last = tmp; 1159 last = tmp;
1162 } 1160 }
1163
1164 /* last == NULL if there are no objects on this space */
1165 //TODO: this makes little sense, why only update the topmost object?
1166 if (!last)
1167 map->at (x, y).flags_ = 0;
1168 else
1169 update_object (last, UP_OBJ_REMOVE);
1170 1161
1171 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1172 update_all_los (map, x, y); 1163 update_all_los (map, x, y);
1173 } 1164 }
1174} 1165}
… …
1538 if (!nr) 1529 if (!nr)
1539 return true; 1530 return true;
1540 1531
1541 nr = min (nr, nrof); 1532 nr = min (nr, nrof);
1542 1533
1534 if (nrof > nr)
1535 {
1543 nrof -= nr; 1536 nrof -= nr;
1544
1545 if (nrof)
1546 {
1547 adjust_weight (env, -weight * max (1, nr)); // carrying == 0 1537 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1548 1538
1549 if (object *pl = visible_to ()) 1539 if (object *pl = visible_to ())
1550 esrv_update_item (UPD_NROF, pl, this); 1540 esrv_update_item (UPD_NROF, pl, this);
1551 1541
1552 return true; 1542 return true;
1553 } 1543 }
1554 else 1544 else
1555 { 1545 {
1556 destroy (1); 1546 destroy ();
1557 return false; 1547 return false;
1558 } 1548 }
1559} 1549}
1560 1550
1561/* 1551/*

Diff Legend

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