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.251 by root, Sun Jul 20 16:56:34 2008 UTC vs.
Revision 1.256 by root, Sun Aug 31 05:47:14 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
839 if (has_active_speed ()) 837 if (has_active_speed ())
840 actives.insert (this); 838 actives.insert (this);
841} 839}
842 840
843void 841void
… …
1115 *(below ? &below->above : &ms.bot) = above; 1113 *(below ? &below->above : &ms.bot) = above;
1116 1114
1117 above = 0; 1115 above = 0;
1118 below = 0; 1116 below = 0;
1119 1117
1118 ms.flags_ = 0;
1119
1120 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
1121 return; 1121 return;
1122 1122
1123 int check_walk_off = !flag [FLAG_NO_APPLY]; 1123 int check_walk_off = !flag [FLAG_NO_APPLY];
1124 1124
… …
1155 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1155 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1156 } 1156 }
1157 1157
1158 last = tmp; 1158 last = tmp;
1159 } 1159 }
1160
1161 /* last == NULL if there are no objects on this space */
1162 //TODO: this makes little sense, why only update the topmost object?
1163 if (!last)
1164 map->at (x, y).flags_ = 0;
1165 else
1166 update_object (last, UP_OBJ_REMOVE);
1167 1160
1168 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1161 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1169 update_all_los (map, x, y); 1162 update_all_los (map, x, y);
1170 } 1163 }
1171} 1164}

Diff Legend

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