ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 (at your option) any later version. 11 * option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23*/ 23 */
24 24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
30 26
27#include "global.h"
28#include "loader.h"
31#include "path.h" 29#include "path.h"
32 30
33/* 31sint8 maptile::outdoor_darkness;
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 strcpy (buf, create_pathname (name));
73 else
74 strcpy (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
137 * by the caller. 71 * by the caller.
138 */ 72 */
139int 73int
140blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
141{ 75{
142 object *tmp;
143 int mflags, blocked;
144
145 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
146 * have already checked this. 77 * have already checked this.
147 */ 78 */
148 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
149 { 80 {
… …
152 } 83 }
153 84
154 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
155 * directly. 86 * directly.
156 */ 87 */
157 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
158 89
159 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
160 92
161 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
162 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
163 * things we need to do for players. 95 * things we need to do for players.
164 */ 96 */
165 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166 return 0; 98 return 0;
167 99
168 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* if there isn't anything alive on this space, and this space isn't
169 * otherwise blocked, we can return now. Only if there is a living 101 * otherwise blocked, we can return now. Only if there is a living
170 * creature do we need to investigate if it is part of this creature 102 * creature do we need to investigate if it is part of this creature
171 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
172 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
173 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
174 */ 106 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 107 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 108 return 0;
177 109
178 if (ob->head != NULL)
179 ob = ob->head; 110 ob = ob->head_ ();
180 111
181 /* We basically go through the stack of objects, and if there is 112 /* We basically go through the stack of objects, and if there is
182 * some other object that has NO_PASS or FLAG_ALIVE set, return 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
185 */ 116 */
186 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187 { 118 {
188 119 if (OB_MOVE_BLOCK (ob, tmp))
189 /* This must be before the checks below. Code for inventory checkers. */
190 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191 { 120 {
192 /* If last_sp is set, the player/monster needs an object, 121 if (tmp->type == CHECK_INV)
193 * so we check for it. If they don't have it, they can't
194 * pass through this space.
195 */
196 if (tmp->last_sp)
197 { 122 {
198 if (check_inv_recursive (ob, tmp) == NULL) 123 bool have = check_inv_recursive (ob, tmp);
124
125 // last_sp set means we block if we don't have.
126 if (logical_xor (have, tmp->last_sp))
199 return 1; 127 return 1;
200 else 128 }
201 continue; 129 else if (tmp->type == T_MATCH)
130 {
131 // T_MATCH allows "entrance" iff the match is true
132 // == blocks if the match fails
133
134 // we could have used an INVOKE_OBJECT, but decided against it, as we
135 // assume that T_MATCH is very common.
136 if (!match (tmp->slaying, ob, tmp, ob))
137 return 1;
202 } 138 }
203 else 139 else
204 { 140 return 1; // unconditional block
205 /* In this case, the player must not have the object - 141
206 * if they do, they can't pass through.
207 */
208 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
209 return 1;
210 else
211 continue;
212 }
213 } /* if check_inv */
214 else 142 } else {
215 { 143 // space does not block the ob, directly, but
216 /* Broke apart a big nasty if into several here to make 144 // anything alive that is not a door still
217 * this more readable. first check - if the space blocks 145 // blocks anything but wizards.
218 * movement, can't move here. 146
219 * second - if a monster, can't move there, unles it is a 147 if (tmp->flag [FLAG_ALIVE]
220 * hidden dm 148 && tmp->head_ () != ob
221 */ 149 && tmp != ob
222 if (OB_MOVE_BLOCK (ob, tmp)) 150 && tmp->type != DOOR
223 return 1; 151 && !tmp->flag [FLAG_WIZPASS])
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
225 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
226 return 1; 152 return 1;
227 } 153 }
228
229 } 154 }
155
230 return 0; 156 return 0;
231} 157}
232 158
233
234/* 159/*
235 * Returns true if the given object can't fit in the given spot. 160 * Returns qthe blocking object if the given object can't fit in the given
236 * This is meant for multi space objects - for single space objecs, 161 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 162 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 163 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 164 * object and makes sure they can be inserted.
240 * 165 *
241 * While this doesn't call out of map, the get_map_flags does. 166 * While this doesn't call out of map, the get_map_flags does.
242 * 167 *
243 * This function has been used to deprecate arch_out_of_map - 168 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 169 * this function also does that check, and since in most cases,
… …
255 * 180 *
256 * Note this used to be arch_blocked, but with new movement 181 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 182 * code, we need to have actual object to check its move_type
258 * against the move_block values. 183 * against the move_block values.
259 */ 184 */
260int 185bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 186object::blocked (maptile *m, int x, int y) const
262{ 187{
263 archetype *tmp; 188 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
264 int flag;
265 maptile *m1;
266 sint16 sx, sy;
267
268 if (!ob)
269 {
270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271 if (flag & P_OUT_OF_MAP)
272 return P_OUT_OF_MAP;
273
274 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block;
276 } 189 {
190 mapxy pos (m, x + tmp->x, y + tmp->y);
277 191
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 192 if (!pos.normalise ())
279 { 193 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 194
282 if (flag & P_OUT_OF_MAP) 195 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 196
284 if (flag & P_IS_ALIVE) 197 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 198 return 1;
286 199
287 mapspace &ms = m1->at (sx, sy); 200 /* However, often ob doesn't have any move type
288 201 * (signifying non-moving objects)
289 /* find_first_free_spot() calls this function. However, often
290 * ob doesn't have any move type (when used to place exits)
291 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 202 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 203 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 204 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 205 continue;
296 206
297 /* Note it is intentional that we check ob - the movement type of the 207 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 208 * head of the object should correspond for the entire object.
299 */ 209 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 210 if (ms.blocks (move_type))
301 return P_NO_PASS; 211 return 1;
302 } 212 }
303 213
304 return 0; 214 return 0;
305} 215}
306 216
… …
324 234
325 insert_ob_in_ob (tmp, container); 235 insert_ob_in_ob (tmp, container);
326 tmp = next; 236 tmp = next;
327 } 237 }
328 238
329 /* sum_weight will go through and calculate what all the containers are 239 // go through and calculate what all the containers are carrying.
330 * carrying. 240 //TODO: remove
331 */ 241 container->update_weight ();
332 sum_weight (container);
333} 242}
334 243
335void 244void
336maptile::set_object_flag (int flag, int value) 245maptile::set_object_flag (int flag, int value)
337{ 246{
… …
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 250 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 251 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 252 tmp->flag [flag] = value;
344} 253}
345 254
255void
256maptile::post_load_original ()
257{
258 if (!spaces)
259 return;
260
261 set_object_flag (FLAG_OBJ_ORIGINAL);
262
263 for (mapspace *ms = spaces + size (); ms-- > spaces; )
264 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
265 INVOKE_OBJECT (RESET, tmp);
266}
267
346/* link_multipart_objects go through all the objects on the map looking 268/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 269 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 270 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 271 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 272 */
352void 273void
353maptile::link_multipart_objects () 274maptile::link_multipart_objects ()
354{ 275{
355 if (!spaces) 276 if (!spaces)
356 return; 277 return;
357 278
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 279 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 280 {
281 object *op = ms->bot;
282 while (op)
360 { 283 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 284 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 285 if (op->head_ () == op && !op->more && op->arch->more)
365 {
366 /* If there is nothing more to this object, this for loop
367 * won't do anything.
368 */
369 archetype *at;
370 object *last, *op;
371 for (at = tmp->arch->more, last = tmp;
372 at;
373 at = at->more, last = op)
374 { 286 {
375 op = arch_to_object (at); 287 op->remove ();
288 op->expand_tail ();
376 289
377 /* update x,y coordinates */ 290 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 291 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 292 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380 op->head = tmp;
381 op->map = this;
382 last->more = op;
383 op->name = tmp->name;
384 op->title = tmp->title;
385
386 /* we could link all the parts onto tmp, and then just
387 * call insert_ob_in_map once, but the effect is the same,
388 * as insert_ob_in_map will call itself with each part, and
389 * the coding is simpler to just to it here with each part.
390 */
391 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 293 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
294
295 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
296 // so we have to reset the iteration through the mapspace
392 } 297 }
298 else
299 op = op->above;
393 } 300 }
394
395 tmp = above;
396 } 301 }
397} 302}
398 303
399/* 304/*
400 * Loads (ands parses) the objects into a given map from the specified 305 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 306 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 307 */
404bool 308bool
405maptile::load_objects (object_thawer &thawer) 309maptile::_load_objects (object_thawer &f)
406{ 310{
407 int unique; 311 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 312 {
415 /* if the archetype for the object is null, means that we 313 coroapi::cede_to_tick (); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 314
417 * or editor will not be able to do anything with it either. 315 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 316 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 317 case KW_arch:
318 if (object *op = object::read (f, this))
319 {
320 // TODO: why?
321 if (op->inv)
322 op->update_weight ();
323
324 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
325 {
326 // we insert manually because
327 // a) its way faster
328 // b) we remove manually, too, and there are good reasons for that
329 // c) it's correct
330 mapspace &ms = at (op->x, op->y);
331
332 op->flag [FLAG_REMOVED] = false;
333
334 op->above = 0;
335 op->below = ms.top;
336
337 *(ms.top ? &ms.top->above : &ms.bot) = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
347 }
348
422 continue; 349 continue;
423 }
424 350
425 switch (i)
426 {
427 case LL_NORMAL:
428 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
429
430 if (op->inv)
431 sum_weight (op);
432
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 351 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 352 return true;
438 op->head = prev, last_more->more = op, last_more = op; 353
354 default:
355 if (!f.parse_error ("map file"))
356 return false;
439 break; 357 break;
440 } 358 }
441 359
442 op = object::create (); 360 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 361 }
463#endif
464 362
465 return true; 363 return true;
466} 364}
467 365
468void 366void
469maptile::activate () 367maptile::activate ()
470{ 368{
471 if (!spaces) 369 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 372 op->activate_recursive ();
477} 373}
478 374
479void 375void
480maptile::deactivate () 376maptile::deactivate ()
481{ 377{
482 if (!spaces) 378 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 381 op->deactivate_recursive ();
488} 382}
489 383
490bool 384bool
491maptile::save_objects (object_freezer &freezer, int flags) 385maptile::_save_objects (object_freezer &f, int flags)
492{ 386{
493 static int cede_count = 0; 387 coroapi::cede_to_tick ();
494 388
495 if (flags & IO_HEADER) 389 if (flags & IO_HEADER)
496 save_header (freezer); 390 _save_header (f);
497 391
498 if (!spaces) 392 if (!spaces)
499 return false; 393 return false;
500 394
501 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
502 { 396 {
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508
509 int unique = 0; 397 bool unique = 0;
398
510 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
511 { 400 {
512 // count per-object, but cede only when modification-safe
513 cede_count++;
514
515 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
516 unique = 1;
517 402
518 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
519 continue; 404 continue;
520 405
521 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
522 { 407 {
523 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
524 save_object (freezer, op, 1); 409 op->write (f);
525 } 410 }
526 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
527 save_object (freezer, op, 1); 412 op->write (f);
528 } 413 }
529 } 414 }
530 415
416 coroapi::cede_to_tick ();
417
531 return true; 418 return true;
532} 419}
533 420
534bool 421bool
535maptile::load_objects (const char *path, bool skip_header) 422maptile::_save_objects (const char *path, int flags)
536{ 423{
537 object_thawer thawer (path); 424 object_freezer freezer;
538 425
539 if (!thawer) 426 if (!_save_objects (freezer, flags))
540 return false; 427 return false;
541 428
542 if (skip_header)
543 for (;;)
544 {
545 keyword kw = thawer.get_kv ();
546
547 if (kw == KW_end)
548 break;
549
550 thawer.skip_kv (kw);
551 }
552
553 return load_objects (thawer);
554}
555
556bool
557maptile::save_objects (const char *path, int flags)
558{
559 object_freezer freezer;
560
561 if (!save_objects (freezer, flags))
562 return false;
563
564 return freezer.save (path); 429 return freezer.save (path);
565} 430}
566 431
567maptile::maptile () 432maptile::maptile ()
568{ 433{
569 in_memory = MAP_SWAPPED; 434 in_memory = MAP_SWAPPED;
570 435
571 /* The maps used to pick up default x and y values from the 436 /* The maps used to pick up default x and y values from the
572 * map archetype. Mimic that behaviour. 437 * map archetype. Mimic that behaviour.
573 */ 438 */
574 width = 16; 439 width = 16;
575 height = 16; 440 height = 16;
576 reset_timeout = 0;
577 timeout = 300; 441 timeout = 300;
578 enter_x = 0; 442 max_nrof = 1000; // 1000 items of anything
579 enter_y = 0; 443 max_volume = 2000000; // 2m³
580} 444}
581 445
582maptile::maptile (int w, int h) 446maptile::maptile (int w, int h)
583{ 447{
584 in_memory = MAP_SWAPPED; 448 in_memory = MAP_SWAPPED;
… …
690 return items; 554 return items;
691} 555}
692 556
693/* opposite of parse string, this puts the string that was originally fed in to 557/* opposite of parse string, this puts the string that was originally fed in to
694 * the map (or something equivilent) into output_string. */ 558 * the map (or something equivilent) into output_string. */
695static void 559static const char *
696print_shop_string (maptile *m, char *output_string) 560print_shop_string (maptile *m)
697{ 561{
698 int i; 562 static dynbuf_text buf; buf.clear ();
699 char tmp[MAX_BUF];
700 563
701 strcpy (output_string, "");
702 for (i = 0; i < m->shopitems[0].index; i++) 564 for (int i = 0; i < m->shopitems[0].index; i++)
703 { 565 {
704 if (m->shopitems[i].typenum) 566 if (m->shopitems[i].typenum)
705 { 567 {
706 if (m->shopitems[i].strength) 568 if (m->shopitems[i].strength)
707 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 569 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
708 else 570 else
709 sprintf (tmp, "%s;", m->shopitems[i].name); 571 buf.printf ("%s;", m->shopitems[i].name);
710 } 572 }
711 else 573 else
712 { 574 {
713 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
714 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 576 buf.printf ("*:%d;", m->shopitems[i].strength);
715 else 577 else
716 sprintf (tmp, "*"); 578 buf.printf ("*");
717 } 579 }
718
719 strcat (output_string, tmp);
720 } 580 }
581
582 return buf;
721} 583}
722 584
723/* This loads the header information of the map. The header 585/* This loads the header information of the map. The header
724 * contains things like difficulty, size, timeout, etc. 586 * contains things like difficulty, size, timeout, etc.
725 * this used to be stored in the map object, but with the 587 * this used to be stored in the map object, but with the
… …
730 * This could be done in lex (like the object loader), but I think 592 * This could be done in lex (like the object loader), but I think
731 * currently, there are few enough fields this is not a big deal. 593 * currently, there are few enough fields this is not a big deal.
732 * MSW 2001-07-01 594 * MSW 2001-07-01
733 */ 595 */
734bool 596bool
735maptile::load_header (object_thawer &thawer) 597maptile::_load_header (object_thawer &thawer)
736{ 598{
737 for (;;) 599 for (;;)
738 { 600 {
739 keyword kw = thawer.get_kv ();
740
741 switch (kw) 601 switch (thawer.kw)
742 { 602 {
743 case KW_EOF:
744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
745 return false;
746
747 case KW_end:
748 return true;
749
750 default:
751 case KW_ERROR:
752 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
753 break;
754
755 case KW_msg: 603 case KW_msg:
756 thawer.get_ml (KW_endmsg, msg); 604 thawer.get_ml (KW_endmsg, msg);
757 break; 605 break;
758 606
759 case KW_lore: // CF+ extension 607 case KW_lore: // CF+ extension
… …
790 case KW_winddir: thawer.get (winddir); break; 638 case KW_winddir: thawer.get (winddir); break;
791 case KW_sky: thawer.get (sky); break; 639 case KW_sky: thawer.get (sky); break;
792 640
793 case KW_per_player: thawer.get (per_player); break; 641 case KW_per_player: thawer.get (per_player); break;
794 case KW_per_party: thawer.get (per_party); break; 642 case KW_per_party: thawer.get (per_party); break;
643 case KW_no_reset: thawer.get (no_reset); break;
644 case KW_no_drop: thawer.get (no_drop); break;
795 645
796 case KW_region: get_region_by_name (thawer.get_str ()); break; 646 case KW_region: default_region = region::find (thawer.get_str ()); break;
797 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 647 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
798 648
799 // old names new names 649 // old names new names
800 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 650 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
801 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 651 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
809 659
810 case KW_tile_path_1: thawer.get (tile_path [0]); break; 660 case KW_tile_path_1: thawer.get (tile_path [0]); break;
811 case KW_tile_path_2: thawer.get (tile_path [1]); break; 661 case KW_tile_path_2: thawer.get (tile_path [1]); break;
812 case KW_tile_path_3: thawer.get (tile_path [2]); break; 662 case KW_tile_path_3: thawer.get (tile_path [2]); break;
813 case KW_tile_path_4: thawer.get (tile_path [3]); break; 663 case KW_tile_path_4: thawer.get (tile_path [3]); break;
664
665 case KW_ERROR:
666 set_key_text (thawer.kw_str, thawer.value);
667 break;
668
669 case KW_end:
670 thawer.next ();
671 return true;
672
673 default:
674 if (!thawer.parse_error ("map", 0))
675 return false;
676 break;
814 } 677 }
678
679 thawer.next ();
815 } 680 }
816 681
817 abort (); 682 abort ();
818}
819
820bool
821maptile::load_header (const char *path)
822{
823 object_thawer thawer (path);
824
825 if (!thawer)
826 return false;
827
828 return load_header (thawer);
829} 683}
830 684
831/****************************************************************************** 685/******************************************************************************
832 * This is the start of unique map handling code 686 * This is the start of unique map handling code
833 *****************************************************************************/ 687 *****************************************************************************/
… …
844 object *above = op->above; 698 object *above = op->above;
845 699
846 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 700 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
847 unique = 1; 701 unique = 1;
848 702
849 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 703 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
850 {
851 op->destroy_inv (false);
852 op->destroy (); 704 op->destroy ();
853 }
854 705
855 op = above; 706 op = above;
856 } 707 }
857 } 708 }
858} 709}
859 710
860bool 711bool
861maptile::save_header (object_freezer &freezer) 712maptile::_save_header (object_freezer &freezer)
862{ 713{
863#define MAP_OUT(k) freezer.put (KW_ ## k, k) 714#define MAP_OUT(k) freezer.put (KW_ ## k, k)
864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 715#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
865 716
866 MAP_OUT2 (arch, "map"); 717 MAP_OUT2 (arch, "map");
… …
868 if (name) MAP_OUT (name); 719 if (name) MAP_OUT (name);
869 MAP_OUT (swap_time); 720 MAP_OUT (swap_time);
870 MAP_OUT (reset_time); 721 MAP_OUT (reset_time);
871 MAP_OUT (reset_timeout); 722 MAP_OUT (reset_timeout);
872 MAP_OUT (fixed_resettime); 723 MAP_OUT (fixed_resettime);
724 MAP_OUT (no_reset);
725 MAP_OUT (no_drop);
873 MAP_OUT (difficulty); 726 MAP_OUT (difficulty);
874
875 if (region) MAP_OUT2 (region, region->name); 727 if (default_region) MAP_OUT2 (region, default_region->name);
876 728
877 if (shopitems) 729 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
878 {
879 char shop[MAX_BUF];
880 print_shop_string (this, shop);
881 MAP_OUT2 (shopitems, shop);
882 }
883
884 MAP_OUT (shopgreed); 730 MAP_OUT (shopgreed);
885 MAP_OUT (shopmin); 731 MAP_OUT (shopmin);
886 MAP_OUT (shopmax); 732 MAP_OUT (shopmax);
887 if (shoprace) MAP_OUT (shoprace); 733 if (shoprace) MAP_OUT (shoprace);
734
888 MAP_OUT (darkness); 735 MAP_OUT (darkness);
889 MAP_OUT (width); 736 MAP_OUT (width);
890 MAP_OUT (height); 737 MAP_OUT (height);
891 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
892 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
… …
915 762
916 return true; 763 return true;
917} 764}
918 765
919bool 766bool
920maptile::save_header (const char *path) 767maptile::_save_header (const char *path)
921{ 768{
922 object_freezer freezer; 769 object_freezer freezer;
923 770
924 if (!save_header (freezer)) 771 if (!_save_header (freezer))
925 return false; 772 return false;
926 773
927 return freezer.save (path); 774 return freezer.save (path);
928} 775}
929 776
… …
931 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
932 */ 779 */
933void 780void
934maptile::clear () 781maptile::clear ()
935{ 782{
936 if (!spaces) 783 if (spaces)
937 return; 784 {
938
939 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
940 while (object *op = ms->bot) 786 while (object *op = ms->bot)
941 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
794 object *head = op->head_ ();
942 if (op->head) 795 if (op == head)
943 op = op->head;
944
945 op->destroy_inv (false);
946 op->destroy (); 796 op->destroy ();
797 else if (head->map != op->map)
798 {
799 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
800 head->destroy ();
801 }
802 }
803
804 sfree0 (spaces, size ());
947 } 805 }
948
949 sfree (spaces, size ()), spaces = 0;
950 806
951 if (buttons) 807 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 808 free_objectlinkpt (buttons), buttons = 0;
809
810 sfree0 (regions, size ());
811 delete [] regionmap; regionmap = 0;
953} 812}
954 813
955void 814void
956maptile::clear_header () 815maptile::clear_header ()
957{ 816{
… …
989 attachable::do_destroy (); 848 attachable::do_destroy ();
990 849
991 clear (); 850 clear ();
992} 851}
993 852
994/* 853/* decay and destroy perishable items in a map */
995 * Updates every button on the map (by calling update_button() for them).
996 */
997void 854void
998maptile::update_buttons () 855maptile::do_decay_objects ()
999{ 856{
1000 for (oblinkpt *obp = buttons; obp; obp = obp->next) 857 if (!spaces)
1001 for (objectlink *ol = obp->link; ol; ol = ol->next) 858 return;
859
860 for (mapspace *ms = spaces + size (); ms-- > spaces; )
861 for (object *above, *op = ms->bot; op; op = above)
1002 { 862 {
1003 if (!ol->ob) 863 above = op->above;
864
865 bool destroy = 0;
866
867 // do not decay anything above unique floor tiles (yet :)
868 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
869 break;
870
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
872 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
873 || QUERY_FLAG (op, FLAG_UNIQUE)
874 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
875 || QUERY_FLAG (op, FLAG_UNPAID)
876 || op->is_alive ())
877 ; // do not decay
878 else if (op->is_weapon ())
1004 { 879 {
1005 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 880 op->stats.dam--;
1006 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 881 if (op->stats.dam < 0)
1007 continue; 882 destroy = 1;
1008 } 883 }
1009 884 else if (op->is_armor ())
1010 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1011 { 885 {
1012 update_button (ol->ob); 886 op->stats.ac--;
1013 break; 887 if (op->stats.ac < 0)
888 destroy = 1;
1014 } 889 }
890 else if (op->type == FOOD)
891 {
892 op->stats.food -= rndm (5, 20);
893 if (op->stats.food < 0)
894 destroy = 1;
895 }
896 else
897 {
898 int mat = op->materials;
899
900 if (mat & M_PAPER
901 || mat & M_LEATHER
902 || mat & M_WOOD
903 || mat & M_ORGANIC
904 || mat & M_CLOTH
905 || mat & M_LIQUID
906 || (mat & M_IRON && rndm (1, 5) == 1)
907 || (mat & M_GLASS && rndm (1, 2) == 1)
908 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
909 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
910 || (mat & M_ICE && temp > 32))
911 destroy = 1;
912 }
913
914 /* adjust overall chance below */
915 if (destroy && rndm (0, 1))
916 op->destroy ();
1015 } 917 }
1016} 918}
1017 919
1018/* 920/*
1019 * This routine is supposed to find out the difficulty of the map. 921 * This routine is supposed to find out the difficulty of the map.
1020 * difficulty does not have a lot to do with character level, 922 * difficulty does not have a lot to do with character level,
1021 * but does have a lot to do with treasure on the map. 923 * but does have a lot to do with treasure on the map.
1022 * 924 *
1023 * Difficulty can now be set by the map creature. If the value stored 925 * Difficulty can now be set by the map creator. If the value stored
1024 * in the map is zero, then use this routine. Maps should really 926 * in the map is zero, then use this routine. Maps should really
1025 * have a difficulty set than using this function - human calculation 927 * have a difficulty set rather than using this function - human calculation
1026 * is much better than this functions guesswork. 928 * is much better than this function's guesswork.
1027 */ 929 */
1028int 930int
1029maptile::estimate_difficulty () const 931maptile::estimate_difficulty () const
1030{ 932{
1031 long monster_cnt = 0; 933 long monster_cnt = 0;
… …
1043 945
1044 if (QUERY_FLAG (op, FLAG_GENERATOR)) 946 if (QUERY_FLAG (op, FLAG_GENERATOR))
1045 { 947 {
1046 total_exp += op->stats.exp; 948 total_exp += op->stats.exp;
1047 949
1048 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 950 if (archetype *at = op->other_arch)
951 {
1049 total_exp += at->clone.stats.exp * 8; 952 total_exp += at->stats.exp * 8;
1050
1051 monster_cnt++; 953 monster_cnt++;
954 }
955
956 for (object *inv = op->inv; inv; inv = inv->below)
957 {
958 total_exp += op->stats.exp * 8;
959 monster_cnt++;
960 }
1052 } 961 }
1053 } 962 }
1054 963
1055 avgexp = (double) total_exp / monster_cnt; 964 avgexp = (double) total_exp / monster_cnt;
1056 965
… …
1069 * postive values make it darker, negative make it brighter 978 * postive values make it darker, negative make it brighter
1070 */ 979 */
1071int 980int
1072maptile::change_map_light (int change) 981maptile::change_map_light (int change)
1073{ 982{
1074 int new_level = darkness + change;
1075
1076 /* Nothing to do */ 983 /* Nothing to do */
1077 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 984 if (!change)
1078 return 0; 985 return 0;
1079 986
1080 /* inform all players on the map */ 987 /* inform all players on the map */
1081 if (change > 0) 988 if (change > 0)
1082 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 989 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1083 else 990 else
1084 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 991 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1085 992
1086 /* Do extra checking. since darkness is a unsigned value, 993 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1087 * we need to be extra careful about negative values.
1088 * In general, the checks below are only needed if change
1089 * is not +/-1
1090 */
1091 if (new_level < 0)
1092 darkness = 0;
1093 else if (new_level >= MAX_DARKNESS)
1094 darkness = MAX_DARKNESS;
1095 else
1096 darkness = new_level;
1097 994
1098 /* All clients need to get re-updated for the change */ 995 /* All clients need to get re-updated for the change */
1099 update_all_map_los (this); 996 update_all_map_los (this);
997
1100 return 1; 998 return 1;
1101} 999}
1102 1000
1103/* 1001/*
1104 * This function updates various attributes about a specific space 1002 * This function updates various attributes about a specific space
… …
1107 * through, etc) 1005 * through, etc)
1108 */ 1006 */
1109void 1007void
1110mapspace::update_ () 1008mapspace::update_ ()
1111{ 1009{
1112 object *tmp, *last = 0; 1010 object *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1011 uint8 flags = P_UPTODATE, anywhere = 0;
1114 New_Face *top, *floor, *middle; 1012 sint8 light = 0;
1115 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1013 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1014
1118 middle = blank_face; 1015 //object *middle = 0;
1119 top = blank_face; 1016 //object *top = 0;
1120 floor = blank_face; 1017 //object *floor = 0;
1018 // this seems to generate better code than using locals, above
1019 object *&top = faces_obj[0] = 0;
1020 object *&middle = faces_obj[1] = 0;
1021 object *&floor = faces_obj[2] = 0;
1121 1022
1122 middle_obj = 0;
1123 top_obj = 0;
1124 floor_obj = 0;
1125
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1024 {
1128 /* This could be made additive I guess (two lights better than 1025 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1129 * one). But if so, it shouldn't be a simple additive - 2
1130 * light bulbs do not illuminate twice as far as once since
1131 * it is a dissapation factor that is cubed.
1132 */
1133 if (tmp->glow_radius > light)
1134 light = tmp->glow_radius; 1026 light += tmp->glow_radius;
1135 1027
1136 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1137 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1138 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1139 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
… …
1142 * Always put the player down for drawing. 1034 * Always put the player down for drawing.
1143 */ 1035 */
1144 if (!tmp->invisible) 1036 if (!tmp->invisible)
1145 { 1037 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1038 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1039 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1040 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1041 {
1153 /* If we got a floor, that means middle and top were below it, 1042 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1043 * so should not be visible, so we clear them.
1155 */ 1044 */
1156 middle = blank_face; 1045 middle = 0;
1157 top = blank_face; 1046 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1047 floor = tmp;
1160 } 1048 }
1161 /* Flag anywhere have high priority */ 1049 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1050 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1051 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1052 middle = tmp;
1167 anywhere = 1; 1053 anywhere = 1;
1168 } 1054 }
1055
1169 /* Find the highest visible face around. If equal 1056 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1057 * visibilities, we still want the one nearer to the
1171 * top 1058 * top
1172 */ 1059 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1060 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1061 middle = tmp;
1177 }
1178 } 1062 }
1179 1063
1180 if (tmp == tmp->above) 1064 if (tmp == tmp->above)
1181 { 1065 {
1182 LOG (llevError, "Error in structure of map\n"); 1066 LOG (llevError, "Error in structure of map\n");
… …
1195 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1079 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1196 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1080 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1197 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1081 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1198 } 1082 }
1199 1083
1200 this->light = light; 1084 this->light = min (light, MAX_LIGHT_RADIUS);
1201 this->flags_ = flags; 1085 this->flags_ = flags;
1202 this->move_block = move_block & ~move_allow; 1086 this->move_block = move_block & ~move_allow;
1203 this->move_on = move_on; 1087 this->move_on = move_on;
1204 this->move_off = move_off; 1088 this->move_off = move_off;
1205 this->move_slow = move_slow; 1089 this->move_slow = move_slow;
… …
1217 * middle face. This should not happen, as we already have the 1101 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1102 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1103 * may be possible for the faces to match but be different objects.
1220 */ 1104 */
1221 if (top == middle) 1105 if (top == middle)
1222 middle = blank_face; 1106 middle = 0;
1223 1107
1224 /* There are three posibilities at this point: 1108 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1109 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1110 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1111 * 3) neither middle or top is set - need to set both.
1228 */ 1112 */
1229 1113
1230 for (tmp = last; tmp; tmp = tmp->below) 1114 for (object *tmp = last; tmp; tmp = tmp->below)
1231 { 1115 {
1232 /* Once we get to a floor, stop, since we already have a floor object */ 1116 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1117 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1118 break;
1235 1119
1236 /* If two top faces are already set, quit processing */ 1120 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1121 if (top && middle)
1238 break; 1122 break;
1239 1123
1240 /* Only show visible faces */ 1124 /* Only show visible faces */
1241 if (!tmp->invisible) 1125 if (!tmp->invisible)
1242 { 1126 {
1243 /* Fill in top if needed */ 1127 /* Fill in top if needed */
1244 if (top == blank_face) 1128 if (!top)
1245 { 1129 {
1246 top = tmp->face;
1247 top_obj = tmp; 1130 top = tmp;
1248 if (top == middle) 1131 if (top == middle)
1249 middle = blank_face; 1132 middle = 0;
1250 } 1133 }
1251 else 1134 else
1252 { 1135 {
1253 /* top is already set - we should only get here if 1136 /* top is already set - we should only get here if
1254 * middle is not set 1137 * middle is not set
1255 * 1138 *
1256 * Set the middle face and break out, since there is nothing 1139 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1140 * more to fill in. We don't check visiblity here, since
1258 * 1141 *
1259 */ 1142 */
1260 if (tmp->face != top) 1143 if (tmp != top)
1261 { 1144 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1145 middle = tmp;
1264 break; 1146 break;
1265 } 1147 }
1266 } 1148 }
1267 } 1149 }
1268 } 1150 }
1269 1151
1270 if (middle == floor) 1152 if (middle == floor)
1271 middle = blank_face; 1153 middle = 0;
1272 1154
1273 if (top == middle) 1155 if (top == middle)
1274 middle = blank_face; 1156 middle = 0;
1275 1157
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1158#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1159 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1160 faces_obj [1] = middle;
1161 faces_obj [2] = floor;
1162#endif
1279} 1163}
1280 1164
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1165uint64
1282 * the map. It also takes care of linking back the freshly found 1166mapspace::volume () const
1283 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num].
1285 */
1286static inline maptile *
1287find_and_link (maptile *orig_map, int tile_num)
1288{ 1167{
1289 maptile *mp = orig_map->tile_map [tile_num]; 1168 uint64 vol = 0;
1290 1169
1291 if (!mp) 1170 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1292 { 1171 vol += op->volume ();
1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1294 1172
1295 if (!mp) 1173 return vol;
1296 { 1174}
1297 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1175
1298 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1176maptile *
1299 &orig_map->tile_path[tile_num], &orig_map->path); 1177maptile::tile_available (int dir, bool load)
1300 mp = new maptile (1, 1); 1178{
1301 mp->alloc (); 1179 if (tile_path[dir])
1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1304 } 1180 {
1181 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1182 return tile_map[dir];
1305 1183
1306 int dest_tile = (tile_num + 2) % 4; 1184 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1185 return tile_map[dir];
1186 }
1307 1187
1308 orig_map->tile_map [tile_num] = mp;
1309
1310 // optimisation: back-link map to origin map if euclidean
1311 //TODO: non-euclidean maps MUST GO
1312 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1314
1315 return mp; 1188 return 0;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1322} 1189}
1323 1190
1324/* this returns TRUE if the coordinates (x,y) are out of 1191/* this returns TRUE if the coordinates (x,y) are out of
1325 * map m. This function also takes into account any 1192 * map m. This function also takes into account any
1326 * tiling considerations, loading adjacant maps as needed. 1193 * tiling considerations, loading adjacant maps as needed.
… …
1339 if (!m) 1206 if (!m)
1340 return 0; 1207 return 0;
1341 1208
1342 if (x < 0) 1209 if (x < 0)
1343 { 1210 {
1344 if (!m->tile_path[3]) 1211 if (!m->tile_available (3))
1345 return 1; 1212 return 1;
1346 1213
1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1348 find_and_link (m, 3);
1349
1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1214 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1351 } 1215 }
1352 1216
1353 if (x >= m->width) 1217 if (x >= m->width)
1354 { 1218 {
1355 if (!m->tile_path[1]) 1219 if (!m->tile_available (1))
1356 return 1; 1220 return 1;
1357 1221
1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1359 find_and_link (m, 1);
1360
1361 return out_of_map (m->tile_map[1], x - m->width, y); 1222 return out_of_map (m->tile_map[1], x - m->width, y);
1362 } 1223 }
1363 1224
1364 if (y < 0) 1225 if (y < 0)
1365 { 1226 {
1366 if (!m->tile_path[0]) 1227 if (!m->tile_available (0))
1367 return 1; 1228 return 1;
1368 1229
1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1370 find_and_link (m, 0);
1371
1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1230 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1373 } 1231 }
1374 1232
1375 if (y >= m->height) 1233 if (y >= m->height)
1376 { 1234 {
1377 if (!m->tile_path[2]) 1235 if (!m->tile_available (2))
1378 return 1; 1236 return 1;
1379
1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1381 find_and_link (m, 2);
1382 1237
1383 return out_of_map (m->tile_map[2], x, y - m->height); 1238 return out_of_map (m->tile_map[2], x, y - m->height);
1384 } 1239 }
1385 1240
1386 /* Simple case - coordinates are within this local 1241 /* Simple case - coordinates are within this local
… …
1400maptile * 1255maptile *
1401maptile::xy_find (sint16 &x, sint16 &y) 1256maptile::xy_find (sint16 &x, sint16 &y)
1402{ 1257{
1403 if (x < 0) 1258 if (x < 0)
1404 { 1259 {
1405 if (!tile_path[3]) 1260 if (!tile_available (3))
1406 return 0; 1261 return 0;
1407 1262
1408 find_and_link (this, 3);
1409 x += tile_map[3]->width; 1263 x += tile_map[3]->width;
1410 return tile_map[3]->xy_find (x, y); 1264 return tile_map[3]->xy_find (x, y);
1411 } 1265 }
1412 1266
1413 if (x >= width) 1267 if (x >= width)
1414 { 1268 {
1415 if (!tile_path[1]) 1269 if (!tile_available (1))
1416 return 0; 1270 return 0;
1417 1271
1418 find_and_link (this, 1);
1419 x -= width; 1272 x -= width;
1420 return tile_map[1]->xy_find (x, y); 1273 return tile_map[1]->xy_find (x, y);
1421 } 1274 }
1422 1275
1423 if (y < 0) 1276 if (y < 0)
1424 { 1277 {
1425 if (!tile_path[0]) 1278 if (!tile_available (0))
1426 return 0; 1279 return 0;
1427 1280
1428 find_and_link (this, 0);
1429 y += tile_map[0]->height; 1281 y += tile_map[0]->height;
1430 return tile_map[0]->xy_find (x, y); 1282 return tile_map[0]->xy_find (x, y);
1431 } 1283 }
1432 1284
1433 if (y >= height) 1285 if (y >= height)
1434 { 1286 {
1435 if (!tile_path[2]) 1287 if (!tile_available (2))
1436 return 0; 1288 return 0;
1437 1289
1438 find_and_link (this, 2);
1439 y -= height; 1290 y -= height;
1440 return tile_map[2]->xy_find (x, y); 1291 return tile_map[2]->xy_find (x, y);
1441 } 1292 }
1442 1293
1443 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1448 1299
1449/** 1300/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1301 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1302 * map1 to map2 in dx/dy.
1452 */ 1303 */
1453static int 1304int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1305adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1306{
1456 if (!map1 || !map2) 1307 if (!map1 || !map2)
1457 return 0; 1308 return 0;
1458 1309
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1310 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!) 1311 //fix: compare paths instead (this is likely faster, too!)
1461 if (map1 == map2) 1312 if (map1 == map2)
1462 { 1313 {
1463 *dx = 0; 1314 *dx = 0;
1464 *dy = 0; 1315 *dy = 0;
… …
1549/* From map.c 1400/* From map.c
1550 * This is used by get_player to determine where the other 1401 * This is used by get_player to determine where the other
1551 * creature is. get_rangevector takes into account map tiling, 1402 * creature is. get_rangevector takes into account map tiling,
1552 * so you just can not look the the map coordinates and get the 1403 * so you just can not look the the map coordinates and get the
1553 * righte value. distance_x/y are distance away, which 1404 * righte value. distance_x/y are distance away, which
1554 * can be negativbe. direction is the crossfire direction scheme 1405 * can be negative. direction is the crossfire direction scheme
1555 * that the creature should head. part is the part of the 1406 * that the creature should head. part is the part of the
1556 * monster that is closest. 1407 * monster that is closest.
1557 * 1408 *
1558 * get_rangevector looks at op1 and op2, and fills in the 1409 * get_rangevector looks at op1 and op2, and fills in the
1559 * structure for op1 to get to op2. 1410 * structure for op1 to get to op2.
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1421get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1422{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1423 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1424 {
1574 /* be conservative and fill in _some_ data */ 1425 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1426 retval->distance = 10000;
1576 retval->distance_x = 32767; 1427 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1428 retval->distance_y = 10000;
1578 retval->direction = 0; 1429 retval->direction = 0;
1579 retval->part = 0; 1430 retval->part = 0;
1580 } 1431 }
1581 else 1432 else
1582 { 1433 {
… …
1587 1438
1588 best = op1; 1439 best = op1;
1589 /* If this is multipart, find the closest part now */ 1440 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1441 if (!(flags & 0x1) && op1->more)
1591 { 1442 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1443 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1444
1595 /* we just take the offset of the piece to head to figure 1445 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1446 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1447 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1448 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1449 * below works.
1600 */ 1450 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1451 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1452 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1453 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1604 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1454 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1455 if (tmpi < best_distance)
1606 { 1456 {
1607 best_distance = tmpi; 1457 best_distance = tmpi;
1608 best = tmp; 1458 best = tmp;
1609 } 1459 }
1610 } 1460 }
1461
1611 if (best != op1) 1462 if (best != op1)
1612 { 1463 {
1613 retval->distance_x += op1->x - best->x; 1464 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1465 retval->distance_y += op1->y - best->y;
1615 } 1466 }
1616 } 1467 }
1468
1617 retval->part = best; 1469 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1470 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1471 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1472 }
1621} 1473}
1622 1474
1623/* this is basically the same as get_rangevector above, but instead of 1475/* this is basically the same as get_rangevector above, but instead of
… …
1628 * flags has no meaning for this function at this time - I kept it in to 1480 * flags has no meaning for this function at this time - I kept it in to
1629 * be more consistant with the above function and also in case they are needed 1481 * be more consistant with the above function and also in case they are needed
1630 * for something in the future. Also, since no object is pasted, the best 1482 * for something in the future. Also, since no object is pasted, the best
1631 * field of the rv_vector is set to NULL. 1483 * field of the rv_vector is set to NULL.
1632 */ 1484 */
1633
1634void 1485void
1635get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1486get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1636{ 1487{
1637 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1488 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1638 { 1489 {
1639 /* be conservative and fill in _some_ data */ 1490 /* be conservative and fill in _some_ data */
1640 retval->distance = 100000; 1491 retval->distance = 100000;
… …
1646 else 1497 else
1647 { 1498 {
1648 retval->distance_x += op2->x - x; 1499 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1500 retval->distance_y += op2->y - y;
1650 1501
1651 retval->part = NULL; 1502 retval->part = 0;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1503 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1504 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1505 }
1655} 1506}
1656 1507
1657/* Returns true of op1 and op2 are effectively on the same map 1508/* Returns true of op1 and op2 are effectively on the same map
… …
1671} 1522}
1672 1523
1673object * 1524object *
1674maptile::insert (object *op, int x, int y, object *originator, int flags) 1525maptile::insert (object *op, int x, int y, object *originator, int flags)
1675{ 1526{
1676 if (!op->flag [FLAG_REMOVED])
1677 op->remove ();
1678
1679 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1527 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1680} 1528}
1681 1529
1530region *
1531maptile::region (int x, int y) const
1532{
1533 if (regions
1534 && regionmap
1535 && !OUT_OF_REAL_MAP (this, x, y))
1536 if (struct region *reg = regionmap [regions [y * width + x]])
1537 return reg;
1538
1539 if (default_region)
1540 return default_region;
1541
1542 return ::region::default_region ();
1543}
1544
1545/* picks a random object from a style map.
1546 */
1547object *
1548maptile::pick_random_object (rand_gen &gen) const
1549{
1550 /* while returning a null object will result in a crash, that
1551 * is actually preferable to an infinite loop. That is because
1552 * most servers will automatically restart in case of crash.
1553 * Change the logic on getting the random space - shouldn't make
1554 * any difference, but this seems clearer to me.
1555 */
1556 for (int i = 1000; --i;)
1557 {
1558 object *pick = at (gen (width), gen (height)).bot;
1559
1560 // do not prefer big monsters just because they are big.
1561 if (pick && pick->is_head ())
1562 return pick->head_ ();
1563 }
1564
1565 // instead of crashing in the unlikely(?) case, try to return *something*
1566 return archetype::find ("bug");
1567}
1568
1569void
1570maptile::play_sound (faceidx sound, int x, int y) const
1571{
1572 if (!sound)
1573 return;
1574
1575 for_all_players_on_map (pl, this)
1576 if (client *ns = pl->ns)
1577 {
1578 int dx = x - pl->ob->x;
1579 int dy = y - pl->ob->y;
1580
1581 int distance = idistance (dx, dy);
1582
1583 if (distance <= MAX_SOUND_DISTANCE)
1584 ns->play_sound (sound, dx, dy);
1585 }
1586}
1587
1588void
1589maptile::say_msg (const char *msg, int x, int y) const
1590{
1591 for_all_players (pl)
1592 if (client *ns = pl->ns)
1593 {
1594 int dx = x - pl->ob->x;
1595 int dy = y - pl->ob->y;
1596
1597 int distance = idistance (dx, dy);
1598
1599 if (distance <= MAX_SOUND_DISTANCE)
1600 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1601 }
1602}
1603
1604static void
1605split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1606{
1607 // clip to map to the left
1608 if (x0 < 0)
1609 {
1610 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1611 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1612
1613 if (x1 < 0) // entirely to the left
1614 return;
1615
1616 x0 = 0;
1617 }
1618
1619 // clip to map to the right
1620 if (x1 > m->width)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1623 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1624
1625 if (x0 > m->width) // entirely to the right
1626 return;
1627
1628 x1 = m->width;
1629 }
1630
1631 // clip to map above
1632 if (y0 < 0)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_UP, 1))
1635 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1636
1637 if (y1 < 0) // entirely above
1638 return;
1639
1640 y0 = 0;
1641 }
1642
1643 // clip to map below
1644 if (y1 > m->height)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1647 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1648
1649 if (y0 > m->height) // entirely below
1650 return;
1651
1652 y1 = m->height;
1653 }
1654
1655 // if we get here, the rect is within the current map
1656 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1657
1658 r->m = m;
1659 r->x0 = x0;
1660 r->y0 = y0;
1661 r->x1 = x1;
1662 r->y1 = y1;
1663 r->dx = dx;
1664 r->dy = dy;
1665}
1666
1667maprect *
1668maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1669{
1670 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1671 buf.clear ();
1672
1673 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1674
1675 // add end marker
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677 r->m = 0;
1678
1679 return (maprect *)buf.linearise ();
1680}
1681

Diff Legend

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