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.243 by root, Sat May 17 00:17:02 2008 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 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 // some objects are unmergable
192 if (!ob1->nrof || !ob2->nrof)
193 return 0;
194
195 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow, assume nrof
196 * for unsigned overflow (2c), second part checks whether the result 192 * is always 0 .. 2**31-1 */
197 * would fit into a 32 bit signed int, which is often used to hold 193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
198 * nrof values.
199 */
200 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
201 return 0; 194 return 0;
202 195
203 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
204 * 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
205 * 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
… …
349 else 342 else
350 { 343 {
351 // maybe there is a player standing on the same mapspace 344 // maybe there is a player standing on the same mapspace
352 // this will catch the case where "this" is a player 345 // this will catch the case where "this" is a player
353 if (object *pl = ms ().player ()) 346 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
354 if (!pl->container || this == pl->container) 348 || this == pl->container)
355 return pl; 349 return pl;
356 } 350 }
357 } 351 }
358 352
359 return 0; 353 return 0;
… …
773 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 767 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774 || (m.move_on | op->move_on ) != m.move_on 768 || (m.move_on | op->move_on ) != m.move_on
775 || (m.move_off | op->move_off ) != m.move_off 769 || (m.move_off | op->move_off ) != m.move_off
776 || (m.move_slow | op->move_slow) != m.move_slow 770 || (m.move_slow | op->move_slow) != m.move_slow
777 /* This isn't perfect, but I don't expect a lot of objects to 771 /* This isn't perfect, but I don't expect a lot of objects to
778 * to have move_allow right now. 772 * have move_allow right now.
779 */ 773 */
780 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
781 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
782 m.flags_ = 0; 776 m.flags_ = 0;
783 } 777 }
… …
913 || map->in_memory != MAP_ACTIVE 907 || map->in_memory != MAP_ACTIVE
914 || map->no_drop 908 || map->no_drop
915 || ms ().move_block == MOVE_ALL) 909 || ms ().move_block == MOVE_ALL)
916 { 910 {
917 while (inv) 911 while (inv)
918 {
919 inv->destroy_inv (false);
920 inv->destroy (); 912 inv->destroy (true);
921 }
922 } 913 }
923 else 914 else
924 { /* Put objects in inventory onto this space */ 915 { /* Put objects in inventory onto this space */
925 while (inv) 916 while (inv)
926 { 917 {
… …
1121 *(below ? &below->above : &ms.bot) = above; 1112 *(below ? &below->above : &ms.bot) = above;
1122 1113
1123 above = 0; 1114 above = 0;
1124 below = 0; 1115 below = 0;
1125 1116
1117 ms.flags_ = 0;
1118
1126 if (map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1127 return; 1120 return;
1128 1121
1129 int check_walk_off = !flag [FLAG_NO_APPLY]; 1122 int check_walk_off = !flag [FLAG_NO_APPLY];
1130 1123
… …
1162 } 1155 }
1163 1156
1164 last = tmp; 1157 last = tmp;
1165 } 1158 }
1166 1159
1167 /* last == NULL if there are no objects on this space */
1168 //TODO: this makes little sense, why only update the topmost object?
1169 if (!last)
1170 map->at (x, y).flags_ = 0;
1171 else
1172 update_object (last, UP_OBJ_REMOVE);
1173
1174 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1160 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1175 update_all_los (map, x, y); 1161 update_all_los (map, x, y);
1176 } 1162 }
1177} 1163}
1178 1164
… …
1241 * job preparing multi-part monsters. 1227 * job preparing multi-part monsters.
1242 */ 1228 */
1243object * 1229object *
1244insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1230insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1245{ 1231{
1232 op->remove ();
1233
1246 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1234 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1247 { 1235 {
1248 tmp->x = x + tmp->arch->x; 1236 tmp->x = x + tmp->arch->x;
1249 tmp->y = y + tmp->arch->y; 1237 tmp->y = y + tmp->arch->y;
1250 } 1238 }
… …
1273 * just 'op' otherwise 1261 * just 'op' otherwise
1274 */ 1262 */
1275object * 1263object *
1276insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1264insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1277{ 1265{
1266 if (op->is_on_map ())
1267 {
1268 LOG (llevError, "insert_ob_in_map called for object already on map");
1269 abort ();
1270 }
1271
1272 if (op->env)
1273 {
1274 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1278 op->remove (); 1275 op->remove ();
1276 }
1277
1278 if (op->face && !face_info (op->face))//D TODO: remove soon
1279 {//D
1280 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1281 op->face = 1;//D
1282 }//D
1279 1283
1280 /* Ideally, the caller figures this out. However, it complicates a lot 1284 /* Ideally, the caller figures this out. However, it complicates a lot
1281 * of areas of callers (eg, anything that uses find_free_spot would now 1285 * of areas of callers (eg, anything that uses find_free_spot would now
1282 * need extra work 1286 * need extra work
1283 */ 1287 */
… …
1523 if (!nr) 1527 if (!nr)
1524 return true; 1528 return true;
1525 1529
1526 nr = min (nr, nrof); 1530 nr = min (nr, nrof);
1527 1531
1532 if (nrof > nr)
1533 {
1528 nrof -= nr; 1534 nrof -= nr;
1529
1530 if (nrof)
1531 {
1532 adjust_weight (env, -weight * nr); // carrying == 0 1535 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1533 1536
1534 if (object *pl = visible_to ()) 1537 if (object *pl = visible_to ())
1535 esrv_update_item (UPD_NROF, pl, this); 1538 esrv_update_item (UPD_NROF, pl, this);
1536 1539
1537 return true; 1540 return true;
1538 } 1541 }
1539 else 1542 else
1540 { 1543 {
1541 destroy (1); 1544 destroy ();
1542 return false; 1545 return false;
1543 } 1546 }
1544} 1547}
1545 1548
1546/* 1549/*

Diff Legend

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