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.50 by root, Mon Dec 25 15:28:35 2006 UTC vs.
Revision 1.96 by root, Thu Mar 15 14:23:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
30 26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
31
31#include "path.h" 32#include "path.h"
32
33/*
34 * Returns the maptile which has a name matching the given argument.
35 * return NULL if no match is found.
36 */
37maptile *
38has_been_loaded (const char *name)
39{
40 maptile *map;
41
42 if (!name || !*name)
43 return 0;
44
45 for (map = first_map; map; map = map->next)
46 if (!strcmp (name, map->path))
47 break;
48
49 return (map);
50}
51 33
52/* 34/*
53 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
54 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
55 * and returns the pointer to a static array containing the result. 37 * and returns the pointer to a static array containing the result.
56 * it really should be called create_mapname 38 * it really should be called create_mapname
57 */ 39 */
58
59const char * 40const char *
60create_pathname (const char *name) 41create_pathname (const char *name)
61{ 42{
62 static char buf[MAX_BUF]; 43 static char buf[8192];
63
64 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
65 * someplace else in the code? msw 2-17-97
66 */
67 if (*name == '/')
68 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
69 else
70 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
71 return (buf); 45 return buf;
72} 46}
73
74/*
75 * same as create_pathname, but for the overlay maps.
76 */
77
78const char *
79create_overlay_pathname (const char *name)
80{
81 static char buf[MAX_BUF];
82
83 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
84 * someplace else in the code? msw 2-17-97
85 */
86 if (*name == '/')
87 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
88 else
89 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
90 return (buf);
91}
92
93/*
94 * same as create_pathname, but for the template maps.
95 */
96
97const char *
98create_template_pathname (const char *name)
99{
100 static char buf[MAX_BUF];
101
102 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
103 * someplace else in the code? msw 2-17-97
104 */
105 if (*name == '/')
106 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
107 else
108 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
109 return (buf);
110}
111
112/*
113 * This makes absolute path to the itemfile where unique objects
114 * will be saved. Converts '/' to '@'. I think it's essier maintain
115 * files than full directory structure, but if this is problem it can
116 * be changed.
117 */
118static const char *
119create_items_path (const char *s)
120{
121 static char buf[MAX_BUF];
122 char *t;
123
124 if (*s == '/')
125 s++;
126
127 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
128
129 for (t = buf + strlen (buf); *s; s++, t++)
130 if (*s == '/')
131 *t = '@';
132 else
133 *t = *s;
134 *t = 0;
135 return (buf);
136}
137
138 47
139/* 48/*
140 * This function checks if a file with the given path exists. 49 * This function checks if a file with the given path exists.
141 * -1 is returned if it fails, otherwise the mode of the file 50 * -1 is returned if it fails, otherwise the mode of the file
142 * is returned. 51 * is returned.
… …
149 * the rest of the code only cares that the file is readable. 58 * the rest of the code only cares that the file is readable.
150 * when the editor goes away, the call to stat should probably be 59 * when the editor goes away, the call to stat should probably be
151 * replaced by an access instead (similar to the windows one, but 60 * replaced by an access instead (similar to the windows one, but
152 * that seems to be missing the prepend_dir processing 61 * that seems to be missing the prepend_dir processing
153 */ 62 */
154
155int 63int
156check_path (const char *name, int prepend_dir) 64check_path (const char *name, int prepend_dir)
157{ 65{
158 char buf[MAX_BUF]; 66 char buf[MAX_BUF];
159 67
160 char *endbuf; 68 char *endbuf;
161 struct stat statbuf; 69 struct stat statbuf;
162 int mode = 0; 70 int mode = 0;
163 71
164 if (prepend_dir) 72 if (prepend_dir)
165 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
166 else 74 else
167 strcpy (buf, name); 75 assign (buf, name);
168 76
169 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
170 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
171 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
172 * all the names. 80 * all the names.
… …
185 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
186 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
187 mode |= 2; 95 mode |= 2;
188 96
189 return (mode); 97 return (mode);
190}
191
192/*
193 * Prints out debug-information about a map.
194 * Dumping these at llevError doesn't seem right, but is
195 * necessary to make sure the information is in fact logged.
196 */
197
198void
199dump_map (const maptile *m)
200{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
203
204 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg);
206
207 if (m->maplore != NULL)
208 LOG (llevError, "Lore:\n%s", m->maplore);
209
210 if (m->tmpname != NULL)
211 LOG (llevError, "Tmpname: %s\n", m->tmpname);
212
213 LOG (llevError, "Difficulty: %d\n", m->difficulty);
214 LOG (llevError, "Darkness: %d\n", m->darkness);
215}
216
217/*
218 * Prints out debug-information about all maps.
219 * This basically just goes through all the maps and calls
220 * dump_map on each one.
221 */
222
223void
224dump_all_maps (void)
225{
226 maptile *m;
227
228 for (m = first_map; m; m = m->next)
229 dump_map (m);
230} 98}
231 99
232/* This rolls up wall, blocks_magic, blocks_view, etc, all into 100/* This rolls up wall, blocks_magic, blocks_view, etc, all into
233 * one function that just returns a P_.. value (see map.h) 101 * one function that just returns a P_.. value (see map.h)
234 * it will also do map translation for tiled maps, returning 102 * it will also do map translation for tiled maps, returning
… …
240 * don't expect to insert/remove anything from those spaces. 108 * don't expect to insert/remove anything from those spaces.
241 */ 109 */
242int 110int
243get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 111get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
244{ 112{
245 sint16 newx, newy;
246 int retval = 0;
247 maptile *mp;
248
249 newx = x; 113 sint16 newx = x;
250 newy = y; 114 sint16 newy = y;
251 115
252 mp = get_map_from_coord (oldmap, &newx, &newy); 116 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
253 117
254 if (!mp) 118 if (!mp)
255 return P_OUT_OF_MAP; 119 return P_OUT_OF_MAP;
256
257 if (mp != oldmap)
258 retval |= P_NEW_MAP;
259 120
260 if (newmap) *newmap = mp; 121 if (newmap) *newmap = mp;
261 if (nx) *nx = newx; 122 if (nx) *nx = newx;
262 if (ny) *ny = newy; 123 if (ny) *ny = newy;
263 124
264 return retval | mp->at (newx, newy).flags (); 125 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
265} 126}
266 127
267/* 128/*
268 * Returns true if the given coordinate is blocked except by the 129 * Returns true if the given coordinate is blocked except by the
269 * object passed is not blocking. This is used with 130 * object passed is not blocking. This is used with
… …
368 229
369 } 230 }
370 return 0; 231 return 0;
371} 232}
372 233
373
374/* 234/*
375 * Returns true if the given object can't fit in the given spot. 235 * Returns true if the given object can't fit in the given spot.
376 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
377 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
378 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
403 archetype *tmp; 263 archetype *tmp;
404 int flag; 264 int flag;
405 maptile *m1; 265 maptile *m1;
406 sint16 sx, sy; 266 sint16 sx, sy;
407 267
408 if (ob == NULL) 268 if (!ob)
409 { 269 {
410 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
411 if (flag & P_OUT_OF_MAP) 271 if (flag & P_OUT_OF_MAP)
412 return P_OUT_OF_MAP; 272 return P_OUT_OF_MAP;
413 273
… …
423 return P_OUT_OF_MAP; 283 return P_OUT_OF_MAP;
424 if (flag & P_IS_ALIVE) 284 if (flag & P_IS_ALIVE)
425 return P_IS_ALIVE; 285 return P_IS_ALIVE;
426 286
427 mapspace &ms = m1->at (sx, sy); 287 mapspace &ms = m1->at (sx, sy);
428
429 288
430 /* find_first_free_spot() calls this function. However, often 289 /* find_first_free_spot() calls this function. However, often
431 * ob doesn't have any move type (when used to place exits) 290 * ob doesn't have any move type (when used to place exits)
432 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 291 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
433 */ 292 */
… …
449 * into inventory, but just links them. What this does is go through 308 * into inventory, but just links them. What this does is go through
450 * and insert them properly. 309 * and insert them properly.
451 * The object 'container' is the object that contains the inventory. 310 * The object 'container' is the object that contains the inventory.
452 * This is needed so that we can update the containers weight. 311 * This is needed so that we can update the containers weight.
453 */ 312 */
454
455void 313void
456fix_container (object *container) 314fix_container (object *container)
457{ 315{
458 object *tmp = container->inv, *next; 316 object *tmp = container->inv, *next;
459 317
460 container->inv = NULL; 318 container->inv = 0;
461 while (tmp != NULL) 319 while (tmp)
462 { 320 {
463 next = tmp->below; 321 next = tmp->below;
464 if (tmp->inv) 322 if (tmp->inv)
465 fix_container (tmp); 323 fix_container (tmp);
324
466 (void) insert_ob_in_ob (tmp, container); 325 insert_ob_in_ob (tmp, container);
467 tmp = next; 326 tmp = next;
468 } 327 }
328
469 /* sum_weight will go through and calculate what all the containers are 329 /* sum_weight will go through and calculate what all the containers are
470 * carrying. 330 * carrying.
471 */ 331 */
472 sum_weight (container); 332 sum_weight (container);
333}
334
335void
336maptile::set_object_flag (int flag, int value)
337{
338 if (!spaces)
339 return;
340
341 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value;
473} 344}
474 345
475/* link_multipart_objects go through all the objects on the map looking 346/* link_multipart_objects go through all the objects on the map looking
476 * for objects whose arch says they are multipart yet according to the 347 * for objects whose arch says they are multipart yet according to the
477 * info we have, they only have the head (as would be expected when 348 * info we have, they only have the head (as would be expected when
478 * they are saved). We do have to look for the old maps that did save 349 * they are saved). We do have to look for the old maps that did save
479 * the more sections and not re-add sections for them. 350 * the more sections and not re-add sections for them.
480 */ 351 */
481 352void
482static void 353maptile::link_multipart_objects ()
483link_multipart_objects (maptile *m)
484{ 354{
485 int x, y; 355 if (!spaces)
486 object *tmp, *op, *last, *above; 356 return;
487 archetype *at;
488 357
489 for (x = 0; x < m->width; x++) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
490 for (y = 0; y < m->height; y++) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
491 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
492 { 360 {
493 above = tmp->above;
494
495 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
496 if (tmp->head || tmp->more) 362 if (!tmp->head && !tmp->more)
497 continue; 363 {
498
499 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
500 * won't do anything. 365 * won't do anything.
501 */ 366 */
502 for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op) 367 archetype *at;
368 object *last, *op;
369 for (at = tmp->arch->more, last = tmp;
370 at;
371 at = at->more, last = op)
503 { 372 {
504 op = arch_to_object (at); 373 op = arch_to_object (at);
505 374
506 /* update x,y coordinates */ 375 /* update x,y coordinates */
507 op->x += tmp->x; 376 op->x += tmp->x;
508 op->y += tmp->y; 377 op->y += tmp->y;
509 op->head = tmp; 378 op->head = tmp;
510 op->map = m; 379 op->map = this;
511 last->more = op; 380 last->more = op;
512 op->name = tmp->name; 381 op->name = tmp->name;
513 op->title = tmp->title; 382 op->title = tmp->title;
383
514 /* we could link all the parts onto tmp, and then just 384 /* we could link all the parts onto tmp, and then just
515 * call insert_ob_in_map once, but the effect is the same, 385 * call insert_ob_in_map once, but the effect is the same,
516 * as insert_ob_in_map will call itself with each part, and 386 * as insert_ob_in_map will call itself with each part, and
517 * the coding is simpler to just to it here with each part. 387 * the coding is simpler to just to it here with each part.
518 */ 388 */
519 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
520 } /* for at = tmp->arch->more */ 390 }
521 } /* for objects on this space */ 391 }
392 }
522} 393}
523 394
524/* 395/*
525 * Loads (ands parses) the objects into a given map from the specified 396 * Loads (ands parses) the objects into a given map from the specified
526 * file pointer. 397 * file pointer.
527 * mapflags is the same as we get with load_original_map
528 */ 398 */
529void 399bool
530load_objects (maptile *m, object_thawer & fp, int mapflags) 400maptile::_load_objects (object_thawer &f)
531{ 401{
532 int i, j; 402 for (;;)
533 int unique;
534 object *op, *prev = NULL, *last_more = NULL, *otmp;
535
536 op = object::create ();
537 op->map = m; /* To handle buttons correctly */
538
539 while ((i = load_object (fp, op, mapflags)))
540 { 403 {
541 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
542 * got an invalid object. Don't do anything with it - the game 405
543 * or editor will not be able to do anything with it either. 406 switch (f.kw)
544 */
545 if (op->arch == NULL)
546 { 407 {
547 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
548 continue; 409 if (object *op = object::read (f, this))
549 }
550
551 switch (i)
552 {
553 case LL_NORMAL:
554 /* if we are loading an overlay, put the floors on the bottom */
555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
556 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
557 else 410 {
411 if (op->inv)
412 sum_weight (op);
413
558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
415 }
559 416
560 if (op->inv) 417 continue;
561 sum_weight (op);
562 418
563 prev = op, last_more = op;
564 break;
565
566 case LL_MORE: 419 case KW_EOF:
567 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
568 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
569 break; 425 break;
570 } 426 }
571 427
572 if (mapflags & MAP_STYLE) 428 f.next ();
573 remove_from_active_list (op);
574
575 op = object::create ();
576 op->map = m;
577 }
578
579 for (i = 0; i < m->width; i++)
580 { 429 }
581 for (j = 0; j < m->height; j++) 430
431 return true;
432}
433
434void
435maptile::activate ()
436{
437 if (!spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive ();
443}
444
445void
446maptile::deactivate ()
447{
448 if (!spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive ();
454}
455
456bool
457maptile::_save_objects (object_freezer &f, int flags)
458{
459 static int cede_count = 0;
460
461 if (flags & IO_HEADER)
462 _save_header (f);
463
464 if (!spaces)
465 return false;
466
467 for (int i = 0; i < size (); ++i)
468 {
469 if (cede_count >= 500)
582 { 470 {
471 cede_count = 0;
472 coroapi::cede ();
473 }
474
475 int unique = 0;
476 for (object *op = spaces [i].bot; op; op = op->above)
477 {
478 // count per-object, but cede only when modification-safe
479 cede_count++;
480
481 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
583 unique = 0; 482 unique = 1;
584 /* check for unique items, or unique squares */ 483
585 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) 484 if (!op->can_map_save ())
485 continue;
486
487 if (unique || op->flag [FLAG_UNIQUE])
586 { 488 {
587 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 489 if (flags & IO_UNIQUES)
588 unique = 1; 490 op->write (f);
589
590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
592 } 491 }
492 else if (flags & IO_OBJECTS)
493 op->write (f);
593 } 494 }
594 } 495 }
595 496
596 op->destroy (); 497 return true;
597 link_multipart_objects (m);
598} 498}
599 499
600/* This saves all the objects on the map in a non destructive fashion. 500bool
601 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 501maptile::_load_objects (const char *path, bool skip_header)
602 * and we only save the head of multi part objects - this is needed
603 * in order to do map tiling properly.
604 */
605void
606save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
607{ 502{
608 int i, j = 0, unique = 0; 503 object_thawer f (path);
609 object *op;
610 504
611 /* first pass - save one-part objects */ 505 if (!f)
612 for (i = 0; i < m->width; i++) 506 return false;
613 for (j = 0; j < m->height; j++) 507
508 f.next ();
509
510 if (skip_header)
511 for (;;)
614 { 512 {
615 unique = 0; 513 keyword kw = f.kw;
616 for (op = m->at (i, j).bot; op; op = op->above) 514 f.skip ();
617 { 515 if (kw == KW_end)
618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE]) 516 break;
619 unique = 1;
620
621 if (op->type == PLAYER)
622 continue;
623
624 if (op->head || op->owner)
625 continue;
626
627 if (unique || op->flag [FLAG_UNIQUE])
628 save_object (fp2, op, 3);
629 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
630 save_object (fp, op, 3);
631 }
632 } 517 }
518
519 return _load_objects (f);
520}
521
522bool
523maptile::_save_objects (const char *path, int flags)
524{
525 object_freezer freezer;
526
527 if (!_save_objects (freezer, flags))
528 return false;
529
530 return freezer.save (path);
633} 531}
634 532
635maptile::maptile () 533maptile::maptile ()
636{ 534{
637 in_memory = MAP_SWAPPED; 535 in_memory = MAP_SWAPPED;
536
638 /* The maps used to pick up default x and y values from the 537 /* The maps used to pick up default x and y values from the
639 * map archetype. Mimic that behaviour. 538 * map archetype. Mimic that behaviour.
640 */ 539 */
641 this->width = 16; 540 width = 16;
642 this->height = 16; 541 height = 16;
542 timeout = 300;
543 max_nrof = 1000; // 1000 items of anything
544 max_volume = 2000000; // 2m³
545}
546
547maptile::maptile (int w, int h)
548{
549 in_memory = MAP_SWAPPED;
550
551 width = w;
552 height = h;
643 this->reset_timeout = 0; 553 reset_timeout = 0;
644 this->timeout = 300; 554 timeout = 300;
645 this->enter_x = 0; 555 enter_x = 0;
646 this->enter_y = 0; 556 enter_y = 0;
647 /*set part to -1 indicating conversion to weather map not yet done */
648 this->worldpartx = -1;
649 this->worldparty = -1;
650}
651 557
652/* 558 alloc ();
653 * Allocates, initialises, and returns a pointer to a maptile.
654 * Modified to no longer take a path option which was not being
655 * used anyways. MSW 2001-07-01
656 */
657maptile *
658get_linked_map (void)
659{
660 maptile *mp, *map = new maptile;
661
662 for (mp = first_map; mp && mp->next; mp = mp->next);
663
664 if (mp == NULL)
665 first_map = map;
666 else
667 mp->next = map;
668
669 return map;
670} 559}
671 560
672/* 561/*
673 * Allocates the arrays contained in a maptile. 562 * Allocates the arrays contained in a maptile.
674 * This basically allocates the dynamic array of spaces for the 563 * This basically allocates the dynamic array of spaces for the
675 * map. 564 * map.
676 */ 565 */
677void 566void
678maptile::allocate () 567maptile::alloc ()
679{ 568{
680 in_memory = MAP_IN_MEMORY;
681
682 /* Log this condition and free the storage. We could I suppose
683 * realloc, but if the caller is presuming the data will be intact,
684 * that is their poor assumption.
685 */
686 if (spaces) 569 if (spaces)
687 {
688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
689 free (spaces);
690 }
691
692 spaces = (mapspace *)
693 calloc (1, width * height * sizeof (mapspace));
694
695 if (!spaces)
696 fatal (OUT_OF_MEMORY);
697}
698
699/* Create and returns a map of the specific size. Used
700 * in random map code and the editor.
701 */
702maptile *
703get_empty_map (int sizex, int sizey)
704{
705 maptile *m = get_linked_map ();
706
707 m->width = sizex;
708 m->height = sizey;
709 m->in_memory = MAP_SWAPPED;
710 m->allocate ();
711
712 return m; 570 return;
571
572 spaces = salloc0<mapspace> (size ());
713} 573}
714 574
715/* Takes a string from a map definition and outputs a pointer to the array of shopitems 575/* Takes a string from a map definition and outputs a pointer to the array of shopitems
716 * corresponding to that string. Memory is allocated for this, it must be freed 576 * corresponding to that string. Memory is allocated for this, it must be freed
717 * at a later date. 577 * at a later date.
718 * Called by parse_map_headers below. 578 * Called by parse_map_headers below.
719 */ 579 */
720
721static shopitems * 580static shopitems *
722parse_shop_string (const char *input_string) 581parse_shop_string (const char *input_string)
723{ 582{
724 char *shop_string, *p, *q, *next_semicolon, *next_colon; 583 char *shop_string, *p, *q, *next_semicolon, *next_colon;
725 shopitems *items = NULL; 584 shopitems *items = NULL;
… …
734 p = strchr (p, ';'); 593 p = strchr (p, ';');
735 number_of_entries++; 594 number_of_entries++;
736 if (p) 595 if (p)
737 p++; 596 p++;
738 } 597 }
598
739 p = shop_string; 599 p = shop_string;
740 strip_endline (p); 600 strip_endline (p);
741 items = new shopitems[number_of_entries + 1]; 601 items = new shopitems[number_of_entries + 1];
742 for (i = 0; i < number_of_entries; i++) 602 for (i = 0; i < number_of_entries; i++)
743 { 603 {
744 if (!p) 604 if (!p)
745 { 605 {
746 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 606 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
747 break; 607 break;
748 } 608 }
609
749 next_semicolon = strchr (p, ';'); 610 next_semicolon = strchr (p, ';');
750 next_colon = strchr (p, ':'); 611 next_colon = strchr (p, ':');
751 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 612 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
752 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 613 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
753 items[i].strength = atoi (strchr (p, ':') + 1); 614 items[i].strength = atoi (strchr (p, ':') + 1);
… …
780 * the next entry while we're at it, better print a warning 641 * the next entry while we're at it, better print a warning
781 */ 642 */
782 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 643 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
783 } 644 }
784 } 645 }
646
785 items[i].index = number_of_entries; 647 items[i].index = number_of_entries;
786 if (next_semicolon) 648 if (next_semicolon)
787 p = ++next_semicolon; 649 p = ++next_semicolon;
788 else 650 else
789 p = NULL; 651 p = NULL;
790 } 652 }
653
791 free (shop_string); 654 free (shop_string);
792 return items; 655 return items;
793} 656}
794 657
795/* opposite of parse string, this puts the string that was originally fed in to 658/* opposite of parse string, this puts the string that was originally fed in to
… …
804 for (i = 0; i < m->shopitems[0].index; i++) 667 for (i = 0; i < m->shopitems[0].index; i++)
805 { 668 {
806 if (m->shopitems[i].typenum) 669 if (m->shopitems[i].typenum)
807 { 670 {
808 if (m->shopitems[i].strength) 671 if (m->shopitems[i].strength)
809 {
810 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 672 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
811 }
812 else 673 else
813 sprintf (tmp, "%s;", m->shopitems[i].name); 674 sprintf (tmp, "%s;", m->shopitems[i].name);
814 } 675 }
815 else 676 else
816 { 677 {
817 if (m->shopitems[i].strength) 678 if (m->shopitems[i].strength)
818 {
819 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 679 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
820 }
821 else 680 else
822 sprintf (tmp, "*"); 681 sprintf (tmp, "*");
823 } 682 }
683
824 strcat (output_string, tmp); 684 strcat (output_string, tmp);
825 } 685 }
826} 686}
827 687
828/* This loads the header information of the map. The header 688/* This loads the header information of the map. The header
… …
833 * put all the stuff in the map object so that names actually make 693 * put all the stuff in the map object so that names actually make
834 * sense. 694 * sense.
835 * This could be done in lex (like the object loader), but I think 695 * This could be done in lex (like the object loader), but I think
836 * currently, there are few enough fields this is not a big deal. 696 * currently, there are few enough fields this is not a big deal.
837 * MSW 2001-07-01 697 * MSW 2001-07-01
838 * return 0 on success, 1 on failure.
839 */ 698 */
840 699bool
841static int 700maptile::_load_header (object_thawer &thawer)
842load_map_header (object_thawer & fp, maptile *m)
843{ 701{
844 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 702 for (;;)
845 int msgpos = 0;
846 int maplorepos = 0;
847
848 while (fgets (buf, HUGE_BUF, fp) != NULL)
849 { 703 {
850 buf[HUGE_BUF - 1] = 0; 704 keyword kw = thawer.get_kv ();
851 key = buf;
852 705
853 while (isspace (*key)) 706 switch (kw)
854 key++;
855
856 if (*key == 0)
857 continue; /* empty line */
858
859 value = strchr (key, ' ');
860
861 if (!value)
862 { 707 {
863 if ((end = strchr (key, '\n'))) 708 case KW_msg:
864 *end = 0; 709 thawer.get_ml (KW_endmsg, msg);
710 break;
711
712 case KW_lore: // CF+ extension
713 thawer.get_ml (KW_endlore, maplore);
714 break;
715
716 case KW_maplore:
717 thawer.get_ml (KW_endmaplore, maplore);
718 break;
719
720 case KW_arch:
721 if (strcmp (thawer.get_str (), "map"))
722 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
723 break;
724
725 case KW_oid:
726 thawer.get (this, thawer.get_sint32 ());
727 break;
728
729 case KW_file_format_version: break; // nop
730
731 case KW_name: thawer.get (name); break;
732 case KW_attach: thawer.get (attach); break;
733 case KW_reset_time: thawer.get (reset_time); break;
734 case KW_shopgreed: thawer.get (shopgreed); break;
735 case KW_shopmin: thawer.get (shopmin); break;
736 case KW_shopmax: thawer.get (shopmax); break;
737 case KW_shoprace: thawer.get (shoprace); break;
738 case KW_outdoor: thawer.get (outdoor); break;
739 case KW_temp: thawer.get (temp); break;
740 case KW_pressure: thawer.get (pressure); break;
741 case KW_humid: thawer.get (humid); break;
742 case KW_windspeed: thawer.get (windspeed); break;
743 case KW_winddir: thawer.get (winddir); break;
744 case KW_sky: thawer.get (sky); break;
745
746 case KW_per_player: thawer.get (per_player); break;
747 case KW_per_party: thawer.get (per_party); break;
748
749 case KW_region: default_region = region::find (thawer.get_str ()); break;
750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
751
752 // old names new names
753 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
754 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
755 case KW_x: case KW_width: thawer.get (width); break;
756 case KW_y: case KW_height: thawer.get (height); break;
757 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
758 case KW_value: case KW_swap_time: thawer.get (timeout); break;
759 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
760 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
761 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
762
763 case KW_tile_path_1: thawer.get (tile_path [0]); break;
764 case KW_tile_path_2: thawer.get (tile_path [1]); break;
765 case KW_tile_path_3: thawer.get (tile_path [2]); break;
766 case KW_tile_path_4: thawer.get (tile_path [3]); break;
767
768 case KW_end:
769 return true;
770
771 default:
772 if (!thawer.parse_error ("map", 0))
773 return false;
774 break;
865 } 775 }
866 else
867 {
868 *value = 0;
869 value++;
870 end = strchr (value, '\n');
871
872 while (isspace (*value))
873 {
874 value++;
875
876 if (*value == '\0' || value == end)
877 {
878 /* Nothing but spaces. */
879 value = NULL;
880 break;
881 }
882 }
883 }
884
885 if (!end)
886 {
887 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
888 return 1;
889 }
890
891 /* key is the field name, value is what it should be set
892 * to. We've already done the work to null terminate key,
893 * and strip off any leading spaces for both of these.
894 * We have not touched the newline at the end of the line -
895 * these are needed for some values. the end pointer
896 * points to the first of the newlines.
897 * value could be NULL! It would be easy enough to just point
898 * this to "" to prevent cores, but that would let more errors slide
899 * through.
900 *
901 * First check for entries that do not use the value parameter, then
902 * validate that value is given and check for the remaining entries
903 * that use the parameter.
904 */
905
906 if (!strcmp (key, "msg"))
907 {
908 while (fgets (buf, HUGE_BUF, fp) != NULL)
909 {
910 if (!strcmp (buf, "endmsg\n"))
911 break;
912 else
913 {
914 /* slightly more efficient than strcat */
915 strcpy (msgbuf + msgpos, buf);
916 msgpos += strlen (buf);
917 }
918 }
919 /* There are lots of maps that have empty messages (eg, msg/endmsg
920 * with nothing between). There is no reason in those cases to
921 * keep the empty message. Also, msgbuf contains garbage data
922 * when msgpos is zero, so copying it results in crashes
923 */
924 if (msgpos != 0)
925 m->msg = strdup (msgbuf);
926 }
927 else if (!strcmp (key, "maplore"))
928 {
929 while (fgets (buf, HUGE_BUF, fp) != NULL)
930 {
931 if (!strcmp (buf, "endmaplore\n"))
932 break;
933 else
934 {
935 /* slightly more efficient than strcat */
936 strcpy (maplorebuf + maplorepos, buf);
937 maplorepos += strlen (buf);
938 }
939 }
940 if (maplorepos != 0)
941 m->maplore = strdup (maplorebuf);
942 }
943 else if (!strcmp (key, "end"))
944 {
945 break;
946 }
947 else if (value == NULL)
948 {
949 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
950 }
951 else if (!strcmp (key, "arch"))
952 {
953 /* This is an oddity, but not something we care about much. */
954 if (strcmp (value, "map\n"))
955 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
956 }
957 else if (!strcmp (key, "name"))
958 {
959 *end = 0;
960 m->name = strdup (value);
961 }
962 /* first strcmp value on these are old names supported
963 * for compatibility reasons. The new values (second) are
964 * what really should be used.
965 */
966 else if (!strcmp (key, "oid"))
967 fp.get (m, atoi (value));
968 else if (!strcmp (key, "attach"))
969 m->attach = value;
970 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
971 m->enter_x = atoi (value);
972 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
973 m->enter_y = atoi (value);
974 else if (!strcmp (key, "x") || !strcmp (key, "width"))
975 m->width = atoi (value);
976 else if (!strcmp (key, "y") || !strcmp (key, "height"))
977 m->height = atoi (value);
978 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
979 m->reset_timeout = atoi (value);
980 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
981 m->timeout = atoi (value);
982 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
983 m->difficulty = clamp (atoi (value), 1, settings.max_level);
984 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
985 m->darkness = atoi (value);
986 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
987 m->fixed_resettime = atoi (value);
988 else if (!strcmp (key, "unique"))
989 m->unique = atoi (value);
990 else if (!strcmp (key, "template"))
991 m->templatemap = atoi (value);
992 else if (!strcmp (key, "region"))
993 m->region = get_region_by_name (value);
994 else if (!strcmp (key, "shopitems"))
995 {
996 *end = 0;
997 m->shopitems = parse_shop_string (value);
998 }
999 else if (!strcmp (key, "shopgreed"))
1000 m->shopgreed = atof (value);
1001 else if (!strcmp (key, "shopmin"))
1002 m->shopmin = atol (value);
1003 else if (!strcmp (key, "shopmax"))
1004 m->shopmax = atol (value);
1005 else if (!strcmp (key, "shoprace"))
1006 {
1007 *end = 0;
1008 m->shoprace = strdup (value);
1009 }
1010 else if (!strcmp (key, "outdoor"))
1011 m->outdoor = atoi (value);
1012 else if (!strcmp (key, "temp"))
1013 m->temp = atoi (value);
1014 else if (!strcmp (key, "pressure"))
1015 m->pressure = atoi (value);
1016 else if (!strcmp (key, "humid"))
1017 m->humid = atoi (value);
1018 else if (!strcmp (key, "windspeed"))
1019 m->windspeed = atoi (value);
1020 else if (!strcmp (key, "winddir"))
1021 m->winddir = atoi (value);
1022 else if (!strcmp (key, "sky"))
1023 m->sky = atoi (value);
1024 else if (!strcmp (key, "nosmooth"))
1025 m->nosmooth = atoi (value);
1026 else if (!strncmp (key, "tile_path_", 10))
1027 {
1028 int tile = atoi (key + 10);
1029
1030 if (tile < 1 || tile > 4)
1031 {
1032 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1033 }
1034 else
1035 {
1036 char *path;
1037
1038 *end = 0;
1039
1040 if (m->tile_path[tile - 1])
1041 {
1042 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1043 free (m->tile_path[tile - 1]);
1044 m->tile_path[tile - 1] = NULL;
1045 }
1046
1047 if (check_path (value, 1) != -1)
1048 {
1049 /* The unadorned path works. */
1050 path = value;
1051 }
1052 else
1053 {
1054 /* Try again; it could be a relative exit. */
1055
1056 path = path_combine_and_normalize (m->path, value);
1057
1058 if (check_path (path, 1) == -1)
1059 {
1060 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1061 path = NULL;
1062 }
1063 }
1064
1065 if (editor)
1066 {
1067 /* Use the value as in the file. */
1068 m->tile_path[tile - 1] = strdup (value);
1069 }
1070 else if (path != NULL)
1071 {
1072 /* Use the normalized value. */
1073 m->tile_path[tile - 1] = strdup (path);
1074 }
1075 } /* end if tile direction (in)valid */
1076 }
1077 else
1078 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1079 }
1080
1081 if (!key || strcmp (key, "end"))
1082 { 776 }
1083 LOG (llevError, "Got premature eof on map header!\n");
1084 return 1;
1085 }
1086 777
1087 return 0; 778 abort ();
1088} 779}
1089 780
1090/* 781bool
1091 * Opens the file "filename" and reads information about the map 782maptile::_load_header (const char *path)
1092 * from the given file, and stores it in a newly allocated
1093 * maptile. A pointer to this structure is returned, or NULL on failure.
1094 * flags correspond to those in map.h. Main ones used are
1095 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1096 * MAP_BLOCK, in which case we block on this load. This happens in all
1097 * cases, no matter if this flag is set or not.
1098 * MAP_STYLE: style map - don't add active objects, don't add to server
1099 * managed map list.
1100 */
1101
1102maptile *
1103load_original_map (const char *filename, int flags)
1104{ 783{
1105 maptile *m;
1106 char pathname[MAX_BUF];
1107
1108 if (flags & MAP_PLAYER_UNIQUE)
1109 strcpy (pathname, filename);
1110 else if (flags & MAP_OVERLAY)
1111 strcpy (pathname, create_overlay_pathname (filename));
1112 else
1113 strcpy (pathname, create_pathname (filename));
1114
1115 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1116
1117 object_thawer thawer (pathname); 784 object_thawer thawer (path);
1118 785
1119 if (!thawer) 786 if (!thawer)
1120 return 0; 787 return false;
1121 788
1122 m = get_linked_map (); 789 return _load_header (thawer);
1123
1124 strcpy (m->path, filename);
1125 if (load_map_header (thawer, m))
1126 {
1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1128 delete_map (m);
1129 return 0;
1130 }
1131
1132 m->allocate ();
1133
1134 m->in_memory = MAP_LOADING;
1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1136
1137 m->in_memory = MAP_IN_MEMORY;
1138 if (!m->difficulty)
1139 m->difficulty = calculate_difficulty (m);
1140 set_map_reset_time (m);
1141 m->instantiate ();
1142 return (m);
1143}
1144
1145/*
1146 * Loads a map, which has been loaded earlier, from file.
1147 * Return the map object we load into (this can change from the passed
1148 * option if we can't find the original map)
1149 */
1150
1151static maptile *
1152load_temporary_map (maptile *m)
1153{
1154 char buf[MAX_BUF];
1155
1156 if (!m->tmpname)
1157 {
1158 LOG (llevError, "No temporary filename for map %s\n", m->path);
1159 strcpy (buf, m->path);
1160 delete_map (m);
1161 m = load_original_map (buf, 0);
1162 if (m == NULL)
1163 return NULL;
1164 fix_auto_apply (m); /* Chests which open as default */
1165 return m;
1166 }
1167
1168 object_thawer thawer (m->tmpname);
1169
1170 if (!thawer)
1171 {
1172 strcpy (buf, m->path);
1173 delete_map (m);
1174 m = load_original_map (buf, 0);
1175 if (!m)
1176 return NULL;
1177 fix_auto_apply (m); /* Chests which open as default */
1178 return m;
1179 }
1180
1181 if (load_map_header (thawer, m))
1182 {
1183 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1184 delete_map (m);
1185 m = load_original_map (m->path, 0);
1186 return NULL;
1187 }
1188
1189 m->allocate ();
1190
1191 m->in_memory = MAP_LOADING;
1192 load_objects (m, thawer, 0);
1193
1194 m->in_memory = MAP_IN_MEMORY;
1195 INVOKE_MAP (SWAPIN, m);
1196 return m;
1197}
1198
1199/*
1200 * Loads a map, which has been loaded earlier, from file.
1201 * Return the map object we load into (this can change from the passed
1202 * option if we can't find the original map)
1203 */
1204
1205maptile *
1206load_overlay_map (const char *filename, maptile *m)
1207{
1208 char pathname[MAX_BUF];
1209
1210 strcpy (pathname, create_overlay_pathname (filename));
1211
1212 object_thawer thawer (pathname);
1213
1214 if (!thawer)
1215 return m;
1216
1217 if (load_map_header (thawer, m))
1218 {
1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1220 delete_map (m);
1221 m = load_original_map (m->path, 0);
1222 return 0;
1223 }
1224 /*m->allocate ();*/
1225
1226 m->in_memory = MAP_LOADING;
1227 load_objects (m, thawer, MAP_OVERLAY);
1228
1229 m->in_memory = MAP_IN_MEMORY;
1230 return m;
1231} 790}
1232 791
1233/****************************************************************************** 792/******************************************************************************
1234 * This is the start of unique map handling code 793 * This is the start of unique map handling code
1235 *****************************************************************************/ 794 *****************************************************************************/
1236 795
1237/* This goes through map 'm' and removed any unique items on the map. */ 796/* This goes through the maptile and removed any unique items on the map. */
1238static void 797void
1239delete_unique_items (maptile *m) 798maptile::clear_unique_items ()
1240{ 799{
1241 int i, j, unique; 800 for (int i = 0; i < size (); ++i)
1242 object *op, *next;
1243
1244 for (i = 0; i < m->width; i++)
1245 for (j = 0; j < m->height; j++)
1246 { 801 {
1247 unique = 0; 802 int unique = 0;
1248 803 for (object *op = spaces [i].bot; op; )
1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 804 {
1251 next = op->above; 805 object *above = op->above;
1252 806
1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 807 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1254 unique = 1; 808 unique = 1;
1255 809
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 810 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 811 {
1258 op->destroy_inv (false); 812 op->destroy_inv (false);
1259 op->destroy (); 813 op->destroy ();
1260 } 814 }
1261 }
1262 }
1263}
1264 815
1265 816 op = above;
1266/*
1267 * Loads unique objects from file(s) into the map which is in memory
1268 * m is the map to load unique items into.
1269 */
1270static void
1271load_unique_objects (maptile *m)
1272{
1273 int count;
1274 char firstname[MAX_BUF];
1275
1276 for (count = 0; count < 10; count++)
1277 {
1278 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1279 if (!access (firstname, R_OK))
1280 break;
1281 }
1282 /* If we get here, we did not find any map */
1283 if (count == 10)
1284 return;
1285
1286 object_thawer thawer (firstname);
1287
1288 if (!thawer)
1289 return;
1290
1291 m->in_memory = MAP_LOADING;
1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295 load_objects (m, thawer, 0);
1296
1297 m->in_memory = MAP_IN_MEMORY;
1298}
1299
1300/*
1301 * Saves a map to file. If flag is set, it is saved into the same
1302 * file it was (originally) loaded from. Otherwise a temporary
1303 * filename will be genarated, and the file will be stored there.
1304 * The temporary filename will be stored in the maptileure.
1305 * If the map is unique, we also save to the filename in the map
1306 * (this should have been updated when first loaded)
1307 */
1308int
1309new_save_map (maptile *m, int flag)
1310{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i;
1313
1314 if (flag && !*m->path)
1315 {
1316 LOG (llevError, "Tried to save map without path.\n");
1317 return -1;
1318 }
1319
1320 if (flag || (m->unique) || (m->templatemap))
1321 {
1322 if (!m->unique && !m->templatemap)
1323 { /* flag is set */
1324 if (flag == 2)
1325 strcpy (filename, create_overlay_pathname (m->path));
1326 else
1327 strcpy (filename, create_pathname (m->path));
1328 } 817 }
1329 else
1330 strcpy (filename, m->path);
1331
1332 make_path_to_file (filename);
1333 }
1334 else
1335 { 818 }
1336 if (!m->tmpname) 819}
1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1338 820
1339 strcpy (filename, m->tmpname); 821bool
822maptile::_save_header (object_freezer &freezer)
823{
824#define MAP_OUT(k) freezer.put (KW_ ## k, k)
825#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
826
827 MAP_OUT2 (arch, "map");
828
829 if (name) MAP_OUT (name);
830 MAP_OUT (swap_time);
831 MAP_OUT (reset_time);
832 MAP_OUT (reset_timeout);
833 MAP_OUT (fixed_resettime);
834 MAP_OUT (difficulty);
835
836 if (default_region) MAP_OUT2 (region, default_region->name);
837
838 if (shopitems)
1340 } 839 {
840 char shop[MAX_BUF];
841 print_shop_string (this, shop);
842 MAP_OUT2 (shopitems, shop);
843 }
1341 844
1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 845 MAP_OUT (shopgreed);
1343 m->in_memory = MAP_SAVING; 846 MAP_OUT (shopmin);
847 MAP_OUT (shopmax);
848 if (shoprace) MAP_OUT (shoprace);
849 MAP_OUT (darkness);
850 MAP_OUT (width);
851 MAP_OUT (height);
852 MAP_OUT (enter_x);
853 MAP_OUT (enter_y);
1344 854
855 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
856 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
857
858 MAP_OUT (outdoor);
859 MAP_OUT (temp);
860 MAP_OUT (pressure);
861 MAP_OUT (humid);
862 MAP_OUT (windspeed);
863 MAP_OUT (winddir);
864 MAP_OUT (sky);
865
866 MAP_OUT (per_player);
867 MAP_OUT (per_party);
868
869 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
870 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
871 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
872 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
873
874 freezer.put (this);
875 freezer.put (KW_end);
876
877 return true;
878}
879
880bool
881maptile::_save_header (const char *path)
882{
1345 object_freezer freezer; 883 object_freezer freezer;
1346 884
1347 /* legacy */ 885 if (!_save_header (freezer))
1348 fprintf (freezer, "arch map\n"); 886 return false;
1349 if (m->name)
1350 fprintf (freezer, "name %s\n", m->name);
1351 if (!flag)
1352 fprintf (freezer, "swap_time %d\n", m->swap_time);
1353 if (m->reset_timeout)
1354 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1355 if (m->fixed_resettime)
1356 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1357 /* we unfortunately have no idea if this is a value the creator set
1358 * or a difficulty value we generated when the map was first loaded
1359 */
1360 if (m->difficulty)
1361 fprintf (freezer, "difficulty %d\n", m->difficulty);
1362 if (m->region)
1363 fprintf (freezer, "region %s\n", m->region->name);
1364 if (m->shopitems)
1365 {
1366 print_shop_string (m, shop);
1367 fprintf (freezer, "shopitems %s\n", shop);
1368 }
1369 if (m->shopgreed)
1370 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1371 if (m->shopmin)
1372 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1373 if (m->shopmax)
1374 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1375 if (m->shoprace)
1376 fprintf (freezer, "shoprace %s\n", m->shoprace);
1377 if (m->darkness)
1378 fprintf (freezer, "darkness %d\n", m->darkness);
1379 if (m->width)
1380 fprintf (freezer, "width %d\n", m->width);
1381 if (m->height)
1382 fprintf (freezer, "height %d\n", m->height);
1383 if (m->enter_x)
1384 fprintf (freezer, "enter_x %d\n", m->enter_x);
1385 if (m->enter_y)
1386 fprintf (freezer, "enter_y %d\n", m->enter_y);
1387 if (m->msg)
1388 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1389 if (m->maplore)
1390 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1391 if (m->unique)
1392 fprintf (freezer, "unique %d\n", m->unique);
1393 if (m->templatemap)
1394 fprintf (freezer, "template %d\n", m->templatemap);
1395 if (m->outdoor)
1396 fprintf (freezer, "outdoor %d\n", m->outdoor);
1397 if (m->temp)
1398 fprintf (freezer, "temp %d\n", m->temp);
1399 if (m->pressure)
1400 fprintf (freezer, "pressure %d\n", m->pressure);
1401 if (m->humid)
1402 fprintf (freezer, "humid %d\n", m->humid);
1403 if (m->windspeed)
1404 fprintf (freezer, "windspeed %d\n", m->windspeed);
1405 if (m->winddir)
1406 fprintf (freezer, "winddir %d\n", m->winddir);
1407 if (m->sky)
1408 fprintf (freezer, "sky %d\n", m->sky);
1409 if (m->nosmooth)
1410 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1411 887
1412 /* Save any tiling information, except on overlays */ 888 return freezer.save (path);
1413 if (flag != 2)
1414 for (i = 0; i < 4; i++)
1415 if (m->tile_path[i])
1416 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1417
1418 freezer.put (m);
1419 fprintf (freezer, "end\n");
1420
1421 /* In the game save unique items in the different file, but
1422 * in the editor save them to the normal map file.
1423 * If unique map, save files in the proper destination (set by
1424 * player)
1425 */
1426 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1427 {
1428 object_freezer unique;
1429
1430 if (flag == 2)
1431 save_objects (m, freezer, unique, 2);
1432 else
1433 save_objects (m, freezer, unique, 0);
1434
1435 sprintf (buf, "%s.v00", create_items_path (m->path));
1436
1437 unique.save (buf);
1438 }
1439 else
1440 { /* save same file when not playing, like in editor */
1441 save_objects (m, freezer, freezer, 0);
1442 }
1443
1444 freezer.save (filename);
1445
1446 return 0;
1447} 889}
1448 890
1449/* 891/*
1450 * Remove and free all objects in the given map. 892 * Remove and free all objects in the given map.
1451 */ 893 */
1452void 894void
1453free_all_objects (maptile *m) 895maptile::clear ()
1454{ 896{
897 sfree (regions, size ()), regions = 0;
898 free (regionmap), regionmap = 0;
899
1455 if (!m->spaces) 900 if (spaces)
1456 return;
1457
1458 for (int i = 0; i < m->width; i++)
1459 for (int j = 0; j < m->height; j++)
1460 { 901 {
1461 mapspace &ms = m->at (i, j); 902 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1462
1463 while (object *op = ms.bot) 903 while (object *op = ms->bot)
1464 { 904 {
1465 if (op->head) 905 if (op->head)
1466 op = op->head; 906 op = op->head;
1467 907
1468 op->destroy_inv (false); 908 op->destroy_inv (false);
1469 op->destroy (); 909 op->destroy ();
1470 } 910 }
911
912 sfree (spaces, size ()), spaces = 0;
1471 } 913 }
1472}
1473 914
1474/* 915 if (buttons)
1475 * Frees everything allocated by the given maptileure. 916 free_objectlinkpt (buttons), buttons = 0;
1476 * don't free tmpname - our caller is left to do that 917}
1477 */ 918
1478void 919void
1479free_map (maptile *m, int flag) 920maptile::clear_header ()
1480{ 921{
1481 if (!m->in_memory) //TODO: makes no sense to me? 922 name = 0;
1482 return; 923 msg = 0;
1483 924 maplore = 0;
1484 m->in_memory = MAP_SAVING; 925 shoprace = 0;
1485
1486 // TODO: use new/delete
1487
1488 if (flag && m->spaces)
1489 free_all_objects (m);
1490
1491 free (m->name), m->name = 0;
1492 free (m->spaces), m->spaces = 0;
1493 free (m->msg), m->msg = 0;
1494 free (m->maplore), m->maplore = 0;
1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0; 926 delete [] shopitems, shopitems = 0;
1497
1498 if (m->buttons)
1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1500 927
1501 for (int i = 0; i < 4; i++) 928 for (int i = 0; i < 4; i++)
1502 {
1503 if (m->tile_path[i])
1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1506 m->tile_map[i] = 0; 929 tile_path [i] = 0;
1507 }
1508
1509 m->in_memory = MAP_SWAPPED;
1510} 930}
1511 931
1512maptile::~maptile () 932maptile::~maptile ()
1513{ 933{
1514 free_map (this, 1); 934 assert (destroyed ());
1515 free (tmpname);
1516} 935}
1517 936
1518void 937void
1519maptile::do_destroy () 938maptile::clear_links_to (maptile *m)
1520{ 939{
1521 attachable::do_destroy ();
1522
1523 free_all_objects (this);
1524
1525 /* We need to look through all the maps and see if any maps 940 /* We need to look through all the maps and see if any maps
1526 * are pointing at this one for tiling information. Since 941 * are pointing at this one for tiling information. Since
1527 * tiling can be asymetric, we just can not look to see which 942 * tiling can be asymetric, we just can not look to see which
1528 * maps this map tiles with and clears those. 943 * maps this map tiles with and clears those.
1529 */ 944 */
1530 //TODO: non-euclidean-tiling MUST GO
1531 for (maptile *m = first_map; m; m = m->next)
1532 for (int i = 0; i < 4; i++) 945 for (int i = 0; i < 4; i++)
1533 if (m->tile_map[i] == this) 946 if (tile_map[i] == m)
1534 m->tile_map[i] = 0; 947 tile_map[i] = 0;
1535
1536 if (first_map == this)
1537 first_map = next;
1538 else
1539 for (maptile *m = first_map; m; m = m->next)
1540 if (m->next = this)
1541 {
1542 m->next = next;
1543 break;
1544 }
1545} 948}
1546 949
1547//TODO: must go
1548void 950void
1549delete_map (maptile *m) 951maptile::do_destroy ()
1550{ 952{
1551 if (m) 953 attachable::do_destroy ();
1552 m->destroy (); 954
955 clear ();
1553} 956}
1554 957
1555/* 958/*
1556 * Makes sure the given map is loaded and swapped in. 959 * Updates every button on the map (by calling update_button() for them).
1557 * name is path name of the map.
1558 * flags meaning:
1559 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1560 * and don't do unique items or the like.
1561 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1562 * dont do any more name translation on it.
1563 * 960 */
1564 * Returns a pointer to the given map. 961void
1565 */ 962maptile::update_buttons ()
1566maptile *
1567ready_map_name (const char *name, int flags)
1568{ 963{
1569 if (!name) 964 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1570 return 0; 965 for (objectlink *ol = obp->link; ol; ol = ol->next)
1571
1572 /* Have we been at this level before? */
1573 maptile *m = has_been_loaded (name);
1574
1575 /* Map is good to go, so just return it */
1576 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1577 return m;
1578
1579 /* unique maps always get loaded from their original location, and never
1580 * a temp location. Likewise, if map_flush is set, or we have never loaded
1581 * this map, load it now. I removed the reset checking from here -
1582 * it seems the probability of a player trying to enter a map that should
1583 * reset but hasn't yet is quite low, and removing that makes this function
1584 * a bit cleaner (and players probably shouldn't rely on exact timing for
1585 * resets in any case - if they really care, they should use the 'maps command.
1586 */
1587 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1588 { 966 {
1589 /* first visit or time to reset */ 967 if (!ol->ob)
1590 if (m)
1591 { 968 {
1592 clean_tmp_map (m); /* Doesn't make much difference */ 969 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1593 delete_map (m); 970 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
971 continue;
1594 } 972 }
1595 973
1596 /* create and load a map */ 974 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1597 if (flags & MAP_PLAYER_UNIQUE)
1598 LOG (llevDebug, "Trying to load map %s.\n", name);
1599 else
1600 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1601
1602 //eval_pv ("$x = Event::time", 1);//D
1603 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1604 return (NULL);
1605 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1606
1607 fix_auto_apply (m); /* Chests which open as default */
1608
1609 /* If a player unique map, no extra unique object file to load.
1610 * if from the editor, likewise.
1611 */
1612 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1613 load_unique_objects (m);
1614
1615 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1616 { 975 {
1617 m = load_overlay_map (name, m); 976 update_button (ol->ob);
1618 if (m == NULL) 977 break;
1619 return NULL;
1620 } 978 }
1621
1622 if (flags & MAP_PLAYER_UNIQUE)
1623 INVOKE_MAP (SWAPIN, m);
1624
1625 } 979 }
1626 else
1627 {
1628 /* If in this loop, we found a temporary map, so load it up. */
1629
1630 m = load_temporary_map (m);
1631 if (m == NULL)
1632 return NULL;
1633 load_unique_objects (m);
1634
1635 clean_tmp_map (m);
1636 m->in_memory = MAP_IN_MEMORY;
1637 /* tempnam() on sun systems (probably others) uses malloc
1638 * to allocated space for the string. Free it here.
1639 * In some cases, load_temporary_map above won't find the
1640 * temporary map, and so has reloaded a new map. If that
1641 * is the case, tmpname is now null
1642 */
1643 if (m->tmpname)
1644 free (m->tmpname);
1645 m->tmpname = NULL;
1646 /* It's going to be saved anew anyway */
1647 }
1648
1649 /* Below here is stuff common to both first time loaded maps and
1650 * temp maps.
1651 */
1652
1653 decay_objects (m); /* start the decay */
1654 /* In case other objects press some buttons down */
1655 update_buttons (m);
1656 if (m->outdoor)
1657 set_darkness_map (m);
1658 /* run the weather over this map */
1659 weather_effect (name);
1660 return m;
1661} 980}
1662
1663 981
1664/* 982/*
1665 * This routine is supposed to find out the difficulty of the map. 983 * This routine is supposed to find out the difficulty of the map.
1666 * difficulty does not have a lot to do with character level, 984 * difficulty does not have a lot to do with character level,
1667 * but does have a lot to do with treasure on the map. 985 * but does have a lot to do with treasure on the map.
… …
1669 * Difficulty can now be set by the map creature. If the value stored 987 * Difficulty can now be set by the map creature. If the value stored
1670 * in the map is zero, then use this routine. Maps should really 988 * in the map is zero, then use this routine. Maps should really
1671 * have a difficulty set than using this function - human calculation 989 * have a difficulty set than using this function - human calculation
1672 * is much better than this functions guesswork. 990 * is much better than this functions guesswork.
1673 */ 991 */
1674
1675int 992int
1676calculate_difficulty (maptile *m) 993maptile::estimate_difficulty () const
1677{ 994{
1678 object *op;
1679 archetype *at;
1680 int x, y, i;
1681 long monster_cnt = 0; 995 long monster_cnt = 0;
1682 double avgexp = 0; 996 double avgexp = 0;
1683 sint64 total_exp = 0; 997 sint64 total_exp = 0;
1684 998
1685 if (m->difficulty) 999 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1686 { 1000 for (object *op = ms->bot; op; op = op->above)
1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1688 return m->difficulty;
1689 }
1690
1691 for (x = 0; x < m->width; x++)
1692 for (y = 0; y < m->height; y++)
1693 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1694 { 1001 {
1695 if (QUERY_FLAG (op, FLAG_MONSTER)) 1002 if (QUERY_FLAG (op, FLAG_MONSTER))
1696 { 1003 {
1697 total_exp += op->stats.exp; 1004 total_exp += op->stats.exp;
1698 monster_cnt++; 1005 monster_cnt++;
1699 } 1006 }
1700 1007
1701 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1008 if (QUERY_FLAG (op, FLAG_GENERATOR))
1702 { 1009 {
1703 total_exp += op->stats.exp; 1010 total_exp += op->stats.exp;
1011
1704 at = type_to_archetype (GENERATE_TYPE (op)); 1012 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1705
1706 if (at != NULL)
1707 total_exp += at->clone.stats.exp * 8; 1013 total_exp += at->clone.stats.exp * 8;
1708 1014
1709 monster_cnt++; 1015 monster_cnt++;
1710 } 1016 }
1711 } 1017 }
1712 1018
1713 avgexp = (double) total_exp / monster_cnt; 1019 avgexp = (double) total_exp / monster_cnt;
1714 1020
1715 for (i = 1; i <= settings.max_level; i++) 1021 for (int i = 1; i <= settings.max_level; i++)
1716 {
1717 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1022 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1718 {
1719 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1720 return i; 1023 return i;
1721 }
1722 }
1723 1024
1724 return 1; 1025 return 1;
1725}
1726
1727void
1728clean_tmp_map (maptile *m)
1729{
1730 if (m->tmpname == NULL)
1731 return;
1732 INVOKE_MAP (CLEAN, m);
1733 (void) unlink (m->tmpname);
1734}
1735
1736void
1737free_all_maps (void)
1738{
1739 int real_maps = 0;
1740
1741 while (first_map)
1742 {
1743 /* I think some of the callers above before it gets here set this to be
1744 * saving, but we still want to free this data
1745 */
1746 if (first_map->in_memory == MAP_SAVING)
1747 first_map->in_memory = MAP_IN_MEMORY;
1748 delete_map (first_map);
1749 real_maps++;
1750 }
1751 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1752} 1026}
1753 1027
1754/* change_map_light() - used to change map light level (darkness) 1028/* change_map_light() - used to change map light level (darkness)
1755 * up or down. Returns true if successful. It should now be 1029 * up or down. Returns true if successful. It should now be
1756 * possible to change a value by more than 1. 1030 * possible to change a value by more than 1.
1757 * Move this from los.c to map.c since this is more related 1031 * Move this from los.c to map.c since this is more related
1758 * to maps than los. 1032 * to maps than los.
1759 * postive values make it darker, negative make it brighter 1033 * postive values make it darker, negative make it brighter
1760 */ 1034 */
1761
1762int 1035int
1763change_map_light (maptile *m, int change) 1036maptile::change_map_light (int change)
1764{ 1037{
1765 int new_level = m->darkness + change; 1038 int new_level = darkness + change;
1766 1039
1767 /* Nothing to do */ 1040 /* Nothing to do */
1768 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1041 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1769 {
1770 return 0; 1042 return 0;
1771 }
1772 1043
1773 /* inform all players on the map */ 1044 /* inform all players on the map */
1774 if (change > 0) 1045 if (change > 0)
1775 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1046 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1776 else 1047 else
1777 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1048 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1778 1049
1779 /* Do extra checking. since m->darkness is a unsigned value, 1050 /* Do extra checking. since darkness is a unsigned value,
1780 * we need to be extra careful about negative values. 1051 * we need to be extra careful about negative values.
1781 * In general, the checks below are only needed if change 1052 * In general, the checks below are only needed if change
1782 * is not +/-1 1053 * is not +/-1
1783 */ 1054 */
1784 if (new_level < 0) 1055 if (new_level < 0)
1785 m->darkness = 0; 1056 darkness = 0;
1786 else if (new_level >= MAX_DARKNESS) 1057 else if (new_level >= MAX_DARKNESS)
1787 m->darkness = MAX_DARKNESS; 1058 darkness = MAX_DARKNESS;
1788 else 1059 else
1789 m->darkness = new_level; 1060 darkness = new_level;
1790 1061
1791 /* All clients need to get re-updated for the change */ 1062 /* All clients need to get re-updated for the change */
1792 update_all_map_los (m); 1063 update_all_map_los (this);
1793 return 1; 1064 return 1;
1794} 1065}
1795 1066
1796/* 1067/*
1797 * This function updates various attributes about a specific space 1068 * This function updates various attributes about a specific space
… …
1801 */ 1072 */
1802void 1073void
1803mapspace::update_ () 1074mapspace::update_ ()
1804{ 1075{
1805 object *tmp, *last = 0; 1076 object *tmp, *last = 0;
1806 uint8 flags = 0, light = 0, anywhere = 0; 1077 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1807 New_Face *top, *floor, *middle;
1808 object *top_obj, *floor_obj, *middle_obj;
1809 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1078 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1810 1079
1811 middle = blank_face; 1080 //object *middle = 0;
1812 top = blank_face; 1081 //object *top = 0;
1813 floor = blank_face; 1082 //object *floor = 0;
1814 1083 // this seems to generate better code than using locals, above
1815 middle_obj = 0; 1084 object *&top = faces_obj[0] = 0;
1816 top_obj = 0; 1085 object *&middle = faces_obj[1] = 0;
1817 floor_obj = 0; 1086 object *&floor = faces_obj[2] = 0;
1818 1087
1819 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1088 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1820 { 1089 {
1821 /* This could be made additive I guess (two lights better than 1090 /* This could be made additive I guess (two lights better than
1822 * one). But if so, it shouldn't be a simple additive - 2 1091 * one). But if so, it shouldn't be a simple additive - 2
… …
1835 * Always put the player down for drawing. 1104 * Always put the player down for drawing.
1836 */ 1105 */
1837 if (!tmp->invisible) 1106 if (!tmp->invisible)
1838 { 1107 {
1839 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1108 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1840 {
1841 top = tmp->face;
1842 top_obj = tmp; 1109 top = tmp;
1843 }
1844 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1110 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1845 { 1111 {
1846 /* If we got a floor, that means middle and top were below it, 1112 /* If we got a floor, that means middle and top were below it,
1847 * so should not be visible, so we clear them. 1113 * so should not be visible, so we clear them.
1848 */ 1114 */
1849 middle = blank_face; 1115 middle = 0;
1850 top = blank_face; 1116 top = 0;
1851 floor = tmp->face;
1852 floor_obj = tmp; 1117 floor = tmp;
1853 } 1118 }
1854 /* Flag anywhere have high priority */ 1119 /* Flag anywhere have high priority */
1855 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1120 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1856 { 1121 {
1857 middle = tmp->face;
1858
1859 middle_obj = tmp; 1122 middle = tmp;
1860 anywhere = 1; 1123 anywhere = 1;
1861 } 1124 }
1862 /* Find the highest visible face around. If equal 1125 /* Find the highest visible face around. If equal
1863 * visibilities, we still want the one nearer to the 1126 * visibilities, we still want the one nearer to the
1864 * top 1127 * top
1865 */ 1128 */
1866 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1129 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1867 {
1868 middle = tmp->face;
1869 middle_obj = tmp; 1130 middle = tmp;
1870 }
1871 } 1131 }
1872 1132
1873 if (tmp == tmp->above) 1133 if (tmp == tmp->above)
1874 { 1134 {
1875 LOG (llevError, "Error in structure of map\n"); 1135 LOG (llevError, "Error in structure of map\n");
… …
1910 * middle face. This should not happen, as we already have the 1170 * middle face. This should not happen, as we already have the
1911 * else statement above so middle should not get set. OTOH, it 1171 * else statement above so middle should not get set. OTOH, it
1912 * may be possible for the faces to match but be different objects. 1172 * may be possible for the faces to match but be different objects.
1913 */ 1173 */
1914 if (top == middle) 1174 if (top == middle)
1915 middle = blank_face; 1175 middle = 0;
1916 1176
1917 /* There are three posibilities at this point: 1177 /* There are three posibilities at this point:
1918 * 1) top face is set, need middle to be set. 1178 * 1) top face is set, need middle to be set.
1919 * 2) middle is set, need to set top. 1179 * 2) middle is set, need to set top.
1920 * 3) neither middle or top is set - need to set both. 1180 * 3) neither middle or top is set - need to set both.
… …
1925 /* Once we get to a floor, stop, since we already have a floor object */ 1185 /* Once we get to a floor, stop, since we already have a floor object */
1926 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1186 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1927 break; 1187 break;
1928 1188
1929 /* If two top faces are already set, quit processing */ 1189 /* If two top faces are already set, quit processing */
1930 if ((top != blank_face) && (middle != blank_face)) 1190 if (top && middle)
1931 break; 1191 break;
1932 1192
1933 /* Only show visible faces, unless its the editor - show all */ 1193 /* Only show visible faces */
1934 if (!tmp->invisible || editor) 1194 if (!tmp->invisible)
1935 { 1195 {
1936 /* Fill in top if needed */ 1196 /* Fill in top if needed */
1937 if (top == blank_face) 1197 if (!top)
1938 { 1198 {
1939 top = tmp->face;
1940 top_obj = tmp; 1199 top = tmp;
1941 if (top == middle) 1200 if (top == middle)
1942 middle = blank_face; 1201 middle = 0;
1943 } 1202 }
1944 else 1203 else
1945 { 1204 {
1946 /* top is already set - we should only get here if 1205 /* top is already set - we should only get here if
1947 * middle is not set 1206 * middle is not set
1948 * 1207 *
1949 * Set the middle face and break out, since there is nothing 1208 * Set the middle face and break out, since there is nothing
1950 * more to fill in. We don't check visiblity here, since 1209 * more to fill in. We don't check visiblity here, since
1951 * 1210 *
1952 */ 1211 */
1953 if (tmp->face != top) 1212 if (tmp != top)
1954 { 1213 {
1955 middle = tmp->face;
1956 middle_obj = tmp; 1214 middle = tmp;
1957 break; 1215 break;
1958 } 1216 }
1959 } 1217 }
1960 } 1218 }
1961 } 1219 }
1962 1220
1963 if (middle == floor) 1221 if (middle == floor)
1964 middle = blank_face; 1222 middle = 0;
1965 1223
1966 if (top == middle) 1224 if (top == middle)
1967 middle = blank_face; 1225 middle = 0;
1968 1226
1969 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1227#if 0
1970 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1228 faces_obj [0] = top;
1971 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1229 faces_obj [1] = middle;
1230 faces_obj [2] = floor;
1231#endif
1972} 1232}
1973 1233
1974void 1234uint64
1975set_map_reset_time (maptile *map) 1235mapspace::volume () const
1976{ 1236{
1977 int timeout; 1237 uint64 vol = 0;
1978 1238
1979 timeout = map->reset_timeout; 1239 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1980 if (timeout <= 0) 1240 vol += op->volume ();
1981 timeout = MAP_DEFAULTRESET;
1982 if (timeout >= MAP_MAXRESET)
1983 timeout = MAP_MAXRESET;
1984 map->reset_time = time (0) + timeout;
1985}
1986 1241
1242 return vol;
1243}
1244
1987/* this updates the orig_map->tile_map[tile_num] value after loading 1245/* this updates the orig_map->tile_map[tile_num] value after finding
1988 * the map. It also takes care of linking back the freshly loaded 1246 * the map. It also takes care of linking back the freshly found
1989 * maps tile_map values if it tiles back to this one. It returns 1247 * maps tile_map values if it tiles back to this one. It returns
1990 * the value of orig_map->tile_map[tile_num]. It really only does this 1248 * the value of orig_map->tile_map[tile_num].
1991 * so that it is easier for calling functions to verify success.
1992 */ 1249 */
1993
1994static maptile * 1250static inline maptile *
1995load_and_link_tiled_map (maptile *orig_map, int tile_num) 1251find_and_link (maptile *orig_map, int tile_num)
1996{ 1252{
1253 maptile *mp = orig_map->tile_map [tile_num];
1254
1255 if (!mp)
1256 {
1257 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1258
1259 if (!mp)
1260 {
1261 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1262 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1263 &orig_map->tile_path[tile_num], &orig_map->path);
1264 mp = new maptile (1, 1);
1265 mp->alloc ();
1266 mp->in_memory = MAP_IN_MEMORY;
1267 }
1268 }
1269
1997 int dest_tile = (tile_num + 2) % 4; 1270 int dest_tile = (tile_num + 2) % 4;
1998 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1999 1271
2000 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1272 orig_map->tile_map [tile_num] = mp;
2001 1273
2002 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1274 // optimisation: back-link map to origin map if euclidean
2003 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1275 //TODO: non-euclidean maps MUST GO
1276 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
2004 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1277 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
2005 1278
2006 return orig_map->tile_map[tile_num]; 1279 return mp;
1280}
1281
1282static inline void
1283load_and_link (maptile *orig_map, int tile_num)
1284{
1285 find_and_link (orig_map, tile_num)->load_sync ();
2007} 1286}
2008 1287
2009/* this returns TRUE if the coordinates (x,y) are out of 1288/* this returns TRUE if the coordinates (x,y) are out of
2010 * map m. This function also takes into account any 1289 * map m. This function also takes into account any
2011 * tiling considerations, loading adjacant maps as needed. 1290 * tiling considerations, loading adjacant maps as needed.
2012 * This is the function should always be used when it 1291 * This is the function should always be used when it
2013 * necessary to check for valid coordinates. 1292 * necessary to check for valid coordinates.
2014 * This function will recursively call itself for the 1293 * This function will recursively call itself for the
2015 * tiled maps. 1294 * tiled maps.
2016 *
2017 *
2018 */ 1295 */
2019int 1296int
2020out_of_map (maptile *m, int x, int y) 1297out_of_map (maptile *m, int x, int y)
2021{ 1298{
2022 /* If we get passed a null map, this is obviously the 1299 /* If we get passed a null map, this is obviously the
… …
2030 { 1307 {
2031 if (!m->tile_path[3]) 1308 if (!m->tile_path[3])
2032 return 1; 1309 return 1;
2033 1310
2034 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1311 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2035 load_and_link_tiled_map (m, 3); 1312 find_and_link (m, 3);
2036 1313
2037 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); 1314 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2038 } 1315 }
2039 1316
2040 if (x >= m->width) 1317 if (x >= m->width)
2041 { 1318 {
2042 if (!m->tile_path[1]) 1319 if (!m->tile_path[1])
2043 return 1; 1320 return 1;
2044 1321
2045 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1322 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2046 load_and_link_tiled_map (m, 1); 1323 find_and_link (m, 1);
2047 1324
2048 return (out_of_map (m->tile_map[1], x - m->width, y)); 1325 return out_of_map (m->tile_map[1], x - m->width, y);
2049 } 1326 }
2050 1327
2051 if (y < 0) 1328 if (y < 0)
2052 { 1329 {
2053 if (!m->tile_path[0]) 1330 if (!m->tile_path[0])
2054 return 1; 1331 return 1;
2055 1332
2056 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1333 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2057 load_and_link_tiled_map (m, 0); 1334 find_and_link (m, 0);
2058 1335
2059 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); 1336 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2060 } 1337 }
2061 1338
2062 if (y >= m->height) 1339 if (y >= m->height)
2063 { 1340 {
2064 if (!m->tile_path[2]) 1341 if (!m->tile_path[2])
2065 return 1; 1342 return 1;
2066 1343
2067 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1344 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2068 load_and_link_tiled_map (m, 2); 1345 find_and_link (m, 2);
2069 1346
2070 return (out_of_map (m->tile_map[2], x, y - m->height)); 1347 return out_of_map (m->tile_map[2], x, y - m->height);
2071 } 1348 }
2072 1349
2073 /* Simple case - coordinates are within this local 1350 /* Simple case - coordinates are within this local
2074 * map. 1351 * map.
2075 */ 1352 */
… …
2078 1355
2079/* This is basically the same as out_of_map above, but 1356/* This is basically the same as out_of_map above, but
2080 * instead we return NULL if no map is valid (coordinates 1357 * instead we return NULL if no map is valid (coordinates
2081 * out of bounds and no tiled map), otherwise it returns 1358 * out of bounds and no tiled map), otherwise it returns
2082 * the map as that the coordinates are really on, and 1359 * the map as that the coordinates are really on, and
2083 * updates x and y to be the localized coordinates. 1360 * updates x and y to be the localised coordinates.
2084 * Using this is more efficient of calling out_of_map 1361 * Using this is more efficient of calling out_of_map
2085 * and then figuring out what the real map is 1362 * and then figuring out what the real map is
2086 */ 1363 */
2087maptile * 1364maptile *
2088get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1365maptile::xy_find (sint16 &x, sint16 &y)
2089{ 1366{
2090
2091 if (*x < 0) 1367 if (x < 0)
2092 { 1368 {
2093 if (!m->tile_path[3]) 1369 if (!tile_path[3])
2094 return 0; 1370 return 0;
2095 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2096 load_and_link_tiled_map (m, 3);
2097 1371
1372 find_and_link (this, 3);
2098 *x += m->tile_map[3]->width; 1373 x += tile_map[3]->width;
2099 return (get_map_from_coord (m->tile_map[3], x, y)); 1374 return tile_map[3]->xy_find (x, y);
2100 } 1375 }
2101 1376
2102 if (*x >= m->width) 1377 if (x >= width)
2103 { 1378 {
2104 if (!m->tile_path[1]) 1379 if (!tile_path[1])
2105 return 0; 1380 return 0;
2106 1381
2107 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1382 find_and_link (this, 1);
2108 load_and_link_tiled_map (m, 1);
2109
2110 *x -= m->width; 1383 x -= width;
2111 return (get_map_from_coord (m->tile_map[1], x, y)); 1384 return tile_map[1]->xy_find (x, y);
2112 } 1385 }
2113 1386
2114 if (*y < 0) 1387 if (y < 0)
2115 { 1388 {
2116 if (!m->tile_path[0]) 1389 if (!tile_path[0])
2117 return 0; 1390 return 0;
2118 1391
2119 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1392 find_and_link (this, 0);
2120 load_and_link_tiled_map (m, 0);
2121
2122 *y += m->tile_map[0]->height; 1393 y += tile_map[0]->height;
2123 return (get_map_from_coord (m->tile_map[0], x, y)); 1394 return tile_map[0]->xy_find (x, y);
2124 } 1395 }
2125 1396
2126 if (*y >= m->height) 1397 if (y >= height)
2127 { 1398 {
2128 if (!m->tile_path[2]) 1399 if (!tile_path[2])
2129 return 0; 1400 return 0;
2130 1401
2131 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1402 find_and_link (this, 2);
2132 load_and_link_tiled_map (m, 2);
2133
2134 *y -= m->height; 1403 y -= height;
2135 return (get_map_from_coord (m->tile_map[2], x, y)); 1404 return tile_map[2]->xy_find (x, y);
2136 } 1405 }
2137 1406
2138 /* Simple case - coordinates are within this local 1407 /* Simple case - coordinates are within this local
2139 * map. 1408 * map.
2140 */ 1409 */
2141
2142 return m; 1410 return this;
2143} 1411}
2144 1412
2145/** 1413/**
2146 * Return whether map2 is adjacent to map1. If so, store the distance from 1414 * Return whether map2 is adjacent to map1. If so, store the distance from
2147 * map1 to map2 in dx/dy. 1415 * map1 to map2 in dx/dy.
2148 */ 1416 */
2149static int 1417int
2150adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1418adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2151{ 1419{
2152 if (!map1 || !map2) 1420 if (!map1 || !map2)
2153 return 0; 1421 return 0;
2154 1422
1423 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1424 //fix: compare paths instead (this is likely faster, too!)
2155 if (map1 == map2) 1425 if (map1 == map2)
2156 { 1426 {
2157 *dx = 0; 1427 *dx = 0;
2158 *dy = 0; 1428 *dy = 0;
2159
2160 } 1429 }
2161 else if (map1->tile_map[0] == map2) 1430 else if (map1->tile_map[0] == map2)
2162 { /* up */ 1431 { /* up */
2163 *dx = 0; 1432 *dx = 0;
2164 *dy = -map2->height; 1433 *dy = -map2->height;
… …
2175 } 1444 }
2176 else if (map1->tile_map[3] == map2) 1445 else if (map1->tile_map[3] == map2)
2177 { /* left */ 1446 { /* left */
2178 *dx = -map2->width; 1447 *dx = -map2->width;
2179 *dy = 0; 1448 *dy = 0;
2180
2181 } 1449 }
2182 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1450 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2183 { /* up right */ 1451 { /* up right */
2184 *dx = map1->tile_map[0]->width; 1452 *dx = map1->tile_map[0]->width;
2185 *dy = -map1->tile_map[0]->height; 1453 *dy = -map1->tile_map[0]->height;
… …
2216 } 1484 }
2217 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1485 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2218 { /* left down */ 1486 { /* left down */
2219 *dx = -map1->tile_map[3]->width; 1487 *dx = -map1->tile_map[3]->width;
2220 *dy = map1->tile_map[3]->height; 1488 *dy = map1->tile_map[3]->height;
2221
2222 } 1489 }
2223 else 1490 else
2224 { /* not "adjacent" enough */
2225 return 0; 1491 return 0;
2226 }
2227 1492
2228 return 1; 1493 return 1;
1494}
1495
1496maptile *
1497maptile::xy_load (sint16 &x, sint16 &y)
1498{
1499 maptile *map = xy_find (x, y);
1500
1501 if (map)
1502 map->load_sync ();
1503
1504 return map;
1505}
1506
1507maptile *
1508get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1509{
1510 return m->xy_load (*x, *y);
2229} 1511}
2230 1512
2231/* From map.c 1513/* From map.c
2232 * This is used by get_player to determine where the other 1514 * This is used by get_player to determine where the other
2233 * creature is. get_rangevector takes into account map tiling, 1515 * creature is. get_rangevector takes into account map tiling,
2234 * so you just can not look the the map coordinates and get the 1516 * so you just can not look the the map coordinates and get the
2235 * righte value. distance_x/y are distance away, which 1517 * righte value. distance_x/y are distance away, which
2236 * can be negativbe. direction is the crossfire direction scheme 1518 * can be negative. direction is the crossfire direction scheme
2237 * that the creature should head. part is the part of the 1519 * that the creature should head. part is the part of the
2238 * monster that is closest. 1520 * monster that is closest.
2239 * 1521 *
2240 * get_rangevector looks at op1 and op2, and fills in the 1522 * get_rangevector looks at op1 and op2, and fills in the
2241 * structure for op1 to get to op2. 1523 * structure for op1 to get to op2.
… …
2246 * be unexpected 1528 * be unexpected
2247 * 1529 *
2248 * currently, the only flag supported (0x1) is don't translate for 1530 * currently, the only flag supported (0x1) is don't translate for
2249 * closest body part of 'op1' 1531 * closest body part of 'op1'
2250 */ 1532 */
2251
2252void 1533void
2253get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1534get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2254{ 1535{
2255 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1536 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2256 { 1537 {
2257 /* be conservative and fill in _some_ data */ 1538 /* be conservative and fill in _some_ data */
2258 retval->distance = 100000; 1539 retval->distance = 10000;
2259 retval->distance_x = 32767; 1540 retval->distance_x = 10000;
2260 retval->distance_y = 32767; 1541 retval->distance_y = 10000;
2261 retval->direction = 0; 1542 retval->direction = 0;
2262 retval->part = 0; 1543 retval->part = 0;
2263 } 1544 }
2264 else 1545 else
2265 { 1546 {
… …
2270 1551
2271 best = op1; 1552 best = op1;
2272 /* If this is multipart, find the closest part now */ 1553 /* If this is multipart, find the closest part now */
2273 if (!(flags & 0x1) && op1->more) 1554 if (!(flags & 0x1) && op1->more)
2274 { 1555 {
2275 object *tmp;
2276 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1556 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
2277 1557
2278 /* we just take the offset of the piece to head to figure 1558 /* we just take the offset of the piece to head to figure
2279 * distance instead of doing all that work above again 1559 * distance instead of doing all that work above again
2280 * since the distance fields we set above are positive in the 1560 * since the distance fields we set above are positive in the
2281 * same axis as is used for multipart objects, the simply arithmetic 1561 * same axis as is used for multipart objects, the simply arithmetic
2282 * below works. 1562 * below works.
2283 */ 1563 */
2284 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1564 for (object *tmp = op1->more; tmp; tmp = tmp->more)
2285 { 1565 {
2286 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1566 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
2287 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1567 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
2288 if (tmpi < best_distance) 1568 if (tmpi < best_distance)
2289 { 1569 {
2290 best_distance = tmpi; 1570 best_distance = tmpi;
2291 best = tmp; 1571 best = tmp;
2292 } 1572 }
2293 } 1573 }
1574
2294 if (best != op1) 1575 if (best != op1)
2295 { 1576 {
2296 retval->distance_x += op1->x - best->x; 1577 retval->distance_x += op1->x - best->x;
2297 retval->distance_y += op1->y - best->y; 1578 retval->distance_y += op1->y - best->y;
2298 } 1579 }
2299 } 1580 }
1581
2300 retval->part = best; 1582 retval->part = best;
2301 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1583 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
2302 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1584 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2303 } 1585 }
2304} 1586}
2305 1587
2306/* this is basically the same as get_rangevector above, but instead of 1588/* this is basically the same as get_rangevector above, but instead of
… …
2311 * flags has no meaning for this function at this time - I kept it in to 1593 * flags has no meaning for this function at this time - I kept it in to
2312 * be more consistant with the above function and also in case they are needed 1594 * be more consistant with the above function and also in case they are needed
2313 * for something in the future. Also, since no object is pasted, the best 1595 * for something in the future. Also, since no object is pasted, the best
2314 * field of the rv_vector is set to NULL. 1596 * field of the rv_vector is set to NULL.
2315 */ 1597 */
2316
2317void 1598void
2318get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1599get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
2319{ 1600{
2320 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1601 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2321 { 1602 {
2322 /* be conservative and fill in _some_ data */ 1603 /* be conservative and fill in _some_ data */
2323 retval->distance = 100000; 1604 retval->distance = 100000;
… …
2330 { 1611 {
2331 retval->distance_x += op2->x - x; 1612 retval->distance_x += op2->x - x;
2332 retval->distance_y += op2->y - y; 1613 retval->distance_y += op2->y - y;
2333 1614
2334 retval->part = NULL; 1615 retval->part = NULL;
2335 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1616 retval->distance = idistance (retval->distance_x, retval->distance_y);
2336 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1617 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2337 } 1618 }
2338} 1619}
2339 1620
2340/* Returns true of op1 and op2 are effectively on the same map 1621/* Returns true of op1 and op2 are effectively on the same map
2341 * (as related to map tiling). Note that this looks for a path from 1622 * (as related to map tiling). Note that this looks for a path from
2342 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1623 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2343 * to op1, this will still return false. 1624 * to op1, this will still return false.
2344 * Note we only look one map out to keep the processing simple 1625 * Note we only look one map out to keep the processing simple
2345 * and efficient. This could probably be a macro. 1626 * and efficient. This could probably be a macro.
2346 * MSW 2001-08-05 1627 * MSW 2001-08-05
2347 */ 1628 */
… …
2350{ 1631{
2351 int dx, dy; 1632 int dx, dy;
2352 1633
2353 return adjacent_map (op1->map, op2->map, &dx, &dy); 1634 return adjacent_map (op1->map, op2->map, &dx, &dy);
2354} 1635}
1636
1637object *
1638maptile::insert (object *op, int x, int y, object *originator, int flags)
1639{
1640 if (!op->flag [FLAG_REMOVED])
1641 op->remove ();
1642
1643 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1644}
1645
1646region *
1647maptile::region (int x, int y) const
1648{
1649 if (regions
1650 && regionmap
1651 && !OUT_OF_REAL_MAP (this, x, y))
1652 if (struct region *reg = regionmap [regions [y * width + x]])
1653 return reg;
1654
1655 if (default_region)
1656 return default_region;
1657
1658 return ::region::default_region ();
1659}
1660
1661/* picks a random object from a style map.
1662 * Redone by MSW so it should be faster and not use static
1663 * variables to generate tables.
1664 */
1665object *
1666maptile::pick_random_object () const
1667{
1668 /* while returning a null object will result in a crash, that
1669 * is actually preferable to an infinite loop. That is because
1670 * most servers will automatically restart in case of crash.
1671 * Change the logic on getting the random space - shouldn't make
1672 * any difference, but this seems clearer to me.
1673 */
1674 for (int i = 1000; --i;)
1675 {
1676 object *pick = at (rndm (width), rndm (height)).bot;
1677
1678 // do not prefer big monsters just because they are big.
1679 if (pick && pick->head_ () == pick)
1680 return pick->head_ ();
1681 }
1682
1683 // instead of crashing in the unlikely(?) case, try to return *something*
1684 return get_archetype ("blocked");
1685}
1686

Diff Legend

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