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.260 by root, Mon Sep 29 10:35:36 2008 UTC vs.
Revision 1.276 by root, Wed Dec 31 18:07:41 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] = {
… …
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
… …
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 ());
1060 1061
1062 object *pl = in_player ();
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 */
1065 map = env->map; 1068 map = env->map;
… …
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/*
… …
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 (m == &freed_map)//D TODO: remove soon 1282 if (m == &freed_map)//D TODO: remove soon
1281 {//D 1283 {//D
1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1284 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 }//D 1285 }//D
1284 1286
1285 /* Ideally, the caller figures this out. However, it complicates a lot 1287 /* Ideally, the caller figures this out. However, it complicates a lot
1286 * 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
1287 * need extra work 1289 * need extra work
1288 */ 1290 */
1291 maptile *newmap = m;
1289 if (!xy_normalise (m, op->x, op->y)) 1292 if (!xy_normalise (newmap, op->x, op->y))
1290 { 1293 {
1291 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1294 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292 return 0; 1295 return 0;
1293 } 1296 }
1294 1297
… …
1296 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1297 return 0; 1300 return 0;
1298 1301
1299 CLEAR_FLAG (op, FLAG_REMOVED); 1302 CLEAR_FLAG (op, FLAG_REMOVED);
1300 1303
1301 op->map = m; 1304 op->map = newmap;
1302 mapspace &ms = op->ms (); 1305 mapspace &ms = op->ms ();
1303 1306
1304 /* this has to be done after we translate the coordinates. 1307 /* this has to be done after we translate the coordinates.
1305 */ 1308 */
1306 if (op->nrof && !(flag & INS_NO_MERGE)) 1309 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1424 op->below = top; 1427 op->below = top;
1425 *(op->above ? &op->above->below : &ms.top) = op; 1428 *(op->above ? &op->above->below : &ms.top) = op;
1426 } 1429 }
1427 } 1430 }
1428 1431
1429 if (op->type == PLAYER) 1432 if (op->is_player ())
1430 { 1433 {
1431 op->contr->do_los = 1; 1434 op->contr->do_los = 1;
1432 ++op->map->players; 1435 ++op->map->players;
1433 op->map->touch (); 1436 op->map->touch ();
1434 } 1437 }
… …
1449 * 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 -
1450 * this should get redone to only look for players within range, 1453 * this should get redone to only look for players within range,
1451 * or just updating the P_UPTODATE for spaces within this area 1454 * or just updating the P_UPTODATE for spaces within this area
1452 * of effect may be sufficient. 1455 * of effect may be sufficient.
1453 */ 1456 */
1454 if (op->map->darkness && (op->glow_radius != 0)) 1457 if (op->affects_los ())
1458 {
1459 op->ms ().invalidate ();
1455 update_all_los (op->map, op->x, op->y); 1460 update_all_los (op->map, op->x, op->y);
1461 }
1456 1462
1457 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1463 /* updates flags (blocked, alive, no magic, etc) for this map space */
1458 update_object (op, UP_OBJ_INSERT); 1464 update_object (op, UP_OBJ_INSERT);
1459 1465
1460 INVOKE_OBJECT (INSERT, op); 1466 INVOKE_OBJECT (INSERT, op);
… …
1655 1661
1656 adjust_weight (this, op->total_weight ()); 1662 adjust_weight (this, op->total_weight ());
1657 1663
1658inserted: 1664inserted:
1659 /* 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 */
1660 if (op->glow_radius && map && map->darkness) 1666 if (op->glow_radius && is_on_map ())
1667 {
1668 update_stats ();
1661 update_all_los (map, x, y); 1669 update_all_los (map, x, y);
1662 1670 }
1671 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663 // if this is a player's inventory, update stats 1672 // if this is a player's inventory, update stats
1664 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1665 update_stats (); 1673 update_stats ();
1666 1674
1667 INVOKE_OBJECT (INSERT, this); 1675 INVOKE_OBJECT (INSERT, this);
1668 1676
1669 return op; 1677 return op;
… …
1753 { 1761 {
1754 1762
1755 float 1763 float
1756 diff = tmp->move_slow_penalty * fabs (op->speed); 1764 diff = tmp->move_slow_penalty * fabs (op->speed);
1757 1765
1758 if (op->type == PLAYER) 1766 if (op->is_player ())
1759 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)) ||
1760 (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)))
1761 diff /= 4.0; 1769 diff /= 4.0;
1762 1770
1763 op->speed_left -= diff; 1771 op->speed_left -= diff;
… …
1971 * head of the object should correspond for the entire object. 1979 * head of the object should correspond for the entire object.
1972 */ 1980 */
1973 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1981 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974 continue; 1982 continue;
1975 1983
1976 if (ob->blocked (m, pos.x, pos.y)) 1984 if (ob->blocked (pos.m, pos.x, pos.y))
1977 continue; 1985 continue;
1978 1986
1979 altern [index++] = i; 1987 altern [index++] = i;
1980 } 1988 }
1981 1989
… …
2049 * there is capable of. 2057 * there is capable of.
2050 */ 2058 */
2051int 2059int
2052find_dir (maptile *m, int x, int y, object *exclude) 2060find_dir (maptile *m, int x, int y, object *exclude)
2053{ 2061{
2054 int i, max = SIZEOFFREE, mflags; 2062 int max = SIZEOFFREE, mflags;
2055
2056 sint16 nx, ny;
2057 object *tmp;
2058 maptile *mp;
2059
2060 MoveType blocked, move_type; 2063 MoveType move_type;
2061 2064
2062 if (exclude && exclude->head_ () != exclude) 2065 if (exclude && exclude->head_ () != exclude)
2063 { 2066 {
2064 exclude = exclude->head; 2067 exclude = exclude->head;
2065 move_type = exclude->move_type; 2068 move_type = exclude->move_type;
… …
2068 { 2071 {
2069 /* 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. */
2070 move_type = MOVE_ALL; 2073 move_type = MOVE_ALL;
2071 } 2074 }
2072 2075
2073 for (i = 1; i < max; i++) 2076 for (int i = 1; i < max; i++)
2074 { 2077 {
2075 mp = m; 2078 mapxy pos (m, x, y);
2076 nx = x + freearr_x[i]; 2079 pos.move (i);
2077 ny = y + freearr_y[i];
2078 2080
2079 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2081 if (!pos.normalise ())
2080
2081 if (mflags & P_OUT_OF_MAP)
2082 max = maxfree[i]; 2082 max = maxfree[i];
2083 else 2083 else
2084 { 2084 {
2085 mapspace &ms = mp->at (nx, ny); 2085 mapspace &ms = *pos;
2086 2086
2087 blocked = ms.move_block;
2088
2089 if ((move_type & blocked) == move_type) 2087 if ((move_type & ms.move_block) == move_type)
2090 max = maxfree[i]; 2088 max = maxfree [i];
2091 else if (mflags & P_IS_ALIVE) 2089 else if (ms.flags () & P_IS_ALIVE)
2092 { 2090 {
2093 for (tmp = ms.bot; tmp; tmp = tmp->above) 2091 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2094 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2092 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2095 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2093 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096 break;
2097
2098 if (tmp)
2099 return freedir[i]; 2094 return freedir [i];
2100 } 2095 }
2101 } 2096 }
2102 } 2097 }
2103 2098
2104 return 0; 2099 return 0;
… …
2285int 2280int
2286can_pick (const object *who, const object *item) 2281can_pick (const object *who, const object *item)
2287{ 2282{
2288 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2283 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2289 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2284 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2290 !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));
2291} 2286}
2292 2287
2293/* 2288/*
2294 * create clone from object to another 2289 * create clone from object to another
2295 */ 2290 */
… …
2327 return tmp; 2322 return tmp;
2328 2323
2329 return 0; 2324 return 0;
2330} 2325}
2331 2326
2332const shstr & 2327shstr_tmp
2333object::kv_get (const shstr &key) const 2328object::kv_get (shstr_tmp key) const
2334{ 2329{
2335 for (key_value *kv = key_values; kv; kv = kv->next) 2330 for (key_value *kv = key_values; kv; kv = kv->next)
2336 if (kv->key == key) 2331 if (kv->key == key)
2337 return kv->value; 2332 return kv->value;
2338 2333
2339 return shstr_null; 2334 return shstr ();
2340} 2335}
2341 2336
2342void 2337void
2343object::kv_set (const shstr &key, const shstr &value) 2338object::kv_set (shstr_tmp key, shstr_tmp value)
2344{ 2339{
2345 for (key_value *kv = key_values; kv; kv = kv->next) 2340 for (key_value *kv = key_values; kv; kv = kv->next)
2346 if (kv->key == key) 2341 if (kv->key == key)
2347 { 2342 {
2348 kv->value = value; 2343 kv->value = value;
… …
2357 2352
2358 key_values = kv; 2353 key_values = kv;
2359} 2354}
2360 2355
2361void 2356void
2362object::kv_del (const shstr &key) 2357object::kv_del (shstr_tmp key)
2363{ 2358{
2364 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2359 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2365 if ((*kvp)->key == key) 2360 if ((*kvp)->key == key)
2366 { 2361 {
2367 key_value *kv = *kvp; 2362 key_value *kv = *kvp;
… …
2536// else if (!old_container->env && contr && contr->ns) 2531// else if (!old_container->env && contr && contr->ns)
2537// contr->ns->floorbox_reset (); 2532// contr->ns->floorbox_reset ();
2538} 2533}
2539 2534
2540object * 2535object *
2541object::force_find (const shstr name) 2536object::force_find (shstr_tmp name)
2542{ 2537{
2543 /* 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
2544 * place 2539 * place
2545 */ 2540 */
2546 for (object *tmp = inv; tmp; tmp = tmp->below) 2541 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2548 return splay (tmp); 2543 return splay (tmp);
2549 2544
2550 return 0; 2545 return 0;
2551} 2546}
2552 2547
2553void 2548object *
2554object::force_add (const shstr name, int duration) 2549object::force_add (shstr_tmp name, int duration)
2555{ 2550{
2556 if (object *force = force_find (name)) 2551 if (object *force = force_find (name))
2557 force->destroy (); 2552 force->destroy ();
2558 2553
2559 object *force = get_archetype (FORCE_NAME); 2554 object *force = get_archetype (FORCE_NAME);
… …
2564 2559
2565 force->set_speed (duration ? 1.f / duration : 0.f); 2560 force->set_speed (duration ? 1.f / duration : 0.f);
2566 force->flag [FLAG_IS_USED_UP] = true; 2561 force->flag [FLAG_IS_USED_UP] = true;
2567 force->flag [FLAG_APPLIED] = true; 2562 force->flag [FLAG_APPLIED] = true;
2568 2563
2569 insert (force); 2564 return insert (force);
2570} 2565}
2571 2566
2572void 2567void
2573object::play_sound (faceidx sound) 2568object::play_sound (faceidx sound)
2574{ 2569{
… …
2585 } 2580 }
2586 else 2581 else
2587 map->play_sound (sound, x, y); 2582 map->play_sound (sound, x, y);
2588} 2583}
2589 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