… | |
… | |
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 |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
203 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
204 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
205 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
207 | |
211 | if (ob1->arch->name != ob2->arch->name |
208 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
209 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
210 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
211 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
212 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
213 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
214 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
215 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
216 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
217 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
218 | || ob1->animation_id != ob2->animation_id |
|
|
219 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
220 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
221 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
222 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
223 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
224 | || ob1->move_type != ob2->move_type |
… | |
… | |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
233 | return 0; |
236 | |
234 | |
237 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
238 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
241 | .any ()) |
238 | .any ()) |
242 | return 0; |
239 | return 0; |
243 | |
240 | |
244 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
… | |
… | |
344 | else |
341 | else |
345 | { |
342 | { |
346 | // maybe there is a player standing on the same mapspace |
343 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
344 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
345 | if (object *pl = ms ().player ()) |
|
|
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
349 | if (!pl->container || this == pl->container) |
347 | || this == pl->container) |
350 | return pl; |
348 | return pl; |
351 | } |
349 | } |
352 | } |
350 | } |
353 | |
351 | |
354 | return 0; |
352 | return 0; |
355 | } |
353 | } |
356 | |
354 | |
357 | // adjust weight per container type ("of holding") |
355 | // adjust weight per container type ("of holding") |
358 | static sint32 |
356 | static sint32 |
359 | weight_adjust (object *op, sint32 weight) |
357 | weight_adjust_for (object *op, sint32 weight) |
360 | { |
358 | { |
361 | return op->type == CONTAINER |
359 | return op->type == CONTAINER |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
360 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | : weight; |
361 | : weight; |
364 | } |
362 | } |
… | |
… | |
370 | static void |
368 | static void |
371 | adjust_weight (object *op, sint32 weight) |
369 | adjust_weight (object *op, sint32 weight) |
372 | { |
370 | { |
373 | while (op) |
371 | while (op) |
374 | { |
372 | { |
|
|
373 | // adjust by actual difference to account for rounding errors |
|
|
374 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
375 | weight = weight_adjust (op, weight); |
375 | weight = weight_adjust_for (op, op->carrying) |
|
|
376 | - weight_adjust_for (op, op->carrying - weight); |
376 | |
377 | |
377 | if (!weight) |
378 | if (!weight) |
378 | return; |
379 | return; |
379 | |
380 | |
380 | op->carrying += weight; |
381 | op->carrying += weight; |
… | |
… | |
403 | op->update_weight (); |
404 | op->update_weight (); |
404 | |
405 | |
405 | sum += op->total_weight (); |
406 | sum += op->total_weight (); |
406 | } |
407 | } |
407 | |
408 | |
408 | sum = weight_adjust (this, sum); |
409 | sum = weight_adjust_for (this, sum); |
409 | |
410 | |
410 | if (sum != carrying) |
411 | if (sum != carrying) |
411 | { |
412 | { |
412 | carrying = sum; |
413 | carrying = sum; |
413 | |
414 | |
… | |
… | |
475 | */ |
476 | */ |
476 | object * |
477 | object * |
477 | find_object_name (const char *str) |
478 | find_object_name (const char *str) |
478 | { |
479 | { |
479 | shstr_cmp str_ (str); |
480 | shstr_cmp str_ (str); |
480 | object *op; |
|
|
481 | |
481 | |
|
|
482 | if (str_) |
482 | for_all_objects (op) |
483 | for_all_objects (op) |
483 | if (op->name == str_) |
484 | if (op->name == str_) |
484 | break; |
485 | return op; |
485 | |
486 | |
486 | return op; |
487 | return 0; |
487 | } |
488 | } |
488 | |
489 | |
489 | /* |
490 | /* |
490 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * skill and experience objects. |
492 | * skill and experience objects. |
… | |
… | |
635 | } |
636 | } |
636 | |
637 | |
637 | if (speed < 0) |
638 | if (speed < 0) |
638 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
639 | |
640 | |
640 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
641 | } |
642 | } |
642 | |
643 | |
643 | void |
644 | void |
644 | object::instantiate () |
645 | object::instantiate () |
645 | { |
646 | { |
… | |
… | |
765 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | /* 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 |
770 | * to have move_allow right now. |
771 | * have move_allow right now. |
771 | */ |
772 | */ |
772 | || ((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 |
773 | || 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) |
774 | m.flags_ = 0; |
775 | m.flags_ = 0; |
775 | } |
776 | } |
… | |
… | |
829 | { |
830 | { |
830 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
831 | if (active) |
832 | if (active) |
832 | return; |
833 | return; |
833 | |
834 | |
|
|
835 | if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | |
834 | if (has_active_speed ()) |
837 | if (has_active_speed ()) |
835 | actives.insert (this); |
838 | actives.insert (this); |
836 | } |
839 | } |
837 | |
840 | |
838 | void |
841 | void |
… | |
… | |
901 | * drop on that space. |
904 | * drop on that space. |
902 | */ |
905 | */ |
903 | if (!drop_to_ground |
906 | if (!drop_to_ground |
904 | || !map |
907 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
908 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
909 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
910 | || ms ().move_block == MOVE_ALL) |
908 | { |
911 | { |
909 | while (inv) |
912 | while (inv) |
910 | { |
|
|
911 | inv->destroy_inv (false); |
|
|
912 | inv->destroy (); |
913 | inv->destroy (true); |
913 | } |
|
|
914 | } |
914 | } |
915 | else |
915 | else |
916 | { /* Put objects in inventory onto this space */ |
916 | { /* Put objects in inventory onto this space */ |
917 | while (inv) |
917 | while (inv) |
918 | { |
918 | { |
… | |
… | |
940 | |
940 | |
941 | static struct freed_map : maptile |
941 | static struct freed_map : maptile |
942 | { |
942 | { |
943 | freed_map () |
943 | freed_map () |
944 | { |
944 | { |
945 | path = "<freed objects map>"; |
945 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
946 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
947 | width = 3; |
948 | height = 3; |
948 | height = 3; |
949 | nodrop = 1; |
949 | no_drop = 1; |
|
|
950 | no_reset = 1; |
950 | |
951 | |
951 | alloc (); |
952 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
953 | in_memory = MAP_ACTIVE; |
|
|
954 | } |
|
|
955 | |
|
|
956 | ~freed_map () |
|
|
957 | { |
|
|
958 | destroy (); |
953 | } |
959 | } |
954 | } freed_map; // freed objects are moved here to avoid crashes |
960 | } freed_map; // freed objects are moved here to avoid crashes |
955 | |
961 | |
956 | void |
962 | void |
957 | object::do_destroy () |
963 | object::do_destroy () |
… | |
… | |
1048 | if (object *pl = visible_to ()) |
1054 | if (object *pl = visible_to ()) |
1049 | esrv_del_item (pl->contr, count); |
1055 | esrv_del_item (pl->contr, count); |
1050 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1056 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1051 | |
1057 | |
1052 | adjust_weight (env, -total_weight ()); |
1058 | adjust_weight (env, -total_weight ()); |
1053 | |
|
|
1054 | *(above ? &above->below : &env->inv) = below; |
|
|
1055 | |
|
|
1056 | if (below) |
|
|
1057 | below->above = above; |
|
|
1058 | |
1059 | |
1059 | /* we set up values so that it could be inserted into |
1060 | /* we set up values so that it could be inserted into |
1060 | * the map, but we don't actually do that - it is up |
1061 | * the map, but we don't actually do that - it is up |
1061 | * to the caller to decide what we want to do. |
1062 | * to the caller to decide what we want to do. |
1062 | */ |
1063 | */ |
1063 | map = env->map; |
1064 | map = env->map; |
1064 | x = env->x; |
1065 | x = env->x; |
1065 | y = env->y; |
1066 | y = env->y; |
|
|
1067 | |
|
|
1068 | // make sure cmov optimisation is applicable |
|
|
1069 | *(above ? &above->below : &env->inv) = below; |
|
|
1070 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1071 | |
1066 | above = 0; |
1072 | above = 0; |
1067 | below = 0; |
1073 | below = 0; |
1068 | env = 0; |
1074 | env = 0; |
1069 | |
1075 | |
1070 | /* NO_FIX_PLAYER is set when a great many changes are being |
1076 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1100 | |
1106 | |
1101 | esrv_del_item (pl->contr, count); |
1107 | esrv_del_item (pl->contr, count); |
1102 | } |
1108 | } |
1103 | |
1109 | |
1104 | /* link the object above us */ |
1110 | /* link the object above us */ |
1105 | if (above) |
1111 | // re-link, make sure compiler can easily use cmove |
1106 | above->below = below; |
1112 | *(above ? &above->below : &ms.top) = below; |
1107 | else |
1113 | *(below ? &below->above : &ms.bot) = above; |
1108 | ms.top = below; /* we were top, set new top */ |
|
|
1109 | |
|
|
1110 | /* Relink the object below us, if there is one */ |
|
|
1111 | if (below) |
|
|
1112 | below->above = above; |
|
|
1113 | else |
|
|
1114 | { |
|
|
1115 | /* Nothing below, which means we need to relink map object for this space |
|
|
1116 | * use translated coordinates in case some oddness with map tiling is |
|
|
1117 | * evident |
|
|
1118 | */ |
|
|
1119 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1120 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1121 | |
|
|
1122 | ms.bot = above; /* goes on above it. */ |
|
|
1123 | } |
|
|
1124 | |
1114 | |
1125 | above = 0; |
1115 | above = 0; |
1126 | below = 0; |
1116 | below = 0; |
|
|
1117 | |
|
|
1118 | ms.flags_ = 0; |
1127 | |
1119 | |
1128 | if (map->in_memory == MAP_SAVING) |
1120 | if (map->in_memory == MAP_SAVING) |
1129 | return; |
1121 | return; |
1130 | |
1122 | |
1131 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1123 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
… | |
… | |
1164 | } |
1156 | } |
1165 | |
1157 | |
1166 | last = tmp; |
1158 | last = tmp; |
1167 | } |
1159 | } |
1168 | |
1160 | |
1169 | /* last == NULL if there are no objects on this space */ |
|
|
1170 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1171 | if (!last) |
|
|
1172 | map->at (x, y).flags_ = 0; |
|
|
1173 | else |
|
|
1174 | update_object (last, UP_OBJ_REMOVE); |
|
|
1175 | |
|
|
1176 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1161 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1177 | update_all_los (map, x, y); |
1162 | update_all_los (map, x, y); |
1178 | } |
1163 | } |
1179 | } |
1164 | } |
1180 | |
1165 | |
… | |
… | |
1243 | * job preparing multi-part monsters. |
1228 | * job preparing multi-part monsters. |
1244 | */ |
1229 | */ |
1245 | object * |
1230 | object * |
1246 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1231 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1247 | { |
1232 | { |
|
|
1233 | op->remove (); |
|
|
1234 | |
1248 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1235 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1249 | { |
1236 | { |
1250 | tmp->x = x + tmp->arch->x; |
1237 | tmp->x = x + tmp->arch->x; |
1251 | tmp->y = y + tmp->arch->y; |
1238 | tmp->y = y + tmp->arch->y; |
1252 | } |
1239 | } |
… | |
… | |
1275 | * just 'op' otherwise |
1262 | * just 'op' otherwise |
1276 | */ |
1263 | */ |
1277 | object * |
1264 | object * |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1265 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1279 | { |
1266 | { |
1280 | assert (!op->flag [FLAG_FREED]); |
1267 | if (op->is_on_map ()) |
|
|
1268 | { |
|
|
1269 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1270 | abort (); |
|
|
1271 | } |
1281 | |
1272 | |
|
|
1273 | if (op->env) |
|
|
1274 | { |
|
|
1275 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1282 | op->remove (); |
1276 | op->remove (); |
|
|
1277 | } |
|
|
1278 | |
|
|
1279 | if (op->face && !face_info (op->face))//D TODO: remove soon |
|
|
1280 | {//D |
|
|
1281 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
|
|
1282 | op->face = 1;//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->destroy (1); |
1291 | op->head_ ()->destroy (1);// 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)) |
… | |
… | |
1304 | */ |
1305 | */ |
1305 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1306 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1306 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1307 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1307 | if (object::can_merge (op, tmp)) |
1308 | if (object::can_merge (op, tmp)) |
1308 | { |
1309 | { |
1309 | // TODO: we atcually 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 (1); |
1314 | } |
1315 | } |
… | |
… | |
1325 | { |
1326 | { |
1326 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1327 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1327 | abort (); |
1328 | abort (); |
1328 | } |
1329 | } |
1329 | |
1330 | |
|
|
1331 | if (!originator->is_on_map ()) |
|
|
1332 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1333 | op->debug_desc (), originator->debug_desc ()); |
|
|
1334 | |
1330 | op->above = originator; |
1335 | op->above = originator; |
1331 | op->below = originator->below; |
1336 | op->below = originator->below; |
1332 | |
|
|
1333 | if (op->below) |
|
|
1334 | op->below->above = op; |
|
|
1335 | else |
|
|
1336 | ms.bot = op; |
|
|
1337 | |
|
|
1338 | /* since *below* originator, no need to update top */ |
|
|
1339 | originator->below = op; |
1337 | originator->below = op; |
|
|
1338 | |
|
|
1339 | *(op->below ? &op->below->above : &ms.bot) = op; |
1340 | } |
1340 | } |
1341 | else |
1341 | else |
1342 | { |
1342 | { |
1343 | object *top, *floor = NULL; |
1343 | object *floor = 0; |
1344 | |
1344 | object *top = ms.top; |
1345 | top = ms.bot; |
|
|
1346 | |
1345 | |
1347 | /* If there are other objects, then */ |
1346 | /* If there are other objects, then */ |
1348 | if (top) |
1347 | if (top) |
1349 | { |
1348 | { |
1350 | object *last = 0; |
|
|
1351 | |
|
|
1352 | /* |
1349 | /* |
1353 | * If there are multiple objects on this space, we do some trickier handling. |
1350 | * If there are multiple objects on this space, we do some trickier handling. |
1354 | * We've already dealt with merging if appropriate. |
1351 | * We've already dealt with merging if appropriate. |
1355 | * Generally, we want to put the new object on top. But if |
1352 | * Generally, we want to put the new object on top. But if |
1356 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1353 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1359 | * once we get to them. This reduces the need to traverse over all of |
1356 | * once we get to them. This reduces the need to traverse over all of |
1360 | * them when adding another one - this saves quite a bit of cpu time |
1357 | * them when adding another one - this saves quite a bit of cpu time |
1361 | * when lots of spells are cast in one area. Currently, it is presumed |
1358 | * when lots of spells are cast in one area. Currently, it is presumed |
1362 | * that flying non pickable objects are spell objects. |
1359 | * that flying non pickable objects are spell objects. |
1363 | */ |
1360 | */ |
1364 | for (top = ms.bot; top; top = top->above) |
1361 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1365 | { |
1362 | { |
1366 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1363 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1367 | floor = top; |
1364 | floor = tmp; |
1368 | |
1365 | |
1369 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1366 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1370 | { |
1367 | { |
1371 | /* We insert above top, so we want this object below this */ |
1368 | /* We insert above top, so we want this object below this */ |
1372 | top = top->below; |
1369 | top = tmp->below; |
1373 | break; |
1370 | break; |
1374 | } |
1371 | } |
1375 | |
1372 | |
1376 | last = top; |
1373 | top = tmp; |
1377 | } |
1374 | } |
1378 | |
|
|
1379 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1380 | top = last; |
|
|
1381 | |
1375 | |
1382 | /* We let update_position deal with figuring out what the space |
1376 | /* We let update_position deal with figuring out what the space |
1383 | * looks like instead of lots of conditions here. |
1377 | * looks like instead of lots of conditions here. |
1384 | * makes things faster, and effectively the same result. |
1378 | * makes things faster, and effectively the same result. |
1385 | */ |
1379 | */ |
… | |
… | |
1392 | */ |
1386 | */ |
1393 | if (!(flag & INS_ON_TOP) |
1387 | if (!(flag & INS_ON_TOP) |
1394 | && ms.flags () & P_BLOCKSVIEW |
1388 | && ms.flags () & P_BLOCKSVIEW |
1395 | && (op->face && !faces [op->face].visibility)) |
1389 | && (op->face && !faces [op->face].visibility)) |
1396 | { |
1390 | { |
|
|
1391 | object *last; |
|
|
1392 | |
1397 | for (last = top; last != floor; last = last->below) |
1393 | for (last = top; last != floor; last = last->below) |
1398 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1394 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1399 | break; |
1395 | break; |
1400 | |
1396 | |
1401 | /* Check to see if we found the object that blocks view, |
1397 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1409 | } /* If objects on this space */ |
1405 | } /* If objects on this space */ |
1410 | |
1406 | |
1411 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1407 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1412 | top = floor; |
1408 | top = floor; |
1413 | |
1409 | |
1414 | /* Top is the object that our object (op) is going to get inserted above. |
1410 | // insert object above top, or bottom-most if top = 0 |
1415 | */ |
|
|
1416 | |
|
|
1417 | /* First object on this space */ |
|
|
1418 | if (!top) |
1411 | if (!top) |
1419 | { |
1412 | { |
|
|
1413 | op->below = 0; |
1420 | op->above = ms.bot; |
1414 | op->above = ms.bot; |
1421 | |
|
|
1422 | if (op->above) |
|
|
1423 | op->above->below = op; |
|
|
1424 | |
|
|
1425 | op->below = 0; |
|
|
1426 | ms.bot = op; |
1415 | ms.bot = op; |
|
|
1416 | |
|
|
1417 | *(op->above ? &op->above->below : &ms.top) = op; |
1427 | } |
1418 | } |
1428 | else |
1419 | else |
1429 | { /* get inserted into the stack above top */ |
1420 | { |
1430 | op->above = top->above; |
1421 | op->above = top->above; |
1431 | |
|
|
1432 | if (op->above) |
|
|
1433 | op->above->below = op; |
1422 | top->above = op; |
1434 | |
1423 | |
1435 | op->below = top; |
1424 | op->below = top; |
1436 | top->above = op; |
1425 | *(op->above ? &op->above->below : &ms.top) = op; |
1437 | } |
1426 | } |
1438 | |
1427 | } |
1439 | if (!op->above) |
|
|
1440 | ms.top = op; |
|
|
1441 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1442 | |
1428 | |
1443 | if (op->type == PLAYER) |
1429 | if (op->type == PLAYER) |
1444 | { |
1430 | { |
1445 | op->contr->do_los = 1; |
1431 | op->contr->do_los = 1; |
1446 | ++op->map->players; |
1432 | ++op->map->players; |
… | |
… | |
1542 | if (!nr) |
1528 | if (!nr) |
1543 | return true; |
1529 | return true; |
1544 | |
1530 | |
1545 | nr = min (nr, nrof); |
1531 | nr = min (nr, nrof); |
1546 | |
1532 | |
|
|
1533 | if (nrof > nr) |
|
|
1534 | { |
1547 | nrof -= nr; |
1535 | nrof -= nr; |
1548 | |
|
|
1549 | if (nrof) |
|
|
1550 | { |
|
|
1551 | adjust_weight (env, -weight * nr); // carrying == 0 |
1536 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1552 | |
1537 | |
1553 | if (object *pl = visible_to ()) |
1538 | if (object *pl = visible_to ()) |
1554 | esrv_update_item (UPD_NROF, pl, this); |
1539 | esrv_update_item (UPD_NROF, pl, this); |
1555 | |
1540 | |
1556 | return true; |
1541 | return true; |
1557 | } |
1542 | } |
1558 | else |
1543 | else |
1559 | { |
1544 | { |
1560 | destroy (1); |
1545 | destroy (); |
1561 | return false; |
1546 | return false; |
1562 | } |
1547 | } |
1563 | } |
1548 | } |
1564 | |
1549 | |
1565 | /* |
1550 | /* |
… | |
… | |
1582 | } |
1567 | } |
1583 | else |
1568 | else |
1584 | { |
1569 | { |
1585 | decrease (nr); |
1570 | decrease (nr); |
1586 | |
1571 | |
1587 | object *op = object_create_clone (this); |
1572 | object *op = deep_clone (); |
1588 | op->nrof = nr; |
1573 | op->nrof = nr; |
1589 | return op; |
1574 | return op; |
1590 | } |
1575 | } |
1591 | } |
1576 | } |
1592 | |
1577 | |
… | |
… | |
1813 | LOG (llevError, "Present_arch called outside map.\n"); |
1798 | LOG (llevError, "Present_arch called outside map.\n"); |
1814 | return NULL; |
1799 | return NULL; |
1815 | } |
1800 | } |
1816 | |
1801 | |
1817 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1802 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1818 | if (tmp->arch == at) |
1803 | if (tmp->arch->archname == at->archname) |
1819 | return tmp; |
1804 | return tmp; |
1820 | |
1805 | |
1821 | return NULL; |
1806 | return NULL; |
1822 | } |
1807 | } |
1823 | |
1808 | |
… | |
… | |
1887 | * The first matching object is returned, or NULL if none. |
1872 | * The first matching object is returned, or NULL if none. |
1888 | */ |
1873 | */ |
1889 | object * |
1874 | object * |
1890 | present_arch_in_ob (const archetype *at, const object *op) |
1875 | present_arch_in_ob (const archetype *at, const object *op) |
1891 | { |
1876 | { |
1892 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1877 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1893 | if (tmp->arch == at) |
1878 | if (tmp->arch->archname == at->archname) |
1894 | return tmp; |
1879 | return tmp; |
1895 | |
1880 | |
1896 | return NULL; |
1881 | return NULL; |
1897 | } |
1882 | } |
1898 | |
1883 | |
… | |
… | |
2307 | |
2292 | |
2308 | /* |
2293 | /* |
2309 | * create clone from object to another |
2294 | * create clone from object to another |
2310 | */ |
2295 | */ |
2311 | object * |
2296 | object * |
2312 | object_create_clone (object *asrc) |
2297 | object::deep_clone () |
2313 | { |
2298 | { |
|
|
2299 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2300 | |
2314 | object *dst = 0; |
2301 | object *dst = clone (); |
2315 | |
2302 | |
2316 | if (!asrc) |
|
|
2317 | return 0; |
|
|
2318 | |
|
|
2319 | object *src = asrc->head_ (); |
|
|
2320 | |
|
|
2321 | object *prev = 0; |
2303 | object *prev = dst; |
2322 | for (object *part = src; part; part = part->more) |
2304 | for (object *part = this->more; part; part = part->more) |
2323 | { |
2305 | { |
2324 | object *tmp = part->clone (); |
2306 | object *tmp = part->clone (); |
2325 | |
|
|
2326 | tmp->x -= src->x; |
|
|
2327 | tmp->y -= src->y; |
|
|
2328 | |
|
|
2329 | if (!part->head) |
|
|
2330 | { |
|
|
2331 | dst = tmp; |
|
|
2332 | tmp->head = 0; |
|
|
2333 | } |
|
|
2334 | else |
|
|
2335 | tmp->head = dst; |
2307 | tmp->head = dst; |
2336 | |
|
|
2337 | tmp->more = 0; |
|
|
2338 | |
|
|
2339 | if (prev) |
|
|
2340 | prev->more = tmp; |
2308 | prev->more = tmp; |
2341 | |
|
|
2342 | prev = tmp; |
2309 | prev = tmp; |
2343 | } |
2310 | } |
2344 | |
2311 | |
2345 | for (object *item = src->inv; item; item = item->below) |
2312 | for (object *item = inv; item; item = item->below) |
2346 | insert_ob_in_ob (object_create_clone (item), dst); |
2313 | insert_ob_in_ob (item->deep_clone (), dst); |
2347 | |
2314 | |
2348 | return dst; |
2315 | return dst; |
2349 | } |
2316 | } |
2350 | |
2317 | |
2351 | /* This returns the first object in who's inventory that |
2318 | /* This returns the first object in who's inventory that |
… | |
… | |
2459 | { |
2426 | { |
2460 | char flagdesc[512]; |
2427 | char flagdesc[512]; |
2461 | char info2[256 * 4]; |
2428 | char info2[256 * 4]; |
2462 | char *p = info; |
2429 | char *p = info; |
2463 | |
2430 | |
2464 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2431 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2465 | count, |
2432 | count, |
2466 | uuid.c_str (), |
2433 | uuid.c_str (), |
2467 | &name, |
2434 | &name, |
2468 | title ? "\",title:\"" : "", |
2435 | title ? ",title:\"" : "", |
2469 | title ? (const char *)title : "", |
2436 | title ? (const char *)title : "", |
|
|
2437 | title ? "\"" : "", |
2470 | flag_desc (flagdesc, 512), type); |
2438 | flag_desc (flagdesc, 512), type); |
2471 | |
2439 | |
2472 | if (!flag[FLAG_REMOVED] && env) |
2440 | if (!flag[FLAG_REMOVED] && env) |
2473 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2441 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2474 | |
2442 | |