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.73 by root, Sun Jan 14 18:00:33 2007 UTC vs.
Revision 1.158 by root, Tue Feb 17 03:53:31 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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 "loader.h"
31#include "path.h" 28#include "path.h"
32 29
33/* 30sint8 maptile::outdoor_darkness;
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 31
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
173 * let the player through (inventory checkers for example) 106 * let the player through (inventory checkers for example)
174 */ 107 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 108 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 109 return 0;
177 110
178 if (ob->head != NULL)
179 ob = ob->head; 111 ob = ob->head_ ();
180 112
181 /* We basically go through the stack of objects, and if there is 113 /* 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 114 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 115 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 116 * ob is blocking it, so return 0.
… …
214 else 146 else
215 { 147 {
216 /* Broke apart a big nasty if into several here to make 148 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 149 * this more readable. first check - if the space blocks
218 * movement, can't move here. 150 * movement, can't move here.
219 * second - if a monster, can't move there, unles it is a 151 * second - if a monster, can't move there, unless it is a
220 * hidden dm 152 * hidden dm
221 */ 153 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 154 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 155 return 1;
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 156
225 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 157 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob
159 && tmp != ob
160 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
226 return 1; 162 return 1;
227 } 163 }
228 164
229 } 165 }
230 return 0; 166 return 0;
231} 167}
232 168
233
234/* 169/*
235 * Returns true if the given object can't fit in the given spot. 170 * 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, 171 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
240 * 175 *
241 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
242 * 177 *
243 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
255 * 190 *
256 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
258 * against the move_block values. 193 * against the move_block values.
259 */ 194 */
260int 195bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
262{ 197{
263 archetype *tmp; 198 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 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
277 201
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 202 if (!pos.normalise ())
279 { 203 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 204
282 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 206
284 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 208 return 1;
286 209
287 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
288 211 * (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. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 213 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 215 continue;
296 216
297 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
299 */ 219 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
301 return P_NO_PASS; 221 return 1;
302 } 222 }
303 223
304 return 0; 224 return 0;
305} 225}
306 226
… …
324 244
325 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
326 tmp = next; 246 tmp = next;
327 } 247 }
328 248
329 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
330 * carrying. 250 //TODO: remove
331 */ 251 container->update_weight ();
332 sum_weight (container);
333} 252}
334 253
335void 254void
336maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
337{ 256{
… …
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 260 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 261 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 262 tmp->flag [flag] = value;
344} 263}
345 264
265void
266maptile::post_load_original ()
267{
268 if (!spaces)
269 return;
270
271 set_object_flag (FLAG_OBJ_ORIGINAL);
272
273 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp);
276}
277
346/* link_multipart_objects go through all the objects on the map looking 278/* 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 279 * 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 280 * 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 281 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 282 */
352void 283void
353maptile::link_multipart_objects () 284maptile::link_multipart_objects ()
354{ 285{
355 if (!spaces) 286 if (!spaces)
356 return; 287 return;
357 288
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 289 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 290 {
291 object *op = ms->bot;
292 while (op)
360 { 293 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 294 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 295 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 { 296 {
375 op = arch_to_object (at); 297 op->remove ();
298 op->expand_tail ();
376 299
377 /* update x,y coordinates */ 300 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 301 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 302 // 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); 303 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
304
305 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
306 // so we have to reset the iteration through the mapspace
392 } 307 }
308 else
309 op = op->above;
393 } 310 }
394
395 tmp = above;
396 } 311 }
397} 312}
398 313
399/* 314/*
400 * Loads (ands parses) the objects into a given map from the specified 315 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 316 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 317 */
404bool 318bool
405maptile::_load_objects (object_thawer &thawer) 319maptile::_load_objects (object_thawer &f)
406{ 320{
407 int unique; 321 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 { 322 {
415 /* if the archetype for the object is null, means that we 323 coroapi::cede_to_tick (); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 324
417 * or editor will not be able to do anything with it either. 325 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 326 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 327 case KW_arch:
328 if (object *op = object::read (f, this))
329 {
330 // TODO: why?
331 if (op->inv)
332 op->update_weight ();
333
334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 {
336 // we insert manually because
337 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that
339 // c) it's correct
340 mapspace &ms = at (op->x, op->y);
341
342 op->flag [FLAG_REMOVED] = false;
343
344 op->above = 0;
345 op->below = ms.top;
346
347 *(ms.top ? &ms.top->above : &ms.bot) = op;
348
349 ms.top = op;
350 ms.flags_ = 0;
351 }
352 else
353 {
354 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
355 op->destroy ();
356 }
357 }
358
422 continue; 359 continue;
423 }
424 360
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: 361 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 362 return true;
438 op->head = prev, last_more->more = op, last_more = op; 363
364 default:
365 if (!f.parse_error ("map file"))
366 return false;
439 break; 367 break;
440 } 368 }
441 369
442 op = object::create (); 370 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 } 371 }
463#endif
464 372
465 return true; 373 return true;
466} 374}
467 375
468void 376void
469maptile::activate () 377maptile::activate ()
470{ 378{
471 if (!spaces) 379 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 382 op->activate_recursive ();
477} 383}
478 384
479void 385void
480maptile::deactivate () 386maptile::deactivate ()
481{ 387{
482 if (!spaces) 388 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 389 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 390 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 391 op->deactivate_recursive ();
488} 392}
489 393
490bool 394bool
491maptile::_save_objects (object_freezer &freezer, int flags) 395maptile::_save_objects (object_freezer &f, int flags)
492{ 396{
493 static int cede_count = 0; 397 coroapi::cede_to_tick ();
494 398
495 if (flags & IO_HEADER) 399 if (flags & IO_HEADER)
496 _save_header (freezer); 400 _save_header (f);
497 401
498 if (!spaces) 402 if (!spaces)
499 return false; 403 return false;
500 404
501 for (int i = 0; i < size (); ++i) 405 for (int i = 0; i < size (); ++i)
502 { 406 {
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; 407 bool unique = 0;
408
512 for (object *op = spaces [i].bot; op; op = op->above) 409 for (object *op = spaces [i].bot; op; op = op->above)
513 { 410 {
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]) 411 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
518 unique = 1;
519 412
520 if (!op->can_map_save ()) 413 if (expect_false (!op->can_map_save ()))
521 continue; 414 continue;
522 415
523 if (unique || op->flag [FLAG_UNIQUE]) 416 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
524 { 417 {
525 if (flags & IO_UNIQUES) 418 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 419 op->write (f);
527 } 420 }
528 else if (flags & IO_OBJECTS) 421 else if (expect_true (flags & IO_OBJECTS))
529 save_object (freezer, op, 1); 422 op->write (f);
530 } 423 }
531 } 424 }
532 425
426 coroapi::cede_to_tick ();
427
533 return true; 428 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} 429}
557 430
558bool 431bool
559maptile::_save_objects (const char *path, int flags) 432maptile::_save_objects (const char *path, int flags)
560{ 433{
… …
569maptile::maptile () 442maptile::maptile ()
570{ 443{
571 in_memory = MAP_SWAPPED; 444 in_memory = MAP_SWAPPED;
572 445
573 /* The maps used to pick up default x and y values from the 446 /* The maps used to pick up default x and y values from the
574 * map archetype. Mimic that behaviour. 447 * map archetype. Mimic that behaviour.
575 */ 448 */
576 width = 16; 449 width = 16;
577 height = 16; 450 height = 16;
578 reset_timeout = 0;
579 timeout = 300; 451 timeout = 300;
580 enter_x = 0; 452 max_nrof = 1000; // 1000 items of anything
581 enter_y = 0; 453 max_volume = 2000000; // 2m³
582} 454}
583 455
584maptile::maptile (int w, int h) 456maptile::maptile (int w, int h)
585{ 457{
586 in_memory = MAP_SWAPPED; 458 in_memory = MAP_SWAPPED;
… …
736bool 608bool
737maptile::_load_header (object_thawer &thawer) 609maptile::_load_header (object_thawer &thawer)
738{ 610{
739 for (;;) 611 for (;;)
740 { 612 {
741 keyword kw = thawer.get_kv ();
742
743 switch (kw) 613 switch (thawer.kw)
744 { 614 {
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: 615 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
759 break; 617 break;
760 618
761 case KW_lore: // CF+ extension 619 case KW_lore: // CF+ extension
… …
792 case KW_winddir: thawer.get (winddir); break; 650 case KW_winddir: thawer.get (winddir); break;
793 case KW_sky: thawer.get (sky); break; 651 case KW_sky: thawer.get (sky); break;
794 652
795 case KW_per_player: thawer.get (per_player); break; 653 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break; 654 case KW_per_party: thawer.get (per_party); break;
655 case KW_no_reset: thawer.get (no_reset); break;
656 case KW_no_drop: thawer.get (no_drop); break;
797 657
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 658 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 659 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 660
801 // old names new names 661 // old names new names
802 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 662 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; 663 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
811 671
812 case KW_tile_path_1: thawer.get (tile_path [0]); break; 672 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break; 673 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break; 674 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 case KW_tile_path_4: thawer.get (tile_path [3]); break; 675 case KW_tile_path_4: thawer.get (tile_path [3]); break;
676
677 case KW_ERROR:
678 set_key_text (thawer.kw_str, thawer.value);
679 break;
680
681 case KW_end:
682 thawer.next ();
683 return true;
684
685 default:
686 if (!thawer.parse_error ("map", 0))
687 return false;
688 break;
816 } 689 }
690
691 thawer.next ();
817 } 692 }
818 693
819 abort (); 694 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} 695}
832 696
833/****************************************************************************** 697/******************************************************************************
834 * This is the start of unique map handling code 698 * This is the start of unique map handling code
835 *****************************************************************************/ 699 *****************************************************************************/
… …
846 object *above = op->above; 710 object *above = op->above;
847 711
848 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 712 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
849 unique = 1; 713 unique = 1;
850 714
851 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 715 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
852 {
853 op->destroy_inv (false);
854 op->destroy (); 716 op->destroy ();
855 }
856 717
857 op = above; 718 op = above;
858 } 719 }
859 } 720 }
860} 721}
… …
870 if (name) MAP_OUT (name); 731 if (name) MAP_OUT (name);
871 MAP_OUT (swap_time); 732 MAP_OUT (swap_time);
872 MAP_OUT (reset_time); 733 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 734 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 735 MAP_OUT (fixed_resettime);
736 MAP_OUT (no_reset);
737 MAP_OUT (no_drop);
875 MAP_OUT (difficulty); 738 MAP_OUT (difficulty);
876 739
877 if (region) MAP_OUT2 (region, region->name); 740 if (default_region) MAP_OUT2 (region, default_region->name);
878 741
879 if (shopitems) 742 if (shopitems)
880 { 743 {
881 char shop[MAX_BUF]; 744 char shop[MAX_BUF];
882 print_shop_string (this, shop); 745 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 796 * Remove and free all objects in the given map.
934 */ 797 */
935void 798void
936maptile::clear () 799maptile::clear ()
937{ 800{
938 if (!spaces) 801 if (spaces)
939 return; 802 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 803 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 804 while (object *op = ms->bot)
943 { 805 {
806 // manually remove, as to not trigger anything
807 if (ms->bot = op->above)
808 ms->bot->below = 0;
809
810 op->flag [FLAG_REMOVED] = true;
811
812 object *head = op->head_ ();
944 if (op->head) 813 if (op == head)
945 op = op->head;
946
947 op->destroy_inv (false);
948 op->destroy (); 814 op->destroy ();
815 else if (head->map != op->map)
816 {
817 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
818 head->destroy ();
819 }
820 }
821
822 sfree0 (spaces, size ());
949 } 823 }
950
951 sfree (spaces, size ()), spaces = 0;
952 824
953 if (buttons) 825 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 826 free_objectlinkpt (buttons), buttons = 0;
827
828 sfree0 (regions, size ());
829 delete [] regionmap; regionmap = 0;
955} 830}
956 831
957void 832void
958maptile::clear_header () 833maptile::clear_header ()
959{ 834{
… …
991 attachable::do_destroy (); 866 attachable::do_destroy ();
992 867
993 clear (); 868 clear ();
994} 869}
995 870
996/* 871/* decay and destroy perishable items in a map */
997 * Updates every button on the map (by calling update_button() for them).
998 */
999void 872void
1000maptile::update_buttons () 873maptile::do_decay_objects ()
1001{ 874{
1002 for (oblinkpt *obp = buttons; obp; obp = obp->next) 875 if (!spaces)
1003 for (objectlink *ol = obp->link; ol; ol = ol->next) 876 return;
877
878 for (mapspace *ms = spaces + size (); ms-- > spaces; )
879 for (object *above, *op = ms->bot; op; op = above)
1004 { 880 {
1005 if (!ol->ob) 881 above = op->above;
882
883 bool destroy = 0;
884
885 // do not decay anything above unique floor tiles (yet :)
886 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
887 break;
888
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
890 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
891 || QUERY_FLAG (op, FLAG_UNIQUE)
892 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
893 || QUERY_FLAG (op, FLAG_UNPAID)
894 || op->is_alive ())
895 ; // do not decay
896 else if (op->is_weapon ())
1006 { 897 {
1007 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 898 op->stats.dam--;
1008 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 899 if (op->stats.dam < 0)
1009 continue; 900 destroy = 1;
1010 } 901 }
1011 902 else if (op->is_armor ())
1012 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1013 { 903 {
1014 update_button (ol->ob); 904 op->stats.ac--;
1015 break; 905 if (op->stats.ac < 0)
906 destroy = 1;
1016 } 907 }
908 else if (op->type == FOOD)
909 {
910 op->stats.food -= rndm (5, 20);
911 if (op->stats.food < 0)
912 destroy = 1;
913 }
914 else
915 {
916 int mat = op->materials;
917
918 if (mat & M_PAPER
919 || mat & M_LEATHER
920 || mat & M_WOOD
921 || mat & M_ORGANIC
922 || mat & M_CLOTH
923 || mat & M_LIQUID
924 || (mat & M_IRON && rndm (1, 5) == 1)
925 || (mat & M_GLASS && rndm (1, 2) == 1)
926 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
927 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
928 || (mat & M_ICE && temp > 32))
929 destroy = 1;
930 }
931
932 /* adjust overall chance below */
933 if (destroy && rndm (0, 1))
934 op->destroy ();
1017 } 935 }
1018} 936}
1019 937
1020/* 938/*
1021 * This routine is supposed to find out the difficulty of the map. 939 * This routine is supposed to find out the difficulty of the map.
1022 * difficulty does not have a lot to do with character level, 940 * difficulty does not have a lot to do with character level,
1023 * but does have a lot to do with treasure on the map. 941 * but does have a lot to do with treasure on the map.
1024 * 942 *
1025 * Difficulty can now be set by the map creature. If the value stored 943 * Difficulty can now be set by the map creator. If the value stored
1026 * in the map is zero, then use this routine. Maps should really 944 * in the map is zero, then use this routine. Maps should really
1027 * have a difficulty set than using this function - human calculation 945 * have a difficulty set rather than using this function - human calculation
1028 * is much better than this functions guesswork. 946 * is much better than this function's guesswork.
1029 */ 947 */
1030int 948int
1031maptile::estimate_difficulty () const 949maptile::estimate_difficulty () const
1032{ 950{
1033 long monster_cnt = 0; 951 long monster_cnt = 0;
… …
1045 963
1046 if (QUERY_FLAG (op, FLAG_GENERATOR)) 964 if (QUERY_FLAG (op, FLAG_GENERATOR))
1047 { 965 {
1048 total_exp += op->stats.exp; 966 total_exp += op->stats.exp;
1049 967
1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 968 if (archetype *at = op->other_arch)
969 {
1051 total_exp += at->clone.stats.exp * 8; 970 total_exp += at->stats.exp * 8;
1052
1053 monster_cnt++; 971 monster_cnt++;
972 }
973
974 for (object *inv = op->inv; inv; inv = inv->below)
975 {
976 total_exp += op->stats.exp * 8;
977 monster_cnt++;
978 }
1054 } 979 }
1055 } 980 }
1056 981
1057 avgexp = (double) total_exp / monster_cnt; 982 avgexp = (double) total_exp / monster_cnt;
1058 983
… …
1071 * postive values make it darker, negative make it brighter 996 * postive values make it darker, negative make it brighter
1072 */ 997 */
1073int 998int
1074maptile::change_map_light (int change) 999maptile::change_map_light (int change)
1075{ 1000{
1076 int new_level = darkness + change;
1077
1078 /* Nothing to do */ 1001 /* Nothing to do */
1079 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1002 if (!change)
1080 return 0; 1003 return 0;
1081 1004
1082 /* inform all players on the map */ 1005 /* inform all players on the map */
1083 if (change > 0) 1006 if (change > 0)
1084 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1007 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1085 else 1008 else
1086 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1009 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1087 1010
1088 /* Do extra checking. since darkness is a unsigned value, 1011 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1089 * we need to be extra careful about negative values.
1090 * In general, the checks below are only needed if change
1091 * is not +/-1
1092 */
1093 if (new_level < 0)
1094 darkness = 0;
1095 else if (new_level >= MAX_DARKNESS)
1096 darkness = MAX_DARKNESS;
1097 else
1098 darkness = new_level;
1099 1012
1100 /* All clients need to get re-updated for the change */ 1013 /* All clients need to get re-updated for the change */
1101 update_all_map_los (this); 1014 update_all_map_los (this);
1015
1102 return 1; 1016 return 1;
1103} 1017}
1104 1018
1105/* 1019/*
1106 * This function updates various attributes about a specific space 1020 * This function updates various attributes about a specific space
… …
1109 * through, etc) 1023 * through, etc)
1110 */ 1024 */
1111void 1025void
1112mapspace::update_ () 1026mapspace::update_ ()
1113{ 1027{
1114 object *tmp, *last = 0; 1028 object *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1029 uint8 flags = P_UPTODATE, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1030 sint8 light = 0;
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; 1031 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1032
1120 middle = blank_face; 1033 //object *middle = 0;
1121 top = blank_face; 1034 //object *top = 0;
1122 floor = blank_face; 1035 //object *floor = 0;
1036 // this seems to generate better code than using locals, above
1037 object *&top = faces_obj[0] = 0;
1038 object *&middle = faces_obj[1] = 0;
1039 object *&floor = faces_obj[2] = 0;
1123 1040
1124 middle_obj = 0;
1125 top_obj = 0;
1126 floor_obj = 0;
1127
1128 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1041 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1129 { 1042 {
1130 /* This could be made additive I guess (two lights better than 1043 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1131 * one). But if so, it shouldn't be a simple additive - 2
1132 * light bulbs do not illuminate twice as far as once since
1133 * it is a dissapation factor that is cubed.
1134 */
1135 if (tmp->glow_radius > light)
1136 light = tmp->glow_radius; 1044 light += tmp->glow_radius;
1137 1045
1138 /* This call is needed in order to update objects the player 1046 /* This call is needed in order to update objects the player
1139 * is standing in that have animations (ie, grass, fire, etc). 1047 * is standing in that have animations (ie, grass, fire, etc).
1140 * However, it also causes the look window to be re-drawn 1048 * However, it also causes the look window to be re-drawn
1141 * 3 times each time the player moves, because many of the 1049 * 3 times each time the player moves, because many of the
… …
1144 * Always put the player down for drawing. 1052 * Always put the player down for drawing.
1145 */ 1053 */
1146 if (!tmp->invisible) 1054 if (!tmp->invisible)
1147 { 1055 {
1148 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1056 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1149 {
1150 top = tmp->face;
1151 top_obj = tmp; 1057 top = tmp;
1152 }
1153 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1058 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1154 { 1059 {
1155 /* If we got a floor, that means middle and top were below it, 1060 /* If we got a floor, that means middle and top were below it,
1156 * so should not be visible, so we clear them. 1061 * so should not be visible, so we clear them.
1157 */ 1062 */
1158 middle = blank_face; 1063 middle = 0;
1159 top = blank_face; 1064 top = 0;
1160 floor = tmp->face;
1161 floor_obj = tmp; 1065 floor = tmp;
1162 } 1066 }
1163 /* Flag anywhere have high priority */ 1067 /* Flag anywhere have high priority */
1164 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1068 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1165 { 1069 {
1166 middle = tmp->face;
1167
1168 middle_obj = tmp; 1070 middle = tmp;
1169 anywhere = 1; 1071 anywhere = 1;
1170 } 1072 }
1073
1171 /* Find the highest visible face around. If equal 1074 /* Find the highest visible face around. If equal
1172 * visibilities, we still want the one nearer to the 1075 * visibilities, we still want the one nearer to the
1173 * top 1076 * top
1174 */ 1077 */
1175 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1078 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1176 {
1177 middle = tmp->face;
1178 middle_obj = tmp; 1079 middle = tmp;
1179 }
1180 } 1080 }
1181 1081
1182 if (tmp == tmp->above) 1082 if (tmp == tmp->above)
1183 { 1083 {
1184 LOG (llevError, "Error in structure of map\n"); 1084 LOG (llevError, "Error in structure of map\n");
… …
1197 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1097 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1198 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1098 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1199 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1099 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1200 } 1100 }
1201 1101
1202 this->light = light; 1102 this->light = min (light, MAX_LIGHT_RADIUS);
1203 this->flags_ = flags; 1103 this->flags_ = flags;
1204 this->move_block = move_block & ~move_allow; 1104 this->move_block = move_block & ~move_allow;
1205 this->move_on = move_on; 1105 this->move_on = move_on;
1206 this->move_off = move_off; 1106 this->move_off = move_off;
1207 this->move_slow = move_slow; 1107 this->move_slow = move_slow;
… …
1219 * middle face. This should not happen, as we already have the 1119 * middle face. This should not happen, as we already have the
1220 * else statement above so middle should not get set. OTOH, it 1120 * else statement above so middle should not get set. OTOH, it
1221 * may be possible for the faces to match but be different objects. 1121 * may be possible for the faces to match but be different objects.
1222 */ 1122 */
1223 if (top == middle) 1123 if (top == middle)
1224 middle = blank_face; 1124 middle = 0;
1225 1125
1226 /* There are three posibilities at this point: 1126 /* There are three posibilities at this point:
1227 * 1) top face is set, need middle to be set. 1127 * 1) top face is set, need middle to be set.
1228 * 2) middle is set, need to set top. 1128 * 2) middle is set, need to set top.
1229 * 3) neither middle or top is set - need to set both. 1129 * 3) neither middle or top is set - need to set both.
1230 */ 1130 */
1231 1131
1232 for (tmp = last; tmp; tmp = tmp->below) 1132 for (object *tmp = last; tmp; tmp = tmp->below)
1233 { 1133 {
1234 /* Once we get to a floor, stop, since we already have a floor object */ 1134 /* Once we get to a floor, stop, since we already have a floor object */
1235 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1135 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1236 break; 1136 break;
1237 1137
1238 /* If two top faces are already set, quit processing */ 1138 /* If two top faces are already set, quit processing */
1239 if ((top != blank_face) && (middle != blank_face)) 1139 if (top && middle)
1240 break; 1140 break;
1241 1141
1242 /* Only show visible faces */ 1142 /* Only show visible faces */
1243 if (!tmp->invisible) 1143 if (!tmp->invisible)
1244 { 1144 {
1245 /* Fill in top if needed */ 1145 /* Fill in top if needed */
1246 if (top == blank_face) 1146 if (!top)
1247 { 1147 {
1248 top = tmp->face;
1249 top_obj = tmp; 1148 top = tmp;
1250 if (top == middle) 1149 if (top == middle)
1251 middle = blank_face; 1150 middle = 0;
1252 } 1151 }
1253 else 1152 else
1254 { 1153 {
1255 /* top is already set - we should only get here if 1154 /* top is already set - we should only get here if
1256 * middle is not set 1155 * middle is not set
1257 * 1156 *
1258 * Set the middle face and break out, since there is nothing 1157 * Set the middle face and break out, since there is nothing
1259 * more to fill in. We don't check visiblity here, since 1158 * more to fill in. We don't check visiblity here, since
1260 * 1159 *
1261 */ 1160 */
1262 if (tmp->face != top) 1161 if (tmp != top)
1263 { 1162 {
1264 middle = tmp->face;
1265 middle_obj = tmp; 1163 middle = tmp;
1266 break; 1164 break;
1267 } 1165 }
1268 } 1166 }
1269 } 1167 }
1270 } 1168 }
1271 1169
1272 if (middle == floor) 1170 if (middle == floor)
1273 middle = blank_face; 1171 middle = 0;
1274 1172
1275 if (top == middle) 1173 if (top == middle)
1276 middle = blank_face; 1174 middle = 0;
1277 1175
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1176#if 0
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1177 faces_obj [0] = top;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1178 faces_obj [1] = middle;
1179 faces_obj [2] = floor;
1180#endif
1281} 1181}
1282 1182
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1183uint64
1284 * the map. It also takes care of linking back the freshly found 1184mapspace::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{ 1185{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1186 uint64 vol = 0;
1292 1187
1293 if (!mp) 1188 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1294 { 1189 vol += op->volume ();
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296 1190
1297 if (!mp) 1191 return vol;
1298 { 1192}
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1193
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1194maptile *
1301 &orig_map->tile_path[tile_num], &orig_map->path); 1195maptile::tile_available (int dir, bool load)
1302 mp = new maptile (1, 1); 1196{
1303 mp->alloc (); 1197 if (tile_path[dir])
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 } 1198 {
1199 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1200 return tile_map[dir];
1307 1201
1308 int dest_tile = (tile_num + 2) % 4; 1202 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1203 return tile_map[dir];
1204 }
1309 1205
1310 orig_map->tile_map [tile_num] = mp;
1311
1312 // optimisation: back-link map to origin map if euclidean
1313 //TODO: non-euclidean maps MUST GO
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
1317 return mp; 1206 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} 1207}
1325 1208
1326/* this returns TRUE if the coordinates (x,y) are out of 1209/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1210 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1211 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1224 if (!m)
1342 return 0; 1225 return 0;
1343 1226
1344 if (x < 0) 1227 if (x < 0)
1345 { 1228 {
1346 if (!m->tile_path[3]) 1229 if (!m->tile_available (3))
1347 return 1; 1230 return 1;
1348 1231
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); 1232 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1233 }
1354 1234
1355 if (x >= m->width) 1235 if (x >= m->width)
1356 { 1236 {
1357 if (!m->tile_path[1]) 1237 if (!m->tile_available (1))
1358 return 1; 1238 return 1;
1359 1239
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); 1240 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1241 }
1365 1242
1366 if (y < 0) 1243 if (y < 0)
1367 { 1244 {
1368 if (!m->tile_path[0]) 1245 if (!m->tile_available (0))
1369 return 1; 1246 return 1;
1370 1247
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); 1248 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1249 }
1376 1250
1377 if (y >= m->height) 1251 if (y >= m->height)
1378 { 1252 {
1379 if (!m->tile_path[2]) 1253 if (!m->tile_available (2))
1380 return 1; 1254 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 1255
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1256 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1257 }
1387 1258
1388 /* Simple case - coordinates are within this local 1259 /* Simple case - coordinates are within this local
… …
1402maptile * 1273maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1274maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1275{
1405 if (x < 0) 1276 if (x < 0)
1406 { 1277 {
1407 if (!tile_path[3]) 1278 if (!tile_available (3))
1408 return 0; 1279 return 0;
1409 1280
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1281 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1282 return tile_map[3]->xy_find (x, y);
1413 } 1283 }
1414 1284
1415 if (x >= width) 1285 if (x >= width)
1416 { 1286 {
1417 if (!tile_path[1]) 1287 if (!tile_available (1))
1418 return 0; 1288 return 0;
1419 1289
1420 find_and_link (this, 1);
1421 x -= width; 1290 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1291 return tile_map[1]->xy_find (x, y);
1423 } 1292 }
1424 1293
1425 if (y < 0) 1294 if (y < 0)
1426 { 1295 {
1427 if (!tile_path[0]) 1296 if (!tile_available (0))
1428 return 0; 1297 return 0;
1429 1298
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1299 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1300 return tile_map[0]->xy_find (x, y);
1433 } 1301 }
1434 1302
1435 if (y >= height) 1303 if (y >= height)
1436 { 1304 {
1437 if (!tile_path[2]) 1305 if (!tile_available (2))
1438 return 0; 1306 return 0;
1439 1307
1440 find_and_link (this, 2);
1441 y -= height; 1308 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1309 return tile_map[2]->xy_find (x, y);
1443 } 1310 }
1444 1311
1445 /* Simple case - coordinates are within this local 1312 /* Simple case - coordinates are within this local
… …
1450 1317
1451/** 1318/**
1452 * Return whether map2 is adjacent to map1. If so, store the distance from 1319 * Return whether map2 is adjacent to map1. If so, store the distance from
1453 * map1 to map2 in dx/dy. 1320 * map1 to map2 in dx/dy.
1454 */ 1321 */
1455static int 1322int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1323adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1324{
1458 if (!map1 || !map2) 1325 if (!map1 || !map2)
1459 return 0; 1326 return 0;
1460 1327
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1328 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1329 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1330 if (map1 == map2)
1464 { 1331 {
1465 *dx = 0; 1332 *dx = 0;
1466 *dy = 0; 1333 *dy = 0;
… …
1551/* From map.c 1418/* From map.c
1552 * This is used by get_player to determine where the other 1419 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1420 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1421 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1422 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1423 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1424 * that the creature should head. part is the part of the
1558 * monster that is closest. 1425 * monster that is closest.
1559 * 1426 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1427 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1428 * structure for op1 to get to op2.
… …
1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1439get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1573{ 1440{
1574 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1441 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1575 { 1442 {
1576 /* be conservative and fill in _some_ data */ 1443 /* be conservative and fill in _some_ data */
1577 retval->distance = 100000; 1444 retval->distance = 10000;
1578 retval->distance_x = 32767; 1445 retval->distance_x = 10000;
1579 retval->distance_y = 32767; 1446 retval->distance_y = 10000;
1580 retval->direction = 0; 1447 retval->direction = 0;
1581 retval->part = 0; 1448 retval->part = 0;
1582 } 1449 }
1583 else 1450 else
1584 { 1451 {
… …
1589 1456
1590 best = op1; 1457 best = op1;
1591 /* If this is multipart, find the closest part now */ 1458 /* If this is multipart, find the closest part now */
1592 if (!(flags & 0x1) && op1->more) 1459 if (!(flags & 0x1) && op1->more)
1593 { 1460 {
1594 object *tmp;
1595 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1461 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1596 1462
1597 /* we just take the offset of the piece to head to figure 1463 /* we just take the offset of the piece to head to figure
1598 * distance instead of doing all that work above again 1464 * distance instead of doing all that work above again
1599 * since the distance fields we set above are positive in the 1465 * since the distance fields we set above are positive in the
1600 * same axis as is used for multipart objects, the simply arithmetic 1466 * same axis as is used for multipart objects, the simply arithmetic
1601 * below works. 1467 * below works.
1602 */ 1468 */
1603 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1469 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604 { 1470 {
1605 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1471 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); 1472 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1607 if (tmpi < best_distance) 1473 if (tmpi < best_distance)
1608 { 1474 {
1609 best_distance = tmpi; 1475 best_distance = tmpi;
1610 best = tmp; 1476 best = tmp;
1611 } 1477 }
1612 } 1478 }
1479
1613 if (best != op1) 1480 if (best != op1)
1614 { 1481 {
1615 retval->distance_x += op1->x - best->x; 1482 retval->distance_x += op1->x - best->x;
1616 retval->distance_y += op1->y - best->y; 1483 retval->distance_y += op1->y - best->y;
1617 } 1484 }
1618 } 1485 }
1486
1619 retval->part = best; 1487 retval->part = best;
1620 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1488 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1489 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1490 }
1623} 1491}
1624 1492
1625/* this is basically the same as get_rangevector above, but instead of 1493/* 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 1498 * 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 1499 * 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 1500 * for something in the future. Also, since no object is pasted, the best
1633 * field of the rv_vector is set to NULL. 1501 * field of the rv_vector is set to NULL.
1634 */ 1502 */
1635
1636void 1503void
1637get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1504get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1638{ 1505{
1639 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1506 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1640 { 1507 {
1641 /* be conservative and fill in _some_ data */ 1508 /* be conservative and fill in _some_ data */
1642 retval->distance = 100000; 1509 retval->distance = 100000;
… …
1649 { 1516 {
1650 retval->distance_x += op2->x - x; 1517 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1518 retval->distance_y += op2->y - y;
1652 1519
1653 retval->part = NULL; 1520 retval->part = NULL;
1654 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1521 retval->distance = idistance (retval->distance_x, retval->distance_y);
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1522 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1523 }
1657} 1524}
1658 1525
1659/* Returns true of op1 and op2 are effectively on the same map 1526/* Returns true of op1 and op2 are effectively on the same map
… …
1673} 1540}
1674 1541
1675object * 1542object *
1676maptile::insert (object *op, int x, int y, object *originator, int flags) 1543maptile::insert (object *op, int x, int y, object *originator, int flags)
1677{ 1544{
1678 if (!op->flag [FLAG_REMOVED])
1679 op->remove ();
1680
1681 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1545 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682} 1546}
1683 1547
1548region *
1549maptile::region (int x, int y) const
1550{
1551 if (regions
1552 && regionmap
1553 && !OUT_OF_REAL_MAP (this, x, y))
1554 if (struct region *reg = regionmap [regions [y * width + x]])
1555 return reg;
1556
1557 if (default_region)
1558 return default_region;
1559
1560 return ::region::default_region ();
1561}
1562
1563/* picks a random object from a style map.
1564 */
1565object *
1566maptile::pick_random_object (rand_gen &gen) const
1567{
1568 /* while returning a null object will result in a crash, that
1569 * is actually preferable to an infinite loop. That is because
1570 * most servers will automatically restart in case of crash.
1571 * Change the logic on getting the random space - shouldn't make
1572 * any difference, but this seems clearer to me.
1573 */
1574 for (int i = 1000; --i;)
1575 {
1576 object *pick = at (gen (width), gen (height)).bot;
1577
1578 // do not prefer big monsters just because they are big.
1579 if (pick && pick->is_head ())
1580 return pick->head_ ();
1581 }
1582
1583 // instead of crashing in the unlikely(?) case, try to return *something*
1584 return archetype::find ("bug");
1585}
1586
1587void
1588maptile::play_sound (faceidx sound, int x, int y) const
1589{
1590 if (!sound)
1591 return;
1592
1593 for_all_players_on_map (pl, this)
1594 if (client *ns = pl->ns)
1595 {
1596 int dx = x - pl->ob->x;
1597 int dy = y - pl->ob->y;
1598
1599 int distance = idistance (dx, dy);
1600
1601 if (distance <= MAX_SOUND_DISTANCE)
1602 ns->play_sound (sound, dx, dy);
1603 }
1604}
1605
1606void
1607maptile::say_msg (const char *msg, int x, int y) const
1608{
1609 for_all_players (pl)
1610 if (client *ns = pl->ns)
1611 {
1612 int dx = x - pl->ob->x;
1613 int dy = y - pl->ob->y;
1614
1615 int distance = idistance (dx, dy);
1616
1617 if (distance <= MAX_SOUND_DISTANCE)
1618 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1619 }
1620}
1621
1622static void
1623split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1624{
1625 // clip to map to the left
1626 if (x0 < 0)
1627 {
1628 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1629 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1630
1631 if (x1 < 0) // entirely to the left
1632 return;
1633
1634 x0 = 0;
1635 }
1636
1637 // clip to map to the right
1638 if (x1 > m->width)
1639 {
1640 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1641 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1642
1643 if (x0 > m->width) // entirely to the right
1644 return;
1645
1646 x1 = m->width;
1647 }
1648
1649 // clip to map above
1650 if (y0 < 0)
1651 {
1652 if (maptile *tile = m->tile_available (TILE_UP, 1))
1653 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1654
1655 if (y1 < 0) // entirely above
1656 return;
1657
1658 y0 = 0;
1659 }
1660
1661 // clip to map below
1662 if (y1 > m->height)
1663 {
1664 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1665 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1666
1667 if (y0 > m->height) // entirely below
1668 return;
1669
1670 y1 = m->height;
1671 }
1672
1673 // if we get here, the rect is within the current map
1674 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1675
1676 r->m = m;
1677 r->x0 = x0;
1678 r->y0 = y0;
1679 r->x1 = x1;
1680 r->y1 = y1;
1681 r->dx = dx;
1682 r->dy = dy;
1683}
1684
1685maprect *
1686maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1687{
1688 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1689 buf.clear ();
1690
1691 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1692
1693 // add end marker
1694 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1695 r->m = 0;
1696
1697 return (maprect *)buf.linearise ();
1698}
1699

Diff Legend

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