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.93 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.200 by root, Fri May 7 19:46:18 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines