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.74 by root, Sun Jan 14 23:35:03 2007 UTC vs.
Revision 1.135 by root, Sun Apr 20 23:25:09 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
… …
324 245
325 insert_ob_in_ob (tmp, container); 246 insert_ob_in_ob (tmp, container);
326 tmp = next; 247 tmp = next;
327 } 248 }
328 249
329 /* sum_weight will go through and calculate what all the containers are 250 // go through and calculate what all the containers are carrying.
330 * carrying. 251 //TODO: remove
331 */ 252 container->update_weight ();
332 sum_weight (container);
333} 253}
334 254
335void 255void
336maptile::set_object_flag (int flag, int value) 256maptile::set_object_flag (int flag, int value)
337{ 257{
… …
344} 264}
345 265
346/* link_multipart_objects go through all the objects on the map looking 266/* 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 267 * 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 268 * 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 269 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 270 */
352void 271void
353maptile::link_multipart_objects () 272maptile::link_multipart_objects ()
354{ 273{
355 if (!spaces) 274 if (!spaces)
356 return; 275 return;
357 276
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 277 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 278 {
279 object *op = ms->bot;
280 while (op)
360 { 281 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 282 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 283 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 { 284 {
375 op = arch_to_object (at); 285 op->remove ();
286 op->expand_tail ();
376 287
377 /* update x,y coordinates */ 288 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 289 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 290 // 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); 291 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
292
293 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
294 // so we have to reset the iteration through the mapspace
392 } 295 }
296 else
297 op = op->above;
393 } 298 }
394
395 tmp = above;
396 } 299 }
397} 300}
398 301
399/* 302/*
400 * Loads (ands parses) the objects into a given map from the specified 303 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 304 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 305 */
404bool 306bool
405maptile::_load_objects (object_thawer &thawer) 307maptile::_load_objects (object_thawer &f)
406{ 308{
407 int unique; 309 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 { 310 {
415 /* if the archetype for the object is null, means that we 311 coroapi::cede_to_tick (); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 312
417 * or editor will not be able to do anything with it either. 313 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 314 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 315 case KW_arch:
316 if (object *op = object::read (f, this))
317 {
318 // TODO: why?
319 if (op->inv)
320 op->update_weight ();
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 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504 if (cede_count >= 500)
505 {
506 cede_count = 0;
507 coroapi::cede ();
508 }
509#endif
510
511 int unique = 0; 398 bool unique = 0;
399
512 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
513 { 401 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
518 unique = 1;
519 403
520 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
521 continue; 405 continue;
522 406
523 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
524 { 408 {
525 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 410 op->write (f);
527 } 411 }
528 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
529 save_object (freezer, op, 1); 413 op->write (f);
530 } 414 }
531 } 415 }
532 416
417 coroapi::cede_to_tick ();
418
533 return true; 419 return true;
534}
535
536bool
537maptile::_load_objects (const char *path, bool skip_header)
538{
539 object_thawer thawer (path);
540
541 if (!thawer)
542 return false;
543
544 if (skip_header)
545 for (;;)
546 {
547 keyword kw = thawer.get_kv ();
548
549 if (kw == KW_end)
550 break;
551
552 thawer.skip_kv (kw);
553 }
554
555 return _load_objects (thawer);
556} 420}
557 421
558bool 422bool
559maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
560{ 424{
… …
569maptile::maptile () 433maptile::maptile ()
570{ 434{
571 in_memory = MAP_SWAPPED; 435 in_memory = MAP_SWAPPED;
572 436
573 /* 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
574 * map archetype. Mimic that behaviour. 438 * map archetype. Mimic that behaviour.
575 */ 439 */
576 width = 16; 440 width = 16;
577 height = 16; 441 height = 16;
578 reset_timeout = 0;
579 timeout = 300; 442 timeout = 300;
580 enter_x = 0; 443 max_nrof = 1000; // 1000 items of anything
581 enter_y = 0; 444 max_volume = 2000000; // 2m³
582} 445}
583 446
584maptile::maptile (int w, int h) 447maptile::maptile (int w, int h)
585{ 448{
586 in_memory = MAP_SWAPPED; 449 in_memory = MAP_SWAPPED;
… …
736bool 599bool
737maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
738{ 601{
739 for (;;) 602 for (;;)
740 { 603 {
741 keyword kw = thawer.get_kv ();
742
743 switch (kw) 604 switch (thawer.kw)
744 { 605 {
745 case KW_EOF:
746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747 return false;
748
749 case KW_end:
750 return true;
751
752 default:
753 case KW_ERROR:
754 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755 break;
756
757 case KW_msg: 606 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
759 break; 608 break;
760 609
761 case KW_lore: // CF+ extension 610 case KW_lore: // CF+ extension
… …
792 case KW_winddir: thawer.get (winddir); break; 641 case KW_winddir: thawer.get (winddir); break;
793 case KW_sky: thawer.get (sky); break; 642 case KW_sky: thawer.get (sky); break;
794 643
795 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
796 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;
797 647
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 650
801 // old names new names 651 // old names new names
802 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;
803 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;
… …
811 661
812 case KW_tile_path_1: thawer.get (tile_path [0]); break; 662 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 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;
816 } 679 }
680
681 thawer.next ();
817 } 682 }
818 683
819 abort (); 684 abort ();
820}
821
822bool
823maptile::_load_header (const char *path)
824{
825 object_thawer thawer (path);
826
827 if (!thawer)
828 return false;
829
830 return _load_header (thawer);
831} 685}
832 686
833/****************************************************************************** 687/******************************************************************************
834 * This is the start of unique map handling code 688 * This is the start of unique map handling code
835 *****************************************************************************/ 689 *****************************************************************************/
… …
846 object *above = op->above; 700 object *above = op->above;
847 701
848 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))
849 unique = 1; 703 unique = 1;
850 704
851 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 705 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
852 { 706 {
853 op->destroy_inv (false); 707 op->destroy_inv (false);
854 op->destroy (); 708 op->destroy ();
855 } 709 }
856 710
… …
870 if (name) MAP_OUT (name); 724 if (name) MAP_OUT (name);
871 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
872 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset);
875 MAP_OUT (difficulty); 730 MAP_OUT (difficulty);
876 731
877 if (region) MAP_OUT2 (region, region->name); 732 if (default_region) MAP_OUT2 (region, default_region->name);
878 733
879 if (shopitems) 734 if (shopitems)
880 { 735 {
881 char shop[MAX_BUF]; 736 char shop[MAX_BUF];
882 print_shop_string (this, shop); 737 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
934 */ 789 */
935void 790void
936maptile::clear () 791maptile::clear ()
937{ 792{
938 if (!spaces) 793 if (spaces)
939 return; 794 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 796 while (object *op = ms->bot)
943 { 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_ ();
944 if (op->head) 805 if (op == head)
945 op = op->head; 806 {
946
947 op->destroy_inv (false); 807 op->destroy_inv (false);
948 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 }
949 } 815 }
950 816
951 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
818 }
952 819
953 if (buttons) 820 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
955} 825}
956 826
957void 827void
958maptile::clear_header () 828maptile::clear_header ()
959{ 829{
… …
989maptile::do_destroy () 859maptile::do_destroy ()
990{ 860{
991 attachable::do_destroy (); 861 attachable::do_destroy ();
992 862
993 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 }
994} 931}
995 932
996/* 933/*
997 * 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).
998 */ 935 */
… …
1046 if (QUERY_FLAG (op, FLAG_GENERATOR)) 983 if (QUERY_FLAG (op, FLAG_GENERATOR))
1047 { 984 {
1048 total_exp += op->stats.exp; 985 total_exp += op->stats.exp;
1049 986
1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 987 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1051 total_exp += at->clone.stats.exp * 8; 988 total_exp += at->stats.exp * 8;
1052 989
1053 monster_cnt++; 990 monster_cnt++;
1054 } 991 }
1055 } 992 }
1056 993
… …
1111void 1048void
1112mapspace::update_ () 1049mapspace::update_ ()
1113{ 1050{
1114 object *tmp, *last = 0; 1051 object *tmp, *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1052 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj;
1118 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;
1119 1054
1120 middle = blank_face; 1055 //object *middle = 0;
1121 top = blank_face; 1056 //object *top = 0;
1122 floor = blank_face; 1057 //object *floor = 0;
1123 1058 // this seems to generate better code than using locals, above
1124 middle_obj = 0; 1059 object *&top = faces_obj[0] = 0;
1125 top_obj = 0; 1060 object *&middle = faces_obj[1] = 0;
1126 floor_obj = 0; 1061 object *&floor = faces_obj[2] = 0;
1127 1062
1128 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1063 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1129 { 1064 {
1130 /* This could be made additive I guess (two lights better than 1065 /* This could be made additive I guess (two lights better than
1131 * 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
… …
1144 * Always put the player down for drawing. 1079 * Always put the player down for drawing.
1145 */ 1080 */
1146 if (!tmp->invisible) 1081 if (!tmp->invisible)
1147 { 1082 {
1148 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1083 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1149 {
1150 top = tmp->face;
1151 top_obj = tmp; 1084 top = tmp;
1152 }
1153 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1085 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1154 { 1086 {
1155 /* 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,
1156 * so should not be visible, so we clear them. 1088 * so should not be visible, so we clear them.
1157 */ 1089 */
1158 middle = blank_face; 1090 middle = 0;
1159 top = blank_face; 1091 top = 0;
1160 floor = tmp->face;
1161 floor_obj = tmp; 1092 floor = tmp;
1162 } 1093 }
1163 /* Flag anywhere have high priority */ 1094 /* Flag anywhere have high priority */
1164 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1095 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1165 { 1096 {
1166 middle = tmp->face;
1167
1168 middle_obj = tmp; 1097 middle = tmp;
1169 anywhere = 1; 1098 anywhere = 1;
1170 } 1099 }
1171 /* Find the highest visible face around. If equal 1100 /* Find the highest visible face around. If equal
1172 * visibilities, we still want the one nearer to the 1101 * visibilities, we still want the one nearer to the
1173 * top 1102 * top
1174 */ 1103 */
1175 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1104 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1176 {
1177 middle = tmp->face;
1178 middle_obj = tmp; 1105 middle = tmp;
1179 }
1180 } 1106 }
1181 1107
1182 if (tmp == tmp->above) 1108 if (tmp == tmp->above)
1183 { 1109 {
1184 LOG (llevError, "Error in structure of map\n"); 1110 LOG (llevError, "Error in structure of map\n");
… …
1219 * middle face. This should not happen, as we already have the 1145 * middle face. This should not happen, as we already have the
1220 * else statement above so middle should not get set. OTOH, it 1146 * else statement above so middle should not get set. OTOH, it
1221 * 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.
1222 */ 1148 */
1223 if (top == middle) 1149 if (top == middle)
1224 middle = blank_face; 1150 middle = 0;
1225 1151
1226 /* There are three posibilities at this point: 1152 /* There are three posibilities at this point:
1227 * 1) top face is set, need middle to be set. 1153 * 1) top face is set, need middle to be set.
1228 * 2) middle is set, need to set top. 1154 * 2) middle is set, need to set top.
1229 * 3) neither middle or top is set - need to set both. 1155 * 3) neither middle or top is set - need to set both.
… …
1234 /* 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 */
1235 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1161 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1236 break; 1162 break;
1237 1163
1238 /* If two top faces are already set, quit processing */ 1164 /* If two top faces are already set, quit processing */
1239 if ((top != blank_face) && (middle != blank_face)) 1165 if (top && middle)
1240 break; 1166 break;
1241 1167
1242 /* Only show visible faces */ 1168 /* Only show visible faces */
1243 if (!tmp->invisible) 1169 if (!tmp->invisible)
1244 { 1170 {
1245 /* Fill in top if needed */ 1171 /* Fill in top if needed */
1246 if (top == blank_face) 1172 if (!top)
1247 { 1173 {
1248 top = tmp->face;
1249 top_obj = tmp; 1174 top = tmp;
1250 if (top == middle) 1175 if (top == middle)
1251 middle = blank_face; 1176 middle = 0;
1252 } 1177 }
1253 else 1178 else
1254 { 1179 {
1255 /* top is already set - we should only get here if 1180 /* top is already set - we should only get here if
1256 * middle is not set 1181 * middle is not set
1257 * 1182 *
1258 * Set the middle face and break out, since there is nothing 1183 * Set the middle face and break out, since there is nothing
1259 * more to fill in. We don't check visiblity here, since 1184 * more to fill in. We don't check visiblity here, since
1260 * 1185 *
1261 */ 1186 */
1262 if (tmp->face != top) 1187 if (tmp != top)
1263 { 1188 {
1264 middle = tmp->face;
1265 middle_obj = tmp; 1189 middle = tmp;
1266 break; 1190 break;
1267 } 1191 }
1268 } 1192 }
1269 } 1193 }
1270 } 1194 }
1271 1195
1272 if (middle == floor) 1196 if (middle == floor)
1273 middle = blank_face; 1197 middle = 0;
1274 1198
1275 if (top == middle) 1199 if (top == middle)
1276 middle = blank_face; 1200 middle = 0;
1277 1201
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1202#if 0
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1203 faces_obj [0] = top;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1204 faces_obj [1] = middle;
1205 faces_obj [2] = floor;
1206#endif
1281} 1207}
1282 1208
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1209uint64
1284 * the map. It also takes care of linking back the freshly found 1210mapspace::volume () const
1285 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num].
1287 */
1288static inline maptile *
1289find_and_link (maptile *orig_map, int tile_num)
1290{ 1211{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1212 uint64 vol = 0;
1292 1213
1293 if (!mp) 1214 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1294 { 1215 vol += op->volume ();
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1216
1297 if (!mp) 1217 return vol;
1298 { 1218}
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 }
1307 1219
1308 int dest_tile = (tile_num + 2) % 4; 1220bool
1221maptile::tile_available (int dir, bool load)
1222{
1223 if (!tile_path[dir])
1224 return 0;
1309 1225
1310 orig_map->tile_map [tile_num] = mp; 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1227 return 1;
1311 1228
1312 // optimisation: back-link map to origin map if euclidean 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1313 //TODO: non-euclidean maps MUST GO 1230 return 1;
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1316 1231
1317 return mp; 1232 return 0;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1324} 1233}
1325 1234
1326/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1250 if (!m)
1342 return 0; 1251 return 0;
1343 1252
1344 if (x < 0) 1253 if (x < 0)
1345 { 1254 {
1346 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1347 return 1; 1256 return 1;
1348 1257
1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1350 find_and_link (m, 3);
1351
1352 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);
1353 } 1259 }
1354 1260
1355 if (x >= m->width) 1261 if (x >= m->width)
1356 { 1262 {
1357 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1358 return 1; 1264 return 1;
1359 1265
1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1361 find_and_link (m, 1);
1362
1363 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);
1364 } 1267 }
1365 1268
1366 if (y < 0) 1269 if (y < 0)
1367 { 1270 {
1368 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1369 return 1; 1272 return 1;
1370 1273
1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1372 find_and_link (m, 0);
1373
1374 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);
1375 } 1275 }
1376 1276
1377 if (y >= m->height) 1277 if (y >= m->height)
1378 { 1278 {
1379 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1380 return 1; 1280 return 1;
1381
1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1383 find_and_link (m, 2);
1384 1281
1385 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);
1386 } 1283 }
1387 1284
1388 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1402maptile * 1299maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1301{
1405 if (x < 0) 1302 if (x < 0)
1406 { 1303 {
1407 if (!tile_path[3]) 1304 if (!tile_available (3))
1408 return 0; 1305 return 0;
1409 1306
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1413 } 1309 }
1414 1310
1415 if (x >= width) 1311 if (x >= width)
1416 { 1312 {
1417 if (!tile_path[1]) 1313 if (!tile_available (1))
1418 return 0; 1314 return 0;
1419 1315
1420 find_and_link (this, 1);
1421 x -= width; 1316 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1423 } 1318 }
1424 1319
1425 if (y < 0) 1320 if (y < 0)
1426 { 1321 {
1427 if (!tile_path[0]) 1322 if (!tile_available (0))
1428 return 0; 1323 return 0;
1429 1324
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1433 } 1327 }
1434 1328
1435 if (y >= height) 1329 if (y >= height)
1436 { 1330 {
1437 if (!tile_path[2]) 1331 if (!tile_available (2))
1438 return 0; 1332 return 0;
1439 1333
1440 find_and_link (this, 2);
1441 y -= height; 1334 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1443 } 1336 }
1444 1337
1445 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1450 1343
1451/** 1344/**
1452 * 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
1453 * map1 to map2 in dx/dy. 1346 * map1 to map2 in dx/dy.
1454 */ 1347 */
1455static int 1348int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1350{
1458 if (!map1 || !map2) 1351 if (!map1 || !map2)
1459 return 0; 1352 return 0;
1460 1353
1461 //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
1462 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1356 if (map1 == map2)
1464 { 1357 {
1465 *dx = 0; 1358 *dx = 0;
1466 *dy = 0; 1359 *dy = 0;
… …
1551/* From map.c 1444/* From map.c
1552 * This is used by get_player to determine where the other 1445 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1446 * creature is. get_rangevector takes into account map tiling,
1554 * 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
1555 * righte value. distance_x/y are distance away, which 1448 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1449 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1450 * that the creature should head. part is the part of the
1558 * monster that is closest. 1451 * monster that is closest.
1559 * 1452 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1453 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1454 * structure for op1 to get to op2.
… …
1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1465get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1573{ 1466{
1574 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))
1575 { 1468 {
1576 /* be conservative and fill in _some_ data */ 1469 /* be conservative and fill in _some_ data */
1577 retval->distance = 100000; 1470 retval->distance = 10000;
1578 retval->distance_x = 32767; 1471 retval->distance_x = 10000;
1579 retval->distance_y = 32767; 1472 retval->distance_y = 10000;
1580 retval->direction = 0; 1473 retval->direction = 0;
1581 retval->part = 0; 1474 retval->part = 0;
1582 } 1475 }
1583 else 1476 else
1584 { 1477 {
… …
1589 1482
1590 best = op1; 1483 best = op1;
1591 /* If this is multipart, find the closest part now */ 1484 /* If this is multipart, find the closest part now */
1592 if (!(flags & 0x1) && op1->more) 1485 if (!(flags & 0x1) && op1->more)
1593 { 1486 {
1594 object *tmp;
1595 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;
1596 1488
1597 /* 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
1598 * distance instead of doing all that work above again 1490 * distance instead of doing all that work above again
1599 * since the distance fields we set above are positive in the 1491 * since the distance fields we set above are positive in the
1600 * same axis as is used for multipart objects, the simply arithmetic 1492 * same axis as is used for multipart objects, the simply arithmetic
1601 * below works. 1493 * below works.
1602 */ 1494 */
1603 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1495 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604 { 1496 {
1605 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) +
1606 (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);
1607 if (tmpi < best_distance) 1499 if (tmpi < best_distance)
1608 { 1500 {
1609 best_distance = tmpi; 1501 best_distance = tmpi;
1610 best = tmp; 1502 best = tmp;
1611 } 1503 }
1612 } 1504 }
1505
1613 if (best != op1) 1506 if (best != op1)
1614 { 1507 {
1615 retval->distance_x += op1->x - best->x; 1508 retval->distance_x += op1->x - best->x;
1616 retval->distance_y += op1->y - best->y; 1509 retval->distance_y += op1->y - best->y;
1617 } 1510 }
1618 } 1511 }
1512
1619 retval->part = best; 1513 retval->part = best;
1620 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));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1515 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1516 }
1623} 1517}
1624 1518
1625/* 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
… …
1630 * 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
1631 * 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
1632 * 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
1633 * field of the rv_vector is set to NULL. 1527 * field of the rv_vector is set to NULL.
1634 */ 1528 */
1635
1636void 1529void
1637get_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)
1638{ 1531{
1639 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))
1640 { 1533 {
1641 /* be conservative and fill in _some_ data */ 1534 /* be conservative and fill in _some_ data */
1642 retval->distance = 100000; 1535 retval->distance = 100000;
… …
1649 { 1542 {
1650 retval->distance_x += op2->x - x; 1543 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1544 retval->distance_y += op2->y - y;
1652 1545
1653 retval->part = NULL; 1546 retval->part = NULL;
1654 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);
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1548 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1549 }
1657} 1550}
1658 1551
1659/* 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
… …
1679 op->remove (); 1572 op->remove ();
1680 1573
1681 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);
1682} 1575}
1683 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