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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines