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.78 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.148 by root, Mon Sep 29 10:31:32 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 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 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
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 2 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,
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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 24#include <unistd.h>
30 25
26#include "global.h"
27#include "loader.h"
31#include "path.h" 28#include "path.h"
32
33/*
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 strcpy (buf, create_pathname (name));
73 else
74 strcpy (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 29
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 33 * new values into newmap, nx, and ny. Any and all of those
… …
173 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
174 */ 105 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 106 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 107 return 0;
177 108
178 if (ob->head != NULL)
179 ob = ob->head; 109 ob = ob->head_ ();
180 110
181 /* We basically go through the stack of objects, and if there is 111 /* 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 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
… …
214 else 144 else
215 { 145 {
216 /* Broke apart a big nasty if into several here to make 146 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 147 * this more readable. first check - if the space blocks
218 * movement, can't move here. 148 * movement, can't move here.
219 * second - if a monster, can't move there, unles it is a 149 * second - if a monster, can't move there, unless it is a
220 * hidden dm 150 * hidden dm
221 */ 151 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 152 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 153 return 1;
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 154
225 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 155 if (tmp->flag [FLAG_ALIVE]
156 && tmp->head_ () != ob
157 && tmp != ob
158 && tmp->type != DOOR
159 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
226 return 1; 160 return 1;
227 } 161 }
228 162
229 } 163 }
230 return 0; 164 return 0;
231} 165}
232 166
233/* 167/*
234 * Returns true if the given object can't fit in the given spot. 168 * Returns qthe blocking object if the given object can't fit in the given
235 * This is meant for multi space objects - for single space objecs, 169 * spot. This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 170 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 171 * of object. This function goes through all the parts of the multipart
238 * multipart object and makes sure they can be inserted. 172 * object and makes sure they can be inserted.
239 * 173 *
240 * While this doesn't call out of map, the get_map_flags does. 174 * While this doesn't call out of map, the get_map_flags does.
241 * 175 *
242 * This function has been used to deprecate arch_out_of_map - 176 * This function has been used to deprecate arch_out_of_map -
243 * this function also does that check, and since in most cases, 177 * this function also does that check, and since in most cases,
… …
254 * 188 *
255 * Note this used to be arch_blocked, but with new movement 189 * Note this used to be arch_blocked, but with new movement
256 * code, we need to have actual object to check its move_type 190 * code, we need to have actual object to check its move_type
257 * against the move_block values. 191 * against the move_block values.
258 */ 192 */
259int 193bool
260ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 194object::blocked (maptile *m, int x, int y) const
261{ 195{
262 archetype *tmp; 196 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
263 int flag;
264 maptile *m1;
265 sint16 sx, sy;
266
267 if (!ob)
268 {
269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
270 if (flag & P_OUT_OF_MAP)
271 return P_OUT_OF_MAP;
272
273 /* don't have object, so don't know what types would block */
274 return m1->at (sx, sy).move_block;
275 } 197 {
198 mapxy pos (m, x + tmp->x, y + tmp->y);
276 199
277 for (tmp = ob->arch; tmp; tmp = tmp->more) 200 if (!pos.normalise ())
278 { 201 return 1;
279 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
280 202
281 if (flag & P_OUT_OF_MAP) 203 mapspace &ms = *pos;
282 return P_OUT_OF_MAP; 204
283 if (flag & P_IS_ALIVE) 205 if (ms.flags () & P_IS_ALIVE)
284 return P_IS_ALIVE; 206 return 1;
285 207
286 mapspace &ms = m1->at (sx, sy); 208 /* However, often ob doesn't have any move type
287 209 * (signifying non-moving objects)
288 /* find_first_free_spot() calls this function. However, often
289 * ob doesn't have any move type (when used to place exits)
290 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 210 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
291 */ 211 */
292
293 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 212 if (!move_type && ms.move_block != MOVE_ALL)
294 continue; 213 continue;
295 214
296 /* Note it is intentional that we check ob - the movement type of the 215 /* Note it is intentional that we check ob - the movement type of the
297 * head of the object should correspond for the entire object. 216 * head of the object should correspond for the entire object.
298 */ 217 */
299 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 218 if (ms.blocks (move_type))
300 return P_NO_PASS; 219 return 1;
301 } 220 }
302 221
303 return 0; 222 return 0;
304} 223}
305 224
… …
323 242
324 insert_ob_in_ob (tmp, container); 243 insert_ob_in_ob (tmp, container);
325 tmp = next; 244 tmp = next;
326 } 245 }
327 246
328 /* sum_weight will go through and calculate what all the containers are 247 // go through and calculate what all the containers are carrying.
329 * carrying. 248 //TODO: remove
330 */ 249 container->update_weight ();
331 sum_weight (container);
332} 250}
333 251
334void 252void
335maptile::set_object_flag (int flag, int value) 253maptile::set_object_flag (int flag, int value)
336{ 254{
… …
340 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
343} 261}
344 262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
274}
275
345/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
346 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
347 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
348 * they are saved). We do have to look for the old maps that did save 279 * they are saved).
349 * the more sections and not re-add sections for them.
350 */ 280 */
351void 281void
352maptile::link_multipart_objects () 282maptile::link_multipart_objects ()
353{ 283{
354 if (!spaces) 284 if (!spaces)
355 return; 285 return;
356 286
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 287 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 288 {
289 object *op = ms->bot;
290 while (op)
359 { 291 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 292 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 293 if (op->head_ () == op && !op->more && op->arch->more)
364 {
365 /* If there is nothing more to this object, this for loop
366 * won't do anything.
367 */
368 archetype *at;
369 object *last, *op;
370 for (at = tmp->arch->more, last = tmp;
371 at;
372 at = at->more, last = op)
373 { 294 {
374 op = arch_to_object (at); 295 op->remove ();
296 op->expand_tail ();
375 297
376 /* update x,y coordinates */ 298 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377 op->x += tmp->x; 299 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378 op->y += tmp->y; 300 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379 op->head = tmp;
380 op->map = this;
381 last->more = op;
382 op->name = tmp->name;
383 op->title = tmp->title;
384
385 /* we could link all the parts onto tmp, and then just
386 * call insert_ob_in_map once, but the effect is the same,
387 * as insert_ob_in_map will call itself with each part, and
388 * the coding is simpler to just to it here with each part.
389 */
390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 301 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
302
303 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
304 // so we have to reset the iteration through the mapspace
391 } 305 }
306 else
307 op = op->above;
392 } 308 }
393
394 tmp = above;
395 } 309 }
396} 310}
397 311
398/* 312/*
399 * Loads (ands parses) the objects into a given map from the specified 313 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 314 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 315 */
403bool 316bool
404maptile::_load_objects (object_thawer &thawer) 317maptile::_load_objects (object_thawer &f)
405{ 318{
406 int unique; 319 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 320 {
414 /* if the archetype for the object is null, means that we 321 coroapi::cede_to_tick (); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 322
416 * or editor will not be able to do anything with it either. 323 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 324 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 325 case KW_arch:
326 if (object *op = object::read (f, this))
327 {
328 // TODO: why?
329 if (op->inv)
330 op->update_weight ();
331
332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 {
334 // we insert manually because
335 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct
338 mapspace &ms = at (op->x, op->y);
339
340 op->flag [FLAG_REMOVED] = false;
341
342 op->above = 0;
343 op->below = ms.top;
344
345 if (ms.top)
346 ms.top->above = op;
347 else
348 ms.bot = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
358 }
359
421 continue; 360 continue;
422 }
423 361
424 switch (i)
425 {
426 case LL_NORMAL:
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
428
429 if (op->inv)
430 sum_weight (op);
431
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 362 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 363 return true;
437 op->head = prev, last_more->more = op, last_more = op; 364
365 default:
366 if (!f.parse_error ("map file"))
367 return false;
438 break; 368 break;
439 } 369 }
440 370
441 op = object::create (); 371 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 372 }
462#endif
463 373
464 return true; 374 return true;
465} 375}
466 376
467void 377void
468maptile::activate () 378maptile::activate ()
469{ 379{
470 if (!spaces) 380 if (spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
475 op->activate_recursive (); 383 op->activate_recursive ();
476} 384}
477 385
478void 386void
479maptile::deactivate () 387maptile::deactivate ()
480{ 388{
481 if (!spaces) 389 if (spaces)
482 return;
483
484 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
485 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 392 op->deactivate_recursive ();
487} 393}
488 394
489bool 395bool
490maptile::_save_objects (object_freezer &freezer, int flags) 396maptile::_save_objects (object_freezer &f, int flags)
491{ 397{
492 static int cede_count = 0; 398 coroapi::cede_to_tick ();
493 399
494 if (flags & IO_HEADER) 400 if (flags & IO_HEADER)
495 _save_header (freezer); 401 _save_header (f);
496 402
497 if (!spaces) 403 if (!spaces)
498 return false; 404 return false;
499 405
500 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
501 { 407 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
510 int unique = 0; 408 bool unique = 0;
409
511 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
512 { 411 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517 unique = 1;
518 413
519 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
520 continue; 415 continue;
521 416
522 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
523 { 418 {
524 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 420 op->write (f);
526 } 421 }
527 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
528 save_object (freezer, op, 1); 423 op->write (f);
529 } 424 }
530 } 425 }
531 426
427 coroapi::cede_to_tick ();
428
532 return true; 429 return true;
533}
534
535bool
536maptile::_load_objects (const char *path, bool skip_header)
537{
538 object_thawer thawer (path);
539
540 if (!thawer)
541 return false;
542
543 if (skip_header)
544 for (;;)
545 {
546 keyword kw = thawer.get_kv ();
547
548 if (kw == KW_end)
549 break;
550
551 thawer.skip_kv (kw);
552 }
553
554 return _load_objects (thawer);
555} 430}
556 431
557bool 432bool
558maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
559{ 434{
… …
568maptile::maptile () 443maptile::maptile ()
569{ 444{
570 in_memory = MAP_SWAPPED; 445 in_memory = MAP_SWAPPED;
571 446
572 /* The maps used to pick up default x and y values from the 447 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 448 * map archetype. Mimic that behaviour.
574 */ 449 */
575 width = 16; 450 width = 16;
576 height = 16; 451 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 452 timeout = 300;
579 enter_x = 0; 453 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 454 max_volume = 2000000; // 2m³
581} 455}
582 456
583maptile::maptile (int w, int h) 457maptile::maptile (int w, int h)
584{ 458{
585 in_memory = MAP_SWAPPED; 459 in_memory = MAP_SWAPPED;
… …
735bool 609bool
736maptile::_load_header (object_thawer &thawer) 610maptile::_load_header (object_thawer &thawer)
737{ 611{
738 for (;;) 612 for (;;)
739 { 613 {
740 keyword kw = thawer.get_kv ();
741
742 switch (kw) 614 switch (thawer.kw)
743 { 615 {
744 case KW_EOF:
745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746 return false;
747
748 case KW_end:
749 return true;
750
751 default:
752 case KW_ERROR:
753 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754 break;
755
756 case KW_msg: 616 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 617 thawer.get_ml (KW_endmsg, msg);
758 break; 618 break;
759 619
760 case KW_lore: // CF+ extension 620 case KW_lore: // CF+ extension
… …
791 case KW_winddir: thawer.get (winddir); break; 651 case KW_winddir: thawer.get (winddir); break;
792 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
793 653
794 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
795 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
796 658
797 case KW_region: get_region_by_name (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799 661
800 // old names new names 662 // old names new names
801 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 663 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
802 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 664 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
810 672
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 673 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 674 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 675 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 case KW_tile_path_4: thawer.get (tile_path [3]); break; 676 case KW_tile_path_4: thawer.get (tile_path [3]); break;
677
678 case KW_ERROR:
679 set_key_text (thawer.kw_str, thawer.value);
680 break;
681
682 case KW_end:
683 thawer.next ();
684 return true;
685
686 default:
687 if (!thawer.parse_error ("map", 0))
688 return false;
689 break;
815 } 690 }
691
692 thawer.next ();
816 } 693 }
817 694
818 abort (); 695 abort ();
819}
820
821bool
822maptile::_load_header (const char *path)
823{
824 object_thawer thawer (path);
825
826 if (!thawer)
827 return false;
828
829 return _load_header (thawer);
830} 696}
831 697
832/****************************************************************************** 698/******************************************************************************
833 * This is the start of unique map handling code 699 * This is the start of unique map handling code
834 *****************************************************************************/ 700 *****************************************************************************/
… …
845 object *above = op->above; 711 object *above = op->above;
846 712
847 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 713 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
848 unique = 1; 714 unique = 1;
849 715
850 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
851 {
852 op->destroy_inv (false);
853 op->destroy (); 717 op->destroy ();
854 }
855 718
856 op = above; 719 op = above;
857 } 720 }
858 } 721 }
859} 722}
… …
869 if (name) MAP_OUT (name); 732 if (name) MAP_OUT (name);
870 MAP_OUT (swap_time); 733 MAP_OUT (swap_time);
871 MAP_OUT (reset_time); 734 MAP_OUT (reset_time);
872 MAP_OUT (reset_timeout); 735 MAP_OUT (reset_timeout);
873 MAP_OUT (fixed_resettime); 736 MAP_OUT (fixed_resettime);
737 MAP_OUT (no_reset);
738 MAP_OUT (no_drop);
874 MAP_OUT (difficulty); 739 MAP_OUT (difficulty);
875 740
876 if (region) MAP_OUT2 (region, region->name); 741 if (default_region) MAP_OUT2 (region, default_region->name);
877 742
878 if (shopitems) 743 if (shopitems)
879 { 744 {
880 char shop[MAX_BUF]; 745 char shop[MAX_BUF];
881 print_shop_string (this, shop); 746 print_shop_string (this, shop);
… …
932 * Remove and free all objects in the given map. 797 * Remove and free all objects in the given map.
933 */ 798 */
934void 799void
935maptile::clear () 800maptile::clear ()
936{ 801{
937 if (!spaces) 802 if (spaces)
938 return; 803 {
939
940 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 804 for (mapspace *ms = spaces + size (); ms-- > spaces; )
941 while (object *op = ms->bot) 805 while (object *op = ms->bot)
942 { 806 {
807 // manually remove, as to not trigger anything
808 if (ms->bot = op->above)
809 ms->bot->below = 0;
810
811 op->flag [FLAG_REMOVED] = true;
812
813 object *head = op->head_ ();
943 if (op->head) 814 if (op == head)
944 op = op->head;
945
946 op->destroy_inv (false);
947 op->destroy (); 815 op->destroy ();
816 else if (head->map != op->map)
817 {
818 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
819 head->destroy ();
820 }
821 }
822
823 sfree0 (spaces, size ());
948 } 824 }
949
950 sfree (spaces, size ()), spaces = 0;
951 825
952 if (buttons) 826 if (buttons)
953 free_objectlinkpt (buttons), buttons = 0; 827 free_objectlinkpt (buttons), buttons = 0;
828
829 sfree0 (regions, size ());
830 delete [] regionmap; regionmap = 0;
954} 831}
955 832
956void 833void
957maptile::clear_header () 834maptile::clear_header ()
958{ 835{
… …
988maptile::do_destroy () 865maptile::do_destroy ()
989{ 866{
990 attachable::do_destroy (); 867 attachable::do_destroy ();
991 868
992 clear (); 869 clear ();
870}
871
872/* decay and destroy perishable items in a map */
873void
874maptile::do_decay_objects ()
875{
876 if (!spaces)
877 return;
878
879 for (mapspace *ms = spaces + size (); ms-- > spaces; )
880 for (object *above, *op = ms->bot; op; op = above)
881 {
882 above = op->above;
883
884 bool destroy = 0;
885
886 // do not decay anything above unique floor tiles (yet :)
887 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
888 break;
889
890 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
891 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
892 || QUERY_FLAG (op, FLAG_UNIQUE)
893 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
894 || QUERY_FLAG (op, FLAG_UNPAID)
895 || op->is_alive ())
896 ; // do not decay
897 else if (op->is_weapon ())
898 {
899 op->stats.dam--;
900 if (op->stats.dam < 0)
901 destroy = 1;
902 }
903 else if (op->is_armor ())
904 {
905 op->stats.ac--;
906 if (op->stats.ac < 0)
907 destroy = 1;
908 }
909 else if (op->type == FOOD)
910 {
911 op->stats.food -= rndm (5, 20);
912 if (op->stats.food < 0)
913 destroy = 1;
914 }
915 else
916 {
917 int mat = op->materials;
918
919 if (mat & M_PAPER
920 || mat & M_LEATHER
921 || mat & M_WOOD
922 || mat & M_ORGANIC
923 || mat & M_CLOTH
924 || mat & M_LIQUID
925 || (mat & M_IRON && rndm (1, 5) == 1)
926 || (mat & M_GLASS && rndm (1, 2) == 1)
927 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
928 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
929 || (mat & M_ICE && temp > 32))
930 destroy = 1;
931 }
932
933 /* adjust overall chance below */
934 if (destroy && rndm (0, 1))
935 op->destroy (true);
936 }
993} 937}
994 938
995/* 939/*
996 * Updates every button on the map (by calling update_button() for them). 940 * Updates every button on the map (by calling update_button() for them).
997 */ 941 */
… …
1044 988
1045 if (QUERY_FLAG (op, FLAG_GENERATOR)) 989 if (QUERY_FLAG (op, FLAG_GENERATOR))
1046 { 990 {
1047 total_exp += op->stats.exp; 991 total_exp += op->stats.exp;
1048 992
1049 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 993 if (archetype *at = op->other_arch)
994 {
1050 total_exp += at->clone.stats.exp * 8; 995 total_exp += at->stats.exp * 8;
1051
1052 monster_cnt++; 996 monster_cnt++;
997 }
998
999 for (object *inv = op->inv; inv; inv = inv->below)
1000 {
1001 total_exp += op->stats.exp * 8;
1002 monster_cnt++;
1003 }
1053 } 1004 }
1054 } 1005 }
1055 1006
1056 avgexp = (double) total_exp / monster_cnt; 1007 avgexp = (double) total_exp / monster_cnt;
1057 1008
… …
1096 else 1047 else
1097 darkness = new_level; 1048 darkness = new_level;
1098 1049
1099 /* All clients need to get re-updated for the change */ 1050 /* All clients need to get re-updated for the change */
1100 update_all_map_los (this); 1051 update_all_map_los (this);
1052
1101 return 1; 1053 return 1;
1102} 1054}
1103 1055
1104/* 1056/*
1105 * This function updates various attributes about a specific space 1057 * This function updates various attributes about a specific space
… …
1108 * through, etc) 1060 * through, etc)
1109 */ 1061 */
1110void 1062void
1111mapspace::update_ () 1063mapspace::update_ ()
1112{ 1064{
1113 object *tmp, *last = 0; 1065 object *last = 0;
1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1066 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1115 facetile *top, *floor, *middle;
1116 object *top_obj, *floor_obj, *middle_obj;
1117 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1067 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1118 1068
1119 middle = blank_face; 1069 //object *middle = 0;
1120 top = blank_face; 1070 //object *top = 0;
1121 floor = blank_face; 1071 //object *floor = 0;
1072 // this seems to generate better code than using locals, above
1073 object *&top = faces_obj[0] = 0;
1074 object *&middle = faces_obj[1] = 0;
1075 object *&floor = faces_obj[2] = 0;
1122 1076
1123 middle_obj = 0;
1124 top_obj = 0;
1125 floor_obj = 0;
1126
1127 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1077 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1128 { 1078 {
1129 /* This could be made additive I guess (two lights better than 1079 /* This could be made additive I guess (two lights better than
1130 * one). But if so, it shouldn't be a simple additive - 2 1080 * one). But if so, it shouldn't be a simple additive - 2
1131 * light bulbs do not illuminate twice as far as once since 1081 * light bulbs do not illuminate twice as far as once since
1132 * it is a dissapation factor that is cubed. 1082 * it is a dissapation factor that is cubed.
1133 */ 1083 */
1134 if (tmp->glow_radius > light)
1135 light = tmp->glow_radius; 1084 light = max (light, tmp->glow_radius);
1136 1085
1137 /* This call is needed in order to update objects the player 1086 /* This call is needed in order to update objects the player
1138 * is standing in that have animations (ie, grass, fire, etc). 1087 * is standing in that have animations (ie, grass, fire, etc).
1139 * However, it also causes the look window to be re-drawn 1088 * However, it also causes the look window to be re-drawn
1140 * 3 times each time the player moves, because many of the 1089 * 3 times each time the player moves, because many of the
… …
1143 * Always put the player down for drawing. 1092 * Always put the player down for drawing.
1144 */ 1093 */
1145 if (!tmp->invisible) 1094 if (!tmp->invisible)
1146 { 1095 {
1147 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1096 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1148 {
1149 top = tmp->face;
1150 top_obj = tmp; 1097 top = tmp;
1151 }
1152 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1098 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1153 { 1099 {
1154 /* If we got a floor, that means middle and top were below it, 1100 /* If we got a floor, that means middle and top were below it,
1155 * so should not be visible, so we clear them. 1101 * so should not be visible, so we clear them.
1156 */ 1102 */
1157 middle = blank_face; 1103 middle = 0;
1158 top = blank_face; 1104 top = 0;
1159 floor = tmp->face;
1160 floor_obj = tmp; 1105 floor = tmp;
1161 } 1106 }
1162 /* Flag anywhere have high priority */ 1107 /* Flag anywhere have high priority */
1163 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1108 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1164 { 1109 {
1165 middle = tmp->face;
1166
1167 middle_obj = tmp; 1110 middle = tmp;
1168 anywhere = 1; 1111 anywhere = 1;
1169 } 1112 }
1113
1170 /* Find the highest visible face around. If equal 1114 /* Find the highest visible face around. If equal
1171 * visibilities, we still want the one nearer to the 1115 * visibilities, we still want the one nearer to the
1172 * top 1116 * top
1173 */ 1117 */
1174 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1118 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1175 {
1176 middle = tmp->face;
1177 middle_obj = tmp; 1119 middle = tmp;
1178 }
1179 } 1120 }
1180 1121
1181 if (tmp == tmp->above) 1122 if (tmp == tmp->above)
1182 { 1123 {
1183 LOG (llevError, "Error in structure of map\n"); 1124 LOG (llevError, "Error in structure of map\n");
… …
1218 * middle face. This should not happen, as we already have the 1159 * middle face. This should not happen, as we already have the
1219 * else statement above so middle should not get set. OTOH, it 1160 * else statement above so middle should not get set. OTOH, it
1220 * may be possible for the faces to match but be different objects. 1161 * may be possible for the faces to match but be different objects.
1221 */ 1162 */
1222 if (top == middle) 1163 if (top == middle)
1223 middle = blank_face; 1164 middle = 0;
1224 1165
1225 /* There are three posibilities at this point: 1166 /* There are three posibilities at this point:
1226 * 1) top face is set, need middle to be set. 1167 * 1) top face is set, need middle to be set.
1227 * 2) middle is set, need to set top. 1168 * 2) middle is set, need to set top.
1228 * 3) neither middle or top is set - need to set both. 1169 * 3) neither middle or top is set - need to set both.
1229 */ 1170 */
1230 1171
1231 for (tmp = last; tmp; tmp = tmp->below) 1172 for (object *tmp = last; tmp; tmp = tmp->below)
1232 { 1173 {
1233 /* Once we get to a floor, stop, since we already have a floor object */ 1174 /* Once we get to a floor, stop, since we already have a floor object */
1234 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1175 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1235 break; 1176 break;
1236 1177
1237 /* If two top faces are already set, quit processing */ 1178 /* If two top faces are already set, quit processing */
1238 if ((top != blank_face) && (middle != blank_face)) 1179 if (top && middle)
1239 break; 1180 break;
1240 1181
1241 /* Only show visible faces */ 1182 /* Only show visible faces */
1242 if (!tmp->invisible) 1183 if (!tmp->invisible)
1243 { 1184 {
1244 /* Fill in top if needed */ 1185 /* Fill in top if needed */
1245 if (top == blank_face) 1186 if (!top)
1246 { 1187 {
1247 top = tmp->face;
1248 top_obj = tmp; 1188 top = tmp;
1249 if (top == middle) 1189 if (top == middle)
1250 middle = blank_face; 1190 middle = 0;
1251 } 1191 }
1252 else 1192 else
1253 { 1193 {
1254 /* top is already set - we should only get here if 1194 /* top is already set - we should only get here if
1255 * middle is not set 1195 * middle is not set
1256 * 1196 *
1257 * Set the middle face and break out, since there is nothing 1197 * Set the middle face and break out, since there is nothing
1258 * more to fill in. We don't check visiblity here, since 1198 * more to fill in. We don't check visiblity here, since
1259 * 1199 *
1260 */ 1200 */
1261 if (tmp->face != top) 1201 if (tmp != top)
1262 { 1202 {
1263 middle = tmp->face;
1264 middle_obj = tmp; 1203 middle = tmp;
1265 break; 1204 break;
1266 } 1205 }
1267 } 1206 }
1268 } 1207 }
1269 } 1208 }
1270 1209
1271 if (middle == floor) 1210 if (middle == floor)
1272 middle = blank_face; 1211 middle = 0;
1273 1212
1274 if (top == middle) 1213 if (top == middle)
1275 middle = blank_face; 1214 middle = 0;
1276 1215
1277 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1216#if 0
1278 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1217 faces_obj [0] = top;
1279 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1218 faces_obj [1] = middle;
1219 faces_obj [2] = floor;
1220#endif
1280} 1221}
1281 1222
1282/* this updates the orig_map->tile_map[tile_num] value after finding 1223uint64
1283 * the map. It also takes care of linking back the freshly found 1224mapspace::volume () const
1284 * maps tile_map values if it tiles back to this one. It returns
1285 * the value of orig_map->tile_map[tile_num].
1286 */
1287static inline maptile *
1288find_and_link (maptile *orig_map, int tile_num)
1289{ 1225{
1290 maptile *mp = orig_map->tile_map [tile_num]; 1226 uint64 vol = 0;
1291 1227
1292 if (!mp) 1228 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1293 { 1229 vol += op->volume ();
1294 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1295 1230
1296 if (!mp) 1231 return vol;
1297 { 1232}
1298 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1299 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1300 &orig_map->tile_path[tile_num], &orig_map->path);
1301 mp = new maptile (1, 1);
1302 mp->alloc ();
1303 mp->in_memory = MAP_IN_MEMORY;
1304 }
1305 }
1306 1233
1307 int dest_tile = (tile_num + 2) % 4; 1234bool
1235maptile::tile_available (int dir, bool load)
1236{
1237 if (!tile_path[dir])
1238 return 0;
1308 1239
1309 orig_map->tile_map [tile_num] = mp; 1240 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1241 return 1;
1310 1242
1311 // optimisation: back-link map to origin map if euclidean 1243 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1312 //TODO: non-euclidean maps MUST GO 1244 return 1;
1313 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1314 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1315 1245
1316 return mp; 1246 return 0;
1317}
1318
1319static inline void
1320load_and_link (maptile *orig_map, int tile_num)
1321{
1322 find_and_link (orig_map, tile_num)->load_sync ();
1323} 1247}
1324 1248
1325/* this returns TRUE if the coordinates (x,y) are out of 1249/* this returns TRUE if the coordinates (x,y) are out of
1326 * map m. This function also takes into account any 1250 * map m. This function also takes into account any
1327 * tiling considerations, loading adjacant maps as needed. 1251 * tiling considerations, loading adjacant maps as needed.
… …
1340 if (!m) 1264 if (!m)
1341 return 0; 1265 return 0;
1342 1266
1343 if (x < 0) 1267 if (x < 0)
1344 { 1268 {
1345 if (!m->tile_path[3]) 1269 if (!m->tile_available (3))
1346 return 1; 1270 return 1;
1347 1271
1348 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1349 find_and_link (m, 3);
1350
1351 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1272 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1352 } 1273 }
1353 1274
1354 if (x >= m->width) 1275 if (x >= m->width)
1355 { 1276 {
1356 if (!m->tile_path[1]) 1277 if (!m->tile_available (1))
1357 return 1; 1278 return 1;
1358 1279
1359 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1360 find_and_link (m, 1);
1361
1362 return out_of_map (m->tile_map[1], x - m->width, y); 1280 return out_of_map (m->tile_map[1], x - m->width, y);
1363 } 1281 }
1364 1282
1365 if (y < 0) 1283 if (y < 0)
1366 { 1284 {
1367 if (!m->tile_path[0]) 1285 if (!m->tile_available (0))
1368 return 1; 1286 return 1;
1369 1287
1370 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1371 find_and_link (m, 0);
1372
1373 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1288 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1374 } 1289 }
1375 1290
1376 if (y >= m->height) 1291 if (y >= m->height)
1377 { 1292 {
1378 if (!m->tile_path[2]) 1293 if (!m->tile_available (2))
1379 return 1; 1294 return 1;
1380
1381 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1382 find_and_link (m, 2);
1383 1295
1384 return out_of_map (m->tile_map[2], x, y - m->height); 1296 return out_of_map (m->tile_map[2], x, y - m->height);
1385 } 1297 }
1386 1298
1387 /* Simple case - coordinates are within this local 1299 /* Simple case - coordinates are within this local
… …
1401maptile * 1313maptile *
1402maptile::xy_find (sint16 &x, sint16 &y) 1314maptile::xy_find (sint16 &x, sint16 &y)
1403{ 1315{
1404 if (x < 0) 1316 if (x < 0)
1405 { 1317 {
1406 if (!tile_path[3]) 1318 if (!tile_available (3))
1407 return 0; 1319 return 0;
1408 1320
1409 find_and_link (this, 3);
1410 x += tile_map[3]->width; 1321 x += tile_map[3]->width;
1411 return tile_map[3]->xy_find (x, y); 1322 return tile_map[3]->xy_find (x, y);
1412 } 1323 }
1413 1324
1414 if (x >= width) 1325 if (x >= width)
1415 { 1326 {
1416 if (!tile_path[1]) 1327 if (!tile_available (1))
1417 return 0; 1328 return 0;
1418 1329
1419 find_and_link (this, 1);
1420 x -= width; 1330 x -= width;
1421 return tile_map[1]->xy_find (x, y); 1331 return tile_map[1]->xy_find (x, y);
1422 } 1332 }
1423 1333
1424 if (y < 0) 1334 if (y < 0)
1425 { 1335 {
1426 if (!tile_path[0]) 1336 if (!tile_available (0))
1427 return 0; 1337 return 0;
1428 1338
1429 find_and_link (this, 0);
1430 y += tile_map[0]->height; 1339 y += tile_map[0]->height;
1431 return tile_map[0]->xy_find (x, y); 1340 return tile_map[0]->xy_find (x, y);
1432 } 1341 }
1433 1342
1434 if (y >= height) 1343 if (y >= height)
1435 { 1344 {
1436 if (!tile_path[2]) 1345 if (!tile_available (2))
1437 return 0; 1346 return 0;
1438 1347
1439 find_and_link (this, 2);
1440 y -= height; 1348 y -= height;
1441 return tile_map[2]->xy_find (x, y); 1349 return tile_map[2]->xy_find (x, y);
1442 } 1350 }
1443 1351
1444 /* Simple case - coordinates are within this local 1352 /* Simple case - coordinates are within this local
… …
1449 1357
1450/** 1358/**
1451 * Return whether map2 is adjacent to map1. If so, store the distance from 1359 * Return whether map2 is adjacent to map1. If so, store the distance from
1452 * map1 to map2 in dx/dy. 1360 * map1 to map2 in dx/dy.
1453 */ 1361 */
1454static int 1362int
1455adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1363adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1456{ 1364{
1457 if (!map1 || !map2) 1365 if (!map1 || !map2)
1458 return 0; 1366 return 0;
1459 1367
1460 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1368 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1461 //fix: compare paths instead (this is likely faster, too!) 1369 //fix: compare paths instead (this is likely faster, too!)
1462 if (map1 == map2) 1370 if (map1 == map2)
1463 { 1371 {
1464 *dx = 0; 1372 *dx = 0;
1465 *dy = 0; 1373 *dy = 0;
… …
1550/* From map.c 1458/* From map.c
1551 * This is used by get_player to determine where the other 1459 * This is used by get_player to determine where the other
1552 * creature is. get_rangevector takes into account map tiling, 1460 * creature is. get_rangevector takes into account map tiling,
1553 * so you just can not look the the map coordinates and get the 1461 * so you just can not look the the map coordinates and get the
1554 * righte value. distance_x/y are distance away, which 1462 * righte value. distance_x/y are distance away, which
1555 * can be negativbe. direction is the crossfire direction scheme 1463 * can be negative. direction is the crossfire direction scheme
1556 * that the creature should head. part is the part of the 1464 * that the creature should head. part is the part of the
1557 * monster that is closest. 1465 * monster that is closest.
1558 * 1466 *
1559 * get_rangevector looks at op1 and op2, and fills in the 1467 * get_rangevector looks at op1 and op2, and fills in the
1560 * structure for op1 to get to op2. 1468 * structure for op1 to get to op2.
… …
1571get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1479get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1572{ 1480{
1573 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1481 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1574 { 1482 {
1575 /* be conservative and fill in _some_ data */ 1483 /* be conservative and fill in _some_ data */
1576 retval->distance = 100000; 1484 retval->distance = 10000;
1577 retval->distance_x = 32767; 1485 retval->distance_x = 10000;
1578 retval->distance_y = 32767; 1486 retval->distance_y = 10000;
1579 retval->direction = 0; 1487 retval->direction = 0;
1580 retval->part = 0; 1488 retval->part = 0;
1581 } 1489 }
1582 else 1490 else
1583 { 1491 {
… …
1588 1496
1589 best = op1; 1497 best = op1;
1590 /* If this is multipart, find the closest part now */ 1498 /* If this is multipart, find the closest part now */
1591 if (!(flags & 0x1) && op1->more) 1499 if (!(flags & 0x1) && op1->more)
1592 { 1500 {
1593 object *tmp;
1594 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1501 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1595 1502
1596 /* we just take the offset of the piece to head to figure 1503 /* we just take the offset of the piece to head to figure
1597 * distance instead of doing all that work above again 1504 * distance instead of doing all that work above again
1598 * since the distance fields we set above are positive in the 1505 * since the distance fields we set above are positive in the
1599 * same axis as is used for multipart objects, the simply arithmetic 1506 * same axis as is used for multipart objects, the simply arithmetic
1600 * below works. 1507 * below works.
1601 */ 1508 */
1602 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1509 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1603 { 1510 {
1604 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1511 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1605 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1512 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1606 if (tmpi < best_distance) 1513 if (tmpi < best_distance)
1607 { 1514 {
… …
1616 retval->distance_y += op1->y - best->y; 1523 retval->distance_y += op1->y - best->y;
1617 } 1524 }
1618 } 1525 }
1619 1526
1620 retval->part = best; 1527 retval->part = best;
1621 retval->distance = idistance (retval->distance_x, retval->distance_y); 1528 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1529 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1623 } 1530 }
1624} 1531}
1625 1532
1626/* this is basically the same as get_rangevector above, but instead of 1533/* this is basically the same as get_rangevector above, but instead of
… …
1631 * flags has no meaning for this function at this time - I kept it in to 1538 * flags has no meaning for this function at this time - I kept it in to
1632 * be more consistant with the above function and also in case they are needed 1539 * be more consistant with the above function and also in case they are needed
1633 * for something in the future. Also, since no object is pasted, the best 1540 * for something in the future. Also, since no object is pasted, the best
1634 * field of the rv_vector is set to NULL. 1541 * field of the rv_vector is set to NULL.
1635 */ 1542 */
1636
1637void 1543void
1638get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1544get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1639{ 1545{
1640 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1546 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1641 { 1547 {
1642 /* be conservative and fill in _some_ data */ 1548 /* be conservative and fill in _some_ data */
1643 retval->distance = 100000; 1549 retval->distance = 100000;
… …
1674} 1580}
1675 1581
1676object * 1582object *
1677maptile::insert (object *op, int x, int y, object *originator, int flags) 1583maptile::insert (object *op, int x, int y, object *originator, int flags)
1678{ 1584{
1679 if (!op->flag [FLAG_REMOVED])
1680 op->remove ();
1681
1682 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1585 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1683} 1586}
1684 1587
1588region *
1589maptile::region (int x, int y) const
1590{
1591 if (regions
1592 && regionmap
1593 && !OUT_OF_REAL_MAP (this, x, y))
1594 if (struct region *reg = regionmap [regions [y * width + x]])
1595 return reg;
1596
1597 if (default_region)
1598 return default_region;
1599
1600 return ::region::default_region ();
1601}
1602
1603/* picks a random object from a style map.
1604 */
1605object *
1606maptile::pick_random_object (rand_gen &gen) const
1607{
1608 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me.
1613 */
1614 for (int i = 1000; --i;)
1615 {
1616 object *pick = at (gen (width), gen (height)).bot;
1617
1618 // do not prefer big monsters just because they are big.
1619 if (pick && pick->is_head ())
1620 return pick->head_ ();
1621 }
1622
1623 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return archetype::find ("bug");
1625}
1626
1627void
1628maptile::play_sound (faceidx sound, int x, int y) const
1629{
1630 if (!sound)
1631 return;
1632
1633 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns)
1636 {
1637 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y;
1639
1640 int distance = idistance (dx, dy);
1641
1642 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy);
1644 }
1645}
1646

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines