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.111 by elmex, Thu Jul 12 18:28:09 2007 UTC vs.
Revision 1.169 by root, Sat Nov 7 18:30:05 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/* 31//+GPL
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46 32
47/* 33sint8 maptile::outdoor_darkness;
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 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 34
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 38 * new values into newmap, nx, and ny. Any and all of those
… …
137 * by the caller. 73 * by the caller.
138 */ 74 */
139int 75int
140blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
141{ 77{
142 object *tmp;
143 int mflags, blocked;
144
145 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
146 * have already checked this. 79 * have already checked this.
147 */ 80 */
148 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
149 { 82 {
150 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
151 return 1; 84 return 1;
152 } 85 }
153 86
154 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
155 * directly.
156 */
157 mflags = m->at (sx, sy).flags ();
158 88
159 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
160 91
161 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
162 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
163 * things we need to do for players. 94 * things we need to do for players.
164 */ 95 */
165 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166 return 0; 97 return 0;
167 98
168 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
169 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
170 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
171 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
172 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
173 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
… …
180 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
181 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
182 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
183 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
184 */ 115 */
185 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
186 { 117 {
187 118 if (OB_MOVE_BLOCK (ob, tmp))
188 /* This must be before the checks below. Code for inventory checkers. */
189 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
190 { 119 {
191 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
192 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
193 * pass through this space. 122 return 1;
194 */ 123 else
195 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
196 { 127 {
197 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
198 return 1; 132 return 1;
199 else 133 }
200 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
201 } 143 }
202 else 144 else
203 { 145 return 1; // unconditional block
204 /* In this case, the player must not have the object - 146
205 * if they do, they can't pass through.
206 */
207 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
208 return 1;
209 else
210 continue;
211 }
212 } /* if check_inv */
213 else 147 } else {
214 { 148 // space does not block the ob, directly, but
215 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
216 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
217 * movement, can't move here.
218 * second - if a monster, can't move there, unless it is a
219 * hidden dm
220 */
221 if (OB_MOVE_BLOCK (ob, tmp))
222 return 1;
223 151
224 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
225 && tmp->head_ () != ob 153 && tmp->head_ () != ob
226 && tmp != ob 154 && tmp != ob
227 && tmp->type != DOOR 155 && tmp->type != DOOR
228 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 156 && !tmp->flag [FLAG_WIZPASS])
229 return 1; 157 return 1;
230 } 158 }
231
232 } 159 }
160
233 return 0; 161 return 0;
234} 162}
235 163
236/* 164/*
237 * Returns true if the given object can't fit in the given spot. 165 * Returns qthe blocking object if the given object can't fit in the given
238 * This is meant for multi space objects - for single space objecs, 166 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 167 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 168 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 169 * object and makes sure they can be inserted.
242 * 170 *
243 * While this doesn't call out of map, the get_map_flags does. 171 * While this doesn't call out of map, the get_map_flags does.
244 * 172 *
245 * This function has been used to deprecate arch_out_of_map - 173 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 174 * this function also does that check, and since in most cases,
… …
257 * 185 *
258 * Note this used to be arch_blocked, but with new movement 186 * Note this used to be arch_blocked, but with new movement
259 * code, we need to have actual object to check its move_type 187 * code, we need to have actual object to check its move_type
260 * against the move_block values. 188 * against the move_block values.
261 */ 189 */
262int 190bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 191object::blocked (maptile *m, int x, int y) const
264{ 192{
265 archetype *tmp; 193 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 } 194 {
195 mapxy pos (m, x + tmp->x, y + tmp->y);
279 196
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 197 if (!pos.normalise ())
281 { 198 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 199
284 if (flag & P_OUT_OF_MAP) 200 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 201
286 if (flag & P_IS_ALIVE) 202 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 203 return 1;
288 204
289 mapspace &ms = m1->at (sx, sy); 205 /* However, often ob doesn't have any move type
290 206 * (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. 207 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 208 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 209 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 210 continue;
298 211
299 /* Note it is intentional that we check ob - the movement type of the 212 /* Note it is intentional that we check ob - the movement type of the
300 * head of the object should correspond for the entire object. 213 * head of the object should correspond for the entire object.
301 */ 214 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 215 if (ms.blocks (move_type))
303 return P_NO_PASS; 216 return 1;
304 } 217 }
305 218
306 return 0; 219 return 0;
307} 220}
308 221
… …
310 * into inventory, but just links them. What this does is go through 223 * into inventory, but just links them. What this does is go through
311 * and insert them properly. 224 * and insert them properly.
312 * The object 'container' is the object that contains the inventory. 225 * The object 'container' is the object that contains the inventory.
313 * This is needed so that we can update the containers weight. 226 * This is needed so that we can update the containers weight.
314 */ 227 */
315void 228static void
316fix_container (object *container) 229fix_container (object *container)
317{ 230{
318 object *tmp = container->inv, *next; 231 object *tmp = container->inv, *next;
319 232
320 container->inv = 0; 233 container->inv = 0;
… …
326 239
327 insert_ob_in_ob (tmp, container); 240 insert_ob_in_ob (tmp, container);
328 tmp = next; 241 tmp = next;
329 } 242 }
330 243
331 /* sum_weight will go through and calculate what all the containers are 244 // go through and calculate what all the containers are carrying.
332 * carrying. 245 //TODO: remove
333 */ 246 container->update_weight ();
334 sum_weight (container);
335} 247}
248
249//-GPL
336 250
337void 251void
338maptile::set_object_flag (int flag, int value) 252maptile::set_object_flag (int flag, int value)
339{ 253{
340 if (!spaces) 254 if (!spaces)
… …
342 256
343 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 257 for (mapspace *ms = spaces + size (); ms-- > spaces; )
344 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 258 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
345 tmp->flag [flag] = value; 259 tmp->flag [flag] = value;
346} 260}
261
262void
263maptile::post_load_original ()
264{
265 if (!spaces)
266 return;
267
268 set_object_flag (FLAG_OBJ_ORIGINAL);
269
270 for (mapspace *ms = spaces + size (); ms-- > spaces; )
271 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272 INVOKE_OBJECT (RESET, tmp);
273}
274
275//+GPL
347 276
348/* link_multipart_objects go through all the objects on the map looking 277/* 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 278 * 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 279 * info we have, they only have the head (as would be expected when
351 * they are saved). 280 * they are saved).
… …
379 op = op->above; 308 op = op->above;
380 } 309 }
381 } 310 }
382} 311}
383 312
313//-GPL
314
384/* 315/*
385 * Loads (ands parses) the objects into a given map from the specified 316 * Loads (ands parses) the objects into a given map from the specified
386 * file pointer. 317 * file pointer.
387 */ 318 */
388bool 319bool
389maptile::_load_objects (object_thawer &f) 320maptile::_load_objects (object_thawer &f)
390{ 321{
391 for (;;) 322 for (;;)
392 { 323 {
393 coroapi::cede_to_tick_every (100); // cede once in a while 324 coroapi::cede_to_tick (); // cede once in a while
394 325
395 switch (f.kw) 326 switch (f.kw)
396 { 327 {
397 case KW_arch: 328 case KW_arch:
398 if (object *op = object::read (f, this)) 329 if (object *op = object::read (f, this))
399 { 330 {
331 // TODO: why?
400 if (op->inv) 332 if (op->inv)
401 sum_weight (op); 333 op->update_weight ();
402 334
403 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336 {
337 // we insert manually because
338 // a) its way faster
339 // b) we remove manually, too, and there are good reasons for that
340 // c) it's correct
341 mapspace &ms = at (op->x, op->y);
342
343 op->flag [FLAG_REMOVED] = false;
344
345 op->above = 0;
346 op->below = ms.top;
347
348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
404 } 358 }
405 359
406 continue; 360 continue;
407 361
408 case KW_EOF: 362 case KW_EOF:
… …
421} 375}
422 376
423void 377void
424maptile::activate () 378maptile::activate ()
425{ 379{
426 active = true;
427
428 if (spaces) 380 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 383 op->activate_recursive ();
432} 384}
433 385
434void 386void
435maptile::deactivate () 387maptile::deactivate ()
436{ 388{
437 active = false;
438
439 if (spaces) 389 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 392 op->deactivate_recursive ();
443} 393}
… …
453 if (!spaces) 403 if (!spaces)
454 return false; 404 return false;
455 405
456 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
457 { 407 {
458 int unique = 0; 408 bool unique = 0;
409
459 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
460 { 411 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 413
464 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
465 continue; 415 continue;
466 416
467 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 418 {
469 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
470 op->write (f); 420 op->write (f);
471 } 421 }
472 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 423 op->write (f);
474 } 424 }
475 } 425 }
476 426
477 coroapi::cede_to_tick (); 427 coroapi::cede_to_tick ();
478 428
479 return true; 429 return true;
480}
481
482bool
483maptile::_load_objects (const char *path, bool skip_header)
484{
485 object_thawer f (path);
486
487 if (!f)
488 return false;
489
490 f.next ();
491
492 if (skip_header)
493 for (;;)
494 {
495 keyword kw = f.kw;
496 f.skip ();
497 if (kw == KW_end)
498 break;
499 }
500
501 return _load_objects (f);
502} 430}
503 431
504bool 432bool
505maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
506{ 434{
… …
551 if (spaces) 479 if (spaces)
552 return; 480 return;
553 481
554 spaces = salloc0<mapspace> (size ()); 482 spaces = salloc0<mapspace> (size ());
555} 483}
484
485//+GPL
556 486
557/* Takes a string from a map definition and outputs a pointer to the array of shopitems 487/* Takes a string from a map definition and outputs a pointer to the array of shopitems
558 * corresponding to that string. Memory is allocated for this, it must be freed 488 * corresponding to that string. Memory is allocated for this, it must be freed
559 * at a later date. 489 * at a later date.
560 * Called by parse_map_headers below. 490 * Called by parse_map_headers below.
… …
637 return items; 567 return items;
638} 568}
639 569
640/* opposite of parse string, this puts the string that was originally fed in to 570/* opposite of parse string, this puts the string that was originally fed in to
641 * the map (or something equivilent) into output_string. */ 571 * the map (or something equivilent) into output_string. */
642static void 572static const char *
643print_shop_string (maptile *m, char *output_string) 573print_shop_string (maptile *m)
644{ 574{
645 int i; 575 static dynbuf_text buf; buf.clear ();
646 char tmp[MAX_BUF];
647 576
648 strcpy (output_string, "");
649 for (i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
650 { 578 {
651 if (m->shopitems[i].typenum) 579 if (m->shopitems[i].typenum)
652 { 580 {
653 if (m->shopitems[i].strength) 581 if (m->shopitems[i].strength)
654 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 582 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
655 else 583 else
656 sprintf (tmp, "%s;", m->shopitems[i].name); 584 buf.printf ("%s;", m->shopitems[i].name);
657 } 585 }
658 else 586 else
659 { 587 {
660 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
661 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 589 buf.printf ("*:%d;", m->shopitems[i].strength);
662 else 590 else
663 sprintf (tmp, "*"); 591 buf.printf ("*");
664 } 592 }
665
666 strcat (output_string, tmp);
667 } 593 }
594
595 return buf;
668} 596}
597
598//-GPL
669 599
670/* This loads the header information of the map. The header 600/* This loads the header information of the map. The header
671 * contains things like difficulty, size, timeout, etc. 601 * contains things like difficulty, size, timeout, etc.
672 * this used to be stored in the map object, but with the 602 * this used to be stored in the map object, but with the
673 * addition of tiling, fields beyond that easily named in an 603 * addition of tiling, fields beyond that easily named in an
… …
681bool 611bool
682maptile::_load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
683{ 613{
684 for (;;) 614 for (;;)
685 { 615 {
686 thawer.next ();
687
688 switch (thawer.kw) 616 switch (thawer.kw)
689 { 617 {
690 case KW_msg: 618 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 619 thawer.get_ml (KW_endmsg, msg);
692 break; 620 break;
… …
726 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
727 655
728 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
729 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break; 658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
731 660
732 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
734 663
735 // old names new names 664 // old names new names
… …
746 case KW_tile_path_1: thawer.get (tile_path [0]); break; 675 case KW_tile_path_1: thawer.get (tile_path [0]); break;
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 676 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 677 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 678 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 679
680 case KW_ERROR:
681 set_key_text (thawer.kw_str, thawer.value);
682 break;
683
751 case KW_end: 684 case KW_end:
685 thawer.next ();
752 return true; 686 return true;
753 687
754 default: 688 default:
755 if (!thawer.parse_error ("map", 0)) 689 if (!thawer.parse_error ("map", 0))
756 return false; 690 return false;
757 break; 691 break;
758 } 692 }
693
694 thawer.next ();
759 } 695 }
760 696
761 abort (); 697 abort ();
762} 698}
763 699
764bool 700//+GPL
765maptile::_load_header (const char *path)
766{
767 object_thawer thawer (path);
768
769 if (!thawer)
770 return false;
771
772 return _load_header (thawer);
773}
774 701
775/****************************************************************************** 702/******************************************************************************
776 * This is the start of unique map handling code 703 * This is the start of unique map handling code
777 *****************************************************************************/ 704 *****************************************************************************/
778 705
… …
789 716
790 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 717 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
791 unique = 1; 718 unique = 1;
792 719
793 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 720 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
794 {
795 op->destroy_inv (false);
796 op->destroy (); 721 op->destroy ();
797 }
798 722
799 op = above; 723 op = above;
800 } 724 }
801 } 725 }
802} 726}
727
728//-GPL
803 729
804bool 730bool
805maptile::_save_header (object_freezer &freezer) 731maptile::_save_header (object_freezer &freezer)
806{ 732{
807#define MAP_OUT(k) freezer.put (KW_ ## k, k) 733#define MAP_OUT(k) freezer.put (KW_ ## k, k)
… …
813 MAP_OUT (swap_time); 739 MAP_OUT (swap_time);
814 MAP_OUT (reset_time); 740 MAP_OUT (reset_time);
815 MAP_OUT (reset_timeout); 741 MAP_OUT (reset_timeout);
816 MAP_OUT (fixed_resettime); 742 MAP_OUT (fixed_resettime);
817 MAP_OUT (no_reset); 743 MAP_OUT (no_reset);
744 MAP_OUT (no_drop);
818 MAP_OUT (difficulty); 745 MAP_OUT (difficulty);
819
820 if (default_region) MAP_OUT2 (region, default_region->name); 746 if (default_region) MAP_OUT2 (region, default_region->name);
821 747
822 if (shopitems) 748 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
823 {
824 char shop[MAX_BUF];
825 print_shop_string (this, shop);
826 MAP_OUT2 (shopitems, shop);
827 }
828
829 MAP_OUT (shopgreed); 749 MAP_OUT (shopgreed);
830 MAP_OUT (shopmin); 750 MAP_OUT (shopmin);
831 MAP_OUT (shopmax); 751 MAP_OUT (shopmax);
832 if (shoprace) MAP_OUT (shoprace); 752 if (shoprace) MAP_OUT (shoprace);
753
833 MAP_OUT (darkness); 754 MAP_OUT (darkness);
834 MAP_OUT (width); 755 MAP_OUT (width);
835 MAP_OUT (height); 756 MAP_OUT (height);
836 MAP_OUT (enter_x); 757 MAP_OUT (enter_x);
837 MAP_OUT (enter_y); 758 MAP_OUT (enter_y);
… …
870 return false; 791 return false;
871 792
872 return freezer.save (path); 793 return freezer.save (path);
873} 794}
874 795
796//+GPL
797
875/* 798/*
876 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
877 */ 800 */
878void 801void
879maptile::clear () 802maptile::clear ()
880{ 803{
881 sfree (regions, size ()), regions = 0;
882 free (regionmap), regionmap = 0;
883
884 if (spaces) 804 if (spaces)
885 { 805 {
886 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 806 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 while (object *op = ms->bot) 807 while (object *op = ms->bot)
888 { 808 {
809 // manually remove, as to not trigger anything
810 if (ms->bot = op->above)
811 ms->bot->below = 0;
812
813 op->flag [FLAG_REMOVED] = true;
814
889 op = op->head_ (); 815 object *head = op->head_ ();
890 op->destroy_inv (false); 816 if (op == head)
891 op->destroy (); 817 op->destroy ();
818 else if (head->map != op->map)
819 {
820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
821 head->destroy ();
822 }
892 } 823 }
893 824
894 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
895 } 826 }
896 827
897 if (buttons) 828 if (buttons)
898 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
830
831 sfree0 (regions, size ());
832 delete [] regionmap; regionmap = 0;
899} 833}
900 834
901void 835void
902maptile::clear_header () 836maptile::clear_header ()
903{ 837{
… …
955 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
956 break; 890 break;
957 891
958 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
959 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
960 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
961 || QUERY_FLAG (op, FLAG_UNIQUE) 894 || QUERY_FLAG (op, FLAG_UNIQUE)
962 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
963 || QUERY_FLAG (op, FLAG_UNPAID) 896 || QUERY_FLAG (op, FLAG_UNPAID)
964 || op->is_alive ()) 897 || op->is_alive ())
965 ; // do not decay 898 ; // do not decay
… …
1004 op->destroy (); 937 op->destroy ();
1005 } 938 }
1006} 939}
1007 940
1008/* 941/*
1009 * Updates every button on the map (by calling update_button() for them).
1010 */
1011void
1012maptile::update_buttons ()
1013{
1014 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1015 for (objectlink *ol = obp->link; ol; ol = ol->next)
1016 {
1017 if (!ol->ob)
1018 {
1019 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1020 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1021 continue;
1022 }
1023
1024 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1025 {
1026 update_button (ol->ob);
1027 break;
1028 }
1029 }
1030}
1031
1032/*
1033 * This routine is supposed to find out the difficulty of the map. 942 * This routine is supposed to find out the difficulty of the map.
1034 * difficulty does not have a lot to do with character level, 943 * difficulty does not have a lot to do with character level,
1035 * but does have a lot to do with treasure on the map. 944 * but does have a lot to do with treasure on the map.
1036 * 945 *
1037 * Difficulty can now be set by the map creature. If the value stored 946 * Difficulty can now be set by the map creator. If the value stored
1038 * in the map is zero, then use this routine. Maps should really 947 * in the map is zero, then use this routine. Maps should really
1039 * have a difficulty set than using this function - human calculation 948 * have a difficulty set rather than using this function - human calculation
1040 * is much better than this functions guesswork. 949 * is much better than this function's guesswork.
1041 */ 950 */
1042int 951int
1043maptile::estimate_difficulty () const 952maptile::estimate_difficulty () const
1044{ 953{
1045 long monster_cnt = 0; 954 long monster_cnt = 0;
… …
1057 966
1058 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
1059 { 968 {
1060 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
1061 970
1062 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = op->other_arch)
972 {
1063 total_exp += at->stats.exp * 8; 973 total_exp += at->stats.exp * 8;
1064
1065 monster_cnt++; 974 monster_cnt++;
975 }
976
977 for (object *inv = op->inv; inv; inv = inv->below)
978 {
979 total_exp += op->stats.exp * 8;
980 monster_cnt++;
981 }
1066 } 982 }
1067 } 983 }
1068 984
1069 avgexp = (double) total_exp / monster_cnt; 985 avgexp = (double) total_exp / monster_cnt;
1070 986
… …
1083 * postive values make it darker, negative make it brighter 999 * postive values make it darker, negative make it brighter
1084 */ 1000 */
1085int 1001int
1086maptile::change_map_light (int change) 1002maptile::change_map_light (int change)
1087{ 1003{
1088 int new_level = darkness + change;
1089
1090 /* Nothing to do */ 1004 /* Nothing to do */
1091 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1005 if (!change)
1092 return 0; 1006 return 0;
1093 1007
1094 /* inform all players on the map */ 1008 /* inform all players on the map */
1095 if (change > 0) 1009 if (change > 0)
1096 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1010 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1097 else 1011 else
1098 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1012 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1099 1013
1100 /* Do extra checking. since darkness is a unsigned value, 1014 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1101 * we need to be extra careful about negative values.
1102 * In general, the checks below are only needed if change
1103 * is not +/-1
1104 */
1105 if (new_level < 0)
1106 darkness = 0;
1107 else if (new_level >= MAX_DARKNESS)
1108 darkness = MAX_DARKNESS;
1109 else
1110 darkness = new_level;
1111 1015
1112 /* All clients need to get re-updated for the change */ 1016 /* All clients need to get re-updated for the change */
1113 update_all_map_los (this); 1017 update_all_map_los (this);
1018
1114 return 1; 1019 return 1;
1115} 1020}
1116 1021
1117/* 1022/*
1118 * This function updates various attributes about a specific space 1023 * This function updates various attributes about a specific space
… …
1121 * through, etc) 1026 * through, etc)
1122 */ 1027 */
1123void 1028void
1124mapspace::update_ () 1029mapspace::update_ ()
1125{ 1030{
1126 object *tmp, *last = 0; 1031 object *last = 0;
1127 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1032 uint8 flags = P_UPTODATE, anywhere = 0;
1033 sint8 light = 0;
1128 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1034 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1129 1035
1130 //object *middle = 0; 1036 //object *middle = 0;
1131 //object *top = 0; 1037 //object *top = 0;
1132 //object *floor = 0; 1038 //object *floor = 0;
1133 // this seems to generate better code than using locals, above 1039 // this seems to generate better code than using locals, above
1134 object *&top = faces_obj[0] = 0; 1040 object *&top = faces_obj[0] = 0;
1135 object *&middle = faces_obj[1] = 0; 1041 object *&middle = faces_obj[1] = 0;
1136 object *&floor = faces_obj[2] = 0; 1042 object *&floor = faces_obj[2] = 0;
1137 1043
1138 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1044 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1139 { 1045 {
1140 /* This could be made additive I guess (two lights better than 1046 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1141 * one). But if so, it shouldn't be a simple additive - 2
1142 * light bulbs do not illuminate twice as far as once since
1143 * it is a dissapation factor that is cubed.
1144 */
1145 if (tmp->glow_radius > light)
1146 light = tmp->glow_radius; 1047 light += tmp->glow_radius;
1147 1048
1148 /* This call is needed in order to update objects the player 1049 /* This call is needed in order to update objects the player
1149 * is standing in that have animations (ie, grass, fire, etc). 1050 * is standing in that have animations (ie, grass, fire, etc).
1150 * However, it also causes the look window to be re-drawn 1051 * However, it also causes the look window to be re-drawn
1151 * 3 times each time the player moves, because many of the 1052 * 3 times each time the player moves, because many of the
… …
1170 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1071 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1171 { 1072 {
1172 middle = tmp; 1073 middle = tmp;
1173 anywhere = 1; 1074 anywhere = 1;
1174 } 1075 }
1076
1175 /* Find the highest visible face around. If equal 1077 /* Find the highest visible face around. If equal
1176 * visibilities, we still want the one nearer to the 1078 * visibilities, we still want the one nearer to the
1177 * top 1079 * top
1178 */ 1080 */
1179 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1081 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1198 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1100 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1199 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1101 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1200 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1102 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1201 } 1103 }
1202 1104
1203 this->light = light; 1105 this->light = min (light, MAX_LIGHT_RADIUS);
1204 this->flags_ = flags; 1106 this->flags_ = flags;
1205 this->move_block = move_block & ~move_allow; 1107 this->move_block = move_block & ~move_allow;
1206 this->move_on = move_on; 1108 this->move_on = move_on;
1207 this->move_off = move_off; 1109 this->move_off = move_off;
1208 this->move_slow = move_slow; 1110 this->move_slow = move_slow;
… …
1228 * 1) top face is set, need middle to be set. 1130 * 1) top face is set, need middle to be set.
1229 * 2) middle is set, need to set top. 1131 * 2) middle is set, need to set top.
1230 * 3) neither middle or top is set - need to set both. 1132 * 3) neither middle or top is set - need to set both.
1231 */ 1133 */
1232 1134
1233 for (tmp = last; tmp; tmp = tmp->below) 1135 for (object *tmp = last; tmp; tmp = tmp->below)
1234 { 1136 {
1235 /* Once we get to a floor, stop, since we already have a floor object */ 1137 /* Once we get to a floor, stop, since we already have a floor object */
1236 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1138 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1237 break; 1139 break;
1238 1140
… …
1290 vol += op->volume (); 1192 vol += op->volume ();
1291 1193
1292 return vol; 1194 return vol;
1293} 1195}
1294 1196
1295/* this updates the orig_map->tile_map[tile_num] value after finding 1197maptile *
1296 * the map. It also takes care of linking back the freshly found 1198maptile::tile_available (int dir, bool load)
1297 * maps tile_map values if it tiles back to this one. It returns
1298 * the value of orig_map->tile_map[tile_num].
1299 */
1300static inline maptile *
1301find_and_link (maptile *orig_map, int tile_num)
1302{ 1199{
1303 maptile *mp = orig_map->tile_map [tile_num]; 1200 if (tile_path[dir])
1304
1305 if (!mp)
1306 {
1307 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1308
1309 if (!mp)
1310 {
1311 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1312 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1313 &orig_map->tile_path[tile_num], &orig_map->path);
1314 mp = new maptile (1, 1);
1315 mp->alloc ();
1316 mp->in_memory = MAP_IN_MEMORY;
1317 }
1318 } 1201 {
1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1203 return tile_map[dir];
1319 1204
1320 int dest_tile = (tile_num + 2) % 4; 1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1206 return tile_map[dir];
1207 }
1321 1208
1322 orig_map->tile_map [tile_num] = mp;
1323
1324 // optimisation: back-link map to origin map if euclidean
1325 //TODO: non-euclidean maps MUST GO
1326 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1327 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1328
1329 return mp; 1209 return 0;
1330}
1331
1332static inline void
1333load_and_link (maptile *orig_map, int tile_num)
1334{
1335 find_and_link (orig_map, tile_num)->load_sync ();
1336} 1210}
1337 1211
1338/* this returns TRUE if the coordinates (x,y) are out of 1212/* this returns TRUE if the coordinates (x,y) are out of
1339 * map m. This function also takes into account any 1213 * map m. This function also takes into account any
1340 * tiling considerations, loading adjacant maps as needed. 1214 * tiling considerations, loading adjacant maps as needed.
… …
1353 if (!m) 1227 if (!m)
1354 return 0; 1228 return 0;
1355 1229
1356 if (x < 0) 1230 if (x < 0)
1357 { 1231 {
1358 if (!m->tile_path[3]) 1232 if (!m->tile_available (3))
1359 return 1; 1233 return 1;
1360 1234
1361 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 3);
1363
1364 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1235 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1365 } 1236 }
1366 1237
1367 if (x >= m->width) 1238 if (x >= m->width)
1368 { 1239 {
1369 if (!m->tile_path[1]) 1240 if (!m->tile_available (1))
1370 return 1; 1241 return 1;
1371 1242
1372 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1373 find_and_link (m, 1);
1374
1375 return out_of_map (m->tile_map[1], x - m->width, y); 1243 return out_of_map (m->tile_map[1], x - m->width, y);
1376 } 1244 }
1377 1245
1378 if (y < 0) 1246 if (y < 0)
1379 { 1247 {
1380 if (!m->tile_path[0]) 1248 if (!m->tile_available (0))
1381 return 1; 1249 return 1;
1382 1250
1383 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1384 find_and_link (m, 0);
1385
1386 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1251 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1387 } 1252 }
1388 1253
1389 if (y >= m->height) 1254 if (y >= m->height)
1390 { 1255 {
1391 if (!m->tile_path[2]) 1256 if (!m->tile_available (2))
1392 return 1; 1257 return 1;
1393
1394 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1395 find_and_link (m, 2);
1396 1258
1397 return out_of_map (m->tile_map[2], x, y - m->height); 1259 return out_of_map (m->tile_map[2], x, y - m->height);
1398 } 1260 }
1399 1261
1400 /* Simple case - coordinates are within this local 1262 /* Simple case - coordinates are within this local
… …
1414maptile * 1276maptile *
1415maptile::xy_find (sint16 &x, sint16 &y) 1277maptile::xy_find (sint16 &x, sint16 &y)
1416{ 1278{
1417 if (x < 0) 1279 if (x < 0)
1418 { 1280 {
1419 if (!tile_path[3]) 1281 if (!tile_available (3))
1420 return 0; 1282 return 0;
1421 1283
1422 find_and_link (this, 3);
1423 x += tile_map[3]->width; 1284 x += tile_map[3]->width;
1424 return tile_map[3]->xy_find (x, y); 1285 return tile_map[3]->xy_find (x, y);
1425 } 1286 }
1426 1287
1427 if (x >= width) 1288 if (x >= width)
1428 { 1289 {
1429 if (!tile_path[1]) 1290 if (!tile_available (1))
1430 return 0; 1291 return 0;
1431 1292
1432 find_and_link (this, 1);
1433 x -= width; 1293 x -= width;
1434 return tile_map[1]->xy_find (x, y); 1294 return tile_map[1]->xy_find (x, y);
1435 } 1295 }
1436 1296
1437 if (y < 0) 1297 if (y < 0)
1438 { 1298 {
1439 if (!tile_path[0]) 1299 if (!tile_available (0))
1440 return 0; 1300 return 0;
1441 1301
1442 find_and_link (this, 0);
1443 y += tile_map[0]->height; 1302 y += tile_map[0]->height;
1444 return tile_map[0]->xy_find (x, y); 1303 return tile_map[0]->xy_find (x, y);
1445 } 1304 }
1446 1305
1447 if (y >= height) 1306 if (y >= height)
1448 { 1307 {
1449 if (!tile_path[2]) 1308 if (!tile_available (2))
1450 return 0; 1309 return 0;
1451 1310
1452 find_and_link (this, 2);
1453 y -= height; 1311 y -= height;
1454 return tile_map[2]->xy_find (x, y); 1312 return tile_map[2]->xy_find (x, y);
1455 } 1313 }
1456 1314
1457 /* Simple case - coordinates are within this local 1315 /* Simple case - coordinates are within this local
… …
1468adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1326adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1469{ 1327{
1470 if (!map1 || !map2) 1328 if (!map1 || !map2)
1471 return 0; 1329 return 0;
1472 1330
1473 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1331 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1474 //fix: compare paths instead (this is likely faster, too!) 1332 //fix: compare paths instead (this is likely faster, too!)
1475 if (map1 == map2) 1333 if (map1 == map2)
1476 { 1334 {
1477 *dx = 0; 1335 *dx = 0;
1478 *dy = 0; 1336 *dy = 0;
… …
1660 else 1518 else
1661 { 1519 {
1662 retval->distance_x += op2->x - x; 1520 retval->distance_x += op2->x - x;
1663 retval->distance_y += op2->y - y; 1521 retval->distance_y += op2->y - y;
1664 1522
1665 retval->part = NULL; 1523 retval->part = 0;
1666 retval->distance = idistance (retval->distance_x, retval->distance_y); 1524 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1667 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1525 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1668 } 1526 }
1669} 1527}
1670 1528
1671/* Returns true of op1 and op2 are effectively on the same map 1529/* Returns true of op1 and op2 are effectively on the same map
… …
1682 int dx, dy; 1540 int dx, dy;
1683 1541
1684 return adjacent_map (op1->map, op2->map, &dx, &dy); 1542 return adjacent_map (op1->map, op2->map, &dx, &dy);
1685} 1543}
1686 1544
1545//-GPL
1546
1687object * 1547object *
1688maptile::insert (object *op, int x, int y, object *originator, int flags) 1548maptile::insert (object *op, int x, int y, object *originator, int flags)
1689{ 1549{
1690 if (!op->flag [FLAG_REMOVED])
1691 op->remove ();
1692
1693 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1550 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1694} 1551}
1695 1552
1696region * 1553region *
1697maptile::region (int x, int y) const 1554maptile::region (int x, int y) const
… …
1706 return default_region; 1563 return default_region;
1707 1564
1708 return ::region::default_region (); 1565 return ::region::default_region ();
1709} 1566}
1710 1567
1568//+GPL
1569
1711/* picks a random object from a style map. 1570/* picks a random object from a style map.
1712 * Redone by MSW so it should be faster and not use static
1713 * variables to generate tables.
1714 */ 1571 */
1715object * 1572object *
1716maptile::pick_random_object () const 1573maptile::pick_random_object (rand_gen &gen) const
1717{ 1574{
1718 /* while returning a null object will result in a crash, that 1575 /* while returning a null object will result in a crash, that
1719 * is actually preferable to an infinite loop. That is because 1576 * is actually preferable to an infinite loop. That is because
1720 * most servers will automatically restart in case of crash. 1577 * most servers will automatically restart in case of crash.
1721 * Change the logic on getting the random space - shouldn't make 1578 * Change the logic on getting the random space - shouldn't make
1722 * any difference, but this seems clearer to me. 1579 * any difference, but this seems clearer to me.
1723 */ 1580 */
1724 for (int i = 1000; --i;) 1581 for (int i = 1000; --i;)
1725 { 1582 {
1726 object *pick = at (rndm (width), rndm (height)).bot; 1583 object *pick = at (gen (width), gen (height)).bot;
1727 1584
1728 // do not prefer big monsters just because they are big. 1585 // do not prefer big monsters just because they are big.
1729 if (pick && pick->head_ () == pick) 1586 if (pick && pick->is_head ())
1730 return pick->head_ (); 1587 return pick->head_ ();
1731 } 1588 }
1732 1589
1733 // instead of crashing in the unlikely(?) case, try to return *something* 1590 // instead of crashing in the unlikely(?) case, try to return *something*
1734 return get_archetype ("blocked"); 1591 return archetype::find (shstr_bug);
1735} 1592}
1736 1593
1594//-GPL
1595
1596void
1597maptile::play_sound (faceidx sound, int x, int y) const
1598{
1599 if (!sound)
1600 return;
1601
1602 for_all_players_on_map (pl, this)
1603 if (client *ns = pl->ns)
1604 {
1605 int dx = x - pl->ob->x;
1606 int dy = y - pl->ob->y;
1607
1608 int distance = idistance (dx, dy);
1609
1610 if (distance <= MAX_SOUND_DISTANCE)
1611 ns->play_sound (sound, dx, dy);
1612 }
1613}
1614
1615void
1616maptile::say_msg (const char *msg, int x, int y) const
1617{
1618 for_all_players (pl)
1619 if (client *ns = pl->ns)
1620 {
1621 int dx = x - pl->ob->x;
1622 int dy = y - pl->ob->y;
1623
1624 int distance = idistance (dx, dy);
1625
1626 if (distance <= MAX_SOUND_DISTANCE)
1627 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1628 }
1629}
1630
1631static void
1632split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1633{
1634 // clip to map to the left
1635 if (x0 < 0)
1636 {
1637 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1638 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1639
1640 if (x1 < 0) // entirely to the left
1641 return;
1642
1643 x0 = 0;
1644 }
1645
1646 // clip to map to the right
1647 if (x1 > m->width)
1648 {
1649 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1650 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1651
1652 if (x0 > m->width) // entirely to the right
1653 return;
1654
1655 x1 = m->width;
1656 }
1657
1658 // clip to map above
1659 if (y0 < 0)
1660 {
1661 if (maptile *tile = m->tile_available (TILE_UP, 1))
1662 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1663
1664 if (y1 < 0) // entirely above
1665 return;
1666
1667 y0 = 0;
1668 }
1669
1670 // clip to map below
1671 if (y1 > m->height)
1672 {
1673 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1674 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1675
1676 if (y0 > m->height) // entirely below
1677 return;
1678
1679 y1 = m->height;
1680 }
1681
1682 // if we get here, the rect is within the current map
1683 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1684
1685 r->m = m;
1686 r->x0 = x0;
1687 r->y0 = y0;
1688 r->x1 = x1;
1689 r->y1 = y1;
1690 r->dx = dx;
1691 r->dy = dy;
1692}
1693
1694maprect *
1695maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1696{
1697 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1698 buf.clear ();
1699
1700 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1701
1702 // add end marker
1703 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1704 r->m = 0;
1705
1706 return (maprect *)buf.linearise ();
1707}
1708

Diff Legend

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