… | |
… | |
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 |
… | |
… | |
326 | { |
323 | { |
327 | // see if we are in a container of sorts |
324 | // see if we are in a container of sorts |
328 | if (env) |
325 | if (env) |
329 | { |
326 | { |
330 | // the player inventory itself is always visible |
327 | // the player inventory itself is always visible |
331 | if (env->type == PLAYER) |
328 | if (env->is_player ()) |
332 | return env; |
329 | return env; |
333 | |
330 | |
334 | // else a player could have our env open |
331 | // else a player could have our env open |
335 | object *envest = env->outer_env (); |
332 | object *envest = env->outer_env (); |
336 | |
333 | |
… | |
… | |
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; |
… | |
… | |
478 | */ |
476 | */ |
479 | object * |
477 | object * |
480 | find_object_name (const char *str) |
478 | find_object_name (const char *str) |
481 | { |
479 | { |
482 | shstr_cmp str_ (str); |
480 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
481 | |
|
|
482 | if (str_) |
485 | for_all_objects (op) |
483 | for_all_objects (op) |
486 | if (op->name == str_) |
484 | if (op->name == str_) |
487 | break; |
485 | return op; |
488 | |
486 | |
489 | return op; |
487 | return 0; |
490 | } |
488 | } |
491 | |
489 | |
492 | /* |
490 | /* |
493 | * 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 |
494 | * skill and experience objects. |
492 | * skill and experience objects. |
… | |
… | |
638 | } |
636 | } |
639 | |
637 | |
640 | if (speed < 0) |
638 | if (speed < 0) |
641 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
642 | |
640 | |
643 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
644 | } |
642 | } |
645 | |
643 | |
646 | void |
644 | void |
647 | object::instantiate () |
645 | object::instantiate () |
648 | { |
646 | { |
… | |
… | |
760 | else if (action == UP_OBJ_INSERT) |
758 | else if (action == UP_OBJ_INSERT) |
761 | { |
759 | { |
762 | // this is likely overkill, TODO: revisit (schmorp) |
760 | // this is likely overkill, TODO: revisit (schmorp) |
763 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
764 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
765 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
763 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
766 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
767 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
768 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | /* 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 |
773 | * to have move_allow right now. |
771 | * have move_allow right now. |
774 | */ |
772 | */ |
775 | || ((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 |
776 | || 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) |
777 | m.flags_ = 0; |
775 | m.invalidate (); |
778 | } |
776 | } |
779 | /* if the object is being removed, we can't make intelligent |
777 | /* if the object is being removed, we can't make intelligent |
780 | * decisions, because remove_ob can't really pass the object |
778 | * decisions, because remove_ob can't really pass the object |
781 | * that is being removed. |
779 | * that is being removed. |
782 | */ |
780 | */ |
783 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
781 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
784 | m.flags_ = 0; |
782 | m.invalidate (); |
785 | else if (action == UP_OBJ_FACE) |
783 | else if (action == UP_OBJ_FACE) |
786 | /* Nothing to do for that case */ ; |
784 | /* Nothing to do for that case */ ; |
787 | else |
785 | else |
788 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
786 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
789 | |
787 | |
… | |
… | |
831 | object::activate () |
829 | object::activate () |
832 | { |
830 | { |
833 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
834 | if (active) |
832 | if (active) |
835 | 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 |
836 | |
837 | |
837 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
838 | actives.insert (this); |
839 | actives.insert (this); |
839 | } |
840 | } |
840 | |
841 | |
… | |
… | |
908 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
909 | || map->no_drop |
910 | || map->no_drop |
910 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
911 | { |
912 | { |
912 | while (inv) |
913 | while (inv) |
913 | { |
|
|
914 | inv->destroy_inv (false); |
|
|
915 | inv->destroy (); |
914 | inv->destroy (); |
916 | } |
|
|
917 | } |
915 | } |
918 | else |
916 | else |
919 | { /* Put objects in inventory onto this space */ |
917 | { /* Put objects in inventory onto this space */ |
920 | while (inv) |
918 | while (inv) |
921 | { |
919 | { |
… | |
… | |
925 | || op->flag [FLAG_NO_DROP] |
923 | || op->flag [FLAG_NO_DROP] |
926 | || op->type == RUNE |
924 | || op->type == RUNE |
927 | || op->type == TRAP |
925 | || op->type == TRAP |
928 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
929 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
930 | op->destroy (true); |
928 | op->destroy (); |
931 | else |
929 | else |
932 | map->insert (op, x, y); |
930 | map->insert (op, x, y); |
933 | } |
931 | } |
934 | } |
932 | } |
935 | } |
933 | } |
… | |
… | |
999 | attacked_by = 0; |
997 | attacked_by = 0; |
1000 | current_weapon = 0; |
998 | current_weapon = 0; |
1001 | } |
999 | } |
1002 | |
1000 | |
1003 | void |
1001 | void |
1004 | object::destroy (bool destroy_inventory) |
1002 | object::destroy () |
1005 | { |
1003 | { |
1006 | if (destroyed ()) |
1004 | if (destroyed ()) |
1007 | return; |
1005 | return; |
1008 | |
1006 | |
1009 | if (!is_head () && !head->destroyed ()) |
1007 | if (!is_head () && !head->destroyed ()) |
1010 | { |
1008 | { |
1011 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1009 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1012 | head->destroy (destroy_inventory); |
1010 | head->destroy (); |
1013 | return; |
1011 | return; |
1014 | } |
1012 | } |
1015 | |
1013 | |
1016 | destroy_inv (!destroy_inventory); |
1014 | destroy_inv (false); |
1017 | |
1015 | |
1018 | if (is_head ()) |
1016 | if (is_head ()) |
1019 | if (sound_destroy) |
1017 | if (sound_destroy) |
1020 | play_sound (sound_destroy); |
1018 | play_sound (sound_destroy); |
1021 | else if (flag [FLAG_MONSTER]) |
1019 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1057 | if (object *pl = visible_to ()) |
1055 | if (object *pl = visible_to ()) |
1058 | esrv_del_item (pl->contr, count); |
1056 | esrv_del_item (pl->contr, count); |
1059 | 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 |
1060 | |
1058 | |
1061 | adjust_weight (env, -total_weight ()); |
1059 | adjust_weight (env, -total_weight ()); |
|
|
1060 | |
|
|
1061 | object *pl = in_player (); |
1062 | |
1062 | |
1063 | /* we set up values so that it could be inserted into |
1063 | /* we set up values so that it could be inserted into |
1064 | * 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 |
1065 | * to the caller to decide what we want to do. |
1065 | * to the caller to decide what we want to do. |
1066 | */ |
1066 | */ |
… | |
… | |
1078 | |
1078 | |
1079 | /* 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 |
1080 | * made to players inventory. If set, avoiding the call |
1080 | * made to players inventory. If set, avoiding the call |
1081 | * to save cpu time. |
1081 | * to save cpu time. |
1082 | */ |
1082 | */ |
1083 | 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 | { |
1084 | otmp->update_stats (); |
1086 | pl->update_stats (); |
|
|
1087 | |
|
|
1088 | if (glow_radius && pl->is_on_map ()) |
|
|
1089 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1090 | } |
1085 | } |
1091 | } |
1086 | else if (map) |
1092 | else if (map) |
1087 | { |
1093 | { |
1088 | map->dirty = true; |
1094 | map->dirty = true; |
1089 | mapspace &ms = this->ms (); |
1095 | mapspace &ms = this->ms (); |
1090 | |
1096 | |
1091 | if (object *pl = ms.player ()) |
1097 | if (object *pl = ms.player ()) |
1092 | { |
1098 | { |
1093 | if (type == PLAYER) // this == pl(!) |
1099 | if (is_player ()) |
1094 | { |
1100 | { |
|
|
1101 | ms.smell = pticks; // remember the smell of the player |
|
|
1102 | |
1095 | // leaving a spot always closes any open container on the ground |
1103 | // leaving a spot always closes any open container on the ground |
1096 | if (container && !container->env) |
1104 | if (container && !container->env) |
1097 | // this causes spurious floorbox updates, but it ensures |
1105 | // this causes spurious floorbox updates, but it ensures |
1098 | // that the CLOSE event is being sent. |
1106 | // that the CLOSE event is being sent. |
1099 | close_container (); |
1107 | close_container (); |
… | |
… | |
1116 | *(below ? &below->above : &ms.bot) = above; |
1124 | *(below ? &below->above : &ms.bot) = above; |
1117 | |
1125 | |
1118 | above = 0; |
1126 | above = 0; |
1119 | below = 0; |
1127 | below = 0; |
1120 | |
1128 | |
|
|
1129 | ms.invalidate (); |
|
|
1130 | |
1121 | if (map->in_memory == MAP_SAVING) |
1131 | if (map->in_memory == MAP_SAVING) |
1122 | return; |
1132 | return; |
1123 | |
1133 | |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1134 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1125 | |
1135 | |
… | |
… | |
1157 | } |
1167 | } |
1158 | |
1168 | |
1159 | last = tmp; |
1169 | last = tmp; |
1160 | } |
1170 | } |
1161 | |
1171 | |
1162 | /* last == NULL if there are no objects on this space */ |
1172 | if (affects_los ()) |
1163 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1164 | if (!last) |
|
|
1165 | map->at (x, y).flags_ = 0; |
|
|
1166 | else |
|
|
1167 | update_object (last, UP_OBJ_REMOVE); |
|
|
1168 | |
|
|
1169 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1170 | update_all_los (map, x, y); |
1173 | update_all_los (map, x, y); |
1171 | } |
1174 | } |
1172 | } |
1175 | } |
1173 | |
1176 | |
1174 | /* |
1177 | /* |
… | |
… | |
1198 | esrv_update_item (UPD_NROF, pl, top); |
1201 | esrv_update_item (UPD_NROF, pl, top); |
1199 | |
1202 | |
1200 | op->weight = 0; // cancel the addition above |
1203 | op->weight = 0; // cancel the addition above |
1201 | op->carrying = 0; // must be 0 already |
1204 | op->carrying = 0; // must be 0 already |
1202 | |
1205 | |
1203 | op->destroy (1); |
1206 | op->destroy (); |
1204 | |
1207 | |
1205 | return top; |
1208 | return top; |
1206 | } |
1209 | } |
1207 | |
1210 | |
1208 | return 0; |
1211 | return 0; |
… | |
… | |
1236 | * job preparing multi-part monsters. |
1239 | * job preparing multi-part monsters. |
1237 | */ |
1240 | */ |
1238 | object * |
1241 | object * |
1239 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1242 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | { |
1243 | { |
|
|
1244 | op->remove (); |
|
|
1245 | |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1246 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1242 | { |
1247 | { |
1243 | tmp->x = x + tmp->arch->x; |
1248 | tmp->x = x + tmp->arch->x; |
1244 | tmp->y = y + tmp->arch->y; |
1249 | tmp->y = y + tmp->arch->y; |
1245 | } |
1250 | } |
… | |
… | |
1270 | object * |
1275 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1276 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1277 | { |
1273 | op->remove (); |
1278 | op->remove (); |
1274 | |
1279 | |
|
|
1280 | if (m == &freed_map)//D TODO: remove soon |
|
|
1281 | {//D |
|
|
1282 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1283 | }//D |
|
|
1284 | |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1276 | * of areas of callers (eg, anything that uses find_free_spot would now |
1286 | * of areas of callers (eg, anything that uses find_free_spot would now |
1277 | * need extra work |
1287 | * need extra work |
1278 | */ |
1288 | */ |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1280 | { |
1290 | { |
1281 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1282 | return 0; |
1292 | return 0; |
1283 | } |
1293 | } |
1284 | |
1294 | |
1285 | if (object *more = op->more) |
1295 | if (object *more = op->more) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1299 | { |
1309 | { |
1300 | // TODO: we actually want to update tmp, not op, |
1310 | // TODO: we actually want to update tmp, not op, |
1301 | // but some caller surely breaks when we return tmp |
1311 | // but some caller surely breaks when we return tmp |
1302 | // from here :/ |
1312 | // from here :/ |
1303 | op->nrof += tmp->nrof; |
1313 | op->nrof += tmp->nrof; |
1304 | tmp->destroy (1); |
1314 | tmp->destroy (); |
1305 | } |
1315 | } |
1306 | |
1316 | |
1307 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1317 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1308 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1309 | |
1319 | |
… | |
… | |
1414 | op->below = top; |
1424 | op->below = top; |
1415 | *(op->above ? &op->above->below : &ms.top) = op; |
1425 | *(op->above ? &op->above->below : &ms.top) = op; |
1416 | } |
1426 | } |
1417 | } |
1427 | } |
1418 | |
1428 | |
1419 | if (op->type == PLAYER) |
1429 | if (op->is_player ()) |
1420 | { |
1430 | { |
1421 | op->contr->do_los = 1; |
1431 | op->contr->do_los = 1; |
1422 | ++op->map->players; |
1432 | ++op->map->players; |
1423 | op->map->touch (); |
1433 | op->map->touch (); |
1424 | } |
1434 | } |
… | |
… | |
1439 | * be far away from this change and not affected in any way - |
1449 | * be far away from this change and not affected in any way - |
1440 | * this should get redone to only look for players within range, |
1450 | * this should get redone to only look for players within range, |
1441 | * or just updating the P_UPTODATE for spaces within this area |
1451 | * or just updating the P_UPTODATE for spaces within this area |
1442 | * of effect may be sufficient. |
1452 | * of effect may be sufficient. |
1443 | */ |
1453 | */ |
1444 | if (op->map->darkness && (op->glow_radius != 0)) |
1454 | if (op->affects_los ()) |
|
|
1455 | { |
|
|
1456 | op->ms ().invalidate (); |
1445 | update_all_los (op->map, op->x, op->y); |
1457 | update_all_los (op->map, op->x, op->y); |
|
|
1458 | } |
1446 | |
1459 | |
1447 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1460 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1448 | update_object (op, UP_OBJ_INSERT); |
1461 | update_object (op, UP_OBJ_INSERT); |
1449 | |
1462 | |
1450 | INVOKE_OBJECT (INSERT, op); |
1463 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1484 | { |
1497 | { |
1485 | /* first search for itself and remove any old instances */ |
1498 | /* first search for itself and remove any old instances */ |
1486 | |
1499 | |
1487 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1500 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1488 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1501 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1489 | tmp->destroy (1); |
1502 | tmp->destroy (); |
1490 | |
1503 | |
1491 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1504 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1492 | |
1505 | |
1493 | tmp->x = op->x; |
1506 | tmp->x = op->x; |
1494 | tmp->y = op->y; |
1507 | tmp->y = op->y; |
… | |
… | |
1518 | if (!nr) |
1531 | if (!nr) |
1519 | return true; |
1532 | return true; |
1520 | |
1533 | |
1521 | nr = min (nr, nrof); |
1534 | nr = min (nr, nrof); |
1522 | |
1535 | |
|
|
1536 | if (nrof > nr) |
|
|
1537 | { |
1523 | nrof -= nr; |
1538 | nrof -= nr; |
1524 | |
|
|
1525 | if (nrof) |
|
|
1526 | { |
|
|
1527 | adjust_weight (env, -weight * nr); // carrying == 0 |
1539 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1528 | |
1540 | |
1529 | if (object *pl = visible_to ()) |
1541 | if (object *pl = visible_to ()) |
1530 | esrv_update_item (UPD_NROF, pl, this); |
1542 | esrv_update_item (UPD_NROF, pl, this); |
1531 | |
1543 | |
1532 | return true; |
1544 | return true; |
1533 | } |
1545 | } |
1534 | else |
1546 | else |
1535 | { |
1547 | { |
1536 | destroy (1); |
1548 | destroy (); |
1537 | return false; |
1549 | return false; |
1538 | } |
1550 | } |
1539 | } |
1551 | } |
1540 | |
1552 | |
1541 | /* |
1553 | /* |
… | |
… | |
1618 | if (object *pl = tmp->visible_to ()) |
1630 | if (object *pl = tmp->visible_to ()) |
1619 | esrv_update_item (UPD_NROF, pl, tmp); |
1631 | esrv_update_item (UPD_NROF, pl, tmp); |
1620 | |
1632 | |
1621 | adjust_weight (this, op->total_weight ()); |
1633 | adjust_weight (this, op->total_weight ()); |
1622 | |
1634 | |
1623 | op->destroy (1); |
1635 | op->destroy (); |
1624 | op = tmp; |
1636 | op = tmp; |
1625 | goto inserted; |
1637 | goto inserted; |
1626 | } |
1638 | } |
1627 | |
1639 | |
1628 | op->owner = 0; // it's his/hers now. period. |
1640 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1646 | |
1658 | |
1647 | adjust_weight (this, op->total_weight ()); |
1659 | adjust_weight (this, op->total_weight ()); |
1648 | |
1660 | |
1649 | inserted: |
1661 | inserted: |
1650 | /* reset the light list and los of the players on the map */ |
1662 | /* reset the light list and los of the players on the map */ |
1651 | if (op->glow_radius && map && map->darkness) |
1663 | if (op->glow_radius && is_on_map ()) |
|
|
1664 | { |
|
|
1665 | update_stats (); |
1652 | update_all_los (map, x, y); |
1666 | update_all_los (map, x, y); |
1653 | |
1667 | } |
|
|
1668 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1654 | // if this is a player's inventory, update stats |
1669 | // if this is a player's inventory, update stats |
1655 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1656 | update_stats (); |
1670 | update_stats (); |
1657 | |
1671 | |
1658 | INVOKE_OBJECT (INSERT, this); |
1672 | INVOKE_OBJECT (INSERT, this); |
1659 | |
1673 | |
1660 | return op; |
1674 | return op; |
… | |
… | |
1744 | { |
1758 | { |
1745 | |
1759 | |
1746 | float |
1760 | float |
1747 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1761 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1748 | |
1762 | |
1749 | if (op->type == PLAYER) |
1763 | if (op->is_player ()) |
1750 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1764 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1751 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1765 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1752 | diff /= 4.0; |
1766 | diff /= 4.0; |
1753 | |
1767 | |
1754 | op->speed_left -= diff; |
1768 | op->speed_left -= diff; |
… | |
… | |
1962 | * head of the object should correspond for the entire object. |
1976 | * head of the object should correspond for the entire object. |
1963 | */ |
1977 | */ |
1964 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1978 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1965 | continue; |
1979 | continue; |
1966 | |
1980 | |
1967 | if (ob->blocked (m, pos.x, pos.y)) |
1981 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1968 | continue; |
1982 | continue; |
1969 | |
1983 | |
1970 | altern [index++] = i; |
1984 | altern [index++] = i; |
1971 | } |
1985 | } |
1972 | |
1986 | |
… | |
… | |
2080 | if ((move_type & blocked) == move_type) |
2094 | if ((move_type & blocked) == move_type) |
2081 | max = maxfree[i]; |
2095 | max = maxfree[i]; |
2082 | else if (mflags & P_IS_ALIVE) |
2096 | else if (mflags & P_IS_ALIVE) |
2083 | { |
2097 | { |
2084 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2098 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2085 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2099 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2086 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2100 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2087 | break; |
2101 | break; |
2088 | |
2102 | |
2089 | if (tmp) |
2103 | if (tmp) |
2090 | return freedir[i]; |
2104 | return freedir[i]; |
… | |
… | |
2276 | int |
2290 | int |
2277 | can_pick (const object *who, const object *item) |
2291 | can_pick (const object *who, const object *item) |
2278 | { |
2292 | { |
2279 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2293 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2280 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2294 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2281 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2295 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2282 | } |
2296 | } |
2283 | |
2297 | |
2284 | /* |
2298 | /* |
2285 | * create clone from object to another |
2299 | * create clone from object to another |
2286 | */ |
2300 | */ |
… | |
… | |
2417 | { |
2431 | { |
2418 | char flagdesc[512]; |
2432 | char flagdesc[512]; |
2419 | char info2[256 * 4]; |
2433 | char info2[256 * 4]; |
2420 | char *p = info; |
2434 | char *p = info; |
2421 | |
2435 | |
2422 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2436 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2423 | count, |
2437 | count, |
2424 | uuid.c_str (), |
2438 | uuid.c_str (), |
2425 | &name, |
2439 | &name, |
2426 | title ? "\",title:\"" : "", |
2440 | title ? ",title:\"" : "", |
2427 | title ? (const char *)title : "", |
2441 | title ? (const char *)title : "", |
|
|
2442 | title ? "\"" : "", |
2428 | flag_desc (flagdesc, 512), type); |
2443 | flag_desc (flagdesc, 512), type); |
2429 | |
2444 | |
2430 | if (!flag[FLAG_REMOVED] && env) |
2445 | if (!flag[FLAG_REMOVED] && env) |
2431 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2446 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2432 | |
2447 | |
… | |
… | |
2538 | return splay (tmp); |
2553 | return splay (tmp); |
2539 | |
2554 | |
2540 | return 0; |
2555 | return 0; |
2541 | } |
2556 | } |
2542 | |
2557 | |
2543 | void |
2558 | object * |
2544 | object::force_add (const shstr name, int duration) |
2559 | object::force_add (const shstr name, int duration) |
2545 | { |
2560 | { |
2546 | if (object *force = force_find (name)) |
2561 | if (object *force = force_find (name)) |
2547 | force->destroy (); |
2562 | force->destroy (); |
2548 | |
2563 | |
… | |
… | |
2554 | |
2569 | |
2555 | force->set_speed (duration ? 1.f / duration : 0.f); |
2570 | force->set_speed (duration ? 1.f / duration : 0.f); |
2556 | force->flag [FLAG_IS_USED_UP] = true; |
2571 | force->flag [FLAG_IS_USED_UP] = true; |
2557 | force->flag [FLAG_APPLIED] = true; |
2572 | force->flag [FLAG_APPLIED] = true; |
2558 | |
2573 | |
2559 | insert (force); |
2574 | return insert (force); |
2560 | } |
2575 | } |
2561 | |
2576 | |
2562 | void |
2577 | void |
2563 | object::play_sound (faceidx sound) |
2578 | object::play_sound (faceidx sound) |
2564 | { |
2579 | { |
… | |
… | |
2575 | } |
2590 | } |
2576 | else |
2591 | else |
2577 | map->play_sound (sound, x, y); |
2592 | map->play_sound (sound, x, y); |
2578 | } |
2593 | } |
2579 | |
2594 | |
|
|
2595 | void |
|
|
2596 | object::make_noise () |
|
|
2597 | { |
|
|
2598 | // we do not model noise in the map, so instead put |
|
|
2599 | // a temporary light into the noise source |
|
|
2600 | // could use the map instead, but that's less reliable for our |
|
|
2601 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2602 | |
|
|
2603 | // currently only works sensibly for players |
|
|
2604 | if (!is_player ()) |
|
|
2605 | return; |
|
|
2606 | |
|
|
2607 | // find old force, or create new one |
|
|
2608 | object *force = force_find (shstr_noise_force); |
|
|
2609 | |
|
|
2610 | if (force) |
|
|
2611 | force->speed_left = -1.f; // patch old speed up |
|
|
2612 | else |
|
|
2613 | { |
|
|
2614 | force = archetype::get (shstr_noise_force); |
|
|
2615 | |
|
|
2616 | force->slaying = shstr_noise_force; |
|
|
2617 | force->stats.food = 1; |
|
|
2618 | force->speed_left = -1.f; |
|
|
2619 | |
|
|
2620 | force->set_speed (1.f / 4.f); |
|
|
2621 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2622 | force->flag [FLAG_APPLIED] = true; |
|
|
2623 | |
|
|
2624 | insert (force); |
|
|
2625 | } |
|
|
2626 | } |
|
|
2627 | |