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.96 by root, Thu Mar 15 14:23:02 2007 UTC vs.
Revision 1.163 by root, Thu Oct 15 21:40:42 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 <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" 28#include "loader.h"
31
32#include "path.h" 29#include "path.h"
33 30
34/* 31sint8 maptile::outdoor_darkness;
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
48/*
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 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
138 * by the caller. 71 * by the caller.
139 */ 72 */
140int 73int
141blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
142{ 75{
143 object *tmp;
144 int mflags, blocked;
145
146 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
147 * have already checked this. 77 * have already checked this.
148 */ 78 */
149 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
150 { 80 {
… …
153 } 83 }
154 84
155 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
156 * directly. 86 * directly.
157 */ 87 */
158 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
159 89
160 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
161 92
162 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
163 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
164 * things we need to do for players. 95 * things we need to do for players.
165 */ 96 */
166 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
167 return 0; 98 return 0;
168 99
169 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* 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 101 * 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 102 * 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 103 * or another. Likewise, only if something is blocking us do we
173 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
174 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
175 */ 106 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 107 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 108 return 0;
178 109
179 if (ob->head != NULL)
180 ob = ob->head; 110 ob = ob->head_ ();
181 111
182 /* We basically go through the stack of objects, and if there is 112 /* 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 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
186 */ 116 */
187 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
188 { 118 {
119 bool block = OB_MOVE_BLOCK (ob, tmp);
189 120
190 /* This must be before the checks below. Code for inventory checkers. */ 121 /* This must be before the checks below. Code for inventory checkers. */
191 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 122 if (block && tmp->type == CHECK_INV)
192 { 123 {
124 bool have = check_inv_recursive (ob, tmp);
125
193 /* If last_sp is set, the player/monster needs an object, 126 /* If last_sp is set, the player/monster needs an object,
194 * so we check for it. If they don't have it, they can't 127 * so we check for it. If they don't have it, they can't
195 * pass through this space. 128 * pass through this space.
196 */ 129 */
197 if (tmp->last_sp) 130 if (tmp->last_sp)
198 { 131 {
199 if (check_inv_recursive (ob, tmp) == NULL) 132 if (!have)
200 return 1; 133 return 1;
201 else
202 continue;
203 } 134 }
204 else 135 else
205 { 136 {
206 /* In this case, the player must not have the object - 137 /* In this case, the player must not have the object -
207 * if they do, they can't pass through. 138 * if they do, they can't pass through.
208 */ 139 */
209 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 140 if (have)
210 return 1; 141 return 1;
211 else
212 continue;
213 } 142 }
214 } /* if check_inv */ 143 }
144 else if (block && tmp->type == T_MATCH)
145 {
146 //TODO
147 }
215 else 148 else
216 { 149 {
217 /* Broke apart a big nasty if into several here to make 150 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 151 * this more readable. first check - if the space blocks
219 * movement, can't move here. 152 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 153 * second - if a monster, can't move there, unless it is a
221 * hidden dm 154 * dm.
222 */ 155 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 156 if (block)
224 return 1; 157 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 158
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 159 if (tmp->flag [FLAG_ALIVE]
160 && tmp->head_ () != ob
161 && tmp != ob
162 && tmp->type != DOOR
163 && !tmp->flag [FLAG_WIZ])
227 return 1; 164 return 1;
228 } 165 }
229
230 } 166 }
167
231 return 0; 168 return 0;
232} 169}
233 170
234/* 171/*
235 * Returns true if the given object can't fit in the given spot. 172 * 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, 173 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 174 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 175 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 176 * object and makes sure they can be inserted.
240 * 177 *
241 * While this doesn't call out of map, the get_map_flags does. 178 * While this doesn't call out of map, the get_map_flags does.
242 * 179 *
243 * This function has been used to deprecate arch_out_of_map - 180 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 181 * this function also does that check, and since in most cases,
… …
255 * 192 *
256 * Note this used to be arch_blocked, but with new movement 193 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 194 * code, we need to have actual object to check its move_type
258 * against the move_block values. 195 * against the move_block values.
259 */ 196 */
260int 197bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 198object::blocked (maptile *m, int x, int y) const
262{ 199{
263 archetype *tmp; 200 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 } 201 {
202 mapxy pos (m, x + tmp->x, y + tmp->y);
277 203
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 204 if (!pos.normalise ())
279 { 205 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 206
282 if (flag & P_OUT_OF_MAP) 207 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 208
284 if (flag & P_IS_ALIVE) 209 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 210 return 1;
286 211
287 mapspace &ms = m1->at (sx, sy); 212 /* However, often ob doesn't have any move type
288 213 * (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. 214 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 215 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 216 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 217 continue;
296 218
297 /* Note it is intentional that we check ob - the movement type of the 219 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 220 * head of the object should correspond for the entire object.
299 */ 221 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 222 if (ms.blocks (move_type))
301 return P_NO_PASS; 223 return 1;
302 } 224 }
303 225
304 return 0; 226 return 0;
305} 227}
306 228
… …
324 246
325 insert_ob_in_ob (tmp, container); 247 insert_ob_in_ob (tmp, container);
326 tmp = next; 248 tmp = next;
327 } 249 }
328 250
329 /* sum_weight will go through and calculate what all the containers are 251 // go through and calculate what all the containers are carrying.
330 * carrying. 252 //TODO: remove
331 */ 253 container->update_weight ();
332 sum_weight (container);
333} 254}
334 255
335void 256void
336maptile::set_object_flag (int flag, int value) 257maptile::set_object_flag (int flag, int value)
337{ 258{
… …
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 262 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 263 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 264 tmp->flag [flag] = value;
344} 265}
345 266
267void
268maptile::post_load_original ()
269{
270 if (!spaces)
271 return;
272
273 set_object_flag (FLAG_OBJ_ORIGINAL);
274
275 for (mapspace *ms = spaces + size (); ms-- > spaces; )
276 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
277 INVOKE_OBJECT (RESET, tmp);
278}
279
346/* link_multipart_objects go through all the objects on the map looking 280/* 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 281 * 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 282 * 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 283 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 284 */
352void 285void
353maptile::link_multipart_objects () 286maptile::link_multipart_objects ()
354{ 287{
355 if (!spaces) 288 if (!spaces)
356 return; 289 return;
357 290
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 291 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 292 {
293 object *op = ms->bot;
294 while (op)
360 { 295 {
361 /* already multipart - don't do anything more */ 296 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 297 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 { 298 {
373 op = arch_to_object (at); 299 op->remove ();
300 op->expand_tail ();
374 301
375 /* update x,y coordinates */ 302 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 303 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 304 // 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); 305 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
306
307 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
308 // so we have to reset the iteration through the mapspace
390 } 309 }
310 else
311 op = op->above;
391 } 312 }
392 } 313 }
393} 314}
394 315
395/* 316/*
396 * Loads (ands parses) the objects into a given map from the specified 317 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 318 * file pointer.
… …
399bool 320bool
400maptile::_load_objects (object_thawer &f) 321maptile::_load_objects (object_thawer &f)
401{ 322{
402 for (;;) 323 for (;;)
403 { 324 {
404 coroapi::cede_every (1000); // cede once in a while 325 coroapi::cede_to_tick (); // cede once in a while
405 326
406 switch (f.kw) 327 switch (f.kw)
407 { 328 {
408 case KW_arch: 329 case KW_arch:
409 if (object *op = object::read (f, this)) 330 if (object *op = object::read (f, this))
410 { 331 {
332 // TODO: why?
411 if (op->inv) 333 if (op->inv)
412 sum_weight (op); 334 op->update_weight ();
413 335
414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 336 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
337 {
338 // we insert manually because
339 // a) its way faster
340 // b) we remove manually, too, and there are good reasons for that
341 // c) it's correct
342 mapspace &ms = at (op->x, op->y);
343
344 op->flag [FLAG_REMOVED] = false;
345
346 op->above = 0;
347 op->below = ms.top;
348
349 *(ms.top ? &ms.top->above : &ms.bot) = op;
350
351 ms.top = op;
352 ms.flags_ = 0;
353 }
354 else
355 {
356 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
357 op->destroy ();
358 }
415 } 359 }
416 360
417 continue; 361 continue;
418 362
419 case KW_EOF: 363 case KW_EOF:
… …
432} 376}
433 377
434void 378void
435maptile::activate () 379maptile::activate ()
436{ 380{
437 if (!spaces) 381 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 384 op->activate_recursive ();
443} 385}
444 386
445void 387void
446maptile::deactivate () 388maptile::deactivate ()
447{ 389{
448 if (!spaces) 390 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 391 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 392 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 393 op->deactivate_recursive ();
454} 394}
455 395
456bool 396bool
457maptile::_save_objects (object_freezer &f, int flags) 397maptile::_save_objects (object_freezer &f, int flags)
458{ 398{
459 static int cede_count = 0; 399 coroapi::cede_to_tick ();
460 400
461 if (flags & IO_HEADER) 401 if (flags & IO_HEADER)
462 _save_header (f); 402 _save_header (f);
463 403
464 if (!spaces) 404 if (!spaces)
465 return false; 405 return false;
466 406
467 for (int i = 0; i < size (); ++i) 407 for (int i = 0; i < size (); ++i)
468 { 408 {
469 if (cede_count >= 500)
470 {
471 cede_count = 0;
472 coroapi::cede ();
473 }
474
475 int unique = 0; 409 bool unique = 0;
410
476 for (object *op = spaces [i].bot; op; op = op->above) 411 for (object *op = spaces [i].bot; op; op = op->above)
477 { 412 {
478 // count per-object, but cede only when modification-safe
479 cede_count++;
480
481 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 413 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
482 unique = 1;
483 414
484 if (!op->can_map_save ()) 415 if (expect_false (!op->can_map_save ()))
485 continue; 416 continue;
486 417
487 if (unique || op->flag [FLAG_UNIQUE]) 418 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
488 { 419 {
489 if (flags & IO_UNIQUES) 420 if (flags & IO_UNIQUES)
490 op->write (f); 421 op->write (f);
491 } 422 }
492 else if (flags & IO_OBJECTS) 423 else if (expect_true (flags & IO_OBJECTS))
493 op->write (f); 424 op->write (f);
494 } 425 }
495 } 426 }
496 427
428 coroapi::cede_to_tick ();
429
497 return true; 430 return true;
498}
499
500bool
501maptile::_load_objects (const char *path, bool skip_header)
502{
503 object_thawer f (path);
504
505 if (!f)
506 return false;
507
508 f.next ();
509
510 if (skip_header)
511 for (;;)
512 {
513 keyword kw = f.kw;
514 f.skip ();
515 if (kw == KW_end)
516 break;
517 }
518
519 return _load_objects (f);
520} 431}
521 432
522bool 433bool
523maptile::_save_objects (const char *path, int flags) 434maptile::_save_objects (const char *path, int flags)
524{ 435{
… …
699bool 610bool
700maptile::_load_header (object_thawer &thawer) 611maptile::_load_header (object_thawer &thawer)
701{ 612{
702 for (;;) 613 for (;;)
703 { 614 {
704 keyword kw = thawer.get_kv ();
705
706 switch (kw) 615 switch (thawer.kw)
707 { 616 {
708 case KW_msg: 617 case KW_msg:
709 thawer.get_ml (KW_endmsg, msg); 618 thawer.get_ml (KW_endmsg, msg);
710 break; 619 break;
711 620
… …
743 case KW_winddir: thawer.get (winddir); break; 652 case KW_winddir: thawer.get (winddir); break;
744 case KW_sky: thawer.get (sky); break; 653 case KW_sky: thawer.get (sky); break;
745 654
746 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
747 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
657 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break;
748 659
749 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: default_region = region::find (thawer.get_str ()); break;
750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
751 662
752 // old names new names 663 // old names new names
… …
763 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
764 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
765 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
766 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
767 678
679 case KW_ERROR:
680 set_key_text (thawer.kw_str, thawer.value);
681 break;
682
768 case KW_end: 683 case KW_end:
684 thawer.next ();
769 return true; 685 return true;
770 686
771 default: 687 default:
772 if (!thawer.parse_error ("map", 0)) 688 if (!thawer.parse_error ("map", 0))
773 return false; 689 return false;
774 break; 690 break;
775 } 691 }
692
693 thawer.next ();
776 } 694 }
777 695
778 abort (); 696 abort ();
779}
780
781bool
782maptile::_load_header (const char *path)
783{
784 object_thawer thawer (path);
785
786 if (!thawer)
787 return false;
788
789 return _load_header (thawer);
790} 697}
791 698
792/****************************************************************************** 699/******************************************************************************
793 * This is the start of unique map handling code 700 * This is the start of unique map handling code
794 *****************************************************************************/ 701 *****************************************************************************/
… …
805 object *above = op->above; 712 object *above = op->above;
806 713
807 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 714 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
808 unique = 1; 715 unique = 1;
809 716
810 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
811 {
812 op->destroy_inv (false);
813 op->destroy (); 718 op->destroy ();
814 }
815 719
816 op = above; 720 op = above;
817 } 721 }
818 } 722 }
819} 723}
… …
829 if (name) MAP_OUT (name); 733 if (name) MAP_OUT (name);
830 MAP_OUT (swap_time); 734 MAP_OUT (swap_time);
831 MAP_OUT (reset_time); 735 MAP_OUT (reset_time);
832 MAP_OUT (reset_timeout); 736 MAP_OUT (reset_timeout);
833 MAP_OUT (fixed_resettime); 737 MAP_OUT (fixed_resettime);
738 MAP_OUT (no_reset);
739 MAP_OUT (no_drop);
834 MAP_OUT (difficulty); 740 MAP_OUT (difficulty);
835 741
836 if (default_region) MAP_OUT2 (region, default_region->name); 742 if (default_region) MAP_OUT2 (region, default_region->name);
837 743
838 if (shopitems) 744 if (shopitems)
… …
892 * Remove and free all objects in the given map. 798 * Remove and free all objects in the given map.
893 */ 799 */
894void 800void
895maptile::clear () 801maptile::clear ()
896{ 802{
897 sfree (regions, size ()), regions = 0;
898 free (regionmap), regionmap = 0;
899
900 if (spaces) 803 if (spaces)
901 { 804 {
902 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 805 for (mapspace *ms = spaces + size (); ms-- > spaces; )
903 while (object *op = ms->bot) 806 while (object *op = ms->bot)
904 { 807 {
808 // manually remove, as to not trigger anything
809 if (ms->bot = op->above)
810 ms->bot->below = 0;
811
812 op->flag [FLAG_REMOVED] = true;
813
814 object *head = op->head_ ();
905 if (op->head) 815 if (op == head)
906 op = op->head;
907
908 op->destroy_inv (false);
909 op->destroy (); 816 op->destroy ();
817 else if (head->map != op->map)
818 {
819 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
820 head->destroy ();
821 }
910 } 822 }
911 823
912 sfree (spaces, size ()), spaces = 0; 824 sfree0 (spaces, size ());
913 } 825 }
914 826
915 if (buttons) 827 if (buttons)
916 free_objectlinkpt (buttons), buttons = 0; 828 free_objectlinkpt (buttons), buttons = 0;
829
830 sfree0 (regions, size ());
831 delete [] regionmap; regionmap = 0;
917} 832}
918 833
919void 834void
920maptile::clear_header () 835maptile::clear_header ()
921{ 836{
… …
953 attachable::do_destroy (); 868 attachable::do_destroy ();
954 869
955 clear (); 870 clear ();
956} 871}
957 872
958/* 873/* decay and destroy perishable items in a map */
959 * Updates every button on the map (by calling update_button() for them).
960 */
961void 874void
962maptile::update_buttons () 875maptile::do_decay_objects ()
963{ 876{
964 for (oblinkpt *obp = buttons; obp; obp = obp->next) 877 if (!spaces)
965 for (objectlink *ol = obp->link; ol; ol = ol->next) 878 return;
879
880 for (mapspace *ms = spaces + size (); ms-- > spaces; )
881 for (object *above, *op = ms->bot; op; op = above)
966 { 882 {
967 if (!ol->ob) 883 above = op->above;
884
885 bool destroy = 0;
886
887 // do not decay anything above unique floor tiles (yet :)
888 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
889 break;
890
891 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
892 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
893 || QUERY_FLAG (op, FLAG_UNIQUE)
894 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
895 || QUERY_FLAG (op, FLAG_UNPAID)
896 || op->is_alive ())
897 ; // do not decay
898 else if (op->is_weapon ())
968 { 899 {
969 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 900 op->stats.dam--;
970 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 901 if (op->stats.dam < 0)
971 continue; 902 destroy = 1;
972 } 903 }
973 904 else if (op->is_armor ())
974 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
975 { 905 {
976 update_button (ol->ob); 906 op->stats.ac--;
977 break; 907 if (op->stats.ac < 0)
908 destroy = 1;
978 } 909 }
910 else if (op->type == FOOD)
911 {
912 op->stats.food -= rndm (5, 20);
913 if (op->stats.food < 0)
914 destroy = 1;
915 }
916 else
917 {
918 int mat = op->materials;
919
920 if (mat & M_PAPER
921 || mat & M_LEATHER
922 || mat & M_WOOD
923 || mat & M_ORGANIC
924 || mat & M_CLOTH
925 || mat & M_LIQUID
926 || (mat & M_IRON && rndm (1, 5) == 1)
927 || (mat & M_GLASS && rndm (1, 2) == 1)
928 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
929 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
930 || (mat & M_ICE && temp > 32))
931 destroy = 1;
932 }
933
934 /* adjust overall chance below */
935 if (destroy && rndm (0, 1))
936 op->destroy ();
979 } 937 }
980} 938}
981 939
982/* 940/*
983 * This routine is supposed to find out the difficulty of the map. 941 * This routine is supposed to find out the difficulty of the map.
984 * difficulty does not have a lot to do with character level, 942 * difficulty does not have a lot to do with character level,
985 * but does have a lot to do with treasure on the map. 943 * but does have a lot to do with treasure on the map.
986 * 944 *
987 * Difficulty can now be set by the map creature. If the value stored 945 * Difficulty can now be set by the map creator. If the value stored
988 * in the map is zero, then use this routine. Maps should really 946 * in the map is zero, then use this routine. Maps should really
989 * have a difficulty set than using this function - human calculation 947 * have a difficulty set rather than using this function - human calculation
990 * is much better than this functions guesswork. 948 * is much better than this function's guesswork.
991 */ 949 */
992int 950int
993maptile::estimate_difficulty () const 951maptile::estimate_difficulty () const
994{ 952{
995 long monster_cnt = 0; 953 long monster_cnt = 0;
… …
1007 965
1008 if (QUERY_FLAG (op, FLAG_GENERATOR)) 966 if (QUERY_FLAG (op, FLAG_GENERATOR))
1009 { 967 {
1010 total_exp += op->stats.exp; 968 total_exp += op->stats.exp;
1011 969
1012 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 970 if (archetype *at = op->other_arch)
971 {
1013 total_exp += at->clone.stats.exp * 8; 972 total_exp += at->stats.exp * 8;
1014
1015 monster_cnt++; 973 monster_cnt++;
974 }
975
976 for (object *inv = op->inv; inv; inv = inv->below)
977 {
978 total_exp += op->stats.exp * 8;
979 monster_cnt++;
980 }
1016 } 981 }
1017 } 982 }
1018 983
1019 avgexp = (double) total_exp / monster_cnt; 984 avgexp = (double) total_exp / monster_cnt;
1020 985
… …
1033 * postive values make it darker, negative make it brighter 998 * postive values make it darker, negative make it brighter
1034 */ 999 */
1035int 1000int
1036maptile::change_map_light (int change) 1001maptile::change_map_light (int change)
1037{ 1002{
1038 int new_level = darkness + change;
1039
1040 /* Nothing to do */ 1003 /* Nothing to do */
1041 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1004 if (!change)
1042 return 0; 1005 return 0;
1043 1006
1044 /* inform all players on the map */ 1007 /* inform all players on the map */
1045 if (change > 0) 1008 if (change > 0)
1046 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1009 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1047 else 1010 else
1048 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1049 1012
1050 /* Do extra checking. since darkness is a unsigned value, 1013 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1051 * we need to be extra careful about negative values.
1052 * In general, the checks below are only needed if change
1053 * is not +/-1
1054 */
1055 if (new_level < 0)
1056 darkness = 0;
1057 else if (new_level >= MAX_DARKNESS)
1058 darkness = MAX_DARKNESS;
1059 else
1060 darkness = new_level;
1061 1014
1062 /* All clients need to get re-updated for the change */ 1015 /* All clients need to get re-updated for the change */
1063 update_all_map_los (this); 1016 update_all_map_los (this);
1017
1064 return 1; 1018 return 1;
1065} 1019}
1066 1020
1067/* 1021/*
1068 * This function updates various attributes about a specific space 1022 * This function updates various attributes about a specific space
… …
1071 * through, etc) 1025 * through, etc)
1072 */ 1026 */
1073void 1027void
1074mapspace::update_ () 1028mapspace::update_ ()
1075{ 1029{
1076 object *tmp, *last = 0; 1030 object *last = 0;
1077 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1031 uint8 flags = P_UPTODATE, anywhere = 0;
1032 sint8 light = 0;
1078 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1033 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1079 1034
1080 //object *middle = 0; 1035 //object *middle = 0;
1081 //object *top = 0; 1036 //object *top = 0;
1082 //object *floor = 0; 1037 //object *floor = 0;
1083 // this seems to generate better code than using locals, above 1038 // this seems to generate better code than using locals, above
1084 object *&top = faces_obj[0] = 0; 1039 object *&top = faces_obj[0] = 0;
1085 object *&middle = faces_obj[1] = 0; 1040 object *&middle = faces_obj[1] = 0;
1086 object *&floor = faces_obj[2] = 0; 1041 object *&floor = faces_obj[2] = 0;
1087 1042
1088 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1043 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1089 { 1044 {
1090 /* This could be made additive I guess (two lights better than 1045 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1091 * one). But if so, it shouldn't be a simple additive - 2
1092 * light bulbs do not illuminate twice as far as once since
1093 * it is a dissapation factor that is cubed.
1094 */
1095 if (tmp->glow_radius > light)
1096 light = tmp->glow_radius; 1046 light += tmp->glow_radius;
1097 1047
1098 /* This call is needed in order to update objects the player 1048 /* This call is needed in order to update objects the player
1099 * is standing in that have animations (ie, grass, fire, etc). 1049 * is standing in that have animations (ie, grass, fire, etc).
1100 * However, it also causes the look window to be re-drawn 1050 * However, it also causes the look window to be re-drawn
1101 * 3 times each time the player moves, because many of the 1051 * 3 times each time the player moves, because many of the
… …
1120 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1121 { 1071 {
1122 middle = tmp; 1072 middle = tmp;
1123 anywhere = 1; 1073 anywhere = 1;
1124 } 1074 }
1075
1125 /* Find the highest visible face around. If equal 1076 /* Find the highest visible face around. If equal
1126 * visibilities, we still want the one nearer to the 1077 * visibilities, we still want the one nearer to the
1127 * top 1078 * top
1128 */ 1079 */
1129 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1080 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1148 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1099 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1149 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1100 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1150 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1101 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1151 } 1102 }
1152 1103
1153 this->light = light; 1104 this->light = min (light, MAX_LIGHT_RADIUS);
1154 this->flags_ = flags; 1105 this->flags_ = flags;
1155 this->move_block = move_block & ~move_allow; 1106 this->move_block = move_block & ~move_allow;
1156 this->move_on = move_on; 1107 this->move_on = move_on;
1157 this->move_off = move_off; 1108 this->move_off = move_off;
1158 this->move_slow = move_slow; 1109 this->move_slow = move_slow;
… …
1178 * 1) top face is set, need middle to be set. 1129 * 1) top face is set, need middle to be set.
1179 * 2) middle is set, need to set top. 1130 * 2) middle is set, need to set top.
1180 * 3) neither middle or top is set - need to set both. 1131 * 3) neither middle or top is set - need to set both.
1181 */ 1132 */
1182 1133
1183 for (tmp = last; tmp; tmp = tmp->below) 1134 for (object *tmp = last; tmp; tmp = tmp->below)
1184 { 1135 {
1185 /* Once we get to a floor, stop, since we already have a floor object */ 1136 /* Once we get to a floor, stop, since we already have a floor object */
1186 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1137 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1187 break; 1138 break;
1188 1139
… …
1240 vol += op->volume (); 1191 vol += op->volume ();
1241 1192
1242 return vol; 1193 return vol;
1243} 1194}
1244 1195
1245/* this updates the orig_map->tile_map[tile_num] value after finding 1196maptile *
1246 * the map. It also takes care of linking back the freshly found 1197maptile::tile_available (int dir, bool load)
1247 * maps tile_map values if it tiles back to this one. It returns
1248 * the value of orig_map->tile_map[tile_num].
1249 */
1250static inline maptile *
1251find_and_link (maptile *orig_map, int tile_num)
1252{ 1198{
1253 maptile *mp = orig_map->tile_map [tile_num]; 1199 if (tile_path[dir])
1254
1255 if (!mp)
1256 {
1257 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1258
1259 if (!mp)
1260 {
1261 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1262 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1263 &orig_map->tile_path[tile_num], &orig_map->path);
1264 mp = new maptile (1, 1);
1265 mp->alloc ();
1266 mp->in_memory = MAP_IN_MEMORY;
1267 }
1268 } 1200 {
1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1202 return tile_map[dir];
1269 1203
1270 int dest_tile = (tile_num + 2) % 4; 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1205 return tile_map[dir];
1206 }
1271 1207
1272 orig_map->tile_map [tile_num] = mp;
1273
1274 // optimisation: back-link map to origin map if euclidean
1275 //TODO: non-euclidean maps MUST GO
1276 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1277 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1278
1279 return mp; 1208 return 0;
1280}
1281
1282static inline void
1283load_and_link (maptile *orig_map, int tile_num)
1284{
1285 find_and_link (orig_map, tile_num)->load_sync ();
1286} 1209}
1287 1210
1288/* this returns TRUE if the coordinates (x,y) are out of 1211/* this returns TRUE if the coordinates (x,y) are out of
1289 * map m. This function also takes into account any 1212 * map m. This function also takes into account any
1290 * tiling considerations, loading adjacant maps as needed. 1213 * tiling considerations, loading adjacant maps as needed.
… …
1303 if (!m) 1226 if (!m)
1304 return 0; 1227 return 0;
1305 1228
1306 if (x < 0) 1229 if (x < 0)
1307 { 1230 {
1308 if (!m->tile_path[3]) 1231 if (!m->tile_available (3))
1309 return 1; 1232 return 1;
1310 1233
1311 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1312 find_and_link (m, 3);
1313
1314 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1234 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1315 } 1235 }
1316 1236
1317 if (x >= m->width) 1237 if (x >= m->width)
1318 { 1238 {
1319 if (!m->tile_path[1]) 1239 if (!m->tile_available (1))
1320 return 1; 1240 return 1;
1321 1241
1322 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1323 find_and_link (m, 1);
1324
1325 return out_of_map (m->tile_map[1], x - m->width, y); 1242 return out_of_map (m->tile_map[1], x - m->width, y);
1326 } 1243 }
1327 1244
1328 if (y < 0) 1245 if (y < 0)
1329 { 1246 {
1330 if (!m->tile_path[0]) 1247 if (!m->tile_available (0))
1331 return 1; 1248 return 1;
1332 1249
1333 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1334 find_and_link (m, 0);
1335
1336 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1250 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1337 } 1251 }
1338 1252
1339 if (y >= m->height) 1253 if (y >= m->height)
1340 { 1254 {
1341 if (!m->tile_path[2]) 1255 if (!m->tile_available (2))
1342 return 1; 1256 return 1;
1343
1344 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1345 find_and_link (m, 2);
1346 1257
1347 return out_of_map (m->tile_map[2], x, y - m->height); 1258 return out_of_map (m->tile_map[2], x, y - m->height);
1348 } 1259 }
1349 1260
1350 /* Simple case - coordinates are within this local 1261 /* Simple case - coordinates are within this local
… …
1364maptile * 1275maptile *
1365maptile::xy_find (sint16 &x, sint16 &y) 1276maptile::xy_find (sint16 &x, sint16 &y)
1366{ 1277{
1367 if (x < 0) 1278 if (x < 0)
1368 { 1279 {
1369 if (!tile_path[3]) 1280 if (!tile_available (3))
1370 return 0; 1281 return 0;
1371 1282
1372 find_and_link (this, 3);
1373 x += tile_map[3]->width; 1283 x += tile_map[3]->width;
1374 return tile_map[3]->xy_find (x, y); 1284 return tile_map[3]->xy_find (x, y);
1375 } 1285 }
1376 1286
1377 if (x >= width) 1287 if (x >= width)
1378 { 1288 {
1379 if (!tile_path[1]) 1289 if (!tile_available (1))
1380 return 0; 1290 return 0;
1381 1291
1382 find_and_link (this, 1);
1383 x -= width; 1292 x -= width;
1384 return tile_map[1]->xy_find (x, y); 1293 return tile_map[1]->xy_find (x, y);
1385 } 1294 }
1386 1295
1387 if (y < 0) 1296 if (y < 0)
1388 { 1297 {
1389 if (!tile_path[0]) 1298 if (!tile_available (0))
1390 return 0; 1299 return 0;
1391 1300
1392 find_and_link (this, 0);
1393 y += tile_map[0]->height; 1301 y += tile_map[0]->height;
1394 return tile_map[0]->xy_find (x, y); 1302 return tile_map[0]->xy_find (x, y);
1395 } 1303 }
1396 1304
1397 if (y >= height) 1305 if (y >= height)
1398 { 1306 {
1399 if (!tile_path[2]) 1307 if (!tile_available (2))
1400 return 0; 1308 return 0;
1401 1309
1402 find_and_link (this, 2);
1403 y -= height; 1310 y -= height;
1404 return tile_map[2]->xy_find (x, y); 1311 return tile_map[2]->xy_find (x, y);
1405 } 1312 }
1406 1313
1407 /* Simple case - coordinates are within this local 1314 /* Simple case - coordinates are within this local
… …
1418adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1325adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1419{ 1326{
1420 if (!map1 || !map2) 1327 if (!map1 || !map2)
1421 return 0; 1328 return 0;
1422 1329
1423 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1330 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1424 //fix: compare paths instead (this is likely faster, too!) 1331 //fix: compare paths instead (this is likely faster, too!)
1425 if (map1 == map2) 1332 if (map1 == map2)
1426 { 1333 {
1427 *dx = 0; 1334 *dx = 0;
1428 *dy = 0; 1335 *dy = 0;
… …
1610 else 1517 else
1611 { 1518 {
1612 retval->distance_x += op2->x - x; 1519 retval->distance_x += op2->x - x;
1613 retval->distance_y += op2->y - y; 1520 retval->distance_y += op2->y - y;
1614 1521
1615 retval->part = NULL; 1522 retval->part = 0;
1616 retval->distance = idistance (retval->distance_x, retval->distance_y); 1523 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1617 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1524 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1618 } 1525 }
1619} 1526}
1620 1527
1621/* Returns true of op1 and op2 are effectively on the same map 1528/* Returns true of op1 and op2 are effectively on the same map
… …
1635} 1542}
1636 1543
1637object * 1544object *
1638maptile::insert (object *op, int x, int y, object *originator, int flags) 1545maptile::insert (object *op, int x, int y, object *originator, int flags)
1639{ 1546{
1640 if (!op->flag [FLAG_REMOVED])
1641 op->remove ();
1642
1643 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1547 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1644} 1548}
1645 1549
1646region * 1550region *
1647maptile::region (int x, int y) const 1551maptile::region (int x, int y) const
… …
1657 1561
1658 return ::region::default_region (); 1562 return ::region::default_region ();
1659} 1563}
1660 1564
1661/* picks a random object from a style map. 1565/* picks a random object from a style map.
1662 * Redone by MSW so it should be faster and not use static
1663 * variables to generate tables.
1664 */ 1566 */
1665object * 1567object *
1666maptile::pick_random_object () const 1568maptile::pick_random_object (rand_gen &gen) const
1667{ 1569{
1668 /* while returning a null object will result in a crash, that 1570 /* while returning a null object will result in a crash, that
1669 * is actually preferable to an infinite loop. That is because 1571 * is actually preferable to an infinite loop. That is because
1670 * most servers will automatically restart in case of crash. 1572 * most servers will automatically restart in case of crash.
1671 * Change the logic on getting the random space - shouldn't make 1573 * Change the logic on getting the random space - shouldn't make
1672 * any difference, but this seems clearer to me. 1574 * any difference, but this seems clearer to me.
1673 */ 1575 */
1674 for (int i = 1000; --i;) 1576 for (int i = 1000; --i;)
1675 { 1577 {
1676 object *pick = at (rndm (width), rndm (height)).bot; 1578 object *pick = at (gen (width), gen (height)).bot;
1677 1579
1678 // do not prefer big monsters just because they are big. 1580 // do not prefer big monsters just because they are big.
1679 if (pick && pick->head_ () == pick) 1581 if (pick && pick->is_head ())
1680 return pick->head_ (); 1582 return pick->head_ ();
1681 } 1583 }
1682 1584
1683 // instead of crashing in the unlikely(?) case, try to return *something* 1585 // instead of crashing in the unlikely(?) case, try to return *something*
1684 return get_archetype ("blocked"); 1586 return archetype::find ("bug");
1685} 1587}
1686 1588
1589void
1590maptile::play_sound (faceidx sound, int x, int y) const
1591{
1592 if (!sound)
1593 return;
1594
1595 for_all_players_on_map (pl, this)
1596 if (client *ns = pl->ns)
1597 {
1598 int dx = x - pl->ob->x;
1599 int dy = y - pl->ob->y;
1600
1601 int distance = idistance (dx, dy);
1602
1603 if (distance <= MAX_SOUND_DISTANCE)
1604 ns->play_sound (sound, dx, dy);
1605 }
1606}
1607
1608void
1609maptile::say_msg (const char *msg, int x, int y) const
1610{
1611 for_all_players (pl)
1612 if (client *ns = pl->ns)
1613 {
1614 int dx = x - pl->ob->x;
1615 int dy = y - pl->ob->y;
1616
1617 int distance = idistance (dx, dy);
1618
1619 if (distance <= MAX_SOUND_DISTANCE)
1620 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1621 }
1622}
1623
1624static void
1625split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1626{
1627 // clip to map to the left
1628 if (x0 < 0)
1629 {
1630 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1631 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1632
1633 if (x1 < 0) // entirely to the left
1634 return;
1635
1636 x0 = 0;
1637 }
1638
1639 // clip to map to the right
1640 if (x1 > m->width)
1641 {
1642 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1643 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1644
1645 if (x0 > m->width) // entirely to the right
1646 return;
1647
1648 x1 = m->width;
1649 }
1650
1651 // clip to map above
1652 if (y0 < 0)
1653 {
1654 if (maptile *tile = m->tile_available (TILE_UP, 1))
1655 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1656
1657 if (y1 < 0) // entirely above
1658 return;
1659
1660 y0 = 0;
1661 }
1662
1663 // clip to map below
1664 if (y1 > m->height)
1665 {
1666 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1667 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1668
1669 if (y0 > m->height) // entirely below
1670 return;
1671
1672 y1 = m->height;
1673 }
1674
1675 // if we get here, the rect is within the current map
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677
1678 r->m = m;
1679 r->x0 = x0;
1680 r->y0 = y0;
1681 r->x1 = x1;
1682 r->y1 = y1;
1683 r->dx = dx;
1684 r->dy = dy;
1685}
1686
1687maprect *
1688maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1689{
1690 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1691 buf.clear ();
1692
1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694
1695 // add end marker
1696 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1697 r->m = 0;
1698
1699 return (maprect *)buf.linearise ();
1700}
1701

Diff Legend

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