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.110 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.164 by root, Fri Oct 16 01:19:12 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 28#include "loader.h"
30
31#include "path.h" 29#include "path.h"
32 30
33/* 31sint8 maptile::outdoor_darkness;
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 assign (buf, create_pathname (name));
73 else
74 assign (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * 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
… …
137 * by the caller. 71 * by the caller.
138 */ 72 */
139int 73int
140blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
141{ 75{
142 object *tmp;
143 int mflags, blocked;
144
145 /* 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
146 * have already checked this. 77 * have already checked this.
147 */ 78 */
148 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
149 { 80 {
… …
152 } 83 }
153 84
154 /* 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
155 * directly. 86 * directly.
156 */ 87 */
157 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
158 89
159 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
160 92
161 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
162 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
163 * things we need to do for players. 95 * things we need to do for players.
164 */ 96 */
165 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166 return 0; 98 return 0;
167 99
168 /* 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
169 * 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
170 * 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
171 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
172 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
173 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
… …
180 /* 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
181 * 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
182 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
183 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
184 */ 116 */
185 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
186 { 118 {
119 bool block = OB_MOVE_BLOCK (ob, tmp);
187 120
188 /* This must be before the checks below. Code for inventory checkers. */ 121 /* This must be before the checks below. Code for inventory checkers. */
189 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 122 if (block && tmp->type == CHECK_INV)
190 { 123 {
124 bool have = check_inv_recursive (ob, tmp);
125
191 /* If last_sp is set, the player/monster needs an object, 126 /* If last_sp is set, the player/monster needs an object,
192 * 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
193 * pass through this space. 128 * pass through this space.
194 */ 129 */
195 if (tmp->last_sp) 130 if (tmp->last_sp)
196 { 131 {
197 if (check_inv_recursive (ob, tmp) == NULL) 132 if (!have)
198 return 1; 133 return 1;
199 else
200 continue;
201 } 134 }
202 else 135 else
203 { 136 {
204 /* In this case, the player must not have the object - 137 /* In this case, the player must not have the object -
205 * if they do, they can't pass through. 138 * if they do, they can't pass through.
206 */ 139 */
207 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 140 if (have)
208 return 1; 141 return 1;
209 else
210 continue;
211 } 142 }
212 } /* if check_inv */ 143 }
144 else if (block && tmp->type == T_MATCH)
145 {
146 //TODO
147 }
213 else 148 else
214 { 149 {
215 /* Broke apart a big nasty if into several here to make 150 /* Broke apart a big nasty if into several here to make
216 * this more readable. first check - if the space blocks 151 * this more readable. first check - if the space blocks
217 * movement, can't move here. 152 * movement, can't move here.
218 * second - if a monster, can't move there, unless it is a 153 * second - if a monster, can't move there, unless it is a
219 * hidden dm 154 * dm.
220 */ 155 */
221 if (OB_MOVE_BLOCK (ob, tmp)) 156 if (block)
222 return 1; 157 return 1;
223 158
224 if (tmp->flag [FLAG_ALIVE] 159 if (tmp->flag [FLAG_ALIVE]
225 && tmp->head_ () != ob 160 && tmp->head_ () != ob
226 && tmp != ob 161 && tmp != ob
227 && tmp->type != DOOR 162 && tmp->type != DOOR
228 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 163 && !tmp->flag [FLAG_WIZ])
229 return 1; 164 return 1;
230 } 165 }
231
232 } 166 }
167
233 return 0; 168 return 0;
234} 169}
235 170
236/* 171/*
237 * 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
238 * This is meant for multi space objects - for single space objecs, 173 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 174 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 175 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 176 * object and makes sure they can be inserted.
242 * 177 *
243 * 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.
244 * 179 *
245 * This function has been used to deprecate arch_out_of_map - 180 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 181 * this function also does that check, and since in most cases,
… …
257 * 192 *
258 * Note this used to be arch_blocked, but with new movement 193 * Note this used to be arch_blocked, but with new movement
259 * 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
260 * against the move_block values. 195 * against the move_block values.
261 */ 196 */
262int 197bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 198object::blocked (maptile *m, int x, int y) const
264{ 199{
265 archetype *tmp; 200 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
266 int flag;
267 maptile *m1;
268 sint16 sx, sy;
269
270 if (!ob)
271 {
272 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
273 if (flag & P_OUT_OF_MAP)
274 return P_OUT_OF_MAP;
275
276 /* don't have object, so don't know what types would block */
277 return m1->at (sx, sy).move_block;
278 } 201 {
202 mapxy pos (m, x + tmp->x, y + tmp->y);
279 203
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 204 if (!pos.normalise ())
281 { 205 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 206
284 if (flag & P_OUT_OF_MAP) 207 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 208
286 if (flag & P_IS_ALIVE) 209 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 210 return 1;
288 211
289 mapspace &ms = m1->at (sx, sy); 212 /* However, often ob doesn't have any move type
290 213 * (signifying non-moving objects)
291 /* find_first_free_spot() calls this function. However, often
292 * ob doesn't have any move type (when used to place exits)
293 * 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.
294 */ 215 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 216 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 217 continue;
298 218
299 /* 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
300 * head of the object should correspond for the entire object. 220 * head of the object should correspond for the entire object.
301 */ 221 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 222 if (ms.blocks (move_type))
303 return P_NO_PASS; 223 return 1;
304 } 224 }
305 225
306 return 0; 226 return 0;
307} 227}
308 228
… …
326 246
327 insert_ob_in_ob (tmp, container); 247 insert_ob_in_ob (tmp, container);
328 tmp = next; 248 tmp = next;
329 } 249 }
330 250
331 /* sum_weight will go through and calculate what all the containers are 251 // go through and calculate what all the containers are carrying.
332 * carrying. 252 //TODO: remove
333 */ 253 container->update_weight ();
334 sum_weight (container);
335} 254}
336 255
337void 256void
338maptile::set_object_flag (int flag, int value) 257maptile::set_object_flag (int flag, int value)
339{ 258{
… …
341 return; 260 return;
342 261
343 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 262 for (mapspace *ms = spaces + size (); ms-- > spaces; )
344 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 263 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
345 tmp->flag [flag] = value; 264 tmp->flag [flag] = value;
265}
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);
346} 278}
347 279
348/* 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
349 * 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
350 * 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
… …
355{ 287{
356 if (!spaces) 288 if (!spaces)
357 return; 289 return;
358 290
359 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 291 for (mapspace *ms = spaces + size (); ms-- > spaces; )
360 for (object *op = ms->bot; op; op = op->above) 292 {
293 object *op = ms->bot;
294 while (op)
361 { 295 {
362 /* already multipart - don't do anything more */ 296 /* already multipart - don't do anything more */
363 if (op->head_ () == op && !op->more && op->arch->more) 297 if (op->head_ () == op && !op->more && op->arch->more)
364 { 298 {
365 op->remove (); 299 op->remove ();
366 op->expand_tail (); 300 op->expand_tail ();
301
302 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
303 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
304 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
367 insert (op, op->x, op->y, 0, 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
368 } 309 }
310 else
311 op = op->above;
369 } 312 }
313 }
370} 314}
371 315
372/* 316/*
373 * 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
374 * file pointer. 318 * file pointer.
… …
376bool 320bool
377maptile::_load_objects (object_thawer &f) 321maptile::_load_objects (object_thawer &f)
378{ 322{
379 for (;;) 323 for (;;)
380 { 324 {
381 coroapi::cede_to_tick_every (100); // cede once in a while 325 coroapi::cede_to_tick (); // cede once in a while
382 326
383 switch (f.kw) 327 switch (f.kw)
384 { 328 {
385 case KW_arch: 329 case KW_arch:
386 if (object *op = object::read (f, this)) 330 if (object *op = object::read (f, this))
387 { 331 {
332 // TODO: why?
388 if (op->inv) 333 if (op->inv)
389 sum_weight (op); 334 op->update_weight ();
390 335
391 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 }
392 } 359 }
393 360
394 continue; 361 continue;
395 362
396 case KW_EOF: 363 case KW_EOF:
… …
409} 376}
410 377
411void 378void
412maptile::activate () 379maptile::activate ()
413{ 380{
414 active = true;
415
416 if (spaces) 381 if (spaces)
417 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
418 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
419 op->activate_recursive (); 384 op->activate_recursive ();
420} 385}
421 386
422void 387void
423maptile::deactivate () 388maptile::deactivate ()
424{ 389{
425 active = false;
426
427 if (spaces) 390 if (spaces)
428 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 391 for (mapspace *ms = spaces + size (); ms-- > spaces; )
429 for (object *op = ms->bot; op; op = op->above) 392 for (object *op = ms->bot; op; op = op->above)
430 op->deactivate_recursive (); 393 op->deactivate_recursive ();
431} 394}
… …
441 if (!spaces) 404 if (!spaces)
442 return false; 405 return false;
443 406
444 for (int i = 0; i < size (); ++i) 407 for (int i = 0; i < size (); ++i)
445 { 408 {
446 int unique = 0; 409 bool unique = 0;
410
447 for (object *op = spaces [i].bot; op; op = op->above) 411 for (object *op = spaces [i].bot; op; op = op->above)
448 { 412 {
449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 413 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
450 unique = 1;
451 414
452 if (!op->can_map_save ()) 415 if (expect_false (!op->can_map_save ()))
453 continue; 416 continue;
454 417
455 if (unique || op->flag [FLAG_UNIQUE]) 418 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
456 { 419 {
457 if (flags & IO_UNIQUES) 420 if (flags & IO_UNIQUES)
458 op->write (f); 421 op->write (f);
459 } 422 }
460 else if (flags & IO_OBJECTS) 423 else if (expect_true (flags & IO_OBJECTS))
461 op->write (f); 424 op->write (f);
462 } 425 }
463 } 426 }
464 427
465 coroapi::cede_to_tick (); 428 coroapi::cede_to_tick ();
466 429
467 return true; 430 return true;
468}
469
470bool
471maptile::_load_objects (const char *path, bool skip_header)
472{
473 object_thawer f (path);
474
475 if (!f)
476 return false;
477
478 f.next ();
479
480 if (skip_header)
481 for (;;)
482 {
483 keyword kw = f.kw;
484 f.skip ();
485 if (kw == KW_end)
486 break;
487 }
488
489 return _load_objects (f);
490} 431}
491 432
492bool 433bool
493maptile::_save_objects (const char *path, int flags) 434maptile::_save_objects (const char *path, int flags)
494{ 435{
… …
625 return items; 566 return items;
626} 567}
627 568
628/* opposite of parse string, this puts the string that was originally fed in to 569/* opposite of parse string, this puts the string that was originally fed in to
629 * the map (or something equivilent) into output_string. */ 570 * the map (or something equivilent) into output_string. */
630static void 571static const char *
631print_shop_string (maptile *m, char *output_string) 572print_shop_string (maptile *m)
632{ 573{
633 int i; 574 static dynbuf_text buf; buf.clear ();
634 char tmp[MAX_BUF];
635 575
636 strcpy (output_string, "");
637 for (i = 0; i < m->shopitems[0].index; i++) 576 for (int i = 0; i < m->shopitems[0].index; i++)
638 { 577 {
639 if (m->shopitems[i].typenum) 578 if (m->shopitems[i].typenum)
640 { 579 {
641 if (m->shopitems[i].strength) 580 if (m->shopitems[i].strength)
642 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 581 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
643 else 582 else
644 sprintf (tmp, "%s;", m->shopitems[i].name); 583 buf.printf ("%s;", m->shopitems[i].name);
645 } 584 }
646 else 585 else
647 { 586 {
648 if (m->shopitems[i].strength) 587 if (m->shopitems[i].strength)
649 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 588 buf.printf ("*:%d;", m->shopitems[i].strength);
650 else 589 else
651 sprintf (tmp, "*"); 590 buf.printf ("*");
652 } 591 }
653
654 strcat (output_string, tmp);
655 } 592 }
593
594 return buf;
656} 595}
657 596
658/* This loads the header information of the map. The header 597/* This loads the header information of the map. The header
659 * contains things like difficulty, size, timeout, etc. 598 * contains things like difficulty, size, timeout, etc.
660 * 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
… …
669bool 608bool
670maptile::_load_header (object_thawer &thawer) 609maptile::_load_header (object_thawer &thawer)
671{ 610{
672 for (;;) 611 for (;;)
673 { 612 {
674 thawer.next ();
675
676 switch (thawer.kw) 613 switch (thawer.kw)
677 { 614 {
678 case KW_msg: 615 case KW_msg:
679 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
680 break; 617 break;
… …
714 case KW_sky: thawer.get (sky); break; 651 case KW_sky: thawer.get (sky); break;
715 652
716 case KW_per_player: thawer.get (per_player); break; 653 case KW_per_player: thawer.get (per_player); break;
717 case KW_per_party: thawer.get (per_party); break; 654 case KW_per_party: thawer.get (per_party); break;
718 case KW_no_reset: thawer.get (no_reset); break; 655 case KW_no_reset: thawer.get (no_reset); break;
656 case KW_no_drop: thawer.get (no_drop); break;
719 657
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 658 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 659 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 660
723 // old names new names 661 // old names new names
… …
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 672 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 673 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 674 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 675 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 676
677 case KW_ERROR:
678 set_key_text (thawer.kw_str, thawer.value);
679 break;
680
739 case KW_end: 681 case KW_end:
682 thawer.next ();
740 return true; 683 return true;
741 684
742 default: 685 default:
743 if (!thawer.parse_error ("map", 0)) 686 if (!thawer.parse_error ("map", 0))
744 return false; 687 return false;
745 break; 688 break;
746 } 689 }
690
691 thawer.next ();
747 } 692 }
748 693
749 abort (); 694 abort ();
750}
751
752bool
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761} 695}
762 696
763/****************************************************************************** 697/******************************************************************************
764 * This is the start of unique map handling code 698 * This is the start of unique map handling code
765 *****************************************************************************/ 699 *****************************************************************************/
… …
777 711
778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 712 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
779 unique = 1; 713 unique = 1;
780 714
781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 715 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
782 {
783 op->destroy_inv (false);
784 op->destroy (); 716 op->destroy ();
785 }
786 717
787 op = above; 718 op = above;
788 } 719 }
789 } 720 }
790} 721}
… …
801 MAP_OUT (swap_time); 732 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 733 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 734 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 735 MAP_OUT (fixed_resettime);
805 MAP_OUT (no_reset); 736 MAP_OUT (no_reset);
737 MAP_OUT (no_drop);
806 MAP_OUT (difficulty); 738 MAP_OUT (difficulty);
807
808 if (default_region) MAP_OUT2 (region, default_region->name); 739 if (default_region) MAP_OUT2 (region, default_region->name);
809 740
810 if (shopitems) 741 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
811 {
812 char shop[MAX_BUF];
813 print_shop_string (this, shop);
814 MAP_OUT2 (shopitems, shop);
815 }
816
817 MAP_OUT (shopgreed); 742 MAP_OUT (shopgreed);
818 MAP_OUT (shopmin); 743 MAP_OUT (shopmin);
819 MAP_OUT (shopmax); 744 MAP_OUT (shopmax);
820 if (shoprace) MAP_OUT (shoprace); 745 if (shoprace) MAP_OUT (shoprace);
746
821 MAP_OUT (darkness); 747 MAP_OUT (darkness);
822 MAP_OUT (width); 748 MAP_OUT (width);
823 MAP_OUT (height); 749 MAP_OUT (height);
824 MAP_OUT (enter_x); 750 MAP_OUT (enter_x);
825 MAP_OUT (enter_y); 751 MAP_OUT (enter_y);
… …
864 * Remove and free all objects in the given map. 790 * Remove and free all objects in the given map.
865 */ 791 */
866void 792void
867maptile::clear () 793maptile::clear ()
868{ 794{
869 sfree (regions, size ()), regions = 0;
870 free (regionmap), regionmap = 0;
871
872 if (spaces) 795 if (spaces)
873 { 796 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 797 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot) 798 while (object *op = ms->bot)
876 { 799 {
800 // manually remove, as to not trigger anything
801 if (ms->bot = op->above)
802 ms->bot->below = 0;
803
804 op->flag [FLAG_REMOVED] = true;
805
877 op = op->head_ (); 806 object *head = op->head_ ();
878 op->destroy_inv (false); 807 if (op == head)
879 op->destroy (); 808 op->destroy ();
809 else if (head->map != op->map)
810 {
811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
812 head->destroy ();
813 }
880 } 814 }
881 815
882 sfree (spaces, size ()), spaces = 0; 816 sfree0 (spaces, size ());
883 } 817 }
884 818
885 if (buttons) 819 if (buttons)
886 free_objectlinkpt (buttons), buttons = 0; 820 free_objectlinkpt (buttons), buttons = 0;
821
822 sfree0 (regions, size ());
823 delete [] regionmap; regionmap = 0;
887} 824}
888 825
889void 826void
890maptile::clear_header () 827maptile::clear_header ()
891{ 828{
… …
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 880 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break; 881 break;
945 882
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 883 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE) 885 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID) 887 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ()) 888 || op->is_alive ())
953 ; // do not decay 889 ; // do not decay
… …
992 op->destroy (); 928 op->destroy ();
993 } 929 }
994} 930}
995 931
996/* 932/*
997 * Updates every button on the map (by calling update_button() for them).
998 */
999void
1000maptile::update_buttons ()
1001{
1002 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1003 for (objectlink *ol = obp->link; ol; ol = ol->next)
1004 {
1005 if (!ol->ob)
1006 {
1007 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1008 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1009 continue;
1010 }
1011
1012 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1013 {
1014 update_button (ol->ob);
1015 break;
1016 }
1017 }
1018}
1019
1020/*
1021 * This routine is supposed to find out the difficulty of the map. 933 * This routine is supposed to find out the difficulty of the map.
1022 * difficulty does not have a lot to do with character level, 934 * difficulty does not have a lot to do with character level,
1023 * but does have a lot to do with treasure on the map. 935 * but does have a lot to do with treasure on the map.
1024 * 936 *
1025 * Difficulty can now be set by the map creature. If the value stored 937 * Difficulty can now be set by the map creator. If the value stored
1026 * in the map is zero, then use this routine. Maps should really 938 * in the map is zero, then use this routine. Maps should really
1027 * have a difficulty set than using this function - human calculation 939 * have a difficulty set rather than using this function - human calculation
1028 * is much better than this functions guesswork. 940 * is much better than this function's guesswork.
1029 */ 941 */
1030int 942int
1031maptile::estimate_difficulty () const 943maptile::estimate_difficulty () const
1032{ 944{
1033 long monster_cnt = 0; 945 long monster_cnt = 0;
… …
1045 957
1046 if (QUERY_FLAG (op, FLAG_GENERATOR)) 958 if (QUERY_FLAG (op, FLAG_GENERATOR))
1047 { 959 {
1048 total_exp += op->stats.exp; 960 total_exp += op->stats.exp;
1049 961
1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 962 if (archetype *at = op->other_arch)
963 {
1051 total_exp += at->stats.exp * 8; 964 total_exp += at->stats.exp * 8;
1052
1053 monster_cnt++; 965 monster_cnt++;
966 }
967
968 for (object *inv = op->inv; inv; inv = inv->below)
969 {
970 total_exp += op->stats.exp * 8;
971 monster_cnt++;
972 }
1054 } 973 }
1055 } 974 }
1056 975
1057 avgexp = (double) total_exp / monster_cnt; 976 avgexp = (double) total_exp / monster_cnt;
1058 977
… …
1071 * postive values make it darker, negative make it brighter 990 * postive values make it darker, negative make it brighter
1072 */ 991 */
1073int 992int
1074maptile::change_map_light (int change) 993maptile::change_map_light (int change)
1075{ 994{
1076 int new_level = darkness + change;
1077
1078 /* Nothing to do */ 995 /* Nothing to do */
1079 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 996 if (!change)
1080 return 0; 997 return 0;
1081 998
1082 /* inform all players on the map */ 999 /* inform all players on the map */
1083 if (change > 0) 1000 if (change > 0)
1084 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1001 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1085 else 1002 else
1086 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1003 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1087 1004
1088 /* Do extra checking. since darkness is a unsigned value, 1005 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1089 * we need to be extra careful about negative values.
1090 * In general, the checks below are only needed if change
1091 * is not +/-1
1092 */
1093 if (new_level < 0)
1094 darkness = 0;
1095 else if (new_level >= MAX_DARKNESS)
1096 darkness = MAX_DARKNESS;
1097 else
1098 darkness = new_level;
1099 1006
1100 /* All clients need to get re-updated for the change */ 1007 /* All clients need to get re-updated for the change */
1101 update_all_map_los (this); 1008 update_all_map_los (this);
1009
1102 return 1; 1010 return 1;
1103} 1011}
1104 1012
1105/* 1013/*
1106 * This function updates various attributes about a specific space 1014 * This function updates various attributes about a specific space
… …
1109 * through, etc) 1017 * through, etc)
1110 */ 1018 */
1111void 1019void
1112mapspace::update_ () 1020mapspace::update_ ()
1113{ 1021{
1114 object *tmp, *last = 0; 1022 object *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1023 uint8 flags = P_UPTODATE, anywhere = 0;
1024 sint8 light = 0;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1025 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1026
1118 //object *middle = 0; 1027 //object *middle = 0;
1119 //object *top = 0; 1028 //object *top = 0;
1120 //object *floor = 0; 1029 //object *floor = 0;
1121 // this seems to generate better code than using locals, above 1030 // this seems to generate better code than using locals, above
1122 object *&top = faces_obj[0] = 0; 1031 object *&top = faces_obj[0] = 0;
1123 object *&middle = faces_obj[1] = 0; 1032 object *&middle = faces_obj[1] = 0;
1124 object *&floor = faces_obj[2] = 0; 1033 object *&floor = faces_obj[2] = 0;
1125 1034
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1035 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1036 {
1128 /* This could be made additive I guess (two lights better than 1037 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1129 * one). But if so, it shouldn't be a simple additive - 2
1130 * light bulbs do not illuminate twice as far as once since
1131 * it is a dissapation factor that is cubed.
1132 */
1133 if (tmp->glow_radius > light)
1134 light = tmp->glow_radius; 1038 light += tmp->glow_radius;
1135 1039
1136 /* This call is needed in order to update objects the player 1040 /* This call is needed in order to update objects the player
1137 * is standing in that have animations (ie, grass, fire, etc). 1041 * is standing in that have animations (ie, grass, fire, etc).
1138 * However, it also causes the look window to be re-drawn 1042 * However, it also causes the look window to be re-drawn
1139 * 3 times each time the player moves, because many of the 1043 * 3 times each time the player moves, because many of the
… …
1158 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1062 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1159 { 1063 {
1160 middle = tmp; 1064 middle = tmp;
1161 anywhere = 1; 1065 anywhere = 1;
1162 } 1066 }
1067
1163 /* Find the highest visible face around. If equal 1068 /* Find the highest visible face around. If equal
1164 * visibilities, we still want the one nearer to the 1069 * visibilities, we still want the one nearer to the
1165 * top 1070 * top
1166 */ 1071 */
1167 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1072 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1186 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1091 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1187 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1092 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1188 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1093 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1189 } 1094 }
1190 1095
1191 this->light = light; 1096 this->light = min (light, MAX_LIGHT_RADIUS);
1192 this->flags_ = flags; 1097 this->flags_ = flags;
1193 this->move_block = move_block & ~move_allow; 1098 this->move_block = move_block & ~move_allow;
1194 this->move_on = move_on; 1099 this->move_on = move_on;
1195 this->move_off = move_off; 1100 this->move_off = move_off;
1196 this->move_slow = move_slow; 1101 this->move_slow = move_slow;
… …
1216 * 1) top face is set, need middle to be set. 1121 * 1) top face is set, need middle to be set.
1217 * 2) middle is set, need to set top. 1122 * 2) middle is set, need to set top.
1218 * 3) neither middle or top is set - need to set both. 1123 * 3) neither middle or top is set - need to set both.
1219 */ 1124 */
1220 1125
1221 for (tmp = last; tmp; tmp = tmp->below) 1126 for (object *tmp = last; tmp; tmp = tmp->below)
1222 { 1127 {
1223 /* Once we get to a floor, stop, since we already have a floor object */ 1128 /* Once we get to a floor, stop, since we already have a floor object */
1224 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1129 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1225 break; 1130 break;
1226 1131
… …
1278 vol += op->volume (); 1183 vol += op->volume ();
1279 1184
1280 return vol; 1185 return vol;
1281} 1186}
1282 1187
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1188maptile *
1284 * the map. It also takes care of linking back the freshly found 1189maptile::tile_available (int dir, bool load)
1285 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num].
1287 */
1288static inline maptile *
1289find_and_link (maptile *orig_map, int tile_num)
1290{ 1190{
1291 maptile *mp = orig_map->tile_map [tile_num]; 1191 if (tile_path[dir])
1292
1293 if (!mp)
1294 {
1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1296
1297 if (!mp)
1298 {
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 } 1192 {
1193 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1194 return tile_map[dir];
1307 1195
1308 int dest_tile = (tile_num + 2) % 4; 1196 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1197 return tile_map[dir];
1198 }
1309 1199
1310 orig_map->tile_map [tile_num] = mp;
1311
1312 // optimisation: back-link map to origin map if euclidean
1313 //TODO: non-euclidean maps MUST GO
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1316
1317 return mp; 1200 return 0;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1324} 1201}
1325 1202
1326/* this returns TRUE if the coordinates (x,y) are out of 1203/* this returns TRUE if the coordinates (x,y) are out of
1327 * map m. This function also takes into account any 1204 * map m. This function also takes into account any
1328 * tiling considerations, loading adjacant maps as needed. 1205 * tiling considerations, loading adjacant maps as needed.
… …
1341 if (!m) 1218 if (!m)
1342 return 0; 1219 return 0;
1343 1220
1344 if (x < 0) 1221 if (x < 0)
1345 { 1222 {
1346 if (!m->tile_path[3]) 1223 if (!m->tile_available (3))
1347 return 1; 1224 return 1;
1348 1225
1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1350 find_and_link (m, 3);
1351
1352 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1226 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1353 } 1227 }
1354 1228
1355 if (x >= m->width) 1229 if (x >= m->width)
1356 { 1230 {
1357 if (!m->tile_path[1]) 1231 if (!m->tile_available (1))
1358 return 1; 1232 return 1;
1359 1233
1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1361 find_and_link (m, 1);
1362
1363 return out_of_map (m->tile_map[1], x - m->width, y); 1234 return out_of_map (m->tile_map[1], x - m->width, y);
1364 } 1235 }
1365 1236
1366 if (y < 0) 1237 if (y < 0)
1367 { 1238 {
1368 if (!m->tile_path[0]) 1239 if (!m->tile_available (0))
1369 return 1; 1240 return 1;
1370 1241
1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1372 find_and_link (m, 0);
1373
1374 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1242 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1375 } 1243 }
1376 1244
1377 if (y >= m->height) 1245 if (y >= m->height)
1378 { 1246 {
1379 if (!m->tile_path[2]) 1247 if (!m->tile_available (2))
1380 return 1; 1248 return 1;
1381
1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1383 find_and_link (m, 2);
1384 1249
1385 return out_of_map (m->tile_map[2], x, y - m->height); 1250 return out_of_map (m->tile_map[2], x, y - m->height);
1386 } 1251 }
1387 1252
1388 /* Simple case - coordinates are within this local 1253 /* Simple case - coordinates are within this local
… …
1402maptile * 1267maptile *
1403maptile::xy_find (sint16 &x, sint16 &y) 1268maptile::xy_find (sint16 &x, sint16 &y)
1404{ 1269{
1405 if (x < 0) 1270 if (x < 0)
1406 { 1271 {
1407 if (!tile_path[3]) 1272 if (!tile_available (3))
1408 return 0; 1273 return 0;
1409 1274
1410 find_and_link (this, 3);
1411 x += tile_map[3]->width; 1275 x += tile_map[3]->width;
1412 return tile_map[3]->xy_find (x, y); 1276 return tile_map[3]->xy_find (x, y);
1413 } 1277 }
1414 1278
1415 if (x >= width) 1279 if (x >= width)
1416 { 1280 {
1417 if (!tile_path[1]) 1281 if (!tile_available (1))
1418 return 0; 1282 return 0;
1419 1283
1420 find_and_link (this, 1);
1421 x -= width; 1284 x -= width;
1422 return tile_map[1]->xy_find (x, y); 1285 return tile_map[1]->xy_find (x, y);
1423 } 1286 }
1424 1287
1425 if (y < 0) 1288 if (y < 0)
1426 { 1289 {
1427 if (!tile_path[0]) 1290 if (!tile_available (0))
1428 return 0; 1291 return 0;
1429 1292
1430 find_and_link (this, 0);
1431 y += tile_map[0]->height; 1293 y += tile_map[0]->height;
1432 return tile_map[0]->xy_find (x, y); 1294 return tile_map[0]->xy_find (x, y);
1433 } 1295 }
1434 1296
1435 if (y >= height) 1297 if (y >= height)
1436 { 1298 {
1437 if (!tile_path[2]) 1299 if (!tile_available (2))
1438 return 0; 1300 return 0;
1439 1301
1440 find_and_link (this, 2);
1441 y -= height; 1302 y -= height;
1442 return tile_map[2]->xy_find (x, y); 1303 return tile_map[2]->xy_find (x, y);
1443 } 1304 }
1444 1305
1445 /* Simple case - coordinates are within this local 1306 /* Simple case - coordinates are within this local
… …
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1317adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1318{
1458 if (!map1 || !map2) 1319 if (!map1 || !map2)
1459 return 0; 1320 return 0;
1460 1321
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1322 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!) 1323 //fix: compare paths instead (this is likely faster, too!)
1463 if (map1 == map2) 1324 if (map1 == map2)
1464 { 1325 {
1465 *dx = 0; 1326 *dx = 0;
1466 *dy = 0; 1327 *dy = 0;
… …
1648 else 1509 else
1649 { 1510 {
1650 retval->distance_x += op2->x - x; 1511 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1512 retval->distance_y += op2->y - y;
1652 1513
1653 retval->part = NULL; 1514 retval->part = 0;
1654 retval->distance = idistance (retval->distance_x, retval->distance_y); 1515 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1516 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1517 }
1657} 1518}
1658 1519
1659/* Returns true of op1 and op2 are effectively on the same map 1520/* Returns true of op1 and op2 are effectively on the same map
… …
1673} 1534}
1674 1535
1675object * 1536object *
1676maptile::insert (object *op, int x, int y, object *originator, int flags) 1537maptile::insert (object *op, int x, int y, object *originator, int flags)
1677{ 1538{
1678 if (!op->flag [FLAG_REMOVED])
1679 op->remove ();
1680
1681 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1539 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682} 1540}
1683 1541
1684region * 1542region *
1685maptile::region (int x, int y) const 1543maptile::region (int x, int y) const
… …
1695 1553
1696 return ::region::default_region (); 1554 return ::region::default_region ();
1697} 1555}
1698 1556
1699/* picks a random object from a style map. 1557/* picks a random object from a style map.
1700 * Redone by MSW so it should be faster and not use static
1701 * variables to generate tables.
1702 */ 1558 */
1703object * 1559object *
1704maptile::pick_random_object () const 1560maptile::pick_random_object (rand_gen &gen) const
1705{ 1561{
1706 /* while returning a null object will result in a crash, that 1562 /* while returning a null object will result in a crash, that
1707 * is actually preferable to an infinite loop. That is because 1563 * is actually preferable to an infinite loop. That is because
1708 * most servers will automatically restart in case of crash. 1564 * most servers will automatically restart in case of crash.
1709 * Change the logic on getting the random space - shouldn't make 1565 * Change the logic on getting the random space - shouldn't make
1710 * any difference, but this seems clearer to me. 1566 * any difference, but this seems clearer to me.
1711 */ 1567 */
1712 for (int i = 1000; --i;) 1568 for (int i = 1000; --i;)
1713 { 1569 {
1714 object *pick = at (rndm (width), rndm (height)).bot; 1570 object *pick = at (gen (width), gen (height)).bot;
1715 1571
1716 // do not prefer big monsters just because they are big. 1572 // do not prefer big monsters just because they are big.
1717 if (pick && pick->head_ () == pick) 1573 if (pick && pick->is_head ())
1718 return pick->head_ (); 1574 return pick->head_ ();
1719 } 1575 }
1720 1576
1721 // instead of crashing in the unlikely(?) case, try to return *something* 1577 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked"); 1578 return archetype::find ("bug");
1723} 1579}
1724 1580
1581void
1582maptile::play_sound (faceidx sound, int x, int y) const
1583{
1584 if (!sound)
1585 return;
1586
1587 for_all_players_on_map (pl, this)
1588 if (client *ns = pl->ns)
1589 {
1590 int dx = x - pl->ob->x;
1591 int dy = y - pl->ob->y;
1592
1593 int distance = idistance (dx, dy);
1594
1595 if (distance <= MAX_SOUND_DISTANCE)
1596 ns->play_sound (sound, dx, dy);
1597 }
1598}
1599
1600void
1601maptile::say_msg (const char *msg, int x, int y) const
1602{
1603 for_all_players (pl)
1604 if (client *ns = pl->ns)
1605 {
1606 int dx = x - pl->ob->x;
1607 int dy = y - pl->ob->y;
1608
1609 int distance = idistance (dx, dy);
1610
1611 if (distance <= MAX_SOUND_DISTANCE)
1612 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1613 }
1614}
1615
1616static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{
1619 // clip to map to the left
1620 if (x0 < 0)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624
1625 if (x1 < 0) // entirely to the left
1626 return;
1627
1628 x0 = 0;
1629 }
1630
1631 // clip to map to the right
1632 if (x1 > m->width)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636
1637 if (x0 > m->width) // entirely to the right
1638 return;
1639
1640 x1 = m->width;
1641 }
1642
1643 // clip to map above
1644 if (y0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648
1649 if (y1 < 0) // entirely above
1650 return;
1651
1652 y0 = 0;
1653 }
1654
1655 // clip to map below
1656 if (y1 > m->height)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660
1661 if (y0 > m->height) // entirely below
1662 return;
1663
1664 y1 = m->height;
1665 }
1666
1667 // if we get here, the rect is within the current map
1668 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1669
1670 r->m = m;
1671 r->x0 = x0;
1672 r->y0 = y0;
1673 r->x1 = x1;
1674 r->y1 = y1;
1675 r->dx = dx;
1676 r->dy = dy;
1677}
1678
1679maprect *
1680maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1681{
1682 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683 buf.clear ();
1684
1685 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686
1687 // add end marker
1688 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1689 r->m = 0;
1690
1691 return (maprect *)buf.linearise ();
1692}
1693

Diff Legend

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