ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.240 by root, Wed May 7 13:40:30 2008 UTC vs.
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines