… | |
… | |
32 | #include <bitset> |
32 | #include <bitset> |
33 | |
33 | |
34 | UUID UUID::cur; |
34 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
35 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
|
|
37 | uint32_t mapspace::smellcount = 10000; |
37 | |
38 | |
38 | objectvec objects; |
39 | objectvec objects; |
39 | activevec actives; |
40 | activevec actives; |
40 | |
41 | |
41 | short freearr_x[SIZEOFFREE] = { |
42 | short freearr_x[SIZEOFFREE] = { |
… | |
… | |
186 | || ob1->speed != ob2->speed |
187 | || ob1->speed != ob2->speed |
187 | || ob1->value != ob2->value |
188 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
189 | || ob1->name != ob2->name) |
189 | return 0; |
190 | return 0; |
190 | |
191 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
192 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
193 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
194 | 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; |
195 | return 0; |
198 | |
196 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
197 | /* 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 |
198 | * 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 |
199 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
204 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
205 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
206 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
207 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
208 | |
211 | if (ob1->arch->name != ob2->arch->name |
209 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
210 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
211 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
212 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
213 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
214 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
215 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
216 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
217 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
218 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
219 | || ob1->animation_id != ob2->animation_id |
|
|
220 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
221 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
222 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
223 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
224 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
225 | || ob1->move_type != ob2->move_type |
… | |
… | |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
234 | return 0; |
236 | |
235 | |
237 | if ((ob1->flag ^ ob2->flag) |
236 | if ((ob1->flag ^ ob2->flag) |
238 | .reset (FLAG_INV_LOCKED) |
237 | .reset (FLAG_INV_LOCKED) |
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
238 | .reset (FLAG_REMOVED) |
241 | .any ()) |
239 | .any ()) |
242 | return 0; |
240 | return 0; |
243 | |
241 | |
244 | /* This is really a spellbook check - we should in general |
242 | /* This is really a spellbook check - we should in general |
… | |
… | |
326 | { |
324 | { |
327 | // see if we are in a container of sorts |
325 | // see if we are in a container of sorts |
328 | if (env) |
326 | if (env) |
329 | { |
327 | { |
330 | // the player inventory itself is always visible |
328 | // the player inventory itself is always visible |
331 | if (env->type == PLAYER) |
329 | if (env->is_player ()) |
332 | return env; |
330 | return env; |
333 | |
331 | |
334 | // else a player could have our env open |
332 | // else a player could have our env open |
335 | object *envest = env->outer_env (); |
333 | object *envest = env->outer_env (); |
336 | |
334 | |
… | |
… | |
344 | else |
342 | else |
345 | { |
343 | { |
346 | // maybe there is a player standing on the same mapspace |
344 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
345 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
346 | if (object *pl = ms ().player ()) |
|
|
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
349 | if (!pl->container || this == pl->container) |
348 | || this == pl->container) |
350 | return pl; |
349 | return pl; |
351 | } |
350 | } |
352 | } |
351 | } |
353 | |
352 | |
354 | return 0; |
353 | return 0; |
355 | } |
354 | } |
356 | |
355 | |
357 | // adjust weight per container type ("of holding") |
356 | // adjust weight per container type ("of holding") |
358 | static sint32 |
357 | static sint32 |
359 | weight_adjust (object *op, sint32 weight) |
358 | weight_adjust_for (object *op, sint32 weight) |
360 | { |
359 | { |
361 | return op->type == CONTAINER |
360 | return op->type == CONTAINER |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
361 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | : weight; |
362 | : weight; |
364 | } |
363 | } |
… | |
… | |
370 | static void |
369 | static void |
371 | adjust_weight (object *op, sint32 weight) |
370 | adjust_weight (object *op, sint32 weight) |
372 | { |
371 | { |
373 | while (op) |
372 | while (op) |
374 | { |
373 | { |
|
|
374 | // adjust by actual difference to account for rounding errors |
|
|
375 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
375 | weight = weight_adjust (op, weight); |
376 | weight = weight_adjust_for (op, op->carrying) |
|
|
377 | - weight_adjust_for (op, op->carrying - weight); |
376 | |
378 | |
377 | if (!weight) |
379 | if (!weight) |
378 | return; |
380 | return; |
379 | |
381 | |
380 | op->carrying += weight; |
382 | op->carrying += weight; |
… | |
… | |
403 | op->update_weight (); |
405 | op->update_weight (); |
404 | |
406 | |
405 | sum += op->total_weight (); |
407 | sum += op->total_weight (); |
406 | } |
408 | } |
407 | |
409 | |
408 | sum = weight_adjust (this, sum); |
410 | sum = weight_adjust_for (this, sum); |
409 | |
411 | |
410 | if (sum != carrying) |
412 | if (sum != carrying) |
411 | { |
413 | { |
412 | carrying = sum; |
414 | carrying = sum; |
413 | |
415 | |
… | |
… | |
475 | */ |
477 | */ |
476 | object * |
478 | object * |
477 | find_object_name (const char *str) |
479 | find_object_name (const char *str) |
478 | { |
480 | { |
479 | shstr_cmp str_ (str); |
481 | shstr_cmp str_ (str); |
480 | object *op; |
|
|
481 | |
482 | |
|
|
483 | if (str_) |
482 | for_all_objects (op) |
484 | for_all_objects (op) |
483 | if (op->name == str_) |
485 | if (op->name == str_) |
484 | break; |
486 | return op; |
485 | |
487 | |
486 | return op; |
488 | return 0; |
487 | } |
489 | } |
488 | |
490 | |
489 | /* |
491 | /* |
490 | * Sets the owner and sets the skill and exp pointers to owner's current |
492 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * skill and experience objects. |
493 | * skill and experience objects. |
… | |
… | |
635 | } |
637 | } |
636 | |
638 | |
637 | if (speed < 0) |
639 | if (speed < 0) |
638 | dst->speed_left -= rndm (); |
640 | dst->speed_left -= rndm (); |
639 | |
641 | |
640 | dst->set_speed (dst->speed); |
642 | dst->activate (); |
641 | } |
643 | } |
642 | |
644 | |
643 | void |
645 | void |
644 | object::instantiate () |
646 | object::instantiate () |
645 | { |
647 | { |
… | |
… | |
757 | else if (action == UP_OBJ_INSERT) |
759 | else if (action == UP_OBJ_INSERT) |
758 | { |
760 | { |
759 | // this is likely overkill, TODO: revisit (schmorp) |
761 | // this is likely overkill, TODO: revisit (schmorp) |
760 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
761 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
762 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
764 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
763 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
764 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
765 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_slow | op->move_slow) != m.move_slow |
770 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | /* 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 |
770 | * to have move_allow right now. |
772 | * have move_allow right now. |
771 | */ |
773 | */ |
772 | || ((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 |
773 | || 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) |
774 | m.flags_ = 0; |
776 | m.invalidate (); |
775 | } |
777 | } |
776 | /* if the object is being removed, we can't make intelligent |
778 | /* if the object is being removed, we can't make intelligent |
777 | * decisions, because remove_ob can't really pass the object |
779 | * decisions, because remove_ob can't really pass the object |
778 | * that is being removed. |
780 | * that is being removed. |
779 | */ |
781 | */ |
780 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
782 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
781 | m.flags_ = 0; |
783 | m.invalidate (); |
782 | else if (action == UP_OBJ_FACE) |
784 | else if (action == UP_OBJ_FACE) |
783 | /* Nothing to do for that case */ ; |
785 | /* Nothing to do for that case */ ; |
784 | else |
786 | else |
785 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
787 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
786 | |
788 | |
… | |
… | |
828 | object::activate () |
830 | object::activate () |
829 | { |
831 | { |
830 | /* If already on active list, don't do anything */ |
832 | /* If already on active list, don't do anything */ |
831 | if (active) |
833 | if (active) |
832 | return; |
834 | return; |
|
|
835 | |
|
|
836 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
837 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
833 | |
838 | |
834 | if (has_active_speed ()) |
839 | if (has_active_speed ()) |
835 | actives.insert (this); |
840 | actives.insert (this); |
836 | } |
841 | } |
837 | |
842 | |
… | |
… | |
901 | * drop on that space. |
906 | * drop on that space. |
902 | */ |
907 | */ |
903 | if (!drop_to_ground |
908 | if (!drop_to_ground |
904 | || !map |
909 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
910 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
911 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
912 | || ms ().move_block == MOVE_ALL) |
908 | { |
913 | { |
909 | while (inv) |
914 | while (inv) |
910 | { |
|
|
911 | inv->destroy_inv (false); |
|
|
912 | inv->destroy (); |
915 | inv->destroy (); |
913 | } |
|
|
914 | } |
916 | } |
915 | else |
917 | else |
916 | { /* Put objects in inventory onto this space */ |
918 | { /* Put objects in inventory onto this space */ |
917 | while (inv) |
919 | while (inv) |
918 | { |
920 | { |
… | |
… | |
922 | || op->flag [FLAG_NO_DROP] |
924 | || op->flag [FLAG_NO_DROP] |
923 | || op->type == RUNE |
925 | || op->type == RUNE |
924 | || op->type == TRAP |
926 | || op->type == TRAP |
925 | || op->flag [FLAG_IS_A_TEMPLATE] |
927 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
928 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | op->destroy (true); |
929 | op->destroy (); |
928 | else |
930 | else |
929 | map->insert (op, x, y); |
931 | map->insert (op, x, y); |
930 | } |
932 | } |
931 | } |
933 | } |
932 | } |
934 | } |
… | |
… | |
940 | |
942 | |
941 | static struct freed_map : maptile |
943 | static struct freed_map : maptile |
942 | { |
944 | { |
943 | freed_map () |
945 | freed_map () |
944 | { |
946 | { |
945 | path = "<freed objects map>"; |
947 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
948 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
949 | width = 3; |
948 | height = 3; |
950 | height = 3; |
949 | nodrop = 1; |
951 | no_drop = 1; |
|
|
952 | no_reset = 1; |
950 | |
953 | |
951 | alloc (); |
954 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
955 | in_memory = MAP_ACTIVE; |
953 | } |
956 | } |
954 | |
957 | |
… | |
… | |
995 | attacked_by = 0; |
998 | attacked_by = 0; |
996 | current_weapon = 0; |
999 | current_weapon = 0; |
997 | } |
1000 | } |
998 | |
1001 | |
999 | void |
1002 | void |
1000 | object::destroy (bool destroy_inventory) |
1003 | object::destroy () |
1001 | { |
1004 | { |
1002 | if (destroyed ()) |
1005 | if (destroyed ()) |
1003 | return; |
1006 | return; |
1004 | |
1007 | |
1005 | if (!is_head () && !head->destroyed ()) |
1008 | if (!is_head () && !head->destroyed ()) |
1006 | { |
1009 | { |
1007 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1010 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1008 | head->destroy (destroy_inventory); |
1011 | head->destroy (); |
1009 | return; |
1012 | return; |
1010 | } |
1013 | } |
1011 | |
1014 | |
1012 | destroy_inv (!destroy_inventory); |
1015 | destroy_inv (false); |
1013 | |
1016 | |
1014 | if (is_head ()) |
1017 | if (is_head ()) |
1015 | if (sound_destroy) |
1018 | if (sound_destroy) |
1016 | play_sound (sound_destroy); |
1019 | play_sound (sound_destroy); |
1017 | else if (flag [FLAG_MONSTER]) |
1020 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1054 | esrv_del_item (pl->contr, count); |
1057 | esrv_del_item (pl->contr, count); |
1055 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1056 | |
1059 | |
1057 | adjust_weight (env, -total_weight ()); |
1060 | adjust_weight (env, -total_weight ()); |
1058 | |
1061 | |
1059 | *(above ? &above->below : &env->inv) = below; |
1062 | object *pl = in_player (); |
1060 | |
|
|
1061 | if (below) |
|
|
1062 | below->above = above; |
|
|
1063 | |
1063 | |
1064 | /* we set up values so that it could be inserted into |
1064 | /* we set up values so that it could be inserted into |
1065 | * the map, but we don't actually do that - it is up |
1065 | * the map, but we don't actually do that - it is up |
1066 | * to the caller to decide what we want to do. |
1066 | * to the caller to decide what we want to do. |
1067 | */ |
1067 | */ |
1068 | map = env->map; |
1068 | map = env->map; |
1069 | x = env->x; |
1069 | x = env->x; |
1070 | y = env->y; |
1070 | y = env->y; |
|
|
1071 | |
|
|
1072 | // make sure cmov optimisation is applicable |
|
|
1073 | *(above ? &above->below : &env->inv) = below; |
|
|
1074 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1075 | |
1071 | above = 0; |
1076 | above = 0; |
1072 | below = 0; |
1077 | below = 0; |
1073 | env = 0; |
1078 | env = 0; |
1074 | |
1079 | |
1075 | /* NO_FIX_PLAYER is set when a great many changes are being |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
1076 | * made to players inventory. If set, avoiding the call |
1081 | * made to players inventory. If set, avoiding the call |
1077 | * to save cpu time. |
1082 | * to save cpu time. |
1078 | */ |
1083 | */ |
1079 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1084 | if (pl) |
|
|
1085 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1086 | { |
1080 | otmp->update_stats (); |
1087 | pl->update_stats (); |
|
|
1088 | |
|
|
1089 | if (glow_radius && pl->is_on_map ()) |
|
|
1090 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1091 | } |
1081 | } |
1092 | } |
1082 | else if (map) |
1093 | else if (map) |
1083 | { |
1094 | { |
1084 | map->dirty = true; |
1095 | map->dirty = true; |
1085 | mapspace &ms = this->ms (); |
1096 | mapspace &ms = this->ms (); |
1086 | |
1097 | |
1087 | if (object *pl = ms.player ()) |
1098 | if (object *pl = ms.player ()) |
1088 | { |
1099 | { |
1089 | if (type == PLAYER) // this == pl(!) |
1100 | if (is_player ()) |
1090 | { |
1101 | { |
|
|
1102 | if (!flag [FLAG_WIZPASS]) |
|
|
1103 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1104 | |
1091 | // leaving a spot always closes any open container on the ground |
1105 | // leaving a spot always closes any open container on the ground |
1092 | if (container && !container->env) |
1106 | if (container && !container->env) |
1093 | // this causes spurious floorbox updates, but it ensures |
1107 | // this causes spurious floorbox updates, but it ensures |
1094 | // that the CLOSE event is being sent. |
1108 | // that the CLOSE event is being sent. |
1095 | close_container (); |
1109 | close_container (); |
… | |
… | |
1105 | |
1119 | |
1106 | esrv_del_item (pl->contr, count); |
1120 | esrv_del_item (pl->contr, count); |
1107 | } |
1121 | } |
1108 | |
1122 | |
1109 | /* link the object above us */ |
1123 | /* link the object above us */ |
1110 | if (above) |
1124 | // re-link, make sure compiler can easily use cmove |
1111 | above->below = below; |
1125 | *(above ? &above->below : &ms.top) = below; |
1112 | else |
1126 | *(below ? &below->above : &ms.bot) = above; |
1113 | ms.top = below; /* we were top, set new top */ |
|
|
1114 | |
|
|
1115 | /* Relink the object below us, if there is one */ |
|
|
1116 | if (below) |
|
|
1117 | below->above = above; |
|
|
1118 | else |
|
|
1119 | { |
|
|
1120 | /* Nothing below, which means we need to relink map object for this space |
|
|
1121 | * use translated coordinates in case some oddness with map tiling is |
|
|
1122 | * evident |
|
|
1123 | */ |
|
|
1124 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1125 | 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 ()); |
|
|
1126 | |
|
|
1127 | ms.bot = above; /* goes on above it. */ |
|
|
1128 | } |
|
|
1129 | |
1127 | |
1130 | above = 0; |
1128 | above = 0; |
1131 | below = 0; |
1129 | below = 0; |
|
|
1130 | |
|
|
1131 | ms.invalidate (); |
1132 | |
1132 | |
1133 | if (map->in_memory == MAP_SAVING) |
1133 | if (map->in_memory == MAP_SAVING) |
1134 | return; |
1134 | return; |
1135 | |
1135 | |
1136 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1136 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
… | |
… | |
1169 | } |
1169 | } |
1170 | |
1170 | |
1171 | last = tmp; |
1171 | last = tmp; |
1172 | } |
1172 | } |
1173 | |
1173 | |
1174 | /* last == NULL if there are no objects on this space */ |
1174 | if (affects_los ()) |
1175 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1176 | if (!last) |
|
|
1177 | map->at (x, y).flags_ = 0; |
|
|
1178 | else |
|
|
1179 | update_object (last, UP_OBJ_REMOVE); |
|
|
1180 | |
|
|
1181 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1182 | update_all_los (map, x, y); |
1175 | update_all_los (map, x, y); |
1183 | } |
1176 | } |
1184 | } |
1177 | } |
1185 | |
1178 | |
1186 | /* |
1179 | /* |
… | |
… | |
1210 | esrv_update_item (UPD_NROF, pl, top); |
1203 | esrv_update_item (UPD_NROF, pl, top); |
1211 | |
1204 | |
1212 | op->weight = 0; // cancel the addition above |
1205 | op->weight = 0; // cancel the addition above |
1213 | op->carrying = 0; // must be 0 already |
1206 | op->carrying = 0; // must be 0 already |
1214 | |
1207 | |
1215 | op->destroy (1); |
1208 | op->destroy (); |
1216 | |
1209 | |
1217 | return top; |
1210 | return top; |
1218 | } |
1211 | } |
1219 | |
1212 | |
1220 | return 0; |
1213 | return 0; |
… | |
… | |
1248 | * job preparing multi-part monsters. |
1241 | * job preparing multi-part monsters. |
1249 | */ |
1242 | */ |
1250 | object * |
1243 | object * |
1251 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1244 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1252 | { |
1245 | { |
|
|
1246 | op->remove (); |
|
|
1247 | |
1253 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1248 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1254 | { |
1249 | { |
1255 | tmp->x = x + tmp->arch->x; |
1250 | tmp->x = x + tmp->arch->x; |
1256 | tmp->y = y + tmp->arch->y; |
1251 | tmp->y = y + tmp->arch->y; |
1257 | } |
1252 | } |
… | |
… | |
1280 | * just 'op' otherwise |
1275 | * just 'op' otherwise |
1281 | */ |
1276 | */ |
1282 | object * |
1277 | object * |
1283 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1284 | { |
1279 | { |
1285 | assert (!op->flag [FLAG_FREED]); |
|
|
1286 | |
|
|
1287 | op->remove (); |
1280 | op->remove (); |
|
|
1281 | |
|
|
1282 | if (m == &freed_map)//D TODO: remove soon |
|
|
1283 | {//D |
|
|
1284 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1285 | }//D |
1288 | |
1286 | |
1289 | /* Ideally, the caller figures this out. However, it complicates a lot |
1287 | /* Ideally, the caller figures this out. However, it complicates a lot |
1290 | * of areas of callers (eg, anything that uses find_free_spot would now |
1288 | * of areas of callers (eg, anything that uses find_free_spot would now |
1291 | * need extra work |
1289 | * need extra work |
1292 | */ |
1290 | */ |
1293 | if (!xy_normalise (m, op->x, op->y)) |
1291 | if (!xy_normalise (m, op->x, op->y)) |
1294 | { |
1292 | { |
1295 | op->destroy (1); |
1293 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1296 | return 0; |
1294 | return 0; |
1297 | } |
1295 | } |
1298 | |
1296 | |
1299 | if (object *more = op->more) |
1297 | if (object *more = op->more) |
1300 | if (!insert_ob_in_map (more, m, originator, flag)) |
1298 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1309 | */ |
1307 | */ |
1310 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1308 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1311 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1309 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1312 | if (object::can_merge (op, tmp)) |
1310 | if (object::can_merge (op, tmp)) |
1313 | { |
1311 | { |
1314 | // TODO: we atcually want to update tmp, not op, |
1312 | // TODO: we actually want to update tmp, not op, |
1315 | // but some caller surely breaks when we return tmp |
1313 | // but some caller surely breaks when we return tmp |
1316 | // from here :/ |
1314 | // from here :/ |
1317 | op->nrof += tmp->nrof; |
1315 | op->nrof += tmp->nrof; |
1318 | tmp->destroy (1); |
1316 | tmp->destroy (); |
1319 | } |
1317 | } |
1320 | |
1318 | |
1321 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1319 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1322 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1320 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1323 | |
1321 | |
… | |
… | |
1330 | { |
1328 | { |
1331 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1329 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1332 | abort (); |
1330 | abort (); |
1333 | } |
1331 | } |
1334 | |
1332 | |
|
|
1333 | if (!originator->is_on_map ()) |
|
|
1334 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1335 | op->debug_desc (), originator->debug_desc ()); |
|
|
1336 | |
1335 | op->above = originator; |
1337 | op->above = originator; |
1336 | op->below = originator->below; |
1338 | op->below = originator->below; |
1337 | |
|
|
1338 | if (op->below) |
|
|
1339 | op->below->above = op; |
|
|
1340 | else |
|
|
1341 | ms.bot = op; |
|
|
1342 | |
|
|
1343 | /* since *below* originator, no need to update top */ |
|
|
1344 | originator->below = op; |
1339 | originator->below = op; |
|
|
1340 | |
|
|
1341 | *(op->below ? &op->below->above : &ms.bot) = op; |
1345 | } |
1342 | } |
1346 | else |
1343 | else |
1347 | { |
1344 | { |
1348 | object *top, *floor = NULL; |
1345 | object *floor = 0; |
1349 | |
1346 | object *top = ms.top; |
1350 | top = ms.bot; |
|
|
1351 | |
1347 | |
1352 | /* If there are other objects, then */ |
1348 | /* If there are other objects, then */ |
1353 | if (top) |
1349 | if (top) |
1354 | { |
1350 | { |
1355 | object *last = 0; |
|
|
1356 | |
|
|
1357 | /* |
1351 | /* |
1358 | * If there are multiple objects on this space, we do some trickier handling. |
1352 | * If there are multiple objects on this space, we do some trickier handling. |
1359 | * We've already dealt with merging if appropriate. |
1353 | * We've already dealt with merging if appropriate. |
1360 | * Generally, we want to put the new object on top. But if |
1354 | * Generally, we want to put the new object on top. But if |
1361 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1355 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1364 | * once we get to them. This reduces the need to traverse over all of |
1358 | * once we get to them. This reduces the need to traverse over all of |
1365 | * them when adding another one - this saves quite a bit of cpu time |
1359 | * them when adding another one - this saves quite a bit of cpu time |
1366 | * when lots of spells are cast in one area. Currently, it is presumed |
1360 | * when lots of spells are cast in one area. Currently, it is presumed |
1367 | * that flying non pickable objects are spell objects. |
1361 | * that flying non pickable objects are spell objects. |
1368 | */ |
1362 | */ |
1369 | for (top = ms.bot; top; top = top->above) |
1363 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1370 | { |
1364 | { |
1371 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1365 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1372 | floor = top; |
1366 | floor = tmp; |
1373 | |
1367 | |
1374 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1368 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1375 | { |
1369 | { |
1376 | /* We insert above top, so we want this object below this */ |
1370 | /* We insert above top, so we want this object below this */ |
1377 | top = top->below; |
1371 | top = tmp->below; |
1378 | break; |
1372 | break; |
1379 | } |
1373 | } |
1380 | |
1374 | |
1381 | last = top; |
1375 | top = tmp; |
1382 | } |
1376 | } |
1383 | |
|
|
1384 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1385 | top = last; |
|
|
1386 | |
1377 | |
1387 | /* We let update_position deal with figuring out what the space |
1378 | /* We let update_position deal with figuring out what the space |
1388 | * looks like instead of lots of conditions here. |
1379 | * looks like instead of lots of conditions here. |
1389 | * makes things faster, and effectively the same result. |
1380 | * makes things faster, and effectively the same result. |
1390 | */ |
1381 | */ |
… | |
… | |
1397 | */ |
1388 | */ |
1398 | if (!(flag & INS_ON_TOP) |
1389 | if (!(flag & INS_ON_TOP) |
1399 | && ms.flags () & P_BLOCKSVIEW |
1390 | && ms.flags () & P_BLOCKSVIEW |
1400 | && (op->face && !faces [op->face].visibility)) |
1391 | && (op->face && !faces [op->face].visibility)) |
1401 | { |
1392 | { |
|
|
1393 | object *last; |
|
|
1394 | |
1402 | for (last = top; last != floor; last = last->below) |
1395 | for (last = top; last != floor; last = last->below) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1396 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1404 | break; |
1397 | break; |
1405 | |
1398 | |
1406 | /* Check to see if we found the object that blocks view, |
1399 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1414 | } /* If objects on this space */ |
1407 | } /* If objects on this space */ |
1415 | |
1408 | |
1416 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1409 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1417 | top = floor; |
1410 | top = floor; |
1418 | |
1411 | |
1419 | /* Top is the object that our object (op) is going to get inserted above. |
1412 | // insert object above top, or bottom-most if top = 0 |
1420 | */ |
|
|
1421 | |
|
|
1422 | /* First object on this space */ |
|
|
1423 | if (!top) |
1413 | if (!top) |
1424 | { |
1414 | { |
|
|
1415 | op->below = 0; |
1425 | op->above = ms.bot; |
1416 | op->above = ms.bot; |
1426 | |
|
|
1427 | if (op->above) |
|
|
1428 | op->above->below = op; |
|
|
1429 | |
|
|
1430 | op->below = 0; |
|
|
1431 | ms.bot = op; |
1417 | ms.bot = op; |
|
|
1418 | |
|
|
1419 | *(op->above ? &op->above->below : &ms.top) = op; |
1432 | } |
1420 | } |
1433 | else |
1421 | else |
1434 | { /* get inserted into the stack above top */ |
1422 | { |
1435 | op->above = top->above; |
1423 | op->above = top->above; |
1436 | |
|
|
1437 | if (op->above) |
|
|
1438 | op->above->below = op; |
1424 | top->above = op; |
1439 | |
1425 | |
1440 | op->below = top; |
1426 | op->below = top; |
1441 | top->above = op; |
1427 | *(op->above ? &op->above->below : &ms.top) = op; |
1442 | } |
1428 | } |
|
|
1429 | } |
1443 | |
1430 | |
1444 | if (!op->above) |
1431 | if (op->is_player ()) |
1445 | ms.top = op; |
|
|
1446 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1447 | |
|
|
1448 | if (op->type == PLAYER) |
|
|
1449 | { |
1432 | { |
1450 | op->contr->do_los = 1; |
1433 | op->contr->do_los = 1; |
1451 | ++op->map->players; |
1434 | ++op->map->players; |
1452 | op->map->touch (); |
1435 | op->map->touch (); |
1453 | } |
1436 | } |
… | |
… | |
1468 | * be far away from this change and not affected in any way - |
1451 | * be far away from this change and not affected in any way - |
1469 | * this should get redone to only look for players within range, |
1452 | * this should get redone to only look for players within range, |
1470 | * or just updating the P_UPTODATE for spaces within this area |
1453 | * or just updating the P_UPTODATE for spaces within this area |
1471 | * of effect may be sufficient. |
1454 | * of effect may be sufficient. |
1472 | */ |
1455 | */ |
1473 | if (op->map->darkness && (op->glow_radius != 0)) |
1456 | if (op->affects_los ()) |
|
|
1457 | { |
|
|
1458 | op->ms ().invalidate (); |
1474 | update_all_los (op->map, op->x, op->y); |
1459 | update_all_los (op->map, op->x, op->y); |
|
|
1460 | } |
1475 | |
1461 | |
1476 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1462 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1477 | update_object (op, UP_OBJ_INSERT); |
1463 | update_object (op, UP_OBJ_INSERT); |
1478 | |
1464 | |
1479 | INVOKE_OBJECT (INSERT, op); |
1465 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1513 | { |
1499 | { |
1514 | /* first search for itself and remove any old instances */ |
1500 | /* first search for itself and remove any old instances */ |
1515 | |
1501 | |
1516 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1502 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1517 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1503 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1518 | tmp->destroy (1); |
1504 | tmp->destroy (); |
1519 | |
1505 | |
1520 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1506 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1521 | |
1507 | |
1522 | tmp->x = op->x; |
1508 | tmp->x = op->x; |
1523 | tmp->y = op->y; |
1509 | tmp->y = op->y; |
… | |
… | |
1547 | if (!nr) |
1533 | if (!nr) |
1548 | return true; |
1534 | return true; |
1549 | |
1535 | |
1550 | nr = min (nr, nrof); |
1536 | nr = min (nr, nrof); |
1551 | |
1537 | |
|
|
1538 | if (nrof > nr) |
|
|
1539 | { |
1552 | nrof -= nr; |
1540 | nrof -= nr; |
1553 | |
|
|
1554 | if (nrof) |
|
|
1555 | { |
|
|
1556 | adjust_weight (env, -weight * nr); // carrying == 0 |
1541 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1557 | |
1542 | |
1558 | if (object *pl = visible_to ()) |
1543 | if (object *pl = visible_to ()) |
1559 | esrv_update_item (UPD_NROF, pl, this); |
1544 | esrv_update_item (UPD_NROF, pl, this); |
1560 | |
1545 | |
1561 | return true; |
1546 | return true; |
1562 | } |
1547 | } |
1563 | else |
1548 | else |
1564 | { |
1549 | { |
1565 | destroy (1); |
1550 | destroy (); |
1566 | return false; |
1551 | return false; |
1567 | } |
1552 | } |
1568 | } |
1553 | } |
1569 | |
1554 | |
1570 | /* |
1555 | /* |
… | |
… | |
1647 | if (object *pl = tmp->visible_to ()) |
1632 | if (object *pl = tmp->visible_to ()) |
1648 | esrv_update_item (UPD_NROF, pl, tmp); |
1633 | esrv_update_item (UPD_NROF, pl, tmp); |
1649 | |
1634 | |
1650 | adjust_weight (this, op->total_weight ()); |
1635 | adjust_weight (this, op->total_weight ()); |
1651 | |
1636 | |
1652 | op->destroy (1); |
1637 | op->destroy (); |
1653 | op = tmp; |
1638 | op = tmp; |
1654 | goto inserted; |
1639 | goto inserted; |
1655 | } |
1640 | } |
1656 | |
1641 | |
1657 | op->owner = 0; // it's his/hers now. period. |
1642 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1675 | |
1660 | |
1676 | adjust_weight (this, op->total_weight ()); |
1661 | adjust_weight (this, op->total_weight ()); |
1677 | |
1662 | |
1678 | inserted: |
1663 | inserted: |
1679 | /* reset the light list and los of the players on the map */ |
1664 | /* reset the light list and los of the players on the map */ |
1680 | if (op->glow_radius && map && map->darkness) |
1665 | if (op->glow_radius && is_on_map ()) |
|
|
1666 | { |
|
|
1667 | update_stats (); |
1681 | update_all_los (map, x, y); |
1668 | update_all_los (map, x, y); |
1682 | |
1669 | } |
|
|
1670 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1683 | // if this is a player's inventory, update stats |
1671 | // if this is a player's inventory, update stats |
1684 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1685 | update_stats (); |
1672 | update_stats (); |
1686 | |
1673 | |
1687 | INVOKE_OBJECT (INSERT, this); |
1674 | INVOKE_OBJECT (INSERT, this); |
1688 | |
1675 | |
1689 | return op; |
1676 | return op; |
… | |
… | |
1773 | { |
1760 | { |
1774 | |
1761 | |
1775 | float |
1762 | float |
1776 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1763 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1777 | |
1764 | |
1778 | if (op->type == PLAYER) |
1765 | if (op->is_player ()) |
1779 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1766 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1780 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1767 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1781 | diff /= 4.0; |
1768 | diff /= 4.0; |
1782 | |
1769 | |
1783 | op->speed_left -= diff; |
1770 | op->speed_left -= diff; |
… | |
… | |
1991 | * head of the object should correspond for the entire object. |
1978 | * head of the object should correspond for the entire object. |
1992 | */ |
1979 | */ |
1993 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1980 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1994 | continue; |
1981 | continue; |
1995 | |
1982 | |
1996 | if (ob->blocked (m, pos.x, pos.y)) |
1983 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1997 | continue; |
1984 | continue; |
1998 | |
1985 | |
1999 | altern [index++] = i; |
1986 | altern [index++] = i; |
2000 | } |
1987 | } |
2001 | |
1988 | |
… | |
… | |
2109 | if ((move_type & blocked) == move_type) |
2096 | if ((move_type & blocked) == move_type) |
2110 | max = maxfree[i]; |
2097 | max = maxfree[i]; |
2111 | else if (mflags & P_IS_ALIVE) |
2098 | else if (mflags & P_IS_ALIVE) |
2112 | { |
2099 | { |
2113 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2100 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2114 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2101 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2115 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2102 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2116 | break; |
2103 | break; |
2117 | |
2104 | |
2118 | if (tmp) |
2105 | if (tmp) |
2119 | return freedir[i]; |
2106 | return freedir[i]; |
… | |
… | |
2305 | int |
2292 | int |
2306 | can_pick (const object *who, const object *item) |
2293 | can_pick (const object *who, const object *item) |
2307 | { |
2294 | { |
2308 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2295 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2309 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2296 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2310 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2297 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2311 | } |
2298 | } |
2312 | |
2299 | |
2313 | /* |
2300 | /* |
2314 | * create clone from object to another |
2301 | * create clone from object to another |
2315 | */ |
2302 | */ |
… | |
… | |
2446 | { |
2433 | { |
2447 | char flagdesc[512]; |
2434 | char flagdesc[512]; |
2448 | char info2[256 * 4]; |
2435 | char info2[256 * 4]; |
2449 | char *p = info; |
2436 | char *p = info; |
2450 | |
2437 | |
2451 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2438 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2452 | count, |
2439 | count, |
2453 | uuid.c_str (), |
2440 | uuid.c_str (), |
2454 | &name, |
2441 | &name, |
2455 | title ? "\",title:\"" : "", |
2442 | title ? ",title:\"" : "", |
2456 | title ? (const char *)title : "", |
2443 | title ? (const char *)title : "", |
|
|
2444 | title ? "\"" : "", |
2457 | flag_desc (flagdesc, 512), type); |
2445 | flag_desc (flagdesc, 512), type); |
2458 | |
2446 | |
2459 | if (!flag[FLAG_REMOVED] && env) |
2447 | if (!flag[FLAG_REMOVED] && env) |
2460 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2448 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2461 | |
2449 | |
… | |
… | |
2567 | return splay (tmp); |
2555 | return splay (tmp); |
2568 | |
2556 | |
2569 | return 0; |
2557 | return 0; |
2570 | } |
2558 | } |
2571 | |
2559 | |
2572 | void |
2560 | object * |
2573 | object::force_add (const shstr name, int duration) |
2561 | object::force_add (const shstr name, int duration) |
2574 | { |
2562 | { |
2575 | if (object *force = force_find (name)) |
2563 | if (object *force = force_find (name)) |
2576 | force->destroy (); |
2564 | force->destroy (); |
2577 | |
2565 | |
… | |
… | |
2583 | |
2571 | |
2584 | force->set_speed (duration ? 1.f / duration : 0.f); |
2572 | force->set_speed (duration ? 1.f / duration : 0.f); |
2585 | force->flag [FLAG_IS_USED_UP] = true; |
2573 | force->flag [FLAG_IS_USED_UP] = true; |
2586 | force->flag [FLAG_APPLIED] = true; |
2574 | force->flag [FLAG_APPLIED] = true; |
2587 | |
2575 | |
2588 | insert (force); |
2576 | return insert (force); |
2589 | } |
2577 | } |
2590 | |
2578 | |
2591 | void |
2579 | void |
2592 | object::play_sound (faceidx sound) |
2580 | object::play_sound (faceidx sound) |
2593 | { |
2581 | { |
… | |
… | |
2604 | } |
2592 | } |
2605 | else |
2593 | else |
2606 | map->play_sound (sound, x, y); |
2594 | map->play_sound (sound, x, y); |
2607 | } |
2595 | } |
2608 | |
2596 | |
|
|
2597 | void |
|
|
2598 | object::make_noise () |
|
|
2599 | { |
|
|
2600 | // we do not model noise in the map, so instead put |
|
|
2601 | // a temporary light into the noise source |
|
|
2602 | // could use the map instead, but that's less reliable for our |
|
|
2603 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2604 | |
|
|
2605 | // currently only works sensibly for players |
|
|
2606 | if (!is_player ()) |
|
|
2607 | return; |
|
|
2608 | |
|
|
2609 | // find old force, or create new one |
|
|
2610 | object *force = force_find (shstr_noise_force); |
|
|
2611 | |
|
|
2612 | if (force) |
|
|
2613 | force->speed_left = -1.f; // patch old speed up |
|
|
2614 | else |
|
|
2615 | { |
|
|
2616 | force = archetype::get (shstr_noise_force); |
|
|
2617 | |
|
|
2618 | force->slaying = shstr_noise_force; |
|
|
2619 | force->stats.food = 1; |
|
|
2620 | force->speed_left = -1.f; |
|
|
2621 | |
|
|
2622 | force->set_speed (1.f / 4.f); |
|
|
2623 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2624 | force->flag [FLAG_APPLIED] = true; |
|
|
2625 | |
|
|
2626 | insert (force); |
|
|
2627 | } |
|
|
2628 | } |
|
|
2629 | |