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.173 by root, Sat Aug 4 22:23:47 2007 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

… …
1089 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1090 return; 1090 return;
1091 1091
1092 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1093 1093
1094 if (object *pl = ms.player ())
1095 {
1096 if (pl->container == this)
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 pl->close_container ();
1102
1103 pl->contr->ns->floorbox_update ();
1104 }
1105
1094 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1095 { 1107 {
1096 /* No point updating the players look faces if he is the object 1108 /* No point updating the players look faces if he is the object
1097 * being removed. 1109 * being removed.
1098 */ 1110 */
1099
1100 if (tmp->type == PLAYER && tmp != this)
1101 {
1102 /* If a container that the player is currently using somehow gets
1103 * removed (most likely destroyed), update the player view
1104 * appropriately.
1105 */
1106 if (tmp->container == this)
1107 {
1108 flag [FLAG_APPLIED] = 0;
1109 tmp->container = 0;
1110 }
1111
1112 if (tmp->contr->ns)
1113 tmp->contr->ns->floorbox_update ();
1114 }
1115 1111
1116 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1117 if (check_walk_off 1113 if (check_walk_off
1118 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1119 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1242 1238
1243 object *top, *floor = NULL; 1239 object *top, *floor = NULL;
1244 1240
1245 op->remove (); 1241 op->remove ();
1246 1242
1247#if 0
1248 if (!m->active != !op->active)
1249 if (m->active)
1250 op->activate_recursive ();
1251 else
1252 op->deactivate_recursive ();
1253#endif
1254
1255 if (out_of_map (m, op->x, op->y)) 1243 if (out_of_map (m, op->x, op->y))
1256 { 1244 {
1257 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1258#ifdef MANY_CORES 1246#ifdef MANY_CORES
1259 /* Better to catch this here, as otherwise the next use of this object 1247 /* Better to catch this here, as otherwise the next use of this object
… …
1430 /* If we have a floor, we know the player, if any, will be above 1418 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there. 1419 * it, so save a few ticks and start from there.
1432 */ 1420 */
1433 if (!(flag & INS_MAP_LOAD)) 1421 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = ms.player ()) 1422 if (object *pl = ms.player ())
1435 if (pl->contr->ns)
1436 pl->contr->ns->floorbox_update (); 1423 pl->contr->ns->floorbox_update ();
1437 1424
1438 /* If this object glows, it may affect lighting conditions that are 1425 /* If this object glows, it may affect lighting conditions that are
1439 * visible to others on this map. But update_all_los is really 1426 * visible to others on this map. But update_all_los is really
1440 * an inefficient way to do this, as it means los for all players 1427 * an inefficient way to do this, as it means los for all players
1441 * on the map will get recalculated. The players could very well 1428 * on the map will get recalculated. The players could very well
… …
2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2336 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2350 * core dumps if they do. 2337 * core dumps if they do.
2351 * 2338 *
2352 * Add a check so we can't pick up invisible objects (0.93.8) 2339 * Add a check so we can't pick up invisible objects (0.93.8)
2353 */ 2340 */
2354
2355int 2341int
2356can_pick (const object *who, const object *item) 2342can_pick (const object *who, const object *item)
2357{ 2343{
2358 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2344 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2359 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2345 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2674 old_container->flag [FLAG_APPLIED] = 0; 2660 old_container->flag [FLAG_APPLIED] = 0;
2675 container = 0; 2661 container = 0;
2676 2662
2677 esrv_update_item (UPD_FLAGS, this, old_container); 2663 esrv_update_item (UPD_FLAGS, this, old_container);
2678 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2664 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2665 play_sound (sound_find ("chest_close"));
2679 } 2666 }
2680 2667
2681 if (new_container) 2668 if (new_container)
2682 { 2669 {
2683 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2670 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2699 new_container->flag [FLAG_APPLIED] = 1; 2686 new_container->flag [FLAG_APPLIED] = 1;
2700 container = new_container; 2687 container = new_container;
2701 2688
2702 esrv_update_item (UPD_FLAGS, this, new_container); 2689 esrv_update_item (UPD_FLAGS, this, new_container);
2703 esrv_send_inventory (this, new_container); 2690 esrv_send_inventory (this, new_container);
2691 play_sound (sound_find ("chest_open"));
2704 } 2692 }
2705} 2693}
2706 2694
2707object * 2695object *
2708object::force_find (const shstr name) 2696object::force_find (const shstr name)
… …
2734 force->flag [FLAG_APPLIED] = true; 2722 force->flag [FLAG_APPLIED] = true;
2735 2723
2736 insert (force); 2724 insert (force);
2737} 2725}
2738 2726
2727void
2728object::play_sound (faceidx sound) const
2729{
2730 if (!sound)
2731 return;
2732
2733 if (flag [FLAG_REMOVED])
2734 return;
2735
2736 if (env)
2737 {
2738 if (object *pl = in_player ())
2739 pl->contr->play_sound (sound);
2740 }
2741 else
2742 map->play_sound (sound, x, y);
2743}
2744

Diff Legend

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