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.128 by root, Sun Sep 9 06:25:45 2007 UTC vs.
Revision 1.133 by root, Wed Apr 2 11:13:52 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) 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,
16 * GNU General Public License for more details. 16 * GNU General Public License 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
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
166 } 166 }
167 return 0; 167 return 0;
168} 168}
169 169
170/* 170/*
171 * Returns true if the given object can't fit in the given spot. 171 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
176 * 176 *
177 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
178 * 178 *
179 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
191 * 191 *
192 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
194 * against the move_block values. 194 * against the move_block values.
195 */ 195 */
196int 196bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
198{ 198{
199 archetype *tmp; 199 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
200 int flag;
201 maptile *m1;
202 sint16 sx, sy;
203
204 if (!ob)
205 {
206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207 if (flag & P_OUT_OF_MAP)
208 return P_OUT_OF_MAP;
209
210 /* don't have object, so don't know what types would block */
211 return m1->at (sx, sy).move_block;
212 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
213 202
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 203 if (!pos.normalise ())
215 { 204 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 205
218 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 207
220 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 209 return 1;
222 210
223 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
224 212 * (signifying non-moving objects)
225 /* find_first_free_spot() calls this function. However, often
226 * ob doesn't have any move type (when used to place exits)
227 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 214 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 216 continue;
232 217
233 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
235 */ 220 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
237 return P_NO_PASS; 222 return 1;
238 } 223 }
239 224
240 return 0; 225 return 0;
241} 226}
242 227
322bool 307bool
323maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
324{ 309{
325 for (;;) 310 for (;;)
326 { 311 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 312 coroapi::cede_to_tick (); // cede once in a while
328 313
329 switch (f.kw) 314 switch (f.kw)
330 { 315 {
331 case KW_arch: 316 case KW_arch:
332 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
333 { 318 {
334 if (op->inv) 319 if (op->inv)
335 sum_weight (op); 320 sum_weight (op);
336 321
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 if (ms.top)
336 ms.top->above = op;
337 else
338 ms.bot = op;
339
340 ms.top = op;
341 ms.flags_ = 0;
342 }
343 else
344 {
345 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
346 op->destroy ();
347 }
338 } 348 }
339 349
340 continue; 350 continue;
341 351
342 case KW_EOF: 352 case KW_EOF:
1610{ 1620{
1611 if (!sound) 1621 if (!sound)
1612 return; 1622 return;
1613 1623
1614 for_all_players (pl) 1624 for_all_players (pl)
1615 if (pl->observe->map == this) 1625 if (pl->ob->map == this)
1616 if (client *ns = pl->ns) 1626 if (client *ns = pl->ns)
1617 { 1627 {
1618 int dx = x - pl->observe->x; 1628 int dx = x - pl->ob->x;
1619 int dy = y - pl->observe->y; 1629 int dy = y - pl->ob->y;
1620 1630
1621 int distance = idistance (dx, dy); 1631 int distance = idistance (dx, dy);
1622 1632
1623 if (distance <= MAX_SOUND_DISTANCE) 1633 if (distance <= MAX_SOUND_DISTANCE)
1624 ns->play_sound (sound, dx, dy); 1634 ns->play_sound (sound, dx, dy);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines