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.270 by root, Sat Dec 27 02:31:19 2008 UTC

… …
323 { 323 {
324 // see if we are in a container of sorts 324 // see if we are in a container of sorts
325 if (env) 325 if (env)
326 { 326 {
327 // the player inventory itself is always visible 327 // the player inventory itself is always visible
328 if (env->type == PLAYER) 328 if (env->is_player ())
329 return env; 329 return env;
330 330
331 // else a player could have our env open 331 // else a player could have our env open
332 object *envest = env->outer_env (); 332 object *envest = env->outer_env ();
333 333
… …
758 else if (action == UP_OBJ_INSERT) 758 else if (action == UP_OBJ_INSERT)
759 { 759 {
760 // this is likely overkill, TODO: revisit (schmorp) 760 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 763 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
… …
770 /* 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
771 * have move_allow right now. 771 * have move_allow right now.
772 */ 772 */
773 || ((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
774 || 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)
775 m.flags_ = 0; 775 m.invalidate ();
776 } 776 }
777 /* if the object is being removed, we can't make intelligent 777 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 778 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 779 * that is being removed.
780 */ 780 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 782 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 783 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 784 /* Nothing to do for that case */ ;
785 else 785 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 786 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 787
… …
1056 esrv_del_item (pl->contr, count); 1056 esrv_del_item (pl->contr, count);
1057 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
1058 1058
1059 adjust_weight (env, -total_weight ()); 1059 adjust_weight (env, -total_weight ());
1060 1060
1061 object *pl = in_player ();
1062
1061 /* we set up values so that it could be inserted into 1063 /* we set up values so that it could be inserted into
1062 * 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
1063 * to the caller to decide what we want to do. 1065 * to the caller to decide what we want to do.
1064 */ 1066 */
1065 map = env->map; 1067 map = env->map;
… …
1076 1078
1077 /* 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
1078 * made to players inventory. If set, avoiding the call 1080 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 1081 * to save cpu time.
1080 */ 1082 */
1081 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 {
1082 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 }
1083 } 1091 }
1084 else if (map) 1092 else if (map)
1085 { 1093 {
1086 map->dirty = true; 1094 map->dirty = true;
1087 mapspace &ms = this->ms (); 1095 mapspace &ms = this->ms ();
1088 1096
1089 if (object *pl = ms.player ()) 1097 if (object *pl = ms.player ())
1090 { 1098 {
1091 if (type == PLAYER) // this == pl(!) 1099 if (is_player ())
1092 { 1100 {
1101 ms.smell = pticks; // remember the smell of the player
1102
1093 // leaving a spot always closes any open container on the ground 1103 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1104 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1105 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1106 // that the CLOSE event is being sent.
1097 close_container (); 1107 close_container ();
… …
1114 *(below ? &below->above : &ms.bot) = above; 1124 *(below ? &below->above : &ms.bot) = above;
1115 1125
1116 above = 0; 1126 above = 0;
1117 below = 0; 1127 below = 0;
1118 1128
1119 ms.flags_ = 0; 1129 ms.invalidate ();
1120 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];
… …
1157 } 1167 }
1158 1168
1159 last = tmp; 1169 last = tmp;
1160 } 1170 }
1161 1171
1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1172 if (affects_los ())
1163 update_all_los (map, x, y); 1173 update_all_los (map, x, y);
1164 } 1174 }
1165} 1175}
1166 1176
1167/* 1177/*
… …
1263 * just 'op' otherwise 1273 * just 'op' otherwise
1264 */ 1274 */
1265object * 1275object *
1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1276insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1267{ 1277{
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 (); 1278 op->remove ();
1278 }
1279 1279
1280 if (m == &freed_map)//D TODO: remove soon 1280 if (m == &freed_map)//D TODO: remove soon
1281 {//D 1281 {//D
1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 }//D 1283 }//D
… …
1424 op->below = top; 1424 op->below = top;
1425 *(op->above ? &op->above->below : &ms.top) = op; 1425 *(op->above ? &op->above->below : &ms.top) = op;
1426 } 1426 }
1427 } 1427 }
1428 1428
1429 if (op->type == PLAYER) 1429 if (op->is_player ())
1430 { 1430 {
1431 op->contr->do_los = 1; 1431 op->contr->do_los = 1;
1432 ++op->map->players; 1432 ++op->map->players;
1433 op->map->touch (); 1433 op->map->touch ();
1434 } 1434 }
… …
1449 * 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 -
1450 * this should get redone to only look for players within range, 1450 * this should get redone to only look for players within range,
1451 * or just updating the P_UPTODATE for spaces within this area 1451 * or just updating the P_UPTODATE for spaces within this area
1452 * of effect may be sufficient. 1452 * of effect may be sufficient.
1453 */ 1453 */
1454 if (op->map->darkness && (op->glow_radius != 0)) 1454 if (op->affects_los ())
1455 {
1456 op->ms ().invalidate ();
1455 update_all_los (op->map, op->x, op->y); 1457 update_all_los (op->map, op->x, op->y);
1458 }
1456 1459
1457 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1460 /* updates flags (blocked, alive, no magic, etc) for this map space */
1458 update_object (op, UP_OBJ_INSERT); 1461 update_object (op, UP_OBJ_INSERT);
1459 1462
1460 INVOKE_OBJECT (INSERT, op); 1463 INVOKE_OBJECT (INSERT, op);
… …
1655 1658
1656 adjust_weight (this, op->total_weight ()); 1659 adjust_weight (this, op->total_weight ());
1657 1660
1658inserted: 1661inserted:
1659 /* 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 */
1660 if (op->glow_radius && map && map->darkness) 1663 if (op->glow_radius && is_on_map ())
1664 {
1665 update_stats ();
1661 update_all_los (map, x, y); 1666 update_all_los (map, x, y);
1662 1667 }
1668 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663 // if this is a player's inventory, update stats 1669 // if this is a player's inventory, update stats
1664 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1665 update_stats (); 1670 update_stats ();
1666 1671
1667 INVOKE_OBJECT (INSERT, this); 1672 INVOKE_OBJECT (INSERT, this);
1668 1673
1669 return op; 1674 return op;
… …
1753 { 1758 {
1754 1759
1755 float 1760 float
1756 diff = tmp->move_slow_penalty * fabs (op->speed); 1761 diff = tmp->move_slow_penalty * fabs (op->speed);
1757 1762
1758 if (op->type == PLAYER) 1763 if (op->is_player ())
1759 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)) ||
1760 (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)))
1761 diff /= 4.0; 1766 diff /= 4.0;
1762 1767
1763 op->speed_left -= diff; 1768 op->speed_left -= diff;
… …
1971 * head of the object should correspond for the entire object. 1976 * head of the object should correspond for the entire object.
1972 */ 1977 */
1973 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1978 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974 continue; 1979 continue;
1975 1980
1976 if (ob->blocked (m, pos.x, pos.y)) 1981 if (ob->blocked (pos.m, pos.x, pos.y))
1977 continue; 1982 continue;
1978 1983
1979 altern [index++] = i; 1984 altern [index++] = i;
1980 } 1985 }
1981 1986
… …
2089 if ((move_type & blocked) == move_type) 2094 if ((move_type & blocked) == move_type)
2090 max = maxfree[i]; 2095 max = maxfree[i];
2091 else if (mflags & P_IS_ALIVE) 2096 else if (mflags & P_IS_ALIVE)
2092 { 2097 {
2093 for (tmp = ms.bot; tmp; tmp = tmp->above) 2098 for (tmp = ms.bot; tmp; tmp = tmp->above)
2094 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2099 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2095 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2100 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096 break; 2101 break;
2097 2102
2098 if (tmp) 2103 if (tmp)
2099 return freedir[i]; 2104 return freedir[i];
… …
2285int 2290int
2286can_pick (const object *who, const object *item) 2291can_pick (const object *who, const object *item)
2287{ 2292{
2288 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2293 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2289 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2294 (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)); 2295 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2291} 2296}
2292 2297
2293/* 2298/*
2294 * create clone from object to another 2299 * create clone from object to another
2295 */ 2300 */
… …
2548 return splay (tmp); 2553 return splay (tmp);
2549 2554
2550 return 0; 2555 return 0;
2551} 2556}
2552 2557
2553void 2558object *
2554object::force_add (const shstr name, int duration) 2559object::force_add (const shstr name, int duration)
2555{ 2560{
2556 if (object *force = force_find (name)) 2561 if (object *force = force_find (name))
2557 force->destroy (); 2562 force->destroy ();
2558 2563
… …
2564 2569
2565 force->set_speed (duration ? 1.f / duration : 0.f); 2570 force->set_speed (duration ? 1.f / duration : 0.f);
2566 force->flag [FLAG_IS_USED_UP] = true; 2571 force->flag [FLAG_IS_USED_UP] = true;
2567 force->flag [FLAG_APPLIED] = true; 2572 force->flag [FLAG_APPLIED] = true;
2568 2573
2569 insert (force); 2574 return insert (force);
2570} 2575}
2571 2576
2572void 2577void
2573object::play_sound (faceidx sound) 2578object::play_sound (faceidx sound)
2574{ 2579{
… …
2585 } 2590 }
2586 else 2591 else
2587 map->play_sound (sound, x, y); 2592 map->play_sound (sound, x, y);
2588} 2593}
2589 2594
2595void
2596object::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

Diff Legend

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