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.74 by root, Sun Jan 14 23:35:03 2007 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC

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

Diff Legend

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