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.247 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.255 by root, Sun Aug 31 02:01:41 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
… …
345 else 341 else
346 { 342 {
347 // maybe there is a player standing on the same mapspace 343 // maybe there is a player standing on the same mapspace
348 // this will catch the case where "this" is a player 344 // this will catch the case where "this" is a player
349 if (object *pl = ms ().player ()) 345 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
350 if (!pl->container || this == pl->container) 347 || this == pl->container)
351 return pl; 348 return pl;
352 } 349 }
353 } 350 }
354 351
355 return 0; 352 return 0;
… …
769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
770 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
771 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
772 || (m.move_slow | op->move_slow) != m.move_slow 769 || (m.move_slow | op->move_slow) != m.move_slow
773 /* 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
774 * to have move_allow right now. 771 * have move_allow right now.
775 */ 772 */
776 || ((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
777 || 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)
778 m.flags_ = 0; 775 m.flags_ = 0;
779 } 776 }
… …
909 || map->in_memory != MAP_ACTIVE 906 || map->in_memory != MAP_ACTIVE
910 || map->no_drop 907 || map->no_drop
911 || ms ().move_block == MOVE_ALL) 908 || ms ().move_block == MOVE_ALL)
912 { 909 {
913 while (inv) 910 while (inv)
914 {
915 inv->destroy_inv (false);
916 inv->destroy (); 911 inv->destroy (true);
917 }
918 } 912 }
919 else 913 else
920 { /* Put objects in inventory onto this space */ 914 { /* Put objects in inventory onto this space */
921 while (inv) 915 while (inv)
922 { 916 {
… …
1117 *(below ? &below->above : &ms.bot) = above; 1111 *(below ? &below->above : &ms.bot) = above;
1118 1112
1119 above = 0; 1113 above = 0;
1120 below = 0; 1114 below = 0;
1121 1115
1116 ms.flags_ = 0;
1117
1122 if (map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1123 return; 1119 return;
1124 1120
1125 int check_walk_off = !flag [FLAG_NO_APPLY]; 1121 int check_walk_off = !flag [FLAG_NO_APPLY];
1126 1122
… …
1157 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1158 } 1154 }
1159 1155
1160 last = tmp; 1156 last = tmp;
1161 } 1157 }
1162
1163 /* last == NULL if there are no objects on this space */
1164 //TODO: this makes little sense, why only update the topmost object?
1165 if (!last)
1166 map->at (x, y).flags_ = 0;
1167 else
1168 update_object (last, UP_OBJ_REMOVE);
1169 1158
1170 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1159 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1171 update_all_los (map, x, y); 1160 update_all_los (map, x, y);
1172 } 1161 }
1173} 1162}
… …
1537 if (!nr) 1526 if (!nr)
1538 return true; 1527 return true;
1539 1528
1540 nr = min (nr, nrof); 1529 nr = min (nr, nrof);
1541 1530
1531 if (nrof > nr)
1532 {
1542 nrof -= nr; 1533 nrof -= nr;
1543
1544 if (nrof)
1545 {
1546 adjust_weight (env, -weight * max (1, nr)); // carrying == 0 1534 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1547 1535
1548 if (object *pl = visible_to ()) 1536 if (object *pl = visible_to ())
1549 esrv_update_item (UPD_NROF, pl, this); 1537 esrv_update_item (UPD_NROF, pl, this);
1550 1538
1551 return true; 1539 return true;
1552 } 1540 }
1553 else 1541 else
1554 { 1542 {
1555 destroy (1); 1543 destroy ();
1556 return false; 1544 return false;
1557 } 1545 }
1558} 1546}
1559 1547
1560/* 1548/*

Diff Legend

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