… | |
… | |
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.invalidate (); |
775 | } |
776 | } |
776 | /* if the object is being removed, we can't make intelligent |
777 | /* if the object is being removed, we can't make intelligent |
777 | * decisions, because remove_ob can't really pass the object |
778 | * decisions, because remove_ob can't really pass the object |
778 | * that is being removed. |
779 | * that is being removed. |
779 | */ |
780 | */ |
780 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
781 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
781 | m.flags_ = 0; |
782 | m.invalidate (); |
782 | else if (action == UP_OBJ_FACE) |
783 | else if (action == UP_OBJ_FACE) |
783 | /* Nothing to do for that case */ ; |
784 | /* Nothing to do for that case */ ; |
784 | else |
785 | else |
785 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
786 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
786 | |
787 | |
… | |
… | |
828 | object::activate () |
829 | object::activate () |
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; |
|
|
834 | |
|
|
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
833 | |
837 | |
834 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
835 | actives.insert (this); |
839 | actives.insert (this); |
836 | } |
840 | } |
837 | |
841 | |
… | |
… | |
901 | * drop on that space. |
905 | * drop on that space. |
902 | */ |
906 | */ |
903 | if (!drop_to_ground |
907 | if (!drop_to_ground |
904 | || !map |
908 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
910 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
908 | { |
912 | { |
909 | while (inv) |
913 | while (inv) |
910 | { |
|
|
911 | inv->destroy_inv (false); |
|
|
912 | inv->destroy (); |
914 | inv->destroy (); |
913 | } |
|
|
914 | } |
915 | } |
915 | else |
916 | else |
916 | { /* Put objects in inventory onto this space */ |
917 | { /* Put objects in inventory onto this space */ |
917 | while (inv) |
918 | while (inv) |
918 | { |
919 | { |
… | |
… | |
922 | || op->flag [FLAG_NO_DROP] |
923 | || op->flag [FLAG_NO_DROP] |
923 | || op->type == RUNE |
924 | || op->type == RUNE |
924 | || op->type == TRAP |
925 | || op->type == TRAP |
925 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | op->destroy (true); |
928 | op->destroy (); |
928 | else |
929 | else |
929 | map->insert (op, x, y); |
930 | map->insert (op, x, y); |
930 | } |
931 | } |
931 | } |
932 | } |
932 | } |
933 | } |
… | |
… | |
940 | |
941 | |
941 | static struct freed_map : maptile |
942 | static struct freed_map : maptile |
942 | { |
943 | { |
943 | freed_map () |
944 | freed_map () |
944 | { |
945 | { |
945 | path = "<freed objects map>"; |
946 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
947 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
948 | width = 3; |
948 | height = 3; |
949 | height = 3; |
949 | nodrop = 1; |
950 | no_drop = 1; |
|
|
951 | no_reset = 1; |
950 | |
952 | |
951 | alloc (); |
953 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
954 | in_memory = MAP_ACTIVE; |
|
|
955 | } |
|
|
956 | |
|
|
957 | ~freed_map () |
|
|
958 | { |
|
|
959 | destroy (); |
953 | } |
960 | } |
954 | } freed_map; // freed objects are moved here to avoid crashes |
961 | } freed_map; // freed objects are moved here to avoid crashes |
955 | |
962 | |
956 | void |
963 | void |
957 | object::do_destroy () |
964 | object::do_destroy () |
… | |
… | |
990 | attacked_by = 0; |
997 | attacked_by = 0; |
991 | current_weapon = 0; |
998 | current_weapon = 0; |
992 | } |
999 | } |
993 | |
1000 | |
994 | void |
1001 | void |
995 | object::destroy (bool destroy_inventory) |
1002 | object::destroy () |
996 | { |
1003 | { |
997 | if (destroyed ()) |
1004 | if (destroyed ()) |
998 | return; |
1005 | return; |
999 | |
1006 | |
1000 | if (!is_head () && !head->destroyed ()) |
1007 | if (!is_head () && !head->destroyed ()) |
1001 | { |
1008 | { |
1002 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1009 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1003 | head->destroy (destroy_inventory); |
1010 | head->destroy (); |
1004 | return; |
1011 | return; |
1005 | } |
1012 | } |
1006 | |
1013 | |
1007 | destroy_inv (!destroy_inventory); |
1014 | destroy_inv (false); |
1008 | |
1015 | |
1009 | if (is_head ()) |
1016 | if (is_head ()) |
1010 | if (sound_destroy) |
1017 | if (sound_destroy) |
1011 | play_sound (sound_destroy); |
1018 | play_sound (sound_destroy); |
1012 | else if (flag [FLAG_MONSTER]) |
1019 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1049 | esrv_del_item (pl->contr, count); |
1056 | esrv_del_item (pl->contr, count); |
1050 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1057 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1051 | |
1058 | |
1052 | adjust_weight (env, -total_weight ()); |
1059 | adjust_weight (env, -total_weight ()); |
1053 | |
1060 | |
1054 | *(above ? &above->below : &env->inv) = below; |
1061 | object *pl = in_player (); |
1055 | |
|
|
1056 | if (below) |
|
|
1057 | below->above = above; |
|
|
1058 | |
1062 | |
1059 | /* we set up values so that it could be inserted into |
1063 | /* we set up values so that it could be inserted into |
1060 | * the map, but we don't actually do that - it is up |
1064 | * the map, but we don't actually do that - it is up |
1061 | * to the caller to decide what we want to do. |
1065 | * to the caller to decide what we want to do. |
1062 | */ |
1066 | */ |
1063 | map = env->map; |
1067 | map = env->map; |
1064 | x = env->x; |
1068 | x = env->x; |
1065 | y = env->y; |
1069 | y = env->y; |
|
|
1070 | |
|
|
1071 | // make sure cmov optimisation is applicable |
|
|
1072 | *(above ? &above->below : &env->inv) = below; |
|
|
1073 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1074 | |
1066 | above = 0; |
1075 | above = 0; |
1067 | below = 0; |
1076 | below = 0; |
1068 | env = 0; |
1077 | env = 0; |
1069 | |
1078 | |
1070 | /* NO_FIX_PLAYER is set when a great many changes are being |
1079 | /* NO_FIX_PLAYER is set when a great many changes are being |
1071 | * made to players inventory. If set, avoiding the call |
1080 | * made to players inventory. If set, avoiding the call |
1072 | * to save cpu time. |
1081 | * to save cpu time. |
1073 | */ |
1082 | */ |
1074 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1083 | if (pl) |
|
|
1084 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1085 | { |
1075 | otmp->update_stats (); |
1086 | pl->update_stats (); |
|
|
1087 | |
|
|
1088 | if (glow_radius && pl->is_on_map () && pl->map->darklevel () > 0) |
|
|
1089 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1090 | } |
1076 | } |
1091 | } |
1077 | else if (map) |
1092 | else if (map) |
1078 | { |
1093 | { |
1079 | map->dirty = true; |
1094 | map->dirty = true; |
1080 | mapspace &ms = this->ms (); |
1095 | mapspace &ms = this->ms (); |
… | |
… | |
1100 | |
1115 | |
1101 | esrv_del_item (pl->contr, count); |
1116 | esrv_del_item (pl->contr, count); |
1102 | } |
1117 | } |
1103 | |
1118 | |
1104 | /* link the object above us */ |
1119 | /* link the object above us */ |
1105 | if (above) |
1120 | // re-link, make sure compiler can easily use cmove |
1106 | above->below = below; |
1121 | *(above ? &above->below : &ms.top) = below; |
1107 | else |
1122 | *(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 | |
1123 | |
1125 | above = 0; |
1124 | above = 0; |
1126 | below = 0; |
1125 | below = 0; |
|
|
1126 | |
|
|
1127 | ms.invalidate (); |
1127 | |
1128 | |
1128 | if (map->in_memory == MAP_SAVING) |
1129 | if (map->in_memory == MAP_SAVING) |
1129 | return; |
1130 | return; |
1130 | |
1131 | |
1131 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1132 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
… | |
… | |
1164 | } |
1165 | } |
1165 | |
1166 | |
1166 | last = tmp; |
1167 | last = tmp; |
1167 | } |
1168 | } |
1168 | |
1169 | |
1169 | /* last == NULL if there are no objects on this space */ |
1170 | if (affect_los () && map->darklevel () > 0) |
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) |
|
|
1177 | update_all_los (map, x, y); |
1171 | update_all_los (map, x, y); |
1178 | } |
1172 | } |
1179 | } |
1173 | } |
1180 | |
1174 | |
1181 | /* |
1175 | /* |
… | |
… | |
1205 | esrv_update_item (UPD_NROF, pl, top); |
1199 | esrv_update_item (UPD_NROF, pl, top); |
1206 | |
1200 | |
1207 | op->weight = 0; // cancel the addition above |
1201 | op->weight = 0; // cancel the addition above |
1208 | op->carrying = 0; // must be 0 already |
1202 | op->carrying = 0; // must be 0 already |
1209 | |
1203 | |
1210 | op->destroy (1); |
1204 | op->destroy (); |
1211 | |
1205 | |
1212 | return top; |
1206 | return top; |
1213 | } |
1207 | } |
1214 | |
1208 | |
1215 | return 0; |
1209 | return 0; |
… | |
… | |
1243 | * job preparing multi-part monsters. |
1237 | * job preparing multi-part monsters. |
1244 | */ |
1238 | */ |
1245 | object * |
1239 | object * |
1246 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1247 | { |
1241 | { |
|
|
1242 | op->remove (); |
|
|
1243 | |
1248 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1244 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1249 | { |
1245 | { |
1250 | tmp->x = x + tmp->arch->x; |
1246 | tmp->x = x + tmp->arch->x; |
1251 | tmp->y = y + tmp->arch->y; |
1247 | tmp->y = y + tmp->arch->y; |
1252 | } |
1248 | } |
… | |
… | |
1275 | * just 'op' otherwise |
1271 | * just 'op' otherwise |
1276 | */ |
1272 | */ |
1277 | object * |
1273 | object * |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1279 | { |
1275 | { |
1280 | assert (!op->flag [FLAG_FREED]); |
|
|
1281 | |
|
|
1282 | op->remove (); |
1276 | op->remove (); |
|
|
1277 | |
|
|
1278 | if (m == &freed_map)//D TODO: remove soon |
|
|
1279 | {//D |
|
|
1280 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1281 | }//D |
1283 | |
1282 | |
1284 | /* Ideally, the caller figures this out. However, it complicates a lot |
1283 | /* 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 |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1286 | * need extra work |
1285 | * need extra work |
1287 | */ |
1286 | */ |
1288 | if (!xy_normalise (m, op->x, op->y)) |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1289 | { |
1288 | { |
1290 | op->destroy (1); |
1289 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1291 | return 0; |
1290 | return 0; |
1292 | } |
1291 | } |
1293 | |
1292 | |
1294 | if (object *more = op->more) |
1293 | if (object *more = op->more) |
1295 | if (!insert_ob_in_map (more, m, originator, flag)) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1304 | */ |
1303 | */ |
1305 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1306 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1305 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1307 | if (object::can_merge (op, tmp)) |
1306 | if (object::can_merge (op, tmp)) |
1308 | { |
1307 | { |
1309 | // TODO: we atcually want to update tmp, not op, |
1308 | // TODO: we actually want to update tmp, not op, |
1310 | // but some caller surely breaks when we return tmp |
1309 | // but some caller surely breaks when we return tmp |
1311 | // from here :/ |
1310 | // from here :/ |
1312 | op->nrof += tmp->nrof; |
1311 | op->nrof += tmp->nrof; |
1313 | tmp->destroy (1); |
1312 | tmp->destroy (); |
1314 | } |
1313 | } |
1315 | |
1314 | |
1316 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1315 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1317 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1316 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | |
1317 | |
… | |
… | |
1325 | { |
1324 | { |
1326 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1327 | abort (); |
1326 | abort (); |
1328 | } |
1327 | } |
1329 | |
1328 | |
|
|
1329 | if (!originator->is_on_map ()) |
|
|
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1331 | op->debug_desc (), originator->debug_desc ()); |
|
|
1332 | |
1330 | op->above = originator; |
1333 | op->above = originator; |
1331 | op->below = originator->below; |
1334 | 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; |
1335 | originator->below = op; |
|
|
1336 | |
|
|
1337 | *(op->below ? &op->below->above : &ms.bot) = op; |
1340 | } |
1338 | } |
1341 | else |
1339 | else |
1342 | { |
1340 | { |
1343 | object *top, *floor = NULL; |
1341 | object *floor = 0; |
1344 | |
1342 | object *top = ms.top; |
1345 | top = ms.bot; |
|
|
1346 | |
1343 | |
1347 | /* If there are other objects, then */ |
1344 | /* If there are other objects, then */ |
1348 | if (top) |
1345 | if (top) |
1349 | { |
1346 | { |
1350 | object *last = 0; |
|
|
1351 | |
|
|
1352 | /* |
1347 | /* |
1353 | * If there are multiple objects on this space, we do some trickier handling. |
1348 | * If there are multiple objects on this space, we do some trickier handling. |
1354 | * We've already dealt with merging if appropriate. |
1349 | * We've already dealt with merging if appropriate. |
1355 | * Generally, we want to put the new object on top. But if |
1350 | * Generally, we want to put the new object on top. But if |
1356 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1351 | * 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 |
1354 | * 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 |
1355 | * 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 |
1356 | * when lots of spells are cast in one area. Currently, it is presumed |
1362 | * that flying non pickable objects are spell objects. |
1357 | * that flying non pickable objects are spell objects. |
1363 | */ |
1358 | */ |
1364 | for (top = ms.bot; top; top = top->above) |
1359 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1365 | { |
1360 | { |
1366 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1361 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1367 | floor = top; |
1362 | floor = tmp; |
1368 | |
1363 | |
1369 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1364 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1370 | { |
1365 | { |
1371 | /* We insert above top, so we want this object below this */ |
1366 | /* We insert above top, so we want this object below this */ |
1372 | top = top->below; |
1367 | top = tmp->below; |
1373 | break; |
1368 | break; |
1374 | } |
1369 | } |
1375 | |
1370 | |
1376 | last = top; |
1371 | top = tmp; |
1377 | } |
1372 | } |
1378 | |
|
|
1379 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1380 | top = last; |
|
|
1381 | |
1373 | |
1382 | /* We let update_position deal with figuring out what the space |
1374 | /* We let update_position deal with figuring out what the space |
1383 | * looks like instead of lots of conditions here. |
1375 | * looks like instead of lots of conditions here. |
1384 | * makes things faster, and effectively the same result. |
1376 | * makes things faster, and effectively the same result. |
1385 | */ |
1377 | */ |
… | |
… | |
1392 | */ |
1384 | */ |
1393 | if (!(flag & INS_ON_TOP) |
1385 | if (!(flag & INS_ON_TOP) |
1394 | && ms.flags () & P_BLOCKSVIEW |
1386 | && ms.flags () & P_BLOCKSVIEW |
1395 | && (op->face && !faces [op->face].visibility)) |
1387 | && (op->face && !faces [op->face].visibility)) |
1396 | { |
1388 | { |
|
|
1389 | object *last; |
|
|
1390 | |
1397 | for (last = top; last != floor; last = last->below) |
1391 | for (last = top; last != floor; last = last->below) |
1398 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1392 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1399 | break; |
1393 | break; |
1400 | |
1394 | |
1401 | /* Check to see if we found the object that blocks view, |
1395 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1409 | } /* If objects on this space */ |
1403 | } /* If objects on this space */ |
1410 | |
1404 | |
1411 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1405 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1412 | top = floor; |
1406 | top = floor; |
1413 | |
1407 | |
1414 | /* Top is the object that our object (op) is going to get inserted above. |
1408 | // insert object above top, or bottom-most if top = 0 |
1415 | */ |
|
|
1416 | |
|
|
1417 | /* First object on this space */ |
|
|
1418 | if (!top) |
1409 | if (!top) |
1419 | { |
1410 | { |
|
|
1411 | op->below = 0; |
1420 | op->above = ms.bot; |
1412 | op->above = ms.bot; |
1421 | |
|
|
1422 | if (op->above) |
|
|
1423 | op->above->below = op; |
|
|
1424 | |
|
|
1425 | op->below = 0; |
|
|
1426 | ms.bot = op; |
1413 | ms.bot = op; |
|
|
1414 | |
|
|
1415 | *(op->above ? &op->above->below : &ms.top) = op; |
1427 | } |
1416 | } |
1428 | else |
1417 | else |
1429 | { /* get inserted into the stack above top */ |
1418 | { |
1430 | op->above = top->above; |
1419 | op->above = top->above; |
1431 | |
|
|
1432 | if (op->above) |
|
|
1433 | op->above->below = op; |
1420 | top->above = op; |
1434 | |
1421 | |
1435 | op->below = top; |
1422 | op->below = top; |
1436 | top->above = op; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1437 | } |
1424 | } |
1438 | |
1425 | } |
1439 | if (!op->above) |
|
|
1440 | ms.top = op; |
|
|
1441 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1442 | |
1426 | |
1443 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1444 | { |
1428 | { |
1445 | op->contr->do_los = 1; |
1429 | op->contr->do_los = 1; |
1446 | ++op->map->players; |
1430 | ++op->map->players; |
… | |
… | |
1463 | * be far away from this change and not affected in any way - |
1447 | * be far away from this change and not affected in any way - |
1464 | * this should get redone to only look for players within range, |
1448 | * this should get redone to only look for players within range, |
1465 | * or just updating the P_UPTODATE for spaces within this area |
1449 | * or just updating the P_UPTODATE for spaces within this area |
1466 | * of effect may be sufficient. |
1450 | * of effect may be sufficient. |
1467 | */ |
1451 | */ |
1468 | if (op->map->darkness && (op->glow_radius != 0)) |
1452 | if (op->affects_los () && op->map->darklevel () > 0) |
|
|
1453 | { |
|
|
1454 | op->ms ().invalidate (); |
1469 | update_all_los (op->map, op->x, op->y); |
1455 | update_all_los (op->map, op->x, op->y); |
|
|
1456 | } |
1470 | |
1457 | |
1471 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1458 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1472 | update_object (op, UP_OBJ_INSERT); |
1459 | update_object (op, UP_OBJ_INSERT); |
1473 | |
1460 | |
1474 | INVOKE_OBJECT (INSERT, op); |
1461 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1508 | { |
1495 | { |
1509 | /* first search for itself and remove any old instances */ |
1496 | /* first search for itself and remove any old instances */ |
1510 | |
1497 | |
1511 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1498 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1512 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1499 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1513 | tmp->destroy (1); |
1500 | tmp->destroy (); |
1514 | |
1501 | |
1515 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1502 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1516 | |
1503 | |
1517 | tmp->x = op->x; |
1504 | tmp->x = op->x; |
1518 | tmp->y = op->y; |
1505 | tmp->y = op->y; |
… | |
… | |
1542 | if (!nr) |
1529 | if (!nr) |
1543 | return true; |
1530 | return true; |
1544 | |
1531 | |
1545 | nr = min (nr, nrof); |
1532 | nr = min (nr, nrof); |
1546 | |
1533 | |
|
|
1534 | if (nrof > nr) |
|
|
1535 | { |
1547 | nrof -= nr; |
1536 | nrof -= nr; |
1548 | |
|
|
1549 | if (nrof) |
|
|
1550 | { |
|
|
1551 | adjust_weight (env, -weight * nr); // carrying == 0 |
1537 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1552 | |
1538 | |
1553 | if (object *pl = visible_to ()) |
1539 | if (object *pl = visible_to ()) |
1554 | esrv_update_item (UPD_NROF, pl, this); |
1540 | esrv_update_item (UPD_NROF, pl, this); |
1555 | |
1541 | |
1556 | return true; |
1542 | return true; |
1557 | } |
1543 | } |
1558 | else |
1544 | else |
1559 | { |
1545 | { |
1560 | destroy (1); |
1546 | destroy (); |
1561 | return false; |
1547 | return false; |
1562 | } |
1548 | } |
1563 | } |
1549 | } |
1564 | |
1550 | |
1565 | /* |
1551 | /* |
… | |
… | |
1582 | } |
1568 | } |
1583 | else |
1569 | else |
1584 | { |
1570 | { |
1585 | decrease (nr); |
1571 | decrease (nr); |
1586 | |
1572 | |
1587 | object *op = object_create_clone (this); |
1573 | object *op = deep_clone (); |
1588 | op->nrof = nr; |
1574 | op->nrof = nr; |
1589 | return op; |
1575 | return op; |
1590 | } |
1576 | } |
1591 | } |
1577 | } |
1592 | |
1578 | |
… | |
… | |
1642 | if (object *pl = tmp->visible_to ()) |
1628 | if (object *pl = tmp->visible_to ()) |
1643 | esrv_update_item (UPD_NROF, pl, tmp); |
1629 | esrv_update_item (UPD_NROF, pl, tmp); |
1644 | |
1630 | |
1645 | adjust_weight (this, op->total_weight ()); |
1631 | adjust_weight (this, op->total_weight ()); |
1646 | |
1632 | |
1647 | op->destroy (1); |
1633 | op->destroy (); |
1648 | op = tmp; |
1634 | op = tmp; |
1649 | goto inserted; |
1635 | goto inserted; |
1650 | } |
1636 | } |
1651 | |
1637 | |
1652 | op->owner = 0; // it's his/hers now. period. |
1638 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1670 | |
1656 | |
1671 | adjust_weight (this, op->total_weight ()); |
1657 | adjust_weight (this, op->total_weight ()); |
1672 | |
1658 | |
1673 | inserted: |
1659 | inserted: |
1674 | /* reset the light list and los of the players on the map */ |
1660 | /* reset the light list and los of the players on the map */ |
1675 | if (op->glow_radius && map && map->darkness) |
1661 | if (op->glow_radius && is_on_map () && map->darklevel () > 0) |
|
|
1662 | { |
|
|
1663 | update_stats (); |
1676 | update_all_los (map, x, y); |
1664 | update_all_los (map, x, y); |
1677 | |
1665 | } |
|
|
1666 | else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1678 | // if this is a player's inventory, update stats |
1667 | // if this is a player's inventory, update stats |
1679 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1680 | update_stats (); |
1668 | update_stats (); |
1681 | |
1669 | |
1682 | INVOKE_OBJECT (INSERT, this); |
1670 | INVOKE_OBJECT (INSERT, this); |
1683 | |
1671 | |
1684 | return op; |
1672 | return op; |
… | |
… | |
1813 | LOG (llevError, "Present_arch called outside map.\n"); |
1801 | LOG (llevError, "Present_arch called outside map.\n"); |
1814 | return NULL; |
1802 | return NULL; |
1815 | } |
1803 | } |
1816 | |
1804 | |
1817 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1805 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1818 | if (tmp->arch == at) |
1806 | if (tmp->arch->archname == at->archname) |
1819 | return tmp; |
1807 | return tmp; |
1820 | |
1808 | |
1821 | return NULL; |
1809 | return NULL; |
1822 | } |
1810 | } |
1823 | |
1811 | |
… | |
… | |
1887 | * The first matching object is returned, or NULL if none. |
1875 | * The first matching object is returned, or NULL if none. |
1888 | */ |
1876 | */ |
1889 | object * |
1877 | object * |
1890 | present_arch_in_ob (const archetype *at, const object *op) |
1878 | present_arch_in_ob (const archetype *at, const object *op) |
1891 | { |
1879 | { |
1892 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1880 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1893 | if (tmp->arch == at) |
1881 | if (tmp->arch->archname == at->archname) |
1894 | return tmp; |
1882 | return tmp; |
1895 | |
1883 | |
1896 | return NULL; |
1884 | return NULL; |
1897 | } |
1885 | } |
1898 | |
1886 | |
… | |
… | |
1986 | * head of the object should correspond for the entire object. |
1974 | * head of the object should correspond for the entire object. |
1987 | */ |
1975 | */ |
1988 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1976 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1989 | continue; |
1977 | continue; |
1990 | |
1978 | |
1991 | if (ob->blocked (m, pos.x, pos.y)) |
1979 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1992 | continue; |
1980 | continue; |
1993 | |
1981 | |
1994 | altern [index++] = i; |
1982 | altern [index++] = i; |
1995 | } |
1983 | } |
1996 | |
1984 | |
… | |
… | |
2307 | |
2295 | |
2308 | /* |
2296 | /* |
2309 | * create clone from object to another |
2297 | * create clone from object to another |
2310 | */ |
2298 | */ |
2311 | object * |
2299 | object * |
2312 | object_create_clone (object *asrc) |
2300 | object::deep_clone () |
2313 | { |
2301 | { |
|
|
2302 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2303 | |
2314 | object *dst = 0; |
2304 | object *dst = clone (); |
2315 | |
2305 | |
2316 | if (!asrc) |
|
|
2317 | return 0; |
|
|
2318 | |
|
|
2319 | object *src = asrc->head_ (); |
|
|
2320 | |
|
|
2321 | object *prev = 0; |
2306 | object *prev = dst; |
2322 | for (object *part = src; part; part = part->more) |
2307 | for (object *part = this->more; part; part = part->more) |
2323 | { |
2308 | { |
2324 | object *tmp = part->clone (); |
2309 | 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; |
2310 | tmp->head = dst; |
2336 | |
|
|
2337 | tmp->more = 0; |
|
|
2338 | |
|
|
2339 | if (prev) |
|
|
2340 | prev->more = tmp; |
2311 | prev->more = tmp; |
2341 | |
|
|
2342 | prev = tmp; |
2312 | prev = tmp; |
2343 | } |
2313 | } |
2344 | |
2314 | |
2345 | for (object *item = src->inv; item; item = item->below) |
2315 | for (object *item = inv; item; item = item->below) |
2346 | insert_ob_in_ob (object_create_clone (item), dst); |
2316 | insert_ob_in_ob (item->deep_clone (), dst); |
2347 | |
2317 | |
2348 | return dst; |
2318 | return dst; |
2349 | } |
2319 | } |
2350 | |
2320 | |
2351 | /* This returns the first object in who's inventory that |
2321 | /* This returns the first object in who's inventory that |
… | |
… | |
2459 | { |
2429 | { |
2460 | char flagdesc[512]; |
2430 | char flagdesc[512]; |
2461 | char info2[256 * 4]; |
2431 | char info2[256 * 4]; |
2462 | char *p = info; |
2432 | char *p = info; |
2463 | |
2433 | |
2464 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2434 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2465 | count, |
2435 | count, |
2466 | uuid.c_str (), |
2436 | uuid.c_str (), |
2467 | &name, |
2437 | &name, |
2468 | title ? "\",title:\"" : "", |
2438 | title ? ",title:\"" : "", |
2469 | title ? (const char *)title : "", |
2439 | title ? (const char *)title : "", |
|
|
2440 | title ? "\"" : "", |
2470 | flag_desc (flagdesc, 512), type); |
2441 | flag_desc (flagdesc, 512), type); |
2471 | |
2442 | |
2472 | if (!flag[FLAG_REMOVED] && env) |
2443 | if (!flag[FLAG_REMOVED] && env) |
2473 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2444 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2474 | |
2445 | |
… | |
… | |
2580 | return splay (tmp); |
2551 | return splay (tmp); |
2581 | |
2552 | |
2582 | return 0; |
2553 | return 0; |
2583 | } |
2554 | } |
2584 | |
2555 | |
2585 | void |
2556 | object * |
2586 | object::force_add (const shstr name, int duration) |
2557 | object::force_add (const shstr name, int duration) |
2587 | { |
2558 | { |
2588 | if (object *force = force_find (name)) |
2559 | if (object *force = force_find (name)) |
2589 | force->destroy (); |
2560 | force->destroy (); |
2590 | |
2561 | |
… | |
… | |
2596 | |
2567 | |
2597 | force->set_speed (duration ? 1.f / duration : 0.f); |
2568 | force->set_speed (duration ? 1.f / duration : 0.f); |
2598 | force->flag [FLAG_IS_USED_UP] = true; |
2569 | force->flag [FLAG_IS_USED_UP] = true; |
2599 | force->flag [FLAG_APPLIED] = true; |
2570 | force->flag [FLAG_APPLIED] = true; |
2600 | |
2571 | |
2601 | insert (force); |
2572 | return insert (force); |
2602 | } |
2573 | } |
2603 | |
2574 | |
2604 | void |
2575 | void |
2605 | object::play_sound (faceidx sound) |
2576 | object::play_sound (faceidx sound) |
2606 | { |
2577 | { |
… | |
… | |
2617 | } |
2588 | } |
2618 | else |
2589 | else |
2619 | map->play_sound (sound, x, y); |
2590 | map->play_sound (sound, x, y); |
2620 | } |
2591 | } |
2621 | |
2592 | |
|
|
2593 | void |
|
|
2594 | object::make_noise () |
|
|
2595 | { |
|
|
2596 | // we do not model noise in the map, so instead put |
|
|
2597 | // a temporary light into the noise source |
|
|
2598 | // could use the map instead, but that's less reliable for our |
|
|
2599 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2600 | |
|
|
2601 | // currently only works sensibly for players |
|
|
2602 | if (!is_player ()) |
|
|
2603 | return; |
|
|
2604 | |
|
|
2605 | // find old force, or create new one |
|
|
2606 | object *force = force_find (shstr_noise_force); |
|
|
2607 | |
|
|
2608 | if (force) |
|
|
2609 | force->speed = 1.f / 4; // patch old speed up |
|
|
2610 | else |
|
|
2611 | force_add (shstr_noise_force, 4); |
|
|
2612 | } |
|
|
2613 | |