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.174 by root, Wed Aug 8 04:52:59 2007 UTC

1095 { 1095 {
1096 /* No point updating the players look faces if he is the object 1096 /* No point updating the players look faces if he is the object
1097 * being removed. 1097 * being removed.
1098 */ 1098 */
1099 1099
1100 if (tmp->type == PLAYER && tmp != this) 1100 if (tmp->type == PLAYER && tmp->container == this)
1101 {
1102 /* If a container that the player is currently using somehow gets 1101 /* If a container that the player is currently using somehow gets
1103 * removed (most likely destroyed), update the player view 1102 * removed (most likely destroyed), update the player view
1104 * appropriately. 1103 * appropriately.
1105 */ 1104 */
1106 if (tmp->container == this)
1107 {
1108 flag [FLAG_APPLIED] = 0;
1109 tmp->container = 0; 1105 tmp->close_container ();
1110 }
1111
1112 if (tmp->contr->ns)
1113 tmp->contr->ns->floorbox_update ();
1114 }
1115 1106
1116 /* See if object moving off should effect something */ 1107 /* See if object moving off should effect something */
1117 if (check_walk_off 1108 if (check_walk_off
1118 && ((move_type & tmp->move_off) 1109 && ((move_type & tmp->move_off)
1119 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1110 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines