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.106 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.107 by root, Mon Jun 4 13:04:00 2007 UTC

278 return m1->at (sx, sy).move_block; 278 return m1->at (sx, sy).move_block;
279 } 279 }
280 280
281 for (tmp = ob->arch; tmp; tmp = tmp->more) 281 for (tmp = ob->arch; tmp; tmp = tmp->more)
282 { 282 {
283 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 284
285 if (flag & P_OUT_OF_MAP) 285 if (flag & P_OUT_OF_MAP)
286 return P_OUT_OF_MAP; 286 return P_OUT_OF_MAP;
287 if (flag & P_IS_ALIVE) 287 if (flag & P_IS_ALIVE)
288 return P_IS_ALIVE; 288 return P_IS_ALIVE;
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 977 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 978 {
979 total_exp += op->stats.exp; 979 total_exp += op->stats.exp;
980 980
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
982 total_exp += at->clone.stats.exp * 8; 982 total_exp += at->stats.exp * 8;
983 983
984 monster_cnt++; 984 monster_cnt++;
985 } 985 }
986 } 986 }
987 987

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines