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.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.133 by root, Wed Apr 2 11:13:52 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 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. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
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 "funcpoint.h"
28
29#include "loader.h"
30
31#include "path.h" 31#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 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * 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
… …
173 * let the player through (inventory checkers for example) 107 * let the player through (inventory checkers for example)
174 */ 108 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 109 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 110 return 0;
177 111
178 if (ob->head != NULL)
179 ob = ob->head; 112 ob = ob->head_ ();
180 113
181 /* We basically go through the stack of objects, and if there is 114 /* 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 115 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 116 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 117 * ob is blocking it, so return 0.
… …
214 else 147 else
215 { 148 {
216 /* Broke apart a big nasty if into several here to make 149 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 150 * this more readable. first check - if the space blocks
218 * movement, can't move here. 151 * movement, can't move here.
219 * second - if a monster, can't move there, unles it is a 152 * second - if a monster, can't move there, unless it is a
220 * hidden dm 153 * hidden dm
221 */ 154 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 155 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 156 return 1;
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 157
225 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 158 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob
160 && tmp != ob
161 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
226 return 1; 163 return 1;
227 } 164 }
228 165
229 } 166 }
230 return 0; 167 return 0;
231} 168}
232 169
233
234/* 170/*
235 * Returns true if the given object can't fit in the given spot. 171 * Returns qthe blocking object if the given object can't fit in the given
236 * This is meant for multi space objects - for single space objecs, 172 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
240 * 176 *
241 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
242 * 178 *
243 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
255 * 191 *
256 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
258 * against the move_block values. 194 * against the move_block values.
259 */ 195 */
260int 196bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
262{ 198{
263 archetype *tmp; 199 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
264 int flag;
265 maptile *m1;
266 sint16 sx, sy;
267
268 if (!ob)
269 {
270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271 if (flag & P_OUT_OF_MAP)
272 return P_OUT_OF_MAP;
273
274 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block;
276 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
277 202
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 203 if (!pos.normalise ())
279 { 204 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 205
282 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 207
284 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 209 return 1;
286 210
287 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
288 212 * (signifying non-moving objects)
289 /* find_first_free_spot() calls this function. However, often
290 * ob doesn't have any move type (when used to place exits)
291 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 214 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 216 continue;
296 217
297 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
299 */ 220 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
301 return P_NO_PASS; 222 return 1;
302 } 223 }
303 224
304 return 0; 225 return 0;
305} 226}
306 227
… …
344} 265}
345 266
346/* link_multipart_objects go through all the objects on the map looking 267/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 268 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 269 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 270 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 271 */
352void 272void
353maptile::link_multipart_objects () 273maptile::link_multipart_objects ()
354{ 274{
355 if (!spaces) 275 if (!spaces)
356 return; 276 return;
357 277
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 278 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 279 {
280 object *op = ms->bot;
281 while (op)
360 { 282 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 283 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 284 if (op->head_ () == op && !op->more && op->arch->more)
365 {
366 /* If there is nothing more to this object, this for loop
367 * won't do anything.
368 */
369 archetype *at;
370 object *last, *op;
371 for (at = tmp->arch->more, last = tmp;
372 at;
373 at = at->more, last = op)
374 { 285 {
375 op = arch_to_object (at); 286 op->remove ();
287 op->expand_tail ();
376 288
377 /* update x,y coordinates */ 289 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 290 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 291 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380 op->head = tmp;
381 op->map = this;
382 last->more = op;
383 op->name = tmp->name;
384 op->title = tmp->title;
385
386 /* we could link all the parts onto tmp, and then just
387 * call insert_ob_in_map once, but the effect is the same,
388 * as insert_ob_in_map will call itself with each part, and
389 * the coding is simpler to just to it here with each part.
390 */
391 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 292 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
293
294 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
295 // so we have to reset the iteration through the mapspace
392 } 296 }
297 else
298 op = op->above;
393 } 299 }
394
395 tmp = above;
396 } 300 }
397} 301}
398 302
399/* 303/*
400 * Loads (ands parses) the objects into a given map from the specified 304 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 305 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 306 */
404bool 307bool
405maptile::load_objects (object_thawer &thawer) 308maptile::_load_objects (object_thawer &f)
406{ 309{
407 int unique; 310 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 311 {
415 /* if the archetype for the object is null, means that we 312 coroapi::cede_to_tick (); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 313
417 * or editor will not be able to do anything with it either. 314 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 315 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 316 case KW_arch:
317 if (object *op = object::read (f, this))
318 {
319 if (op->inv)
320 sum_weight (op);
321
322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 if (ms.top)
336 ms.top->above = op;
337 else
338 ms.bot = op;
339
340 ms.top = op;
341 ms.flags_ = 0;
342 }
343 else
344 {
345 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
346 op->destroy ();
347 }
348 }
349
422 continue; 350 continue;
423 }
424 351
425 switch (i)
426 {
427 case LL_NORMAL:
428 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
429
430 if (op->inv)
431 sum_weight (op);
432
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 352 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 353 return true;
438 op->head = prev, last_more->more = op, last_more = op; 354
355 default:
356 if (!f.parse_error ("map file"))
357 return false;
439 break; 358 break;
440 } 359 }
441 360
442 op = object::create (); 361 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 362 }
463#endif
464 363
465 return true; 364 return true;
466} 365}
467 366
468void 367void
469maptile::activate () 368maptile::activate ()
470{ 369{
471 if (!spaces) 370 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 373 op->activate_recursive ();
477} 374}
478 375
479void 376void
480maptile::deactivate () 377maptile::deactivate ()
481{ 378{
482 if (!spaces) 379 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 382 op->deactivate_recursive ();
488} 383}
489 384
490bool 385bool
491maptile::save_objects (object_freezer &freezer, int flags) 386maptile::_save_objects (object_freezer &f, int flags)
492{ 387{
493 static int cede_count = 0; 388 coroapi::cede_to_tick ();
494 389
495 if (flags & IO_HEADER) 390 if (flags & IO_HEADER)
496 save_header (freezer); 391 _save_header (f);
497 392
498 if (!spaces) 393 if (!spaces)
499 return false; 394 return false;
500 395
501 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
502 { 397 {
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508
509 int unique = 0; 398 bool unique = 0;
399
510 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
511 { 401 {
512 // count per-object, but cede only when modification-safe
513 cede_count++;
514
515 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
516 unique = 1;
517 403
518 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
519 continue; 405 continue;
520 406
521 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
522 { 408 {
523 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
524 save_object (freezer, op, 1); 410 op->write (f);
525 } 411 }
526 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
527 save_object (freezer, op, 1); 413 op->write (f);
528 } 414 }
529 } 415 }
530 416
417 coroapi::cede_to_tick ();
418
531 return true; 419 return true;
532} 420}
533 421
534bool 422bool
535maptile::load_objects (const char *path, bool skip_header) 423maptile::_save_objects (const char *path, int flags)
536{ 424{
537 object_thawer thawer (path); 425 object_freezer freezer;
538 426
539 if (!thawer) 427 if (!_save_objects (freezer, flags))
540 return false; 428 return false;
541 429
542 if (skip_header)
543 for (;;)
544 {
545 keyword kw = thawer.get_kv ();
546
547 if (kw == KW_end)
548 break;
549
550 thawer.skip_kv (kw);
551 }
552
553 return load_objects (thawer);
554}
555
556bool
557maptile::save_objects (const char *path, int flags)
558{
559 object_freezer freezer;
560
561 if (!save_objects (freezer, flags))
562 return false;
563
564 return freezer.save (path); 430 return freezer.save (path);
565} 431}
566 432
567maptile::maptile () 433maptile::maptile ()
568{ 434{
569 in_memory = MAP_SWAPPED; 435 in_memory = MAP_SWAPPED;
570 436
571 /* The maps used to pick up default x and y values from the 437 /* The maps used to pick up default x and y values from the
572 * map archetype. Mimic that behaviour. 438 * map archetype. Mimic that behaviour.
573 */ 439 */
574 width = 16; 440 width = 16;
575 height = 16; 441 height = 16;
576 reset_timeout = 0;
577 timeout = 300; 442 timeout = 300;
578 enter_x = 0; 443 max_nrof = 1000; // 1000 items of anything
579 enter_y = 0; 444 max_volume = 2000000; // 2m³
580} 445}
581 446
582maptile::maptile (int w, int h) 447maptile::maptile (int w, int h)
583{ 448{
584 in_memory = MAP_SWAPPED; 449 in_memory = MAP_SWAPPED;
… …
730 * This could be done in lex (like the object loader), but I think 595 * This could be done in lex (like the object loader), but I think
731 * currently, there are few enough fields this is not a big deal. 596 * currently, there are few enough fields this is not a big deal.
732 * MSW 2001-07-01 597 * MSW 2001-07-01
733 */ 598 */
734bool 599bool
735maptile::load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
736{ 601{
737 for (;;) 602 for (;;)
738 { 603 {
739 keyword kw = thawer.get_kv ();
740
741 switch (kw) 604 switch (thawer.kw)
742 { 605 {
743 case KW_EOF:
744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
745 return false;
746
747 case KW_end:
748 return true;
749
750 default:
751 case KW_ERROR:
752 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
753 break;
754
755 case KW_msg: 606 case KW_msg:
756 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
757 break; 608 break;
758 609
759 case KW_lore: // CF+ extension 610 case KW_lore: // CF+ extension
… …
790 case KW_winddir: thawer.get (winddir); break; 641 case KW_winddir: thawer.get (winddir); break;
791 case KW_sky: thawer.get (sky); break; 642 case KW_sky: thawer.get (sky); break;
792 643
793 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
794 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;
795 647
796 case KW_region: get_region_by_name (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
797 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
798 650
799 // old names new names 651 // old names new names
800 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 652 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
801 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 653 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
809 661
810 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
811 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
812 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
813 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
666
667 case KW_ERROR:
668 set_key_text (thawer.kw_str, thawer.value);
669 break;
670
671 case KW_end:
672 thawer.next ();
673 return true;
674
675 default:
676 if (!thawer.parse_error ("map", 0))
677 return false;
678 break;
814 } 679 }
680
681 thawer.next ();
815 } 682 }
816 683
817 abort (); 684 abort ();
818}
819
820bool
821maptile::load_header (const char *path)
822{
823 object_thawer thawer (path);
824
825 if (!thawer)
826 return false;
827
828 return load_header (thawer);
829} 685}
830 686
831/****************************************************************************** 687/******************************************************************************
832 * This is the start of unique map handling code 688 * This is the start of unique map handling code
833 *****************************************************************************/ 689 *****************************************************************************/
… …
844 object *above = op->above; 700 object *above = op->above;
845 701
846 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 702 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
847 unique = 1; 703 unique = 1;
848 704
849 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 705 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
850 { 706 {
851 op->destroy_inv (false); 707 op->destroy_inv (false);
852 op->destroy (); 708 op->destroy ();
853 } 709 }
854 710
… …
856 } 712 }
857 } 713 }
858} 714}
859 715
860bool 716bool
861maptile::save_header (object_freezer &freezer) 717maptile::_save_header (object_freezer &freezer)
862{ 718{
863#define MAP_OUT(k) freezer.put (KW_ ## k, k) 719#define MAP_OUT(k) freezer.put (KW_ ## k, k)
864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 720#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
865 721
866 MAP_OUT2 (arch, "map"); 722 MAP_OUT2 (arch, "map");
… …
868 if (name) MAP_OUT (name); 724 if (name) MAP_OUT (name);
869 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
870 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
871 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
872 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset);
873 MAP_OUT (difficulty); 730 MAP_OUT (difficulty);
874 731
875 if (region) MAP_OUT2 (region, region->name); 732 if (default_region) MAP_OUT2 (region, default_region->name);
876 733
877 if (shopitems) 734 if (shopitems)
878 { 735 {
879 char shop[MAX_BUF]; 736 char shop[MAX_BUF];
880 print_shop_string (this, shop); 737 print_shop_string (this, shop);
… …
915 772
916 return true; 773 return true;
917} 774}
918 775
919bool 776bool
920maptile::save_header (const char *path) 777maptile::_save_header (const char *path)
921{ 778{
922 object_freezer freezer; 779 object_freezer freezer;
923 780
924 if (!save_header (freezer)) 781 if (!_save_header (freezer))
925 return false; 782 return false;
926 783
927 return freezer.save (path); 784 return freezer.save (path);
928} 785}
929 786
… …
931 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
932 */ 789 */
933void 790void
934maptile::clear () 791maptile::clear ()
935{ 792{
936 if (!spaces) 793 if (spaces)
937 return; 794 {
938
939 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
940 while (object *op = ms->bot) 796 while (object *op = ms->bot)
941 { 797 {
798 // manually remove, as to not trigger anything
799 if (ms->bot = op->above)
800 ms->bot->below = 0;
801
802 op->flag [FLAG_REMOVED] = true;
803
804 object *head = op->head_ ();
942 if (op->head) 805 if (op == head)
943 op = op->head; 806 {
944
945 op->destroy_inv (false); 807 op->destroy_inv (false);
946 op->destroy (); 808 op->destroy ();
809 }
810 else if (head->map != op->map)
811 {
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy ();
814 }
947 } 815 }
948 816
949 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
818 }
950 819
951 if (buttons) 820 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
953} 825}
954 826
955void 827void
956maptile::clear_header () 828maptile::clear_header ()
957{ 829{
… …
987maptile::do_destroy () 859maptile::do_destroy ()
988{ 860{
989 attachable::do_destroy (); 861 attachable::do_destroy ();
990 862
991 clear (); 863 clear ();
864}
865
866/* decay and destroy perishable items in a map */
867void
868maptile::do_decay_objects ()
869{
870 if (!spaces)
871 return;
872
873 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 for (object *above, *op = ms->bot; op; op = above)
875 {
876 above = op->above;
877
878 bool destroy = 0;
879
880 // do not decay anything above unique floor tiles (yet :)
881 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
882 break;
883
884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
886 || QUERY_FLAG (op, FLAG_UNIQUE)
887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
888 || QUERY_FLAG (op, FLAG_UNPAID)
889 || op->is_alive ())
890 ; // do not decay
891 else if (op->is_weapon ())
892 {
893 op->stats.dam--;
894 if (op->stats.dam < 0)
895 destroy = 1;
896 }
897 else if (op->is_armor ())
898 {
899 op->stats.ac--;
900 if (op->stats.ac < 0)
901 destroy = 1;
902 }
903 else if (op->type == FOOD)
904 {
905 op->stats.food -= rndm (5, 20);
906 if (op->stats.food < 0)
907 destroy = 1;
908 }
909 else
910 {
911 int mat = op->materials;
912
913 if (mat & M_PAPER
914 || mat & M_LEATHER
915 || mat & M_WOOD
916 || mat & M_ORGANIC
917 || mat & M_CLOTH
918 || mat & M_LIQUID
919 || (mat & M_IRON && rndm (1, 5) == 1)
920 || (mat & M_GLASS && rndm (1, 2) == 1)
921 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
922 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
923 || (mat & M_ICE && temp > 32))
924 destroy = 1;
925 }
926
927 /* adjust overall chance below */
928 if (destroy && rndm (0, 1))
929 op->destroy ();
930 }
992} 931}
993 932
994/* 933/*
995 * Updates every button on the map (by calling update_button() for them). 934 * Updates every button on the map (by calling update_button() for them).
996 */ 935 */
… …
1044 if (QUERY_FLAG (op, FLAG_GENERATOR)) 983 if (QUERY_FLAG (op, FLAG_GENERATOR))
1045 { 984 {
1046 total_exp += op->stats.exp; 985 total_exp += op->stats.exp;
1047 986
1048 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 987 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1049 total_exp += at->clone.stats.exp * 8; 988 total_exp += at->stats.exp * 8;
1050 989
1051 monster_cnt++; 990 monster_cnt++;
1052 } 991 }
1053 } 992 }
1054 993
… …
1108 */ 1047 */
1109void 1048void
1110mapspace::update_ () 1049mapspace::update_ ()
1111{ 1050{
1112 object *tmp, *last = 0; 1051 object *tmp, *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1052 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 New_Face *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1053 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1054
1118 middle = blank_face; 1055 //object *middle = 0;
1119 top = blank_face; 1056 //object *top = 0;
1120 floor = blank_face; 1057 //object *floor = 0;
1121 1058 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1059 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1060 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1061 object *&floor = faces_obj[2] = 0;
1125 1062
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1063 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1064 {
1128 /* This could be made additive I guess (two lights better than 1065 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1066 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1079 * Always put the player down for drawing.
1143 */ 1080 */
1144 if (!tmp->invisible) 1081 if (!tmp->invisible)
1145 { 1082 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1083 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1084 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1085 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1086 {
1153 /* If we got a floor, that means middle and top were below it, 1087 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1088 * so should not be visible, so we clear them.
1155 */ 1089 */
1156 middle = blank_face; 1090 middle = 0;
1157 top = blank_face; 1091 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1092 floor = tmp;
1160 } 1093 }
1161 /* Flag anywhere have high priority */ 1094 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1095 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1096 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1097 middle = tmp;
1167 anywhere = 1; 1098 anywhere = 1;
1168 } 1099 }
1169 /* Find the highest visible face around. If equal 1100 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1101 * visibilities, we still want the one nearer to the
1171 * top 1102 * top
1172 */ 1103 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1104 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1105 middle = tmp;
1177 }
1178 } 1106 }
1179 1107
1180 if (tmp == tmp->above) 1108 if (tmp == tmp->above)
1181 { 1109 {
1182 LOG (llevError, "Error in structure of map\n"); 1110 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1145 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1146 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1147 * may be possible for the faces to match but be different objects.
1220 */ 1148 */
1221 if (top == middle) 1149 if (top == middle)
1222 middle = blank_face; 1150 middle = 0;
1223 1151
1224 /* There are three posibilities at this point: 1152 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1153 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1154 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1155 * 3) neither middle or top is set - need to set both.
… …
1232 /* Once we get to a floor, stop, since we already have a floor object */ 1160 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1161 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1162 break;
1235 1163
1236 /* If two top faces are already set, quit processing */ 1164 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1165 if (top && middle)
1238 break; 1166 break;
1239 1167
1240 /* Only show visible faces */ 1168 /* Only show visible faces */
1241 if (!tmp->invisible) 1169 if (!tmp->invisible)
1242 { 1170 {
1243 /* Fill in top if needed */ 1171 /* Fill in top if needed */
1244 if (top == blank_face) 1172 if (!top)
1245 { 1173 {
1246 top = tmp->face;
1247 top_obj = tmp; 1174 top = tmp;
1248 if (top == middle) 1175 if (top == middle)
1249 middle = blank_face; 1176 middle = 0;
1250 } 1177 }
1251 else 1178 else
1252 { 1179 {
1253 /* top is already set - we should only get here if 1180 /* top is already set - we should only get here if
1254 * middle is not set 1181 * middle is not set
1255 * 1182 *
1256 * Set the middle face and break out, since there is nothing 1183 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1184 * more to fill in. We don't check visiblity here, since
1258 * 1185 *
1259 */ 1186 */
1260 if (tmp->face != top) 1187 if (tmp != top)
1261 { 1188 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1189 middle = tmp;
1264 break; 1190 break;
1265 } 1191 }
1266 } 1192 }
1267 } 1193 }
1268 } 1194 }
1269 1195
1270 if (middle == floor) 1196 if (middle == floor)
1271 middle = blank_face; 1197 middle = 0;
1272 1198
1273 if (top == middle) 1199 if (top == middle)
1274 middle = blank_face; 1200 middle = 0;
1275 1201
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1202#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1203 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1204 faces_obj [1] = middle;
1205 faces_obj [2] = floor;
1206#endif
1279} 1207}
1280 1208
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1209uint64
1282 * the map. It also takes care of linking back the freshly found 1210mapspace::volume () const
1283 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num].
1285 */
1286static inline maptile *
1287find_and_link (maptile *orig_map, int tile_num)
1288{ 1211{
1289 maptile *mp = orig_map->tile_map [tile_num]; 1212 uint64 vol = 0;
1290 1213
1291 if (!mp) 1214 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1292 { 1215 vol += op->volume ();
1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1294 1216
1295 if (!mp) 1217 return vol;
1296 { 1218}
1297 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1298 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1299 &orig_map->tile_path[tile_num], &orig_map->path);
1300 mp = new maptile (1, 1);
1301 mp->alloc ();
1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1304 }
1305 1219
1306 int dest_tile = (tile_num + 2) % 4; 1220bool
1221maptile::tile_available (int dir, bool load)
1222{
1223 if (!tile_path[dir])
1224 return 0;
1307 1225
1308 orig_map->tile_map [tile_num] = mp; 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1227 return 1;
1309 1228
1310 // optimisation: back-link map to origin map if euclidean 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1311 //TODO: non-euclidean maps MUST GO 1230 return 1;
1312 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1314 1231
1315 return mp; 1232 return 0;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1322} 1233}
1323 1234
1324/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1325 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1326 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1339 if (!m) 1250 if (!m)
1340 return 0; 1251 return 0;
1341 1252
1342 if (x < 0) 1253 if (x < 0)
1343 { 1254 {
1344 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1345 return 1; 1256 return 1;
1346 1257
1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1348 find_and_link (m, 3);
1349
1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1258 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1351 } 1259 }
1352 1260
1353 if (x >= m->width) 1261 if (x >= m->width)
1354 { 1262 {
1355 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1356 return 1; 1264 return 1;
1357 1265
1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1359 find_and_link (m, 1);
1360
1361 return out_of_map (m->tile_map[1], x - m->width, y); 1266 return out_of_map (m->tile_map[1], x - m->width, y);
1362 } 1267 }
1363 1268
1364 if (y < 0) 1269 if (y < 0)
1365 { 1270 {
1366 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1367 return 1; 1272 return 1;
1368 1273
1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1370 find_and_link (m, 0);
1371
1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1274 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1373 } 1275 }
1374 1276
1375 if (y >= m->height) 1277 if (y >= m->height)
1376 { 1278 {
1377 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1378 return 1; 1280 return 1;
1379
1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1381 find_and_link (m, 2);
1382 1281
1383 return out_of_map (m->tile_map[2], x, y - m->height); 1282 return out_of_map (m->tile_map[2], x, y - m->height);
1384 } 1283 }
1385 1284
1386 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1400maptile * 1299maptile *
1401maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1402{ 1301{
1403 if (x < 0) 1302 if (x < 0)
1404 { 1303 {
1405 if (!tile_path[3]) 1304 if (!tile_available (3))
1406 return 0; 1305 return 0;
1407 1306
1408 find_and_link (this, 3);
1409 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1410 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1411 } 1309 }
1412 1310
1413 if (x >= width) 1311 if (x >= width)
1414 { 1312 {
1415 if (!tile_path[1]) 1313 if (!tile_available (1))
1416 return 0; 1314 return 0;
1417 1315
1418 find_and_link (this, 1);
1419 x -= width; 1316 x -= width;
1420 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1421 } 1318 }
1422 1319
1423 if (y < 0) 1320 if (y < 0)
1424 { 1321 {
1425 if (!tile_path[0]) 1322 if (!tile_available (0))
1426 return 0; 1323 return 0;
1427 1324
1428 find_and_link (this, 0);
1429 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1430 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1431 } 1327 }
1432 1328
1433 if (y >= height) 1329 if (y >= height)
1434 { 1330 {
1435 if (!tile_path[2]) 1331 if (!tile_available (2))
1436 return 0; 1332 return 0;
1437 1333
1438 find_and_link (this, 2);
1439 y -= height; 1334 y -= height;
1440 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1441 } 1336 }
1442 1337
1443 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1448 1343
1449/** 1344/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1345 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1346 * map1 to map2 in dx/dy.
1452 */ 1347 */
1453static int 1348int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1350{
1456 if (!map1 || !map2) 1351 if (!map1 || !map2)
1457 return 0; 1352 return 0;
1458 1353
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1354 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1461 if (map1 == map2) 1356 if (map1 == map2)
1462 { 1357 {
1463 *dx = 0; 1358 *dx = 0;
1464 *dy = 0; 1359 *dy = 0;
… …
1549/* From map.c 1444/* From map.c
1550 * This is used by get_player to determine where the other 1445 * This is used by get_player to determine where the other
1551 * creature is. get_rangevector takes into account map tiling, 1446 * creature is. get_rangevector takes into account map tiling,
1552 * so you just can not look the the map coordinates and get the 1447 * so you just can not look the the map coordinates and get the
1553 * righte value. distance_x/y are distance away, which 1448 * righte value. distance_x/y are distance away, which
1554 * can be negativbe. direction is the crossfire direction scheme 1449 * can be negative. direction is the crossfire direction scheme
1555 * that the creature should head. part is the part of the 1450 * that the creature should head. part is the part of the
1556 * monster that is closest. 1451 * monster that is closest.
1557 * 1452 *
1558 * get_rangevector looks at op1 and op2, and fills in the 1453 * get_rangevector looks at op1 and op2, and fills in the
1559 * structure for op1 to get to op2. 1454 * structure for op1 to get to op2.
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1465get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1466{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1467 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1468 {
1574 /* be conservative and fill in _some_ data */ 1469 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1470 retval->distance = 10000;
1576 retval->distance_x = 32767; 1471 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1472 retval->distance_y = 10000;
1578 retval->direction = 0; 1473 retval->direction = 0;
1579 retval->part = 0; 1474 retval->part = 0;
1580 } 1475 }
1581 else 1476 else
1582 { 1477 {
… …
1587 1482
1588 best = op1; 1483 best = op1;
1589 /* If this is multipart, find the closest part now */ 1484 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1485 if (!(flags & 0x1) && op1->more)
1591 { 1486 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1487 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1488
1595 /* we just take the offset of the piece to head to figure 1489 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1490 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1491 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1492 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1493 * below works.
1600 */ 1494 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1495 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1496 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1497 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1604 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1498 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1499 if (tmpi < best_distance)
1606 { 1500 {
1607 best_distance = tmpi; 1501 best_distance = tmpi;
1608 best = tmp; 1502 best = tmp;
1609 } 1503 }
1610 } 1504 }
1505
1611 if (best != op1) 1506 if (best != op1)
1612 { 1507 {
1613 retval->distance_x += op1->x - best->x; 1508 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1509 retval->distance_y += op1->y - best->y;
1615 } 1510 }
1616 } 1511 }
1512
1617 retval->part = best; 1513 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1514 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1515 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1516 }
1621} 1517}
1622 1518
1623/* this is basically the same as get_rangevector above, but instead of 1519/* this is basically the same as get_rangevector above, but instead of
… …
1628 * flags has no meaning for this function at this time - I kept it in to 1524 * flags has no meaning for this function at this time - I kept it in to
1629 * be more consistant with the above function and also in case they are needed 1525 * be more consistant with the above function and also in case they are needed
1630 * for something in the future. Also, since no object is pasted, the best 1526 * for something in the future. Also, since no object is pasted, the best
1631 * field of the rv_vector is set to NULL. 1527 * field of the rv_vector is set to NULL.
1632 */ 1528 */
1633
1634void 1529void
1635get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1530get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1636{ 1531{
1637 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1532 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1638 { 1533 {
1639 /* be conservative and fill in _some_ data */ 1534 /* be conservative and fill in _some_ data */
1640 retval->distance = 100000; 1535 retval->distance = 100000;
… …
1647 { 1542 {
1648 retval->distance_x += op2->x - x; 1543 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1544 retval->distance_y += op2->y - y;
1650 1545
1651 retval->part = NULL; 1546 retval->part = NULL;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1547 retval->distance = idistance (retval->distance_x, retval->distance_y);
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1548 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1549 }
1655} 1550}
1656 1551
1657/* Returns true of op1 and op2 are effectively on the same map 1552/* Returns true of op1 and op2 are effectively on the same map
… …
1677 op->remove (); 1572 op->remove ();
1678 1573
1679 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1574 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1680} 1575}
1681 1576
1577region *
1578maptile::region (int x, int y) const
1579{
1580 if (regions
1581 && regionmap
1582 && !OUT_OF_REAL_MAP (this, x, y))
1583 if (struct region *reg = regionmap [regions [y * width + x]])
1584 return reg;
1585
1586 if (default_region)
1587 return default_region;
1588
1589 return ::region::default_region ();
1590}
1591
1592/* picks a random object from a style map.
1593 * Redone by MSW so it should be faster and not use static
1594 * variables to generate tables.
1595 */
1596object *
1597maptile::pick_random_object () const
1598{
1599 /* while returning a null object will result in a crash, that
1600 * is actually preferable to an infinite loop. That is because
1601 * most servers will automatically restart in case of crash.
1602 * Change the logic on getting the random space - shouldn't make
1603 * any difference, but this seems clearer to me.
1604 */
1605 for (int i = 1000; --i;)
1606 {
1607 object *pick = at (rndm (width), rndm (height)).bot;
1608
1609 // do not prefer big monsters just because they are big.
1610 if (pick && pick->head_ () == pick)
1611 return pick->head_ ();
1612 }
1613
1614 // instead of crashing in the unlikely(?) case, try to return *something*
1615 return get_archetype ("blocked");
1616}
1617
1618void
1619maptile::play_sound (faceidx sound, int x, int y) const
1620{
1621 if (!sound)
1622 return;
1623
1624 for_all_players (pl)
1625 if (pl->ob->map == this)
1626 if (client *ns = pl->ns)
1627 {
1628 int dx = x - pl->ob->x;
1629 int dy = y - pl->ob->y;
1630
1631 int distance = idistance (dx, dy);
1632
1633 if (distance <= MAX_SOUND_DISTANCE)
1634 ns->play_sound (sound, dx, dy);
1635 }
1636}
1637

Diff Legend

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