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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines