ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.102 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.103 by root, Thu May 17 23:35:19 2007 UTC

220 * hidden dm 220 * hidden dm
221 */ 221 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 222 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 223 return 1;
224 224
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) 225 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 226 && tmp->head_ () != ob
227 && tmp != ob 227 && tmp != ob
228 && tmp->type != DOOR 228 && tmp->type != DOOR
229 && !tmp->flag [FLAG_WIZ] 229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
230 && tmp->contr->hidden)
231 return 1; 230 return 1;
232 } 231 }
233 232
234 } 233 }
235 return 0; 234 return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines