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.54 by root, Wed Dec 27 13:13:46 2006 UTC vs.
Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines