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.105 by root, Mon May 28 05:35:51 2007 UTC vs.
Revision 1.108 by root, Tue Jun 5 13:05:02 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
276 276
277 /* don't have object, so don't know what types would block */ 277 /* don't have object, so don't know what types would block */
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 = (archetype *)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