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

Diff Legend

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