… | |
… | |
29 | #include <sys/types.h> |
29 | #include <sys/types.h> |
30 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
31 | #include <object.h> |
31 | #include <object.h> |
32 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
33 | #include <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
34 | |
36 | |
35 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
36 | static UUID uuid; |
38 | static UUID uuid; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
38 | |
40 | |
… | |
… | |
219 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
220 | |
222 | |
221 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
222 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
223 | |
225 | |
224 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
225 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
226 | * being locked in inventory should prevent merging. |
|
|
227 | * 0x4 in flags3 is CLIENT_SENT |
|
|
228 | */ |
|
|
229 | if ((ob1->arch != ob2->arch) || |
|
|
230 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
231 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
232 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
233 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
234 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
235 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
236 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
237 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
238 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
239 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
240 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
241 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
242 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
243 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
244 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
245 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
246 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
247 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
248 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
249 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
250 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
251 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
252 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
253 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
254 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
255 | return 0; |
251 | return 0; |
256 | |
252 | |
257 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
258 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
259 | */ |
255 | */ |
… | |
… | |
352 | object * |
348 | object * |
353 | object_get_env_recursive (object *op) |
349 | object_get_env_recursive (object *op) |
354 | { |
350 | { |
355 | while (op->env != NULL) |
351 | while (op->env != NULL) |
356 | op = op->env; |
352 | op = op->env; |
357 | return op; |
|
|
358 | } |
|
|
359 | |
|
|
360 | /* |
|
|
361 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
|
|
362 | * a better check. We basically keeping traversing up until we can't |
|
|
363 | * or find a player. |
|
|
364 | */ |
|
|
365 | |
|
|
366 | object * |
|
|
367 | is_player_inv (object *op) |
|
|
368 | { |
|
|
369 | for (; op != NULL && op->type != PLAYER; op = op->env) |
|
|
370 | if (op->env == op) |
|
|
371 | op->env = NULL; |
|
|
372 | return op; |
353 | return op; |
373 | } |
354 | } |
374 | |
355 | |
375 | /* |
356 | /* |
376 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
… | |
… | |
713 | op->active_next = NULL; |
694 | op->active_next = NULL; |
714 | op->active_prev = NULL; |
695 | op->active_prev = NULL; |
715 | } |
696 | } |
716 | |
697 | |
717 | /* |
698 | /* |
718 | * update_object() updates the array which represents the map. |
699 | * update_object() updates the the map. |
719 | * It takes into account invisible objects (and represent squares covered |
700 | * It takes into account invisible objects (and represent squares covered |
720 | * by invisible objects by whatever is below them (unless it's another |
701 | * by invisible objects by whatever is below them (unless it's another |
721 | * invisible object, etc...) |
702 | * invisible object, etc...) |
722 | * If the object being updated is beneath a player, the look-window |
703 | * If the object being updated is beneath a player, the look-window |
723 | * of that player is updated (this might be a suboptimal way of |
704 | * of that player is updated (this might be a suboptimal way of |
724 | * updating that window, though, since update_object() is called _often_) |
705 | * updating that window, though, since update_object() is called _often_) |
725 | * |
706 | * |
726 | * action is a hint of what the caller believes need to be done. |
707 | * action is a hint of what the caller believes need to be done. |
727 | * For example, if the only thing that has changed is the face (due to |
|
|
728 | * an animation), we don't need to call update_position until that actually |
|
|
729 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
730 | * of walls or living creatures may need us to update the flags now. |
|
|
731 | * current action are: |
708 | * current action are: |
732 | * UP_OBJ_INSERT: op was inserted |
709 | * UP_OBJ_INSERT: op was inserted |
733 | * UP_OBJ_REMOVE: op was removed |
710 | * UP_OBJ_REMOVE: op was removed |
734 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
711 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
735 | * as that is easier than trying to look at what may have changed. |
712 | * as that is easier than trying to look at what may have changed. |
736 | * UP_OBJ_FACE: only the objects face has changed. |
713 | * UP_OBJ_FACE: only the objects face has changed. |
737 | */ |
714 | */ |
738 | |
|
|
739 | void |
715 | void |
740 | update_object (object *op, int action) |
716 | update_object (object *op, int action) |
741 | { |
717 | { |
742 | int update_now = 0, flags; |
|
|
743 | MoveType move_on, move_off, move_block, move_slow; |
718 | MoveType move_on, move_off, move_block, move_slow; |
744 | |
719 | |
745 | if (op == NULL) |
720 | if (op == NULL) |
746 | { |
721 | { |
747 | /* this should never happen */ |
722 | /* this should never happen */ |
748 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
723 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
749 | return; |
724 | return; |
750 | } |
725 | } |
751 | |
726 | |
752 | if (op->env != NULL) |
727 | if (op->env) |
753 | { |
728 | { |
754 | /* Animation is currently handled by client, so nothing |
729 | /* Animation is currently handled by client, so nothing |
755 | * to do in this case. |
730 | * to do in this case. |
756 | */ |
731 | */ |
757 | return; |
732 | return; |
… | |
… | |
771 | abort (); |
746 | abort (); |
772 | #endif |
747 | #endif |
773 | return; |
748 | return; |
774 | } |
749 | } |
775 | |
750 | |
776 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
751 | mapspace &m = op->ms (); |
777 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
778 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
779 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
780 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
781 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
782 | |
752 | |
|
|
753 | if (m.flags_ & P_NEED_UPDATE) |
|
|
754 | /* nop */; |
783 | if (action == UP_OBJ_INSERT) |
755 | else if (action == UP_OBJ_INSERT) |
784 | { |
756 | { |
|
|
757 | // this is likely overkill, TODO: revisit (schmorp) |
785 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
758 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
786 | update_now = 1; |
|
|
787 | |
|
|
788 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
759 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
789 | update_now = 1; |
760 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
790 | |
761 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
762 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
791 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
763 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
792 | update_now = 1; |
|
|
793 | |
|
|
794 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
795 | update_now = 1; |
|
|
796 | |
|
|
797 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
798 | update_now = 1; |
|
|
799 | |
|
|
800 | if ((move_on | op->move_on) != move_on) |
764 | || (m.move_on | op->move_on ) != m.move_on |
801 | update_now = 1; |
|
|
802 | |
|
|
803 | if ((move_off | op->move_off) != move_off) |
765 | || (m.move_off | op->move_off ) != m.move_off |
804 | update_now = 1; |
766 | || (m.move_slow | op->move_slow) != m.move_slow |
805 | |
|
|
806 | /* This isn't perfect, but I don't expect a lot of objects to |
767 | /* This isn't perfect, but I don't expect a lot of objects to |
807 | * to have move_allow right now. |
768 | * to have move_allow right now. |
808 | */ |
769 | */ |
809 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
770 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
810 | update_now = 1; |
771 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
811 | |
772 | m.flags_ = P_NEED_UPDATE; |
812 | if ((move_slow | op->move_slow) != move_slow) |
|
|
813 | update_now = 1; |
|
|
814 | } |
773 | } |
815 | |
|
|
816 | /* if the object is being removed, we can't make intelligent |
774 | /* if the object is being removed, we can't make intelligent |
817 | * decisions, because remove_ob can't really pass the object |
775 | * decisions, because remove_ob can't really pass the object |
818 | * that is being removed. |
776 | * that is being removed. |
819 | */ |
777 | */ |
820 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
778 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
821 | update_now = 1; |
779 | m.flags_ = P_NEED_UPDATE; |
822 | else if (action == UP_OBJ_FACE) |
780 | else if (action == UP_OBJ_FACE) |
823 | /* Nothing to do for that case */ ; |
781 | /* Nothing to do for that case */ ; |
824 | else |
782 | else |
825 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
783 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
826 | |
784 | |
827 | if (update_now) |
|
|
828 | { |
|
|
829 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
830 | update_position (op->map, op->x, op->y); |
|
|
831 | } |
|
|
832 | |
|
|
833 | if (op->more != NULL) |
785 | if (op->more) |
834 | update_object (op->more, action); |
786 | update_object (op->more, action); |
835 | } |
787 | } |
836 | |
788 | |
837 | object::vector object::mortals; |
789 | object::vector object::mortals; |
838 | object::vector object::objects; // not yet used |
790 | object::vector object::objects; // not yet used |
… | |
… | |
1059 | |
1011 | |
1060 | /* NO_FIX_PLAYER is set when a great many changes are being |
1012 | /* NO_FIX_PLAYER is set when a great many changes are being |
1061 | * made to players inventory. If set, avoiding the call |
1013 | * made to players inventory. If set, avoiding the call |
1062 | * to save cpu time. |
1014 | * to save cpu time. |
1063 | */ |
1015 | */ |
1064 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1016 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1065 | fix_player (otmp); |
1017 | fix_player (otmp); |
1066 | |
1018 | |
1067 | if (above != NULL) |
1019 | if (above != NULL) |
1068 | above->below = below; |
1020 | above->below = below; |
1069 | else |
1021 | else |
… | |
… | |
1089 | |
1041 | |
1090 | /* link the object above us */ |
1042 | /* link the object above us */ |
1091 | if (above) |
1043 | if (above) |
1092 | above->below = below; |
1044 | above->below = below; |
1093 | else |
1045 | else |
1094 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1046 | map->at (x, y).top = below; /* we were top, set new top */ |
1095 | |
1047 | |
1096 | /* Relink the object below us, if there is one */ |
1048 | /* Relink the object below us, if there is one */ |
1097 | if (below) |
1049 | if (below) |
1098 | below->above = above; |
1050 | below->above = above; |
1099 | else |
1051 | else |
… | |
… | |
1111 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1063 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1112 | LOG (llevError, "%s\n", dump); |
1064 | LOG (llevError, "%s\n", dump); |
1113 | free (dump); |
1065 | free (dump); |
1114 | } |
1066 | } |
1115 | |
1067 | |
1116 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1068 | map->at (x, y).bottom = above; /* goes on above it. */ |
1117 | } |
1069 | } |
1118 | |
1070 | |
1119 | above = 0; |
1071 | above = 0; |
1120 | below = 0; |
1072 | below = 0; |
1121 | |
1073 | |
… | |
… | |
1140 | { |
1092 | { |
1141 | CLEAR_FLAG (this, FLAG_APPLIED); |
1093 | CLEAR_FLAG (this, FLAG_APPLIED); |
1142 | tmp->container = 0; |
1094 | tmp->container = 0; |
1143 | } |
1095 | } |
1144 | |
1096 | |
1145 | tmp->contr->socket->update_look = 1; |
1097 | tmp->contr->ns->floorbox_update (); |
1146 | } |
1098 | } |
1147 | |
1099 | |
1148 | /* See if player moving off should effect something */ |
1100 | /* See if player moving off should effect something */ |
1149 | if (check_walk_off |
1101 | if (check_walk_off |
1150 | && ((move_type & tmp->move_off) |
1102 | && ((move_type & tmp->move_off) |
… | |
… | |
1164 | last = tmp; |
1116 | last = tmp; |
1165 | } |
1117 | } |
1166 | |
1118 | |
1167 | /* last == NULL of there are no objects on this space */ |
1119 | /* last == NULL of there are no objects on this space */ |
1168 | if (!last) |
1120 | if (!last) |
1169 | { |
1121 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1170 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1171 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1172 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1173 | * be correct anyways. |
|
|
1174 | */ |
|
|
1175 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
|
|
1176 | update_position (map, x, y); |
|
|
1177 | } |
|
|
1178 | else |
1122 | else |
1179 | update_object (last, UP_OBJ_REMOVE); |
1123 | update_object (last, UP_OBJ_REMOVE); |
1180 | |
1124 | |
1181 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1125 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1182 | update_all_los (map, x, y); |
1126 | update_all_los (map, x, y); |
… | |
… | |
1372 | op->below = originator->below; |
1316 | op->below = originator->below; |
1373 | |
1317 | |
1374 | if (op->below) |
1318 | if (op->below) |
1375 | op->below->above = op; |
1319 | op->below->above = op; |
1376 | else |
1320 | else |
1377 | SET_MAP_OB (op->map, op->x, op->y, op); |
1321 | op->ms ().bottom = op; |
1378 | |
1322 | |
1379 | /* since *below* originator, no need to update top */ |
1323 | /* since *below* originator, no need to update top */ |
1380 | originator->below = op; |
1324 | originator->below = op; |
1381 | } |
1325 | } |
1382 | else |
1326 | else |
… | |
… | |
1428 | * If INS_ON_TOP is used, don't do this processing |
1372 | * If INS_ON_TOP is used, don't do this processing |
1429 | * Need to find the object that in fact blocks view, otherwise |
1373 | * Need to find the object that in fact blocks view, otherwise |
1430 | * stacking is a bit odd. |
1374 | * stacking is a bit odd. |
1431 | */ |
1375 | */ |
1432 | if (!(flag & INS_ON_TOP) && |
1376 | if (!(flag & INS_ON_TOP) && |
1433 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1377 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1434 | { |
1378 | { |
1435 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1436 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1437 | break; |
1381 | break; |
1438 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1461 | |
1405 | |
1462 | if (op->above) |
1406 | if (op->above) |
1463 | op->above->below = op; |
1407 | op->above->below = op; |
1464 | |
1408 | |
1465 | op->below = NULL; |
1409 | op->below = NULL; |
1466 | SET_MAP_OB (op->map, op->x, op->y, op); |
1410 | op->ms ().bottom = op; |
1467 | } |
1411 | } |
1468 | else |
1412 | else |
1469 | { /* get inserted into the stack above top */ |
1413 | { /* get inserted into the stack above top */ |
1470 | op->above = top->above; |
1414 | op->above = top->above; |
1471 | |
1415 | |
… | |
… | |
1475 | op->below = top; |
1419 | op->below = top; |
1476 | top->above = op; |
1420 | top->above = op; |
1477 | } |
1421 | } |
1478 | |
1422 | |
1479 | if (op->above == NULL) |
1423 | if (op->above == NULL) |
1480 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1424 | op->ms ().top = op; |
1481 | } /* else not INS_BELOW_ORIGINATOR */ |
1425 | } /* else not INS_BELOW_ORIGINATOR */ |
1482 | |
1426 | |
1483 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1484 | op->contr->do_los = 1; |
1428 | op->contr->do_los = 1; |
1485 | |
1429 | |
1486 | /* If we have a floor, we know the player, if any, will be above |
1430 | /* If we have a floor, we know the player, if any, will be above |
1487 | * it, so save a few ticks and start from there. |
1431 | * it, so save a few ticks and start from there. |
1488 | */ |
1432 | */ |
1489 | if (!(flag & INS_MAP_LOAD)) |
1433 | if (!(flag & INS_MAP_LOAD)) |
1490 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1434 | if (object *pl = op->ms ().player ()) |
1491 | if (tmp->type == PLAYER) |
1435 | pl->contr->ns->floorbox_update (); |
1492 | tmp->contr->socket->update_look = 1; |
|
|
1493 | |
1436 | |
1494 | /* If this object glows, it may affect lighting conditions that are |
1437 | /* If this object glows, it may affect lighting conditions that are |
1495 | * visible to others on this map. But update_all_los is really |
1438 | * visible to others on this map. But update_all_los is really |
1496 | * an inefficient way to do this, as it means los for all players |
1439 | * an inefficient way to do this, as it means los for all players |
1497 | * on the map will get recalculated. The players could very well |
1440 | * on the map will get recalculated. The players could very well |
… | |
… | |
1505 | |
1448 | |
1506 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1507 | update_object (op, UP_OBJ_INSERT); |
1450 | update_object (op, UP_OBJ_INSERT); |
1508 | |
1451 | |
1509 | /* Don't know if moving this to the end will break anything. However, |
1452 | /* Don't know if moving this to the end will break anything. However, |
1510 | * we want to have update_look set above before calling this. |
1453 | * we want to have floorbox_update called before calling this. |
1511 | * |
1454 | * |
1512 | * check_move_on() must be after this because code called from |
1455 | * check_move_on() must be after this because code called from |
1513 | * check_move_on() depends on correct map flags (so functions like |
1456 | * check_move_on() depends on correct map flags (so functions like |
1514 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1515 | * update_object(). |
1458 | * update_object(). |
… | |
… | |
1531 | |
1474 | |
1532 | return op; |
1475 | return op; |
1533 | } |
1476 | } |
1534 | |
1477 | |
1535 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1536 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1537 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1538 | */ |
1481 | */ |
1539 | void |
1482 | void |
1540 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1541 | { |
1484 | { |
1542 | object * |
1485 | object *tmp, *tmp1; |
1543 | tmp; |
|
|
1544 | object * |
|
|
1545 | tmp1; |
|
|
1546 | |
1486 | |
1547 | /* first search for itself and remove any old instances */ |
1487 | /* first search for itself and remove any old instances */ |
1548 | |
1488 | |
1549 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1489 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1550 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1490 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
… | |
… | |
1618 | if (i > op->nrof) |
1558 | if (i > op->nrof) |
1619 | i = op->nrof; |
1559 | i = op->nrof; |
1620 | |
1560 | |
1621 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1561 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1622 | op->nrof -= i; |
1562 | op->nrof -= i; |
1623 | else if (op->env != NULL) |
1563 | else if (op->env) |
1624 | { |
1564 | { |
1625 | /* is this object in the players inventory, or sub container |
1565 | /* is this object in the players inventory, or sub container |
1626 | * therein? |
1566 | * therein? |
1627 | */ |
1567 | */ |
1628 | tmp = is_player_inv (op->env); |
1568 | tmp = op->in_player (); |
1629 | /* nope. Is this a container the player has opened? |
1569 | /* nope. Is this a container the player has opened? |
1630 | * If so, set tmp to that player. |
1570 | * If so, set tmp to that player. |
1631 | * IMO, searching through all the players will mostly |
1571 | * IMO, searching through all the players will mostly |
1632 | * likely be quicker than following op->env to the map, |
1572 | * likely be quicker than following op->env to the map, |
1633 | * and then searching the map for a player. |
1573 | * and then searching the map for a player. |
1634 | */ |
1574 | */ |
1635 | if (!tmp) |
1575 | if (!tmp) |
1636 | { |
1576 | { |
1637 | for (pl = first_player; pl; pl = pl->next) |
1577 | for (pl = first_player; pl; pl = pl->next) |
1638 | if (pl->ob->container == op->env) |
1578 | if (pl->ob->container == op->env) |
|
|
1579 | { |
|
|
1580 | tmp = pl->ob; |
1639 | break; |
1581 | break; |
1640 | if (pl) |
1582 | } |
1641 | tmp = pl->ob; |
|
|
1642 | else |
|
|
1643 | tmp = NULL; |
|
|
1644 | } |
1583 | } |
1645 | |
1584 | |
1646 | if (i < op->nrof) |
1585 | if (i < op->nrof) |
1647 | { |
1586 | { |
1648 | sub_weight (op->env, op->weight * i); |
1587 | sub_weight (op->env, op->weight * i); |
1649 | op->nrof -= i; |
1588 | op->nrof -= i; |
1650 | if (tmp) |
1589 | if (tmp) |
1651 | { |
|
|
1652 | esrv_send_item (tmp, op); |
1590 | esrv_send_item (tmp, op); |
1653 | } |
|
|
1654 | } |
1591 | } |
1655 | else |
1592 | else |
1656 | { |
1593 | { |
1657 | op->remove (); |
1594 | op->remove (); |
1658 | op->nrof = 0; |
1595 | op->nrof = 0; |
1659 | if (tmp) |
1596 | if (tmp) |
1660 | { |
|
|
1661 | esrv_del_item (tmp->contr, op->count); |
1597 | esrv_del_item (tmp->contr, op->count); |
1662 | } |
|
|
1663 | } |
1598 | } |
1664 | } |
1599 | } |
1665 | else |
1600 | else |
1666 | { |
1601 | { |
1667 | object *above = op->above; |
1602 | object *above = op->above; |
… | |
… | |
1673 | op->remove (); |
1608 | op->remove (); |
1674 | op->nrof = 0; |
1609 | op->nrof = 0; |
1675 | } |
1610 | } |
1676 | |
1611 | |
1677 | /* Since we just removed op, op->above is null */ |
1612 | /* Since we just removed op, op->above is null */ |
1678 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1613 | for (tmp = above; tmp; tmp = tmp->above) |
1679 | if (tmp->type == PLAYER) |
1614 | if (tmp->type == PLAYER) |
1680 | { |
1615 | { |
1681 | if (op->nrof) |
1616 | if (op->nrof) |
1682 | esrv_send_item (tmp, op); |
1617 | esrv_send_item (tmp, op); |
1683 | else |
1618 | else |
… | |
… | |
1688 | if (op->nrof) |
1623 | if (op->nrof) |
1689 | return op; |
1624 | return op; |
1690 | else |
1625 | else |
1691 | { |
1626 | { |
1692 | op->destroy (); |
1627 | op->destroy (); |
1693 | return NULL; |
1628 | return 0; |
1694 | } |
1629 | } |
1695 | } |
1630 | } |
1696 | |
1631 | |
1697 | /* |
1632 | /* |
1698 | * add_weight(object, weight) adds the specified weight to an object, |
1633 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1786 | add_weight (this, op->weight * op->nrof); |
1721 | add_weight (this, op->weight * op->nrof); |
1787 | } |
1722 | } |
1788 | else |
1723 | else |
1789 | add_weight (this, (op->weight + op->carrying)); |
1724 | add_weight (this, (op->weight + op->carrying)); |
1790 | |
1725 | |
1791 | otmp = is_player_inv (this); |
1726 | otmp = this->in_player (); |
1792 | if (otmp && otmp->contr) |
1727 | if (otmp && otmp->contr) |
1793 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1728 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1794 | fix_player (otmp); |
1729 | fix_player (otmp); |
1795 | |
1730 | |
1796 | op->map = NULL; |
1731 | op->map = 0; |
1797 | op->env = this; |
1732 | op->env = this; |
1798 | op->above = NULL; |
1733 | op->above = 0; |
1799 | op->below = NULL; |
1734 | op->below = 0; |
1800 | op->x = 0, op->y = 0; |
1735 | op->x = 0, op->y = 0; |
1801 | |
1736 | |
1802 | /* reset the light list and los of the players on the map */ |
1737 | /* reset the light list and los of the players on the map */ |
1803 | if ((op->glow_radius != 0) && map) |
1738 | if ((op->glow_radius != 0) && map) |
1804 | { |
1739 | { |
… | |
… | |
2141 | * if the space being examined only has a wall to the north and empty |
2076 | * if the space being examined only has a wall to the north and empty |
2142 | * spaces in all the other directions, this will reduce the search space |
2077 | * spaces in all the other directions, this will reduce the search space |
2143 | * to only the spaces immediately surrounding the target area, and |
2078 | * to only the spaces immediately surrounding the target area, and |
2144 | * won't look 2 spaces south of the target space. |
2079 | * won't look 2 spaces south of the target space. |
2145 | */ |
2080 | */ |
2146 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2081 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2147 | stop = maxfree[i]; |
2082 | stop = maxfree[i]; |
2148 | } |
2083 | } |
|
|
2084 | |
2149 | if (!index) |
2085 | if (!index) |
2150 | return -1; |
2086 | return -1; |
|
|
2087 | |
2151 | return altern[RANDOM () % index]; |
2088 | return altern[RANDOM () % index]; |
2152 | } |
2089 | } |
2153 | |
2090 | |
2154 | /* |
2091 | /* |
2155 | * find_first_free_spot(archetype, maptile, x, y) works like |
2092 | * find_first_free_spot(archetype, maptile, x, y) works like |
… | |
… | |
2263 | mp = m; |
2200 | mp = m; |
2264 | nx = x + freearr_x[i]; |
2201 | nx = x + freearr_x[i]; |
2265 | ny = y + freearr_y[i]; |
2202 | ny = y + freearr_y[i]; |
2266 | |
2203 | |
2267 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2204 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2205 | |
2268 | if (mflags & P_OUT_OF_MAP) |
2206 | if (mflags & P_OUT_OF_MAP) |
2269 | { |
|
|
2270 | max = maxfree[i]; |
2207 | max = maxfree[i]; |
2271 | } |
|
|
2272 | else |
2208 | else |
2273 | { |
2209 | { |
2274 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2210 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2275 | |
2211 | |
2276 | if ((move_type & blocked) == move_type) |
2212 | if ((move_type & blocked) == move_type) |
2277 | { |
|
|
2278 | max = maxfree[i]; |
2213 | max = maxfree[i]; |
2279 | } |
|
|
2280 | else if (mflags & P_IS_ALIVE) |
2214 | else if (mflags & P_IS_ALIVE) |
2281 | { |
2215 | { |
2282 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2216 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2283 | { |
|
|
2284 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2217 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2285 | { |
|
|
2286 | break; |
2218 | break; |
2287 | } |
2219 | |
2288 | } |
|
|
2289 | if (tmp) |
2220 | if (tmp) |
2290 | { |
|
|
2291 | return freedir[i]; |
2221 | return freedir[i]; |
2292 | } |
|
|
2293 | } |
2222 | } |
2294 | } |
2223 | } |
2295 | } |
2224 | } |
|
|
2225 | |
2296 | return 0; |
2226 | return 0; |
2297 | } |
2227 | } |
2298 | |
2228 | |
2299 | /* |
2229 | /* |
2300 | * distance(object 1, object 2) will return the square of the |
2230 | * distance(object 1, object 2) will return the square of the |
… | |
… | |
2302 | */ |
2232 | */ |
2303 | |
2233 | |
2304 | int |
2234 | int |
2305 | distance (const object *ob1, const object *ob2) |
2235 | distance (const object *ob1, const object *ob2) |
2306 | { |
2236 | { |
2307 | int |
2237 | int i; |
2308 | i; |
|
|
2309 | |
2238 | |
2310 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2239 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2311 | return i; |
2240 | return i; |
2312 | } |
2241 | } |
2313 | |
2242 | |
… | |
… | |
2318 | */ |
2247 | */ |
2319 | |
2248 | |
2320 | int |
2249 | int |
2321 | find_dir_2 (int x, int y) |
2250 | find_dir_2 (int x, int y) |
2322 | { |
2251 | { |
2323 | int |
2252 | int q; |
2324 | q; |
|
|
2325 | |
2253 | |
2326 | if (y) |
2254 | if (y) |
2327 | q = x * 100 / y; |
2255 | q = x * 100 / y; |
2328 | else if (x) |
2256 | else if (x) |
2329 | q = -300 * x; |
2257 | q = -300 * x; |
… | |
… | |
2455 | * find a path to that monster that we found. If not, |
2383 | * find a path to that monster that we found. If not, |
2456 | * we don't bother going toward it. Returns 1 if we |
2384 | * we don't bother going toward it. Returns 1 if we |
2457 | * can see a direct way to get it |
2385 | * can see a direct way to get it |
2458 | * Modified to be map tile aware -.MSW |
2386 | * Modified to be map tile aware -.MSW |
2459 | */ |
2387 | */ |
2460 | |
|
|
2461 | |
|
|
2462 | int |
2388 | int |
2463 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2389 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2464 | { |
2390 | { |
2465 | sint16 dx, dy; |
2391 | sint16 dx, dy; |
2466 | int |
|
|
2467 | mflags; |
2392 | int mflags; |
2468 | |
2393 | |
2469 | if (dir < 0) |
2394 | if (dir < 0) |
2470 | return 0; /* exit condition: invalid direction */ |
2395 | return 0; /* exit condition: invalid direction */ |
2471 | |
2396 | |
2472 | dx = x + freearr_x[dir]; |
2397 | dx = x + freearr_x[dir]; |
… | |
… | |
2485 | return 0; |
2410 | return 0; |
2486 | |
2411 | |
2487 | /* yes, can see. */ |
2412 | /* yes, can see. */ |
2488 | if (dir < 9) |
2413 | if (dir < 9) |
2489 | return 1; |
2414 | return 1; |
|
|
2415 | |
2490 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2416 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2491 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2417 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2418 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2492 | } |
2419 | } |
2493 | |
|
|
2494 | |
|
|
2495 | |
2420 | |
2496 | /* |
2421 | /* |
2497 | * can_pick(picker, item): finds out if an object is possible to be |
2422 | * can_pick(picker, item): finds out if an object is possible to be |
2498 | * picked up by the picker. Returnes 1 if it can be |
2423 | * picked up by the picker. Returnes 1 if it can be |
2499 | * picked up, otherwise 0. |
2424 | * picked up, otherwise 0. |
… | |
… | |
2510 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2435 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2511 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2436 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2512 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2437 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2513 | } |
2438 | } |
2514 | |
2439 | |
2515 | |
|
|
2516 | /* |
2440 | /* |
2517 | * create clone from object to another |
2441 | * create clone from object to another |
2518 | */ |
2442 | */ |
2519 | object * |
2443 | object * |
2520 | object_create_clone (object *asrc) |
2444 | object_create_clone (object *asrc) |
… | |
… | |
2539 | { |
2463 | { |
2540 | dst = tmp; |
2464 | dst = tmp; |
2541 | tmp->head = 0; |
2465 | tmp->head = 0; |
2542 | } |
2466 | } |
2543 | else |
2467 | else |
2544 | { |
|
|
2545 | tmp->head = dst; |
2468 | tmp->head = dst; |
2546 | } |
|
|
2547 | |
2469 | |
2548 | tmp->more = 0; |
2470 | tmp->more = 0; |
2549 | |
2471 | |
2550 | if (prev) |
2472 | if (prev) |
2551 | prev->more = tmp; |
2473 | prev->more = tmp; |