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.166 by root, Wed Oct 21 00:44:39 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
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 <support@deliantra.net>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h" 28#include "loader.h"
31
32#include "path.h" 29#include "path.h"
33 30
34/* 31sint8 maptile::outdoor_darkness;
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47
48/*
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
138 * by the caller. 71 * by the caller.
139 */ 72 */
140int 73int
141blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
142{ 75{
143 object *tmp;
144 int mflags, blocked;
145
146 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
147 * have already checked this. 77 * have already checked this.
148 */ 78 */
149 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
150 { 80 {
151 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 81 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
152 return 1; 82 return 1;
153 } 83 }
154 84
155 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 mapspace &ms = m->at (sx, sy);
156 * directly.
157 */
158 mflags = m->at (sx, sy).flags ();
159 86
160 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 87 int mflags = ms.flags ();
88 int blocked = ms.move_block;
161 89
162 /* If space is currently not blocked by anything, no need to 90 /* If space is currently not blocked by anything, no need to
163 * go further. Not true for players - all sorts of special 91 * go further. Not true for players - all sorts of special
164 * things we need to do for players. 92 * things we need to do for players.
165 */ 93 */
166 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 94 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
167 return 0; 95 return 0;
168 96
169 /* if there isn't anytyhing alive on this space, and this space isn't 97 /* if there isn't anything alive on this space, and this space isn't
170 * otherwise blocked, we can return now. Only if there is a living 98 * otherwise blocked, we can return now. Only if there is a living
171 * creature do we need to investigate if it is part of this creature 99 * creature do we need to investigate if it is part of this creature
172 * or another. Likewise, only if something is blocking us do we 100 * or another. Likewise, only if something is blocking us do we
173 * need to investigate if there is a special circumstance that would 101 * need to investigate if there is a special circumstance that would
174 * let the player through (inventory checkers for example) 102 * let the player through (inventory checkers for example)
181 /* We basically go through the stack of objects, and if there is 109 /* We basically go through the stack of objects, and if there is
182 * some other object that has NO_PASS or FLAG_ALIVE set, return 110 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 111 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 112 * ob is blocking it, so return 0.
185 */ 113 */
186 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 114 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187 { 115 {
188 116 if (OB_MOVE_BLOCK (ob, tmp))
189 /* This must be before the checks below. Code for inventory checkers. */
190 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191 { 117 {
192 /* If last_sp is set, the player/monster needs an object, 118 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
193 * so we check for it. If they don't have it, they can't 119 if (RESULT_INT (0))
194 * pass through this space. 120 return 1;
195 */ 121 else
196 if (tmp->last_sp) 122 continue;
123
124 if (tmp->type == CHECK_INV)
197 { 125 {
198 if (check_inv_recursive (ob, tmp) == NULL) 126 bool have = check_inv_recursive (ob, tmp);
127
128 // last_sp set means we block if we don't have.
129 if (logical_xor (have, tmp->last_sp))
199 return 1; 130 return 1;
200 else 131 }
201 continue; 132 else if (tmp->type == T_MATCH)
133 {
134 // T_MATCH allows "entrance" iff the match is true
135 // == blocks if the match fails
136
137 // we could have used an INVOKE_OBJECT, but decided against it, as we
138 // assume that T_MATCH is relatively common.
139 if (!match (tmp->slaying, ob, tmp, ob))
140 return 1;
202 } 141 }
203 else 142 else
204 { 143 return 1; // unconditional block
205 /* In this case, the player must not have the object - 144
206 * if they do, they can't pass through.
207 */
208 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
209 return 1;
210 else
211 continue;
212 }
213 } /* if check_inv */
214 else 145 } else {
215 { 146 // space does not block the ob, directly, but
216 /* Broke apart a big nasty if into several here to make 147 // anything alive that is not a door still
217 * this more readable. first check - if the space blocks 148 // blocks anything but wizards.
218 * movement, can't move here.
219 * second - if a monster, can't move there, unless it is a
220 * hidden dm
221 */
222 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1;
224 149
225 if (tmp->flag [FLAG_ALIVE] 150 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 151 && tmp->head_ () != ob
227 && tmp != ob 152 && tmp != ob
228 && tmp->type != DOOR 153 && tmp->type != DOOR
229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 154 && !tmp->flag [FLAG_WIZPASS])
230 return 1; 155 return 1;
231 } 156 }
232
233 } 157 }
158
234 return 0; 159 return 0;
235} 160}
236 161
237/* 162/*
238 * Returns true if the given object can't fit in the given spot. 163 * Returns qthe blocking object if the given object can't fit in the given
239 * This is meant for multi space objects - for single space objecs, 164 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 166 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
243 * 168 *
244 * While this doesn't call out of map, the get_map_flags does. 169 * While this doesn't call out of map, the get_map_flags does.
245 * 170 *
246 * This function has been used to deprecate arch_out_of_map - 171 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 172 * this function also does that check, and since in most cases,
258 * 183 *
259 * Note this used to be arch_blocked, but with new movement 184 * Note this used to be arch_blocked, but with new movement
260 * code, we need to have actual object to check its move_type 185 * code, we need to have actual object to check its move_type
261 * against the move_block values. 186 * against the move_block values.
262 */ 187 */
263int 188bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 189object::blocked (maptile *m, int x, int y) const
265{ 190{
266 archetype *tmp; 191 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 192 {
193 mapxy pos (m, x + tmp->x, y + tmp->y);
280 194
281 for (tmp = ob->arch; tmp; tmp = tmp->more) 195 if (!pos.normalise ())
282 { 196 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
284 197
285 if (flag & P_OUT_OF_MAP) 198 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 199
287 if (flag & P_IS_ALIVE) 200 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 201 return 1;
289 202
290 mapspace &ms = m1->at (sx, sy); 203 /* However, often ob doesn't have any move type
291 204 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 205 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 206 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 207 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 208 continue;
299 209
300 /* Note it is intentional that we check ob - the movement type of the 210 /* Note it is intentional that we check ob - the movement type of the
301 * head of the object should correspond for the entire object. 211 * head of the object should correspond for the entire object.
302 */ 212 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 213 if (ms.blocks (move_type))
304 return P_NO_PASS; 214 return 1;
305 } 215 }
306 216
307 return 0; 217 return 0;
308} 218}
309 219
327 237
328 insert_ob_in_ob (tmp, container); 238 insert_ob_in_ob (tmp, container);
329 tmp = next; 239 tmp = next;
330 } 240 }
331 241
332 /* sum_weight will go through and calculate what all the containers are 242 // go through and calculate what all the containers are carrying.
333 * carrying. 243 //TODO: remove
334 */ 244 container->update_weight ();
335 sum_weight (container);
336} 245}
337 246
338void 247void
339maptile::set_object_flag (int flag, int value) 248maptile::set_object_flag (int flag, int value)
340{ 249{
342 return; 251 return;
343 252
344 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value; 255 tmp->flag [flag] = value;
256}
257
258void
259maptile::post_load_original ()
260{
261 if (!spaces)
262 return;
263
264 set_object_flag (FLAG_OBJ_ORIGINAL);
265
266 for (mapspace *ms = spaces + size (); ms-- > spaces; )
267 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
268 INVOKE_OBJECT (RESET, tmp);
347} 269}
348 270
349/* link_multipart_objects go through all the objects on the map looking 271/* link_multipart_objects go through all the objects on the map looking
350 * for objects whose arch says they are multipart yet according to the 272 * for objects whose arch says they are multipart yet according to the
351 * info we have, they only have the head (as would be expected when 273 * info we have, they only have the head (as would be expected when
356{ 278{
357 if (!spaces) 279 if (!spaces)
358 return; 280 return;
359 281
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 282 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 283 {
284 object *op = ms->bot;
285 while (op)
362 { 286 {
363 /* already multipart - don't do anything more */ 287 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 288 if (op->head_ () == op && !op->more && op->arch->more)
365 { 289 {
366 op->remove (); 290 op->remove ();
367 op->expand_tail (); 291 op->expand_tail ();
292
293 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
294 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
295 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 296 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
297
298 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
299 // so we have to reset the iteration through the mapspace
369 } 300 }
301 else
302 op = op->above;
370 } 303 }
304 }
371} 305}
372 306
373/* 307/*
374 * Loads (ands parses) the objects into a given map from the specified 308 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 309 * file pointer.
377bool 311bool
378maptile::_load_objects (object_thawer &f) 312maptile::_load_objects (object_thawer &f)
379{ 313{
380 for (;;) 314 for (;;)
381 { 315 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 316 coroapi::cede_to_tick (); // cede once in a while
383 317
384 switch (f.kw) 318 switch (f.kw)
385 { 319 {
386 case KW_arch: 320 case KW_arch:
387 if (object *op = object::read (f, this)) 321 if (object *op = object::read (f, this))
388 { 322 {
323 // TODO: why?
389 if (op->inv) 324 if (op->inv)
390 sum_weight (op); 325 op->update_weight ();
391 326
392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 327 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
328 {
329 // we insert manually because
330 // a) its way faster
331 // b) we remove manually, too, and there are good reasons for that
332 // c) it's correct
333 mapspace &ms = at (op->x, op->y);
334
335 op->flag [FLAG_REMOVED] = false;
336
337 op->above = 0;
338 op->below = ms.top;
339
340 *(ms.top ? &ms.top->above : &ms.bot) = op;
341
342 ms.top = op;
343 ms.flags_ = 0;
344 }
345 else
346 {
347 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
348 op->destroy ();
349 }
393 } 350 }
394 351
395 continue; 352 continue;
396 353
397 case KW_EOF: 354 case KW_EOF:
410} 367}
411 368
412void 369void
413maptile::activate () 370maptile::activate ()
414{ 371{
415 active = true;
416
417 if (spaces) 372 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 373 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 374 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 375 op->activate_recursive ();
421} 376}
422 377
423void 378void
424maptile::deactivate () 379maptile::deactivate ()
425{ 380{
426 active = false;
427
428 if (spaces) 381 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 384 op->deactivate_recursive ();
432} 385}
442 if (!spaces) 395 if (!spaces)
443 return false; 396 return false;
444 397
445 for (int i = 0; i < size (); ++i) 398 for (int i = 0; i < size (); ++i)
446 { 399 {
447 int unique = 0; 400 bool unique = 0;
401
448 for (object *op = spaces [i].bot; op; op = op->above) 402 for (object *op = spaces [i].bot; op; op = op->above)
449 { 403 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 404 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 405
453 if (!op->can_map_save ()) 406 if (expect_false (!op->can_map_save ()))
454 continue; 407 continue;
455 408
456 if (unique || op->flag [FLAG_UNIQUE]) 409 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 410 {
458 if (flags & IO_UNIQUES) 411 if (flags & IO_UNIQUES)
459 op->write (f); 412 op->write (f);
460 } 413 }
461 else if (flags & IO_OBJECTS) 414 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 415 op->write (f);
463 } 416 }
464 } 417 }
465 418
466 coroapi::cede_to_tick (); 419 coroapi::cede_to_tick ();
467 420
468 return true; 421 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 422}
492 423
493bool 424bool
494maptile::_save_objects (const char *path, int flags) 425maptile::_save_objects (const char *path, int flags)
495{ 426{
626 return items; 557 return items;
627} 558}
628 559
629/* opposite of parse string, this puts the string that was originally fed in to 560/* opposite of parse string, this puts the string that was originally fed in to
630 * the map (or something equivilent) into output_string. */ 561 * the map (or something equivilent) into output_string. */
631static void 562static const char *
632print_shop_string (maptile *m, char *output_string) 563print_shop_string (maptile *m)
633{ 564{
634 int i; 565 static dynbuf_text buf; buf.clear ();
635 char tmp[MAX_BUF];
636 566
637 strcpy (output_string, "");
638 for (i = 0; i < m->shopitems[0].index; i++) 567 for (int i = 0; i < m->shopitems[0].index; i++)
639 { 568 {
640 if (m->shopitems[i].typenum) 569 if (m->shopitems[i].typenum)
641 { 570 {
642 if (m->shopitems[i].strength) 571 if (m->shopitems[i].strength)
643 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 572 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
644 else 573 else
645 sprintf (tmp, "%s;", m->shopitems[i].name); 574 buf.printf ("%s;", m->shopitems[i].name);
646 } 575 }
647 else 576 else
648 { 577 {
649 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
650 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 579 buf.printf ("*:%d;", m->shopitems[i].strength);
651 else 580 else
652 sprintf (tmp, "*"); 581 buf.printf ("*");
653 } 582 }
654
655 strcat (output_string, tmp);
656 } 583 }
584
585 return buf;
657} 586}
658 587
659/* This loads the header information of the map. The header 588/* This loads the header information of the map. The header
660 * contains things like difficulty, size, timeout, etc. 589 * contains things like difficulty, size, timeout, etc.
661 * this used to be stored in the map object, but with the 590 * this used to be stored in the map object, but with the
670bool 599bool
671maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
672{ 601{
673 for (;;) 602 for (;;)
674 { 603 {
675 thawer.next ();
676
677 switch (thawer.kw) 604 switch (thawer.kw)
678 { 605 {
679 case KW_msg: 606 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
681 break; 608 break;
714 case KW_winddir: thawer.get (winddir); break; 641 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break; 642 case KW_sky: thawer.get (sky); break;
716 643
717 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 645 case KW_per_party: thawer.get (per_party); break;
646 case KW_no_reset: thawer.get (no_reset); break;
647 case KW_no_drop: thawer.get (no_drop); break;
719 648
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 649 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 650 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 651
723 // old names new names 652 // old names new names
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 663 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 664 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 665 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 666 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 667
668 case KW_ERROR:
669 set_key_text (thawer.kw_str, thawer.value);
670 break;
671
739 case KW_end: 672 case KW_end:
673 thawer.next ();
740 return true; 674 return true;
741 675
742 default: 676 default:
743 if (!thawer.parse_error ("map", 0)) 677 if (!thawer.parse_error ("map", 0))
744 return false; 678 return false;
745 break; 679 break;
746 } 680 }
681
682 thawer.next ();
747 } 683 }
748 684
749 abort (); 685 abort ();
750}
751
752bool
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761} 686}
762 687
763/****************************************************************************** 688/******************************************************************************
764 * This is the start of unique map handling code 689 * This is the start of unique map handling code
765 *****************************************************************************/ 690 *****************************************************************************/
777 702
778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
779 unique = 1; 704 unique = 1;
780 705
781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
782 {
783 op->destroy_inv (false);
784 op->destroy (); 707 op->destroy ();
785 }
786 708
787 op = above; 709 op = above;
788 } 710 }
789 } 711 }
790} 712}
800 if (name) MAP_OUT (name); 722 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 723 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 724 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 725 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 726 MAP_OUT (fixed_resettime);
727 MAP_OUT (no_reset);
728 MAP_OUT (no_drop);
805 MAP_OUT (difficulty); 729 MAP_OUT (difficulty);
806
807 if (default_region) MAP_OUT2 (region, default_region->name); 730 if (default_region) MAP_OUT2 (region, default_region->name);
808 731
809 if (shopitems) 732 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
810 {
811 char shop[MAX_BUF];
812 print_shop_string (this, shop);
813 MAP_OUT2 (shopitems, shop);
814 }
815
816 MAP_OUT (shopgreed); 733 MAP_OUT (shopgreed);
817 MAP_OUT (shopmin); 734 MAP_OUT (shopmin);
818 MAP_OUT (shopmax); 735 MAP_OUT (shopmax);
819 if (shoprace) MAP_OUT (shoprace); 736 if (shoprace) MAP_OUT (shoprace);
737
820 MAP_OUT (darkness); 738 MAP_OUT (darkness);
821 MAP_OUT (width); 739 MAP_OUT (width);
822 MAP_OUT (height); 740 MAP_OUT (height);
823 MAP_OUT (enter_x); 741 MAP_OUT (enter_x);
824 MAP_OUT (enter_y); 742 MAP_OUT (enter_y);
863 * Remove and free all objects in the given map. 781 * Remove and free all objects in the given map.
864 */ 782 */
865void 783void
866maptile::clear () 784maptile::clear ()
867{ 785{
868 sfree (regions, size ()), regions = 0;
869 free (regionmap), regionmap = 0;
870
871 if (spaces) 786 if (spaces)
872 { 787 {
873 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 788 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 while (object *op = ms->bot) 789 while (object *op = ms->bot)
875 { 790 {
791 // manually remove, as to not trigger anything
792 if (ms->bot = op->above)
793 ms->bot->below = 0;
794
795 op->flag [FLAG_REMOVED] = true;
796
876 op = op->head_ (); 797 object *head = op->head_ ();
877 op->destroy_inv (false); 798 if (op == head)
878 op->destroy (); 799 op->destroy ();
800 else if (head->map != op->map)
801 {
802 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
803 head->destroy ();
804 }
879 } 805 }
880 806
881 sfree (spaces, size ()), spaces = 0; 807 sfree0 (spaces, size ());
882 } 808 }
883 809
884 if (buttons) 810 if (buttons)
885 free_objectlinkpt (buttons), buttons = 0; 811 free_objectlinkpt (buttons), buttons = 0;
812
813 sfree0 (regions, size ());
814 delete [] regionmap; regionmap = 0;
886} 815}
887 816
888void 817void
889maptile::clear_header () 818maptile::clear_header ()
890{ 819{
922 attachable::do_destroy (); 851 attachable::do_destroy ();
923 852
924 clear (); 853 clear ();
925} 854}
926 855
927/* 856/* decay and destroy perishable items in a map */
928 * Updates every button on the map (by calling update_button() for them).
929 */
930void 857void
931maptile::update_buttons () 858maptile::do_decay_objects ()
932{ 859{
933 for (oblinkpt *obp = buttons; obp; obp = obp->next) 860 if (!spaces)
934 for (objectlink *ol = obp->link; ol; ol = ol->next) 861 return;
862
863 for (mapspace *ms = spaces + size (); ms-- > spaces; )
864 for (object *above, *op = ms->bot; op; op = above)
935 { 865 {
936 if (!ol->ob) 866 above = op->above;
867
868 bool destroy = 0;
869
870 // do not decay anything above unique floor tiles (yet :)
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
872 break;
873
874 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
875 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
876 || QUERY_FLAG (op, FLAG_UNIQUE)
877 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
878 || QUERY_FLAG (op, FLAG_UNPAID)
879 || op->is_alive ())
880 ; // do not decay
881 else if (op->is_weapon ())
937 { 882 {
938 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 883 op->stats.dam--;
939 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 884 if (op->stats.dam < 0)
940 continue; 885 destroy = 1;
941 } 886 }
942 887 else if (op->is_armor ())
943 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
944 { 888 {
945 update_button (ol->ob); 889 op->stats.ac--;
946 break; 890 if (op->stats.ac < 0)
891 destroy = 1;
947 } 892 }
893 else if (op->type == FOOD)
894 {
895 op->stats.food -= rndm (5, 20);
896 if (op->stats.food < 0)
897 destroy = 1;
898 }
899 else
900 {
901 int mat = op->materials;
902
903 if (mat & M_PAPER
904 || mat & M_LEATHER
905 || mat & M_WOOD
906 || mat & M_ORGANIC
907 || mat & M_CLOTH
908 || mat & M_LIQUID
909 || (mat & M_IRON && rndm (1, 5) == 1)
910 || (mat & M_GLASS && rndm (1, 2) == 1)
911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
913 || (mat & M_ICE && temp > 32))
914 destroy = 1;
915 }
916
917 /* adjust overall chance below */
918 if (destroy && rndm (0, 1))
919 op->destroy ();
948 } 920 }
949} 921}
950 922
951/* 923/*
952 * This routine is supposed to find out the difficulty of the map. 924 * This routine is supposed to find out the difficulty of the map.
953 * difficulty does not have a lot to do with character level, 925 * difficulty does not have a lot to do with character level,
954 * but does have a lot to do with treasure on the map. 926 * but does have a lot to do with treasure on the map.
955 * 927 *
956 * Difficulty can now be set by the map creature. If the value stored 928 * Difficulty can now be set by the map creator. If the value stored
957 * in the map is zero, then use this routine. Maps should really 929 * in the map is zero, then use this routine. Maps should really
958 * have a difficulty set than using this function - human calculation 930 * have a difficulty set rather than using this function - human calculation
959 * is much better than this functions guesswork. 931 * is much better than this function's guesswork.
960 */ 932 */
961int 933int
962maptile::estimate_difficulty () const 934maptile::estimate_difficulty () const
963{ 935{
964 long monster_cnt = 0; 936 long monster_cnt = 0;
976 948
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 949 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 950 {
979 total_exp += op->stats.exp; 951 total_exp += op->stats.exp;
980 952
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 953 if (archetype *at = op->other_arch)
954 {
982 total_exp += at->clone.stats.exp * 8; 955 total_exp += at->stats.exp * 8;
983
984 monster_cnt++; 956 monster_cnt++;
957 }
958
959 for (object *inv = op->inv; inv; inv = inv->below)
960 {
961 total_exp += op->stats.exp * 8;
962 monster_cnt++;
963 }
985 } 964 }
986 } 965 }
987 966
988 avgexp = (double) total_exp / monster_cnt; 967 avgexp = (double) total_exp / monster_cnt;
989 968
1002 * postive values make it darker, negative make it brighter 981 * postive values make it darker, negative make it brighter
1003 */ 982 */
1004int 983int
1005maptile::change_map_light (int change) 984maptile::change_map_light (int change)
1006{ 985{
1007 int new_level = darkness + change;
1008
1009 /* Nothing to do */ 986 /* Nothing to do */
1010 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 987 if (!change)
1011 return 0; 988 return 0;
1012 989
1013 /* inform all players on the map */ 990 /* inform all players on the map */
1014 if (change > 0) 991 if (change > 0)
1015 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 992 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1016 else 993 else
1017 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 994 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1018 995
1019 /* Do extra checking. since darkness is a unsigned value, 996 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1020 * we need to be extra careful about negative values.
1021 * In general, the checks below are only needed if change
1022 * is not +/-1
1023 */
1024 if (new_level < 0)
1025 darkness = 0;
1026 else if (new_level >= MAX_DARKNESS)
1027 darkness = MAX_DARKNESS;
1028 else
1029 darkness = new_level;
1030 997
1031 /* All clients need to get re-updated for the change */ 998 /* All clients need to get re-updated for the change */
1032 update_all_map_los (this); 999 update_all_map_los (this);
1000
1033 return 1; 1001 return 1;
1034} 1002}
1035 1003
1036/* 1004/*
1037 * This function updates various attributes about a specific space 1005 * This function updates various attributes about a specific space
1040 * through, etc) 1008 * through, etc)
1041 */ 1009 */
1042void 1010void
1043mapspace::update_ () 1011mapspace::update_ ()
1044{ 1012{
1045 object *tmp, *last = 0; 1013 object *last = 0;
1046 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1014 uint8 flags = P_UPTODATE, anywhere = 0;
1015 sint8 light = 0;
1047 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1016 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1048 1017
1049 //object *middle = 0; 1018 //object *middle = 0;
1050 //object *top = 0; 1019 //object *top = 0;
1051 //object *floor = 0; 1020 //object *floor = 0;
1052 // this seems to generate better code than using locals, above 1021 // this seems to generate better code than using locals, above
1053 object *&top = faces_obj[0] = 0; 1022 object *&top = faces_obj[0] = 0;
1054 object *&middle = faces_obj[1] = 0; 1023 object *&middle = faces_obj[1] = 0;
1055 object *&floor = faces_obj[2] = 0; 1024 object *&floor = faces_obj[2] = 0;
1056 1025
1057 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1026 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1058 { 1027 {
1059 /* This could be made additive I guess (two lights better than 1028 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1060 * one). But if so, it shouldn't be a simple additive - 2
1061 * light bulbs do not illuminate twice as far as once since
1062 * it is a dissapation factor that is cubed.
1063 */
1064 if (tmp->glow_radius > light)
1065 light = tmp->glow_radius; 1029 light += tmp->glow_radius;
1066 1030
1067 /* This call is needed in order to update objects the player 1031 /* This call is needed in order to update objects the player
1068 * is standing in that have animations (ie, grass, fire, etc). 1032 * is standing in that have animations (ie, grass, fire, etc).
1069 * However, it also causes the look window to be re-drawn 1033 * However, it also causes the look window to be re-drawn
1070 * 3 times each time the player moves, because many of the 1034 * 3 times each time the player moves, because many of the
1089 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1053 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1090 { 1054 {
1091 middle = tmp; 1055 middle = tmp;
1092 anywhere = 1; 1056 anywhere = 1;
1093 } 1057 }
1058
1094 /* Find the highest visible face around. If equal 1059 /* Find the highest visible face around. If equal
1095 * visibilities, we still want the one nearer to the 1060 * visibilities, we still want the one nearer to the
1096 * top 1061 * top
1097 */ 1062 */
1098 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1063 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1117 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1082 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1118 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1083 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1119 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1084 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1120 } 1085 }
1121 1086
1122 this->light = light; 1087 this->light = min (light, MAX_LIGHT_RADIUS);
1123 this->flags_ = flags; 1088 this->flags_ = flags;
1124 this->move_block = move_block & ~move_allow; 1089 this->move_block = move_block & ~move_allow;
1125 this->move_on = move_on; 1090 this->move_on = move_on;
1126 this->move_off = move_off; 1091 this->move_off = move_off;
1127 this->move_slow = move_slow; 1092 this->move_slow = move_slow;
1147 * 1) top face is set, need middle to be set. 1112 * 1) top face is set, need middle to be set.
1148 * 2) middle is set, need to set top. 1113 * 2) middle is set, need to set top.
1149 * 3) neither middle or top is set - need to set both. 1114 * 3) neither middle or top is set - need to set both.
1150 */ 1115 */
1151 1116
1152 for (tmp = last; tmp; tmp = tmp->below) 1117 for (object *tmp = last; tmp; tmp = tmp->below)
1153 { 1118 {
1154 /* Once we get to a floor, stop, since we already have a floor object */ 1119 /* Once we get to a floor, stop, since we already have a floor object */
1155 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1120 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 break; 1121 break;
1157 1122
1209 vol += op->volume (); 1174 vol += op->volume ();
1210 1175
1211 return vol; 1176 return vol;
1212} 1177}
1213 1178
1214/* this updates the orig_map->tile_map[tile_num] value after finding 1179maptile *
1215 * the map. It also takes care of linking back the freshly found 1180maptile::tile_available (int dir, bool load)
1216 * maps tile_map values if it tiles back to this one. It returns
1217 * the value of orig_map->tile_map[tile_num].
1218 */
1219static inline maptile *
1220find_and_link (maptile *orig_map, int tile_num)
1221{ 1181{
1222 maptile *mp = orig_map->tile_map [tile_num]; 1182 if (tile_path[dir])
1223
1224 if (!mp)
1225 {
1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1227
1228 if (!mp)
1229 {
1230 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1231 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1232 &orig_map->tile_path[tile_num], &orig_map->path);
1233 mp = new maptile (1, 1);
1234 mp->alloc ();
1235 mp->in_memory = MAP_IN_MEMORY;
1236 }
1237 } 1183 {
1184 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1185 return tile_map[dir];
1238 1186
1239 int dest_tile = (tile_num + 2) % 4; 1187 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1188 return tile_map[dir];
1189 }
1240 1190
1241 orig_map->tile_map [tile_num] = mp;
1242
1243 // optimisation: back-link map to origin map if euclidean
1244 //TODO: non-euclidean maps MUST GO
1245 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1246 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1247
1248 return mp; 1191 return 0;
1249}
1250
1251static inline void
1252load_and_link (maptile *orig_map, int tile_num)
1253{
1254 find_and_link (orig_map, tile_num)->load_sync ();
1255} 1192}
1256 1193
1257/* this returns TRUE if the coordinates (x,y) are out of 1194/* this returns TRUE if the coordinates (x,y) are out of
1258 * map m. This function also takes into account any 1195 * map m. This function also takes into account any
1259 * tiling considerations, loading adjacant maps as needed. 1196 * tiling considerations, loading adjacant maps as needed.
1272 if (!m) 1209 if (!m)
1273 return 0; 1210 return 0;
1274 1211
1275 if (x < 0) 1212 if (x < 0)
1276 { 1213 {
1277 if (!m->tile_path[3]) 1214 if (!m->tile_available (3))
1278 return 1; 1215 return 1;
1279 1216
1280 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1281 find_and_link (m, 3);
1282
1283 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1217 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1284 } 1218 }
1285 1219
1286 if (x >= m->width) 1220 if (x >= m->width)
1287 { 1221 {
1288 if (!m->tile_path[1]) 1222 if (!m->tile_available (1))
1289 return 1; 1223 return 1;
1290 1224
1291 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1292 find_and_link (m, 1);
1293
1294 return out_of_map (m->tile_map[1], x - m->width, y); 1225 return out_of_map (m->tile_map[1], x - m->width, y);
1295 } 1226 }
1296 1227
1297 if (y < 0) 1228 if (y < 0)
1298 { 1229 {
1299 if (!m->tile_path[0]) 1230 if (!m->tile_available (0))
1300 return 1; 1231 return 1;
1301 1232
1302 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1303 find_and_link (m, 0);
1304
1305 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1233 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1306 } 1234 }
1307 1235
1308 if (y >= m->height) 1236 if (y >= m->height)
1309 { 1237 {
1310 if (!m->tile_path[2]) 1238 if (!m->tile_available (2))
1311 return 1; 1239 return 1;
1312
1313 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1314 find_and_link (m, 2);
1315 1240
1316 return out_of_map (m->tile_map[2], x, y - m->height); 1241 return out_of_map (m->tile_map[2], x, y - m->height);
1317 } 1242 }
1318 1243
1319 /* Simple case - coordinates are within this local 1244 /* Simple case - coordinates are within this local
1333maptile * 1258maptile *
1334maptile::xy_find (sint16 &x, sint16 &y) 1259maptile::xy_find (sint16 &x, sint16 &y)
1335{ 1260{
1336 if (x < 0) 1261 if (x < 0)
1337 { 1262 {
1338 if (!tile_path[3]) 1263 if (!tile_available (3))
1339 return 0; 1264 return 0;
1340 1265
1341 find_and_link (this, 3);
1342 x += tile_map[3]->width; 1266 x += tile_map[3]->width;
1343 return tile_map[3]->xy_find (x, y); 1267 return tile_map[3]->xy_find (x, y);
1344 } 1268 }
1345 1269
1346 if (x >= width) 1270 if (x >= width)
1347 { 1271 {
1348 if (!tile_path[1]) 1272 if (!tile_available (1))
1349 return 0; 1273 return 0;
1350 1274
1351 find_and_link (this, 1);
1352 x -= width; 1275 x -= width;
1353 return tile_map[1]->xy_find (x, y); 1276 return tile_map[1]->xy_find (x, y);
1354 } 1277 }
1355 1278
1356 if (y < 0) 1279 if (y < 0)
1357 { 1280 {
1358 if (!tile_path[0]) 1281 if (!tile_available (0))
1359 return 0; 1282 return 0;
1360 1283
1361 find_and_link (this, 0);
1362 y += tile_map[0]->height; 1284 y += tile_map[0]->height;
1363 return tile_map[0]->xy_find (x, y); 1285 return tile_map[0]->xy_find (x, y);
1364 } 1286 }
1365 1287
1366 if (y >= height) 1288 if (y >= height)
1367 { 1289 {
1368 if (!tile_path[2]) 1290 if (!tile_available (2))
1369 return 0; 1291 return 0;
1370 1292
1371 find_and_link (this, 2);
1372 y -= height; 1293 y -= height;
1373 return tile_map[2]->xy_find (x, y); 1294 return tile_map[2]->xy_find (x, y);
1374 } 1295 }
1375 1296
1376 /* Simple case - coordinates are within this local 1297 /* Simple case - coordinates are within this local
1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1308adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1388{ 1309{
1389 if (!map1 || !map2) 1310 if (!map1 || !map2)
1390 return 0; 1311 return 0;
1391 1312
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1313 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!) 1314 //fix: compare paths instead (this is likely faster, too!)
1394 if (map1 == map2) 1315 if (map1 == map2)
1395 { 1316 {
1396 *dx = 0; 1317 *dx = 0;
1397 *dy = 0; 1318 *dy = 0;
1579 else 1500 else
1580 { 1501 {
1581 retval->distance_x += op2->x - x; 1502 retval->distance_x += op2->x - x;
1582 retval->distance_y += op2->y - y; 1503 retval->distance_y += op2->y - y;
1583 1504
1584 retval->part = NULL; 1505 retval->part = 0;
1585 retval->distance = idistance (retval->distance_x, retval->distance_y); 1506 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1586 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1507 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1587 } 1508 }
1588} 1509}
1589 1510
1590/* Returns true of op1 and op2 are effectively on the same map 1511/* Returns true of op1 and op2 are effectively on the same map
1604} 1525}
1605 1526
1606object * 1527object *
1607maptile::insert (object *op, int x, int y, object *originator, int flags) 1528maptile::insert (object *op, int x, int y, object *originator, int flags)
1608{ 1529{
1609 if (!op->flag [FLAG_REMOVED])
1610 op->remove ();
1611
1612 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1530 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1613} 1531}
1614 1532
1615region * 1533region *
1616maptile::region (int x, int y) const 1534maptile::region (int x, int y) const
1626 1544
1627 return ::region::default_region (); 1545 return ::region::default_region ();
1628} 1546}
1629 1547
1630/* picks a random object from a style map. 1548/* picks a random object from a style map.
1631 * Redone by MSW so it should be faster and not use static
1632 * variables to generate tables.
1633 */ 1549 */
1634object * 1550object *
1635maptile::pick_random_object () const 1551maptile::pick_random_object (rand_gen &gen) const
1636{ 1552{
1637 /* while returning a null object will result in a crash, that 1553 /* while returning a null object will result in a crash, that
1638 * is actually preferable to an infinite loop. That is because 1554 * is actually preferable to an infinite loop. That is because
1639 * most servers will automatically restart in case of crash. 1555 * most servers will automatically restart in case of crash.
1640 * Change the logic on getting the random space - shouldn't make 1556 * Change the logic on getting the random space - shouldn't make
1641 * any difference, but this seems clearer to me. 1557 * any difference, but this seems clearer to me.
1642 */ 1558 */
1643 for (int i = 1000; --i;) 1559 for (int i = 1000; --i;)
1644 { 1560 {
1645 object *pick = at (rndm (width), rndm (height)).bot; 1561 object *pick = at (gen (width), gen (height)).bot;
1646 1562
1647 // do not prefer big monsters just because they are big. 1563 // do not prefer big monsters just because they are big.
1648 if (pick && pick->head_ () == pick) 1564 if (pick && pick->is_head ())
1649 return pick->head_ (); 1565 return pick->head_ ();
1650 } 1566 }
1651 1567
1652 // instead of crashing in the unlikely(?) case, try to return *something* 1568 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked"); 1569 return archetype::find ("bug");
1654} 1570}
1655 1571
1572void
1573maptile::play_sound (faceidx sound, int x, int y) const
1574{
1575 if (!sound)
1576 return;
1577
1578 for_all_players_on_map (pl, this)
1579 if (client *ns = pl->ns)
1580 {
1581 int dx = x - pl->ob->x;
1582 int dy = y - pl->ob->y;
1583
1584 int distance = idistance (dx, dy);
1585
1586 if (distance <= MAX_SOUND_DISTANCE)
1587 ns->play_sound (sound, dx, dy);
1588 }
1589}
1590
1591void
1592maptile::say_msg (const char *msg, int x, int y) const
1593{
1594 for_all_players (pl)
1595 if (client *ns = pl->ns)
1596 {
1597 int dx = x - pl->ob->x;
1598 int dy = y - pl->ob->y;
1599
1600 int distance = idistance (dx, dy);
1601
1602 if (distance <= MAX_SOUND_DISTANCE)
1603 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1604 }
1605}
1606
1607static void
1608split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1609{
1610 // clip to map to the left
1611 if (x0 < 0)
1612 {
1613 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1614 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1615
1616 if (x1 < 0) // entirely to the left
1617 return;
1618
1619 x0 = 0;
1620 }
1621
1622 // clip to map to the right
1623 if (x1 > m->width)
1624 {
1625 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1626 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1627
1628 if (x0 > m->width) // entirely to the right
1629 return;
1630
1631 x1 = m->width;
1632 }
1633
1634 // clip to map above
1635 if (y0 < 0)
1636 {
1637 if (maptile *tile = m->tile_available (TILE_UP, 1))
1638 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1639
1640 if (y1 < 0) // entirely above
1641 return;
1642
1643 y0 = 0;
1644 }
1645
1646 // clip to map below
1647 if (y1 > m->height)
1648 {
1649 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1650 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1651
1652 if (y0 > m->height) // entirely below
1653 return;
1654
1655 y1 = m->height;
1656 }
1657
1658 // if we get here, the rect is within the current map
1659 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1660
1661 r->m = m;
1662 r->x0 = x0;
1663 r->y0 = y0;
1664 r->x1 = x1;
1665 r->y1 = y1;
1666 r->dx = dx;
1667 r->dy = dy;
1668}
1669
1670maprect *
1671maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1672{
1673 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1674 buf.clear ();
1675
1676 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1677
1678 // add end marker
1679 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1680 r->m = 0;
1681
1682 return (maprect *)buf.linearise ();
1683}
1684

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines