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.257 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.279 by root, Thu Jan 8 03:03:23 2009 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] = {
… …
323 { 324 {
324 // see if we are in a container of sorts 325 // see if we are in a container of sorts
325 if (env) 326 if (env)
326 { 327 {
327 // the player inventory itself is always visible 328 // the player inventory itself is always visible
328 if (env->type == PLAYER) 329 if (env->is_player ())
329 return env; 330 return env;
330 331
331 // else a player could have our env open 332 // else a player could have our env open
332 object *envest = env->outer_env (); 333 object *envest = env->outer_env ();
333 334
… …
758 else if (action == UP_OBJ_INSERT) 759 else if (action == UP_OBJ_INSERT)
759 { 760 {
760 // this is likely overkill, TODO: revisit (schmorp) 761 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 764 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 766 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 767 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 768 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 769 || (m.move_off | op->move_off ) != m.move_off
… …
770 /* 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
771 * have move_allow right now. 772 * have move_allow right now.
772 */ 773 */
773 || ((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
774 || 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)
775 m.flags_ = 0; 776 m.invalidate ();
776 } 777 }
777 /* if the object is being removed, we can't make intelligent 778 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 779 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 780 * that is being removed.
780 */ 781 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 782 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 783 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 784 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 785 /* Nothing to do for that case */ ;
785 else 786 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 787 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 788
… …
909 || map->in_memory != MAP_ACTIVE 910 || map->in_memory != MAP_ACTIVE
910 || map->no_drop 911 || map->no_drop
911 || ms ().move_block == MOVE_ALL) 912 || ms ().move_block == MOVE_ALL)
912 { 913 {
913 while (inv) 914 while (inv)
914 inv->destroy (true); 915 inv->destroy ();
915 } 916 }
916 else 917 else
917 { /* Put objects in inventory onto this space */ 918 { /* Put objects in inventory onto this space */
918 while (inv) 919 while (inv)
919 { 920 {
… …
923 || op->flag [FLAG_NO_DROP] 924 || op->flag [FLAG_NO_DROP]
924 || op->type == RUNE 925 || op->type == RUNE
925 || op->type == TRAP 926 || op->type == TRAP
926 || op->flag [FLAG_IS_A_TEMPLATE] 927 || op->flag [FLAG_IS_A_TEMPLATE]
927 || op->flag [FLAG_DESTROY_ON_DEATH]) 928 || op->flag [FLAG_DESTROY_ON_DEATH])
928 op->destroy (true); 929 op->destroy ();
929 else 930 else
930 map->insert (op, x, y); 931 map->insert (op, x, y);
931 } 932 }
932 } 933 }
933} 934}
… …
962 963
963void 964void
964object::do_destroy () 965object::do_destroy ()
965{ 966{
966 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 968 remove_link ();
968 969
969 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 971 remove_friendly_object (this);
971 972
972 remove (); 973 remove ();
… …
997 attacked_by = 0; 998 attacked_by = 0;
998 current_weapon = 0; 999 current_weapon = 0;
999} 1000}
1000 1001
1001void 1002void
1002object::destroy (bool destroy_inventory) 1003object::destroy ()
1003{ 1004{
1004 if (destroyed ()) 1005 if (destroyed ())
1005 return; 1006 return;
1006 1007
1007 if (!is_head () && !head->destroyed ()) 1008 if (!is_head () && !head->destroyed ())
1008 { 1009 {
1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010 head->destroy (destroy_inventory); 1011 head->destroy ();
1011 return; 1012 return;
1012 } 1013 }
1013 1014
1014 destroy_inv (!destroy_inventory); 1015 destroy_inv (false);
1015 1016
1016 if (is_head ()) 1017 if (is_head ())
1017 if (sound_destroy) 1018 if (sound_destroy)
1018 play_sound (sound_destroy); 1019 play_sound (sound_destroy);
1019 else if (flag [FLAG_MONSTER]) 1020 else if (flag [FLAG_MONSTER])
… …
1055 if (object *pl = visible_to ()) 1056 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count); 1057 esrv_del_item (pl->contr, count);
1057 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
1058 1059
1059 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1061
1062 object *pl = in_player ();
1060 1063
1061 /* we set up values so that it could be inserted into 1064 /* we set up values so that it could be inserted into
1062 * 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
1063 * to the caller to decide what we want to do. 1066 * to the caller to decide what we want to do.
1064 */ 1067 */
… …
1076 1079
1077 /* 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
1078 * made to players inventory. If set, avoiding the call 1081 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 1082 * to save cpu time.
1080 */ 1083 */
1081 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 {
1082 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 }
1083 } 1092 }
1084 else if (map) 1093 else if (map)
1085 { 1094 {
1086 map->dirty = true; 1095 map->dirty = true;
1087 mapspace &ms = this->ms (); 1096 mapspace &ms = this->ms ();
1088 1097
1089 if (object *pl = ms.player ()) 1098 if (object *pl = ms.player ())
1090 { 1099 {
1091 if (type == PLAYER) // this == pl(!) 1100 if (is_player ())
1092 { 1101 {
1102 if (!flag [FLAG_WIZPASS])
1103 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1104
1093 // leaving a spot always closes any open container on the ground 1105 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1106 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1107 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1108 // that the CLOSE event is being sent.
1097 close_container (); 1109 close_container ();
… …
1114 *(below ? &below->above : &ms.bot) = above; 1126 *(below ? &below->above : &ms.bot) = above;
1115 1127
1116 above = 0; 1128 above = 0;
1117 below = 0; 1129 below = 0;
1118 1130
1119 ms.flags_ = 0; 1131 ms.invalidate ();
1120 1132
1121 if (map->in_memory == MAP_SAVING) 1133 if (map->in_memory == MAP_SAVING)
1122 return; 1134 return;
1123 1135
1124 int check_walk_off = !flag [FLAG_NO_APPLY]; 1136 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1157 } 1169 }
1158 1170
1159 last = tmp; 1171 last = tmp;
1160 } 1172 }
1161 1173
1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1174 if (affects_los ())
1163 update_all_los (map, x, y); 1175 update_all_los (map, x, y);
1164 } 1176 }
1165} 1177}
1166 1178
1167/* 1179/*
… …
1191 esrv_update_item (UPD_NROF, pl, top); 1203 esrv_update_item (UPD_NROF, pl, top);
1192 1204
1193 op->weight = 0; // cancel the addition above 1205 op->weight = 0; // cancel the addition above
1194 op->carrying = 0; // must be 0 already 1206 op->carrying = 0; // must be 0 already
1195 1207
1196 op->destroy (1); 1208 op->destroy ();
1197 1209
1198 return top; 1210 return top;
1199 } 1211 }
1200 1212
1201 return 0; 1213 return 0;
… …
1263 * just 'op' otherwise 1275 * just 'op' otherwise
1264 */ 1276 */
1265object * 1277object *
1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1278insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1267{ 1279{
1268 if (op->is_on_map ())
1269 {
1270 LOG (llevError, "insert_ob_in_map called for object already on map");
1271 abort ();
1272 }
1273
1274 if (op->env)
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1277 op->remove (); 1280 op->remove ();
1278 }
1279 1281
1280 if (op->face && !face_info (op->face))//D TODO: remove soon 1282 if (m == &freed_map)//D TODO: remove soon
1281 {//D 1283 {//D
1282 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1284 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 op->face = 1;//D
1284 }//D 1285 }//D
1285 1286
1286 /* Ideally, the caller figures this out. However, it complicates a lot 1287 /* Ideally, the caller figures this out. However, it complicates a lot
1287 * of areas of callers (eg, anything that uses find_free_spot would now 1288 * of areas of callers (eg, anything that uses find_free_spot would now
1288 * need extra work 1289 * need extra work
1289 */ 1290 */
1291 maptile *newmap = m;
1290 if (!xy_normalise (m, op->x, op->y)) 1292 if (!xy_normalise (newmap, op->x, op->y))
1291 { 1293 {
1292 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1294 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1293 return 0; 1295 return 0;
1294 } 1296 }
1295 1297
1296 if (object *more = op->more) 1298 if (object *more = op->more)
1297 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1298 return 0; 1300 return 0;
1299 1301
1300 CLEAR_FLAG (op, FLAG_REMOVED); 1302 CLEAR_FLAG (op, FLAG_REMOVED);
1301 1303
1302 op->map = m; 1304 op->map = newmap;
1303 mapspace &ms = op->ms (); 1305 mapspace &ms = op->ms ();
1304 1306
1305 /* this has to be done after we translate the coordinates. 1307 /* this has to be done after we translate the coordinates.
1306 */ 1308 */
1307 if (op->nrof && !(flag & INS_NO_MERGE)) 1309 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1310 { 1312 {
1311 // TODO: we actually want to update tmp, not op, 1313 // TODO: we actually want to update tmp, not op,
1312 // but some caller surely breaks when we return tmp 1314 // but some caller surely breaks when we return tmp
1313 // from here :/ 1315 // from here :/
1314 op->nrof += tmp->nrof; 1316 op->nrof += tmp->nrof;
1315 tmp->destroy (1); 1317 tmp->destroy ();
1316 } 1318 }
1317 1319
1318 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1320 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1319 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1321 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1320 1322
… …
1425 op->below = top; 1427 op->below = top;
1426 *(op->above ? &op->above->below : &ms.top) = op; 1428 *(op->above ? &op->above->below : &ms.top) = op;
1427 } 1429 }
1428 } 1430 }
1429 1431
1430 if (op->type == PLAYER) 1432 if (op->is_player ())
1431 { 1433 {
1432 op->contr->do_los = 1; 1434 op->contr->do_los = 1;
1433 ++op->map->players; 1435 ++op->map->players;
1434 op->map->touch (); 1436 op->map->touch ();
1435 } 1437 }
… …
1450 * be far away from this change and not affected in any way - 1452 * be far away from this change and not affected in any way -
1451 * this should get redone to only look for players within range, 1453 * this should get redone to only look for players within range,
1452 * or just updating the P_UPTODATE for spaces within this area 1454 * or just updating the P_UPTODATE for spaces within this area
1453 * of effect may be sufficient. 1455 * of effect may be sufficient.
1454 */ 1456 */
1455 if (op->map->darkness && (op->glow_radius != 0)) 1457 if (op->affects_los ())
1458 {
1459 op->ms ().invalidate ();
1456 update_all_los (op->map, op->x, op->y); 1460 update_all_los (op->map, op->x, op->y);
1461 }
1457 1462
1458 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1463 /* updates flags (blocked, alive, no magic, etc) for this map space */
1459 update_object (op, UP_OBJ_INSERT); 1464 update_object (op, UP_OBJ_INSERT);
1460 1465
1461 INVOKE_OBJECT (INSERT, op); 1466 INVOKE_OBJECT (INSERT, op);
… …
1489/* this function inserts an object in the map, but if it 1494/* this function inserts an object in the map, but if it
1490 * finds an object of its own type, it'll remove that one first. 1495 * finds an object of its own type, it'll remove that one first.
1491 * op is the object to insert it under: supplies x and the map. 1496 * op is the object to insert it under: supplies x and the map.
1492 */ 1497 */
1493void 1498void
1494replace_insert_ob_in_map (const char *arch_string, object *op) 1499replace_insert_ob_in_map (shstr_tmp archname, object *op)
1495{ 1500{
1496 /* first search for itself and remove any old instances */ 1501 /* first search for itself and remove any old instances */
1497 1502
1498 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1504 if (tmp->arch->archname == archname) /* same archetype */
1500 tmp->destroy (1); 1505 tmp->destroy ();
1501 1506
1502 object *tmp = arch_to_object (archetype::find (arch_string)); 1507 object *tmp = arch_to_object (archetype::find (archname));
1503 1508
1504 tmp->x = op->x; 1509 tmp->x = op->x;
1505 tmp->y = op->y; 1510 tmp->y = op->y;
1506 1511
1507 insert_ob_in_map (tmp, op->map, op, 0); 1512 insert_ob_in_map (tmp, op->map, op, 0);
… …
1628 if (object *pl = tmp->visible_to ()) 1633 if (object *pl = tmp->visible_to ())
1629 esrv_update_item (UPD_NROF, pl, tmp); 1634 esrv_update_item (UPD_NROF, pl, tmp);
1630 1635
1631 adjust_weight (this, op->total_weight ()); 1636 adjust_weight (this, op->total_weight ());
1632 1637
1633 op->destroy (1); 1638 op->destroy ();
1634 op = tmp; 1639 op = tmp;
1635 goto inserted; 1640 goto inserted;
1636 } 1641 }
1637 1642
1638 op->owner = 0; // it's his/hers now. period. 1643 op->owner = 0; // it's his/hers now. period.
… …
1656 1661
1657 adjust_weight (this, op->total_weight ()); 1662 adjust_weight (this, op->total_weight ());
1658 1663
1659inserted: 1664inserted:
1660 /* reset the light list and los of the players on the map */ 1665 /* reset the light list and los of the players on the map */
1661 if (op->glow_radius && map && map->darkness) 1666 if (op->glow_radius && is_on_map ())
1667 {
1668 update_stats ();
1662 update_all_los (map, x, y); 1669 update_all_los (map, x, y);
1663 1670 }
1671 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1664 // if this is a player's inventory, update stats 1672 // if this is a player's inventory, update stats
1665 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1666 update_stats (); 1673 update_stats ();
1667 1674
1668 INVOKE_OBJECT (INSERT, this); 1675 INVOKE_OBJECT (INSERT, this);
1669 1676
1670 return op; 1677 return op;
… …
1754 { 1761 {
1755 1762
1756 float 1763 float
1757 diff = tmp->move_slow_penalty * fabs (op->speed); 1764 diff = tmp->move_slow_penalty * fabs (op->speed);
1758 1765
1759 if (op->type == PLAYER) 1766 if (op->is_player ())
1760 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1761 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1762 diff /= 4.0; 1769 diff /= 4.0;
1763 1770
1764 op->speed_left -= diff; 1771 op->speed_left -= diff;
… …
1972 * head of the object should correspond for the entire object. 1979 * head of the object should correspond for the entire object.
1973 */ 1980 */
1974 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1981 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1975 continue; 1982 continue;
1976 1983
1977 if (ob->blocked (m, pos.x, pos.y)) 1984 if (ob->blocked (pos.m, pos.x, pos.y))
1978 continue; 1985 continue;
1979 1986
1980 altern [index++] = i; 1987 altern [index++] = i;
1981 } 1988 }
1982 1989
… …
2050 * there is capable of. 2057 * there is capable of.
2051 */ 2058 */
2052int 2059int
2053find_dir (maptile *m, int x, int y, object *exclude) 2060find_dir (maptile *m, int x, int y, object *exclude)
2054{ 2061{
2055 int i, max = SIZEOFFREE, mflags; 2062 int max = SIZEOFFREE, mflags;
2056
2057 sint16 nx, ny;
2058 object *tmp;
2059 maptile *mp;
2060
2061 MoveType blocked, move_type; 2063 MoveType move_type;
2062 2064
2063 if (exclude && exclude->head_ () != exclude) 2065 if (exclude && exclude->head_ () != exclude)
2064 { 2066 {
2065 exclude = exclude->head; 2067 exclude = exclude->head;
2066 move_type = exclude->move_type; 2068 move_type = exclude->move_type;
… …
2069 { 2071 {
2070 /* If we don't have anything, presume it can use all movement types. */ 2072 /* If we don't have anything, presume it can use all movement types. */
2071 move_type = MOVE_ALL; 2073 move_type = MOVE_ALL;
2072 } 2074 }
2073 2075
2074 for (i = 1; i < max; i++) 2076 for (int i = 1; i < max; i++)
2075 { 2077 {
2076 mp = m; 2078 mapxy pos (m, x, y);
2077 nx = x + freearr_x[i]; 2079 pos.move (i);
2078 ny = y + freearr_y[i];
2079 2080
2080 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2081 if (!pos.normalise ())
2081
2082 if (mflags & P_OUT_OF_MAP)
2083 max = maxfree[i]; 2082 max = maxfree[i];
2084 else 2083 else
2085 { 2084 {
2086 mapspace &ms = mp->at (nx, ny); 2085 mapspace &ms = *pos;
2087 2086
2088 blocked = ms.move_block;
2089
2090 if ((move_type & blocked) == move_type) 2087 if ((move_type & ms.move_block) == move_type)
2091 max = maxfree[i]; 2088 max = maxfree [i];
2092 else if (mflags & P_IS_ALIVE) 2089 else if (ms.flags () & P_IS_ALIVE)
2093 { 2090 {
2094 for (tmp = ms.bot; tmp; tmp = tmp->above) 2091 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2095 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2092 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2096 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2093 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2097 break;
2098
2099 if (tmp)
2100 return freedir[i]; 2094 return freedir [i];
2101 } 2095 }
2102 } 2096 }
2103 } 2097 }
2104 2098
2105 return 0; 2099 return 0;
… …
2180 * This basically means that if direction is 15, then it could either go 2174 * This basically means that if direction is 15, then it could either go
2181 * direction 4, 14, or 16 to get back to where we are. 2175 * direction 4, 14, or 16 to get back to where we are.
2182 * Moved from spell_util.c to object.c with the other related direction 2176 * Moved from spell_util.c to object.c with the other related direction
2183 * functions. 2177 * functions.
2184 */ 2178 */
2185int reduction_dir[SIZEOFFREE][3] = { 2179const int reduction_dir[SIZEOFFREE][3] = {
2186 {0, 0, 0}, /* 0 */ 2180 {0, 0, 0}, /* 0 */
2187 {0, 0, 0}, /* 1 */ 2181 {0, 0, 0}, /* 1 */
2188 {0, 0, 0}, /* 2 */ 2182 {0, 0, 0}, /* 2 */
2189 {0, 0, 0}, /* 3 */ 2183 {0, 0, 0}, /* 3 */
2190 {0, 0, 0}, /* 4 */ 2184 {0, 0, 0}, /* 4 */
… …
2286int 2280int
2287can_pick (const object *who, const object *item) 2281can_pick (const object *who, const object *item)
2288{ 2282{
2289 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2283 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2290 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2284 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2291 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2285 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2292} 2286}
2293 2287
2294/* 2288/*
2295 * create clone from object to another 2289 * create clone from object to another
2296 */ 2290 */
… …
2328 return tmp; 2322 return tmp;
2329 2323
2330 return 0; 2324 return 0;
2331} 2325}
2332 2326
2333const shstr & 2327shstr_tmp
2334object::kv_get (const shstr &key) const 2328object::kv_get (shstr_tmp key) const
2335{ 2329{
2336 for (key_value *kv = key_values; kv; kv = kv->next) 2330 for (key_value *kv = key_values; kv; kv = kv->next)
2337 if (kv->key == key) 2331 if (kv->key == key)
2338 return kv->value; 2332 return kv->value;
2339 2333
2340 return shstr_null; 2334 return shstr ();
2341} 2335}
2342 2336
2343void 2337void
2344object::kv_set (const shstr &key, const shstr &value) 2338object::kv_set (shstr_tmp key, shstr_tmp value)
2345{ 2339{
2346 for (key_value *kv = key_values; kv; kv = kv->next) 2340 for (key_value *kv = key_values; kv; kv = kv->next)
2347 if (kv->key == key) 2341 if (kv->key == key)
2348 { 2342 {
2349 kv->value = value; 2343 kv->value = value;
… …
2358 2352
2359 key_values = kv; 2353 key_values = kv;
2360} 2354}
2361 2355
2362void 2356void
2363object::kv_del (const shstr &key) 2357object::kv_del (shstr_tmp key)
2364{ 2358{
2365 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2359 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2366 if ((*kvp)->key == key) 2360 if ((*kvp)->key == key)
2367 { 2361 {
2368 key_value *kv = *kvp; 2362 key_value *kv = *kvp;
… …
2537// else if (!old_container->env && contr && contr->ns) 2531// else if (!old_container->env && contr && contr->ns)
2538// contr->ns->floorbox_reset (); 2532// contr->ns->floorbox_reset ();
2539} 2533}
2540 2534
2541object * 2535object *
2542object::force_find (const shstr name) 2536object::force_find (shstr_tmp name)
2543{ 2537{
2544 /* cycle through his inventory to look for the MARK we want to 2538 /* cycle through his inventory to look for the MARK we want to
2545 * place 2539 * place
2546 */ 2540 */
2547 for (object *tmp = inv; tmp; tmp = tmp->below) 2541 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2549 return splay (tmp); 2543 return splay (tmp);
2550 2544
2551 return 0; 2545 return 0;
2552} 2546}
2553 2547
2554void 2548object *
2555object::force_add (const shstr name, int duration) 2549object::force_add (shstr_tmp name, int duration)
2556{ 2550{
2557 if (object *force = force_find (name)) 2551 if (object *force = force_find (name))
2558 force->destroy (); 2552 force->destroy ();
2559 2553
2560 object *force = get_archetype (FORCE_NAME); 2554 object *force = get_archetype (FORCE_NAME);
… …
2565 2559
2566 force->set_speed (duration ? 1.f / duration : 0.f); 2560 force->set_speed (duration ? 1.f / duration : 0.f);
2567 force->flag [FLAG_IS_USED_UP] = true; 2561 force->flag [FLAG_IS_USED_UP] = true;
2568 force->flag [FLAG_APPLIED] = true; 2562 force->flag [FLAG_APPLIED] = true;
2569 2563
2570 insert (force); 2564 return insert (force);
2571} 2565}
2572 2566
2573void 2567void
2574object::play_sound (faceidx sound) 2568object::play_sound (faceidx sound)
2575{ 2569{
… …
2586 } 2580 }
2587 else 2581 else
2588 map->play_sound (sound, x, y); 2582 map->play_sound (sound, x, y);
2589} 2583}
2590 2584
2585void
2586object::make_noise ()
2587{
2588 // we do not model noise in the map, so instead put
2589 // a temporary light into the noise source
2590 // could use the map instead, but that's less reliable for our
2591 // goal, which is to make invisibility a bit harder to exploit
2592
2593 // currently only works sensibly for players
2594 if (!is_player ())
2595 return;
2596
2597 // find old force, or create new one
2598 object *force = force_find (shstr_noise_force);
2599
2600 if (force)
2601 force->speed_left = -1.f; // patch old speed up
2602 else
2603 {
2604 force = archetype::get (shstr_noise_force);
2605
2606 force->slaying = shstr_noise_force;
2607 force->stats.food = 1;
2608 force->speed_left = -1.f;
2609
2610 force->set_speed (1.f / 4.f);
2611 force->flag [FLAG_IS_USED_UP] = true;
2612 force->flag [FLAG_APPLIED] = true;
2613
2614 insert (force);
2615 }
2616}
2617

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines