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.112 by root, Thu Jul 12 18:48:20 2007 UTC vs.
Revision 1.171 by root, Sun Nov 8 16:13:45 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{
… …
521 */ 449 */
522 width = 16; 450 width = 16;
523 height = 16; 451 height = 16;
524 timeout = 300; 452 timeout = 300;
525 max_nrof = 1000; // 1000 items of anything 453 max_nrof = 1000; // 1000 items of anything
454 max_items = 25;
526 max_volume = 2000000; // 2m³ 455 max_volume = 2000000; // 2m³
527} 456}
528 457
529maptile::maptile (int w, int h) 458maptile::maptile (int w, int h)
530{ 459{
… …
551 if (spaces) 480 if (spaces)
552 return; 481 return;
553 482
554 spaces = salloc0<mapspace> (size ()); 483 spaces = salloc0<mapspace> (size ());
555} 484}
485
486//+GPL
556 487
557/* Takes a string from a map definition and outputs a pointer to the array of shopitems 488/* 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 489 * corresponding to that string. Memory is allocated for this, it must be freed
559 * at a later date. 490 * at a later date.
560 * Called by parse_map_headers below. 491 * Called by parse_map_headers below.
… …
637 return items; 568 return items;
638} 569}
639 570
640/* opposite of parse string, this puts the string that was originally fed in to 571/* opposite of parse string, this puts the string that was originally fed in to
641 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
642static void 573static const char *
643print_shop_string (maptile *m, char *output_string) 574print_shop_string (maptile *m)
644{ 575{
645 int i; 576 static dynbuf_text buf; buf.clear ();
646 char tmp[MAX_BUF];
647 577
648 strcpy (output_string, "");
649 for (i = 0; i < m->shopitems[0].index; i++) 578 for (int i = 0; i < m->shopitems[0].index; i++)
650 { 579 {
651 if (m->shopitems[i].typenum) 580 if (m->shopitems[i].typenum)
652 { 581 {
653 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
654 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 583 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
655 else 584 else
656 sprintf (tmp, "%s;", m->shopitems[i].name); 585 buf.printf ("%s;", m->shopitems[i].name);
657 } 586 }
658 else 587 else
659 { 588 {
660 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
661 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 590 buf.printf ("*:%d;", m->shopitems[i].strength);
662 else 591 else
663 sprintf (tmp, "*"); 592 buf.printf ("*");
664 } 593 }
665
666 strcat (output_string, tmp);
667 } 594 }
595
596 return buf;
668} 597}
598
599//-GPL
669 600
670/* This loads the header information of the map. The header 601/* This loads the header information of the map. The header
671 * contains things like difficulty, size, timeout, etc. 602 * contains things like difficulty, size, timeout, etc.
672 * this used to be stored in the map object, but with the 603 * this used to be stored in the map object, but with the
673 * addition of tiling, fields beyond that easily named in an 604 * addition of tiling, fields beyond that easily named in an
… …
681bool 612bool
682maptile::_load_header (object_thawer &thawer) 613maptile::_load_header (object_thawer &thawer)
683{ 614{
684 for (;;) 615 for (;;)
685 { 616 {
686 thawer.next ();
687
688 switch (thawer.kw) 617 switch (thawer.kw)
689 { 618 {
690 case KW_msg: 619 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 620 thawer.get_ml (KW_endmsg, msg);
692 break; 621 break;
… …
726 case KW_sky: thawer.get (sky); break; 655 case KW_sky: thawer.get (sky); break;
727 656
728 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
729 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break; 659 case KW_no_reset: thawer.get (no_reset); break;
660 case KW_no_drop: thawer.get (no_drop); break;
731 661
732 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: default_region = region::find (thawer.get_str ()); break;
733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
734 664
735 // old names new names 665 // old names new names
… …
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 680
751 case KW_ERROR: 681 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
753 break; 683 break;
754 684
755 case KW_end: 685 case KW_end:
686 thawer.next ();
756 return true; 687 return true;
757 688
758 default: 689 default:
759 if (!thawer.parse_error ("map", 0)) 690 if (!thawer.parse_error ("map", 0))
760 return false; 691 return false;
761 break; 692 break;
762 } 693 }
694
695 thawer.next ();
763 } 696 }
764 697
765 abort (); 698 abort ();
766} 699}
767 700
768bool 701//+GPL
769maptile::_load_header (const char *path)
770{
771 object_thawer thawer (path);
772
773 if (!thawer)
774 return false;
775
776 return _load_header (thawer);
777}
778 702
779/****************************************************************************** 703/******************************************************************************
780 * This is the start of unique map handling code 704 * This is the start of unique map handling code
781 *****************************************************************************/ 705 *****************************************************************************/
782 706
… …
793 717
794 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 718 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
795 unique = 1; 719 unique = 1;
796 720
797 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 721 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
798 {
799 op->destroy_inv (false);
800 op->destroy (); 722 op->destroy ();
801 }
802 723
803 op = above; 724 op = above;
804 } 725 }
805 } 726 }
806} 727}
728
729//-GPL
807 730
808bool 731bool
809maptile::_save_header (object_freezer &freezer) 732maptile::_save_header (object_freezer &freezer)
810{ 733{
811#define MAP_OUT(k) freezer.put (KW_ ## k, k) 734#define MAP_OUT(k) freezer.put (KW_ ## k, k)
… …
817 MAP_OUT (swap_time); 740 MAP_OUT (swap_time);
818 MAP_OUT (reset_time); 741 MAP_OUT (reset_time);
819 MAP_OUT (reset_timeout); 742 MAP_OUT (reset_timeout);
820 MAP_OUT (fixed_resettime); 743 MAP_OUT (fixed_resettime);
821 MAP_OUT (no_reset); 744 MAP_OUT (no_reset);
745 MAP_OUT (no_drop);
822 MAP_OUT (difficulty); 746 MAP_OUT (difficulty);
823
824 if (default_region) MAP_OUT2 (region, default_region->name); 747 if (default_region) MAP_OUT2 (region, default_region->name);
825 748
826 if (shopitems) 749 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
827 {
828 char shop[MAX_BUF];
829 print_shop_string (this, shop);
830 MAP_OUT2 (shopitems, shop);
831 }
832
833 MAP_OUT (shopgreed); 750 MAP_OUT (shopgreed);
834 MAP_OUT (shopmin); 751 MAP_OUT (shopmin);
835 MAP_OUT (shopmax); 752 MAP_OUT (shopmax);
836 if (shoprace) MAP_OUT (shoprace); 753 if (shoprace) MAP_OUT (shoprace);
754
837 MAP_OUT (darkness); 755 MAP_OUT (darkness);
838 MAP_OUT (width); 756 MAP_OUT (width);
839 MAP_OUT (height); 757 MAP_OUT (height);
840 MAP_OUT (enter_x); 758 MAP_OUT (enter_x);
841 MAP_OUT (enter_y); 759 MAP_OUT (enter_y);
… …
874 return false; 792 return false;
875 793
876 return freezer.save (path); 794 return freezer.save (path);
877} 795}
878 796
797//+GPL
798
879/* 799/*
880 * Remove and free all objects in the given map. 800 * Remove and free all objects in the given map.
881 */ 801 */
882void 802void
883maptile::clear () 803maptile::clear ()
884{ 804{
885 sfree (regions, size ()), regions = 0;
886 free (regionmap), regionmap = 0;
887
888 if (spaces) 805 if (spaces)
889 { 806 {
890 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 807 for (mapspace *ms = spaces + size (); ms-- > spaces; )
891 while (object *op = ms->bot) 808 while (object *op = ms->bot)
892 { 809 {
810 // manually remove, as to not trigger anything
811 if (ms->bot = op->above)
812 ms->bot->below = 0;
813
814 op->flag [FLAG_REMOVED] = true;
815
893 op = op->head_ (); 816 object *head = op->head_ ();
894 op->destroy_inv (false); 817 if (op == head)
895 op->destroy (); 818 op->destroy ();
819 else if (head->map != op->map)
820 {
821 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
822 head->destroy ();
823 }
896 } 824 }
897 825
898 sfree (spaces, size ()), spaces = 0; 826 sfree0 (spaces, size ());
899 } 827 }
900 828
901 if (buttons) 829 if (buttons)
902 free_objectlinkpt (buttons), buttons = 0; 830 free_objectlinkpt (buttons), buttons = 0;
831
832 sfree0 (regions, size ());
833 delete [] regionmap; regionmap = 0;
903} 834}
904 835
905void 836void
906maptile::clear_header () 837maptile::clear_header ()
907{ 838{
… …
959 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 890 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
960 break; 891 break;
961 892
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 893 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 894 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE) 895 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID) 897 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ()) 898 || op->is_alive ())
969 ; // do not decay 899 ; // do not decay
… …
1008 op->destroy (); 938 op->destroy ();
1009 } 939 }
1010} 940}
1011 941
1012/* 942/*
1013 * Updates every button on the map (by calling update_button() for them).
1014 */
1015void
1016maptile::update_buttons ()
1017{
1018 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1019 for (objectlink *ol = obp->link; ol; ol = ol->next)
1020 {
1021 if (!ol->ob)
1022 {
1023 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1024 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1025 continue;
1026 }
1027
1028 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1029 {
1030 update_button (ol->ob);
1031 break;
1032 }
1033 }
1034}
1035
1036/*
1037 * This routine is supposed to find out the difficulty of the map. 943 * This routine is supposed to find out the difficulty of the map.
1038 * difficulty does not have a lot to do with character level, 944 * difficulty does not have a lot to do with character level,
1039 * but does have a lot to do with treasure on the map. 945 * but does have a lot to do with treasure on the map.
1040 * 946 *
1041 * Difficulty can now be set by the map creature. If the value stored 947 * Difficulty can now be set by the map creator. If the value stored
1042 * in the map is zero, then use this routine. Maps should really 948 * in the map is zero, then use this routine. Maps should really
1043 * have a difficulty set than using this function - human calculation 949 * have a difficulty set rather than using this function - human calculation
1044 * is much better than this functions guesswork. 950 * is much better than this function's guesswork.
1045 */ 951 */
1046int 952int
1047maptile::estimate_difficulty () const 953maptile::estimate_difficulty () const
1048{ 954{
1049 long monster_cnt = 0; 955 long monster_cnt = 0;
… …
1061 967
1062 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (QUERY_FLAG (op, FLAG_GENERATOR))
1063 { 969 {
1064 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
1065 971
1066 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 972 if (archetype *at = op->other_arch)
973 {
1067 total_exp += at->stats.exp * 8; 974 total_exp += at->stats.exp * 8;
1068
1069 monster_cnt++; 975 monster_cnt++;
976 }
977
978 for (object *inv = op->inv; inv; inv = inv->below)
979 {
980 total_exp += op->stats.exp * 8;
981 monster_cnt++;
982 }
1070 } 983 }
1071 } 984 }
1072 985
1073 avgexp = (double) total_exp / monster_cnt; 986 avgexp = (double) total_exp / monster_cnt;
1074 987
… …
1087 * postive values make it darker, negative make it brighter 1000 * postive values make it darker, negative make it brighter
1088 */ 1001 */
1089int 1002int
1090maptile::change_map_light (int change) 1003maptile::change_map_light (int change)
1091{ 1004{
1092 int new_level = darkness + change;
1093
1094 /* Nothing to do */ 1005 /* Nothing to do */
1095 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1006 if (!change)
1096 return 0; 1007 return 0;
1097 1008
1098 /* inform all players on the map */ 1009 /* inform all players on the map */
1099 if (change > 0) 1010 if (change > 0)
1100 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1101 else 1012 else
1102 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1013 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1103 1014
1104 /* Do extra checking. since darkness is a unsigned value, 1015 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1105 * we need to be extra careful about negative values.
1106 * In general, the checks below are only needed if change
1107 * is not +/-1
1108 */
1109 if (new_level < 0)
1110 darkness = 0;
1111 else if (new_level >= MAX_DARKNESS)
1112 darkness = MAX_DARKNESS;
1113 else
1114 darkness = new_level;
1115 1016
1116 /* All clients need to get re-updated for the change */ 1017 /* All clients need to get re-updated for the change */
1117 update_all_map_los (this); 1018 update_all_map_los (this);
1019
1118 return 1; 1020 return 1;
1119} 1021}
1120 1022
1121/* 1023/*
1122 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
… …
1125 * through, etc) 1027 * through, etc)
1126 */ 1028 */
1127void 1029void
1128mapspace::update_ () 1030mapspace::update_ ()
1129{ 1031{
1130 object *tmp, *last = 0; 1032 object *last = 0;
1131 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1034 sint8 light = 0;
1132 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0;
1037 uint32_t nrof = 0;
1038 object *anywhere = 0;
1133 1039
1134 //object *middle = 0; 1040 //object *middle = 0;
1135 //object *top = 0; 1041 //object *top = 0;
1136 //object *floor = 0; 1042 //object *floor = 0;
1137 // this seems to generate better code than using locals, above 1043 // this seems to generate better code than using locals, above
1138 object *&top = faces_obj[0] = 0; 1044 object *&top = faces_obj[0] = 0;
1139 object *&middle = faces_obj[1] = 0; 1045 object *&middle = faces_obj[1] = 0;
1140 object *&floor = faces_obj[2] = 0; 1046 object *&floor = faces_obj[2] = 0;
1141 1047
1048 object::flags_t allflags; // all flags of all objects or'ed together
1049
1142 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1050 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1143 { 1051 {
1144 /* This could be made additive I guess (two lights better than 1052 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1145 * one). But if so, it shouldn't be a simple additive - 2
1146 * light bulbs do not illuminate twice as far as once since
1147 * it is a dissapation factor that is cubed.
1148 */
1149 if (tmp->glow_radius > light)
1150 light = tmp->glow_radius; 1053 light += tmp->glow_radius;
1151 1054
1152 /* This call is needed in order to update objects the player 1055 /* This call is needed in order to update objects the player
1153 * is standing in that have animations (ie, grass, fire, etc). 1056 * is standing in that have animations (ie, grass, fire, etc).
1154 * However, it also causes the look window to be re-drawn 1057 * However, it also causes the look window to be re-drawn
1155 * 3 times each time the player moves, because many of the 1058 * 3 times each time the player moves, because many of the
1156 * functions the move_player calls eventualy call this. 1059 * functions the move_player calls eventualy call this.
1157 * 1060 *
1158 * Always put the player down for drawing. 1061 * Always put the player down for drawing.
1159 */ 1062 */
1160 if (!tmp->invisible) 1063 if (expect_true (!tmp->invisible))
1161 { 1064 {
1162 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1065 if (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER])
1163 top = tmp; 1066 top = tmp;
1164 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1067 else
1165 { 1068 {
1069 if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1070 {
1166 /* If we got a floor, that means middle and top were below it, 1071 /* If we got a floor, that means middle and top were below it,
1167 * so should not be visible, so we clear them. 1072 * so should not be visible, so we clear them.
1168 */ 1073 */
1169 middle = 0; 1074 middle = 0;
1170 top = 0; 1075 top = 0;
1171 floor = tmp; 1076 floor = tmp;
1077 volume = 0;
1078 nrof = 0;
1079 }
1080 else
1081 {
1082 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1083 {
1084 ++nrof;
1085 volume += tmp->volume ();
1086 }
1087
1088 /* Flag anywhere have high priority */
1089 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1090 anywhere = tmp;
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility))
1096 middle = tmp;
1097 }
1172 } 1098 }
1173 /* Flag anywhere have high priority */
1174 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1175 {
1176 middle = tmp;
1177 anywhere = 1;
1178 }
1179 /* Find the highest visible face around. If equal
1180 * visibilities, we still want the one nearer to the
1181 * top
1182 */
1183 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1184 middle = tmp;
1185 }
1186
1187 if (tmp == tmp->above)
1188 {
1189 LOG (llevError, "Error in structure of map\n");
1190 exit (-1);
1191 } 1099 }
1192 1100
1193 move_slow |= tmp->move_slow; 1101 move_slow |= tmp->move_slow;
1194 move_block |= tmp->move_block; 1102 move_block |= tmp->move_block;
1195 move_on |= tmp->move_on; 1103 move_on |= tmp->move_on;
1196 move_off |= tmp->move_off; 1104 move_off |= tmp->move_off;
1197 move_allow |= tmp->move_allow; 1105 move_allow |= tmp->move_allow;
1198 1106
1199 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1107 allflags |= tmp->flag;
1200 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1108
1201 if (tmp->type == PLAYER) flags |= P_PLAYER; 1109 if (tmp->type == PLAYER) flags |= P_PLAYER;
1202 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1110 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1203 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1204 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1205 } 1111 }
1206 1112
1207 this->light = light; 1113 // FLAG_SEE_ANYWHERE takes precedence
1114 if (anywhere)
1115 middle = anywhere;
1116
1117 // ORing all flags together and checking them here is much faster
1118 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1119 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1120 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1121 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1122
1123 this->light = min (light, MAX_LIGHT_RADIUS);
1208 this->flags_ = flags; 1124 this->flags_ = flags;
1209 this->move_block = move_block & ~move_allow; 1125 this->move_block = move_block & ~move_allow;
1210 this->move_on = move_on; 1126 this->move_on = move_on;
1211 this->move_off = move_off; 1127 this->move_off = move_off;
1212 this->move_slow = move_slow; 1128 this->move_slow = move_slow;
1129 this->volume_ = volume / 1024;
1130 this->nrof_ = upos_min (nrof, 65535); // assume nrof <= 2**31
1213 1131
1214 /* At this point, we have a floor face (if there is a floor), 1132 /* At this point, we have a floor face (if there is a floor),
1215 * and the floor is set - we are not going to touch it at 1133 * and the floor is set - we are not going to touch it at
1216 * this point. 1134 * this point.
1217 * middle contains the highest visibility face. 1135 * middle contains the highest visibility face.
… …
1232 * 1) top face is set, need middle to be set. 1150 * 1) top face is set, need middle to be set.
1233 * 2) middle is set, need to set top. 1151 * 2) middle is set, need to set top.
1234 * 3) neither middle or top is set - need to set both. 1152 * 3) neither middle or top is set - need to set both.
1235 */ 1153 */
1236 1154
1237 for (tmp = last; tmp; tmp = tmp->below) 1155 for (object *tmp = last; tmp; tmp = tmp->below)
1238 { 1156 {
1239 /* Once we get to a floor, stop, since we already have a floor object */ 1157 /* Once we get to a floor, stop, since we already have a floor object */
1240 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1158 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1241 break; 1159 break;
1242 1160
… …
1283 faces_obj [1] = middle; 1201 faces_obj [1] = middle;
1284 faces_obj [2] = floor; 1202 faces_obj [2] = floor;
1285#endif 1203#endif
1286} 1204}
1287 1205
1288uint64 1206maptile *
1289mapspace::volume () const 1207maptile::tile_available (int dir, bool load)
1290{ 1208{
1291 uint64 vol = 0; 1209 if (tile_path[dir])
1292
1293 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1294 vol += op->volume ();
1295
1296 return vol;
1297}
1298
1299/* this updates the orig_map->tile_map[tile_num] value after finding
1300 * the map. It also takes care of linking back the freshly found
1301 * maps tile_map values if it tiles back to this one. It returns
1302 * the value of orig_map->tile_map[tile_num].
1303 */
1304static inline maptile *
1305find_and_link (maptile *orig_map, int tile_num)
1306{
1307 maptile *mp = orig_map->tile_map [tile_num];
1308
1309 if (!mp)
1310 {
1311 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1312
1313 if (!mp)
1314 {
1315 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1316 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1317 &orig_map->tile_path[tile_num], &orig_map->path);
1318 mp = new maptile (1, 1);
1319 mp->alloc ();
1320 mp->in_memory = MAP_IN_MEMORY;
1321 }
1322 } 1210 {
1211 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1212 return tile_map[dir];
1323 1213
1324 int dest_tile = (tile_num + 2) % 4; 1214 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1215 return tile_map[dir];
1216 }
1325 1217
1326 orig_map->tile_map [tile_num] = mp;
1327
1328 // optimisation: back-link map to origin map if euclidean
1329 //TODO: non-euclidean maps MUST GO
1330 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1331 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1332
1333 return mp; 1218 return 0;
1334}
1335
1336static inline void
1337load_and_link (maptile *orig_map, int tile_num)
1338{
1339 find_and_link (orig_map, tile_num)->load_sync ();
1340} 1219}
1341 1220
1342/* this returns TRUE if the coordinates (x,y) are out of 1221/* this returns TRUE if the coordinates (x,y) are out of
1343 * map m. This function also takes into account any 1222 * map m. This function also takes into account any
1344 * tiling considerations, loading adjacant maps as needed. 1223 * tiling considerations, loading adjacant maps as needed.
… …
1357 if (!m) 1236 if (!m)
1358 return 0; 1237 return 0;
1359 1238
1360 if (x < 0) 1239 if (x < 0)
1361 { 1240 {
1362 if (!m->tile_path[3]) 1241 if (!m->tile_available (3))
1363 return 1; 1242 return 1;
1364 1243
1365 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1366 find_and_link (m, 3);
1367
1368 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1244 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1369 } 1245 }
1370 1246
1371 if (x >= m->width) 1247 if (x >= m->width)
1372 { 1248 {
1373 if (!m->tile_path[1]) 1249 if (!m->tile_available (1))
1374 return 1; 1250 return 1;
1375 1251
1376 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1377 find_and_link (m, 1);
1378
1379 return out_of_map (m->tile_map[1], x - m->width, y); 1252 return out_of_map (m->tile_map[1], x - m->width, y);
1380 } 1253 }
1381 1254
1382 if (y < 0) 1255 if (y < 0)
1383 { 1256 {
1384 if (!m->tile_path[0]) 1257 if (!m->tile_available (0))
1385 return 1; 1258 return 1;
1386 1259
1387 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1388 find_and_link (m, 0);
1389
1390 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1260 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1391 } 1261 }
1392 1262
1393 if (y >= m->height) 1263 if (y >= m->height)
1394 { 1264 {
1395 if (!m->tile_path[2]) 1265 if (!m->tile_available (2))
1396 return 1; 1266 return 1;
1397
1398 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1399 find_and_link (m, 2);
1400 1267
1401 return out_of_map (m->tile_map[2], x, y - m->height); 1268 return out_of_map (m->tile_map[2], x, y - m->height);
1402 } 1269 }
1403 1270
1404 /* Simple case - coordinates are within this local 1271 /* Simple case - coordinates are within this local
… …
1418maptile * 1285maptile *
1419maptile::xy_find (sint16 &x, sint16 &y) 1286maptile::xy_find (sint16 &x, sint16 &y)
1420{ 1287{
1421 if (x < 0) 1288 if (x < 0)
1422 { 1289 {
1423 if (!tile_path[3]) 1290 if (!tile_available (3))
1424 return 0; 1291 return 0;
1425 1292
1426 find_and_link (this, 3);
1427 x += tile_map[3]->width; 1293 x += tile_map[3]->width;
1428 return tile_map[3]->xy_find (x, y); 1294 return tile_map[3]->xy_find (x, y);
1429 } 1295 }
1430 1296
1431 if (x >= width) 1297 if (x >= width)
1432 { 1298 {
1433 if (!tile_path[1]) 1299 if (!tile_available (1))
1434 return 0; 1300 return 0;
1435 1301
1436 find_and_link (this, 1);
1437 x -= width; 1302 x -= width;
1438 return tile_map[1]->xy_find (x, y); 1303 return tile_map[1]->xy_find (x, y);
1439 } 1304 }
1440 1305
1441 if (y < 0) 1306 if (y < 0)
1442 { 1307 {
1443 if (!tile_path[0]) 1308 if (!tile_available (0))
1444 return 0; 1309 return 0;
1445 1310
1446 find_and_link (this, 0);
1447 y += tile_map[0]->height; 1311 y += tile_map[0]->height;
1448 return tile_map[0]->xy_find (x, y); 1312 return tile_map[0]->xy_find (x, y);
1449 } 1313 }
1450 1314
1451 if (y >= height) 1315 if (y >= height)
1452 { 1316 {
1453 if (!tile_path[2]) 1317 if (!tile_available (2))
1454 return 0; 1318 return 0;
1455 1319
1456 find_and_link (this, 2);
1457 y -= height; 1320 y -= height;
1458 return tile_map[2]->xy_find (x, y); 1321 return tile_map[2]->xy_find (x, y);
1459 } 1322 }
1460 1323
1461 /* Simple case - coordinates are within this local 1324 /* Simple case - coordinates are within this local
… …
1472adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1335adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1473{ 1336{
1474 if (!map1 || !map2) 1337 if (!map1 || !map2)
1475 return 0; 1338 return 0;
1476 1339
1477 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1340 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1478 //fix: compare paths instead (this is likely faster, too!) 1341 //fix: compare paths instead (this is likely faster, too!)
1479 if (map1 == map2) 1342 if (map1 == map2)
1480 { 1343 {
1481 *dx = 0; 1344 *dx = 0;
1482 *dy = 0; 1345 *dy = 0;
… …
1664 else 1527 else
1665 { 1528 {
1666 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1667 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1668 1531
1669 retval->part = NULL; 1532 retval->part = 0;
1670 retval->distance = idistance (retval->distance_x, retval->distance_y); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1671 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1672 } 1535 }
1673} 1536}
1674 1537
1675/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
… …
1686 int dx, dy; 1549 int dx, dy;
1687 1550
1688 return adjacent_map (op1->map, op2->map, &dx, &dy); 1551 return adjacent_map (op1->map, op2->map, &dx, &dy);
1689} 1552}
1690 1553
1554//-GPL
1555
1691object * 1556object *
1692maptile::insert (object *op, int x, int y, object *originator, int flags) 1557maptile::insert (object *op, int x, int y, object *originator, int flags)
1693{ 1558{
1694 if (!op->flag [FLAG_REMOVED])
1695 op->remove ();
1696
1697 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1559 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1698} 1560}
1699 1561
1700region * 1562region *
1701maptile::region (int x, int y) const 1563maptile::region (int x, int y) const
… …
1710 return default_region; 1572 return default_region;
1711 1573
1712 return ::region::default_region (); 1574 return ::region::default_region ();
1713} 1575}
1714 1576
1577//+GPL
1578
1715/* picks a random object from a style map. 1579/* picks a random object from a style map.
1716 * Redone by MSW so it should be faster and not use static
1717 * variables to generate tables.
1718 */ 1580 */
1719object * 1581object *
1720maptile::pick_random_object () const 1582maptile::pick_random_object (rand_gen &gen) const
1721{ 1583{
1722 /* while returning a null object will result in a crash, that 1584 /* while returning a null object will result in a crash, that
1723 * is actually preferable to an infinite loop. That is because 1585 * is actually preferable to an infinite loop. That is because
1724 * most servers will automatically restart in case of crash. 1586 * most servers will automatically restart in case of crash.
1725 * Change the logic on getting the random space - shouldn't make 1587 * Change the logic on getting the random space - shouldn't make
1726 * any difference, but this seems clearer to me. 1588 * any difference, but this seems clearer to me.
1727 */ 1589 */
1728 for (int i = 1000; --i;) 1590 for (int i = 1000; --i;)
1729 { 1591 {
1730 object *pick = at (rndm (width), rndm (height)).bot; 1592 object *pick = at (gen (width), gen (height)).bot;
1731 1593
1732 // do not prefer big monsters just because they are big. 1594 // do not prefer big monsters just because they are big.
1733 if (pick && pick->head_ () == pick) 1595 if (pick && pick->is_head ())
1734 return pick->head_ (); 1596 return pick->head_ ();
1735 } 1597 }
1736 1598
1737 // instead of crashing in the unlikely(?) case, try to return *something* 1599 // instead of crashing in the unlikely(?) case, try to return *something*
1738 return get_archetype ("blocked"); 1600 return archetype::find (shstr_bug);
1739} 1601}
1740 1602
1603//-GPL
1604
1605void
1606maptile::play_sound (faceidx sound, int x, int y) const
1607{
1608 if (!sound)
1609 return;
1610
1611 for_all_players_on_map (pl, this)
1612 if (client *ns = pl->ns)
1613 {
1614 int dx = x - pl->ob->x;
1615 int dy = y - pl->ob->y;
1616
1617 int distance = idistance (dx, dy);
1618
1619 if (distance <= MAX_SOUND_DISTANCE)
1620 ns->play_sound (sound, dx, dy);
1621 }
1622}
1623
1624void
1625maptile::say_msg (const char *msg, int x, int y) const
1626{
1627 for_all_players (pl)
1628 if (client *ns = pl->ns)
1629 {
1630 int dx = x - pl->ob->x;
1631 int dy = y - pl->ob->y;
1632
1633 int distance = idistance (dx, dy);
1634
1635 if (distance <= MAX_SOUND_DISTANCE)
1636 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1637 }
1638}
1639
1640static void
1641split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1642{
1643 // clip to map to the left
1644 if (x0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1647 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1648
1649 if (x1 < 0) // entirely to the left
1650 return;
1651
1652 x0 = 0;
1653 }
1654
1655 // clip to map to the right
1656 if (x1 > m->width)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1659 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1660
1661 if (x0 > m->width) // entirely to the right
1662 return;
1663
1664 x1 = m->width;
1665 }
1666
1667 // clip to map above
1668 if (y0 < 0)
1669 {
1670 if (maptile *tile = m->tile_available (TILE_UP, 1))
1671 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1672
1673 if (y1 < 0) // entirely above
1674 return;
1675
1676 y0 = 0;
1677 }
1678
1679 // clip to map below
1680 if (y1 > m->height)
1681 {
1682 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1683 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1684
1685 if (y0 > m->height) // entirely below
1686 return;
1687
1688 y1 = m->height;
1689 }
1690
1691 // if we get here, the rect is within the current map
1692 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1693
1694 r->m = m;
1695 r->x0 = x0;
1696 r->y0 = y0;
1697 r->x1 = x1;
1698 r->y1 = y1;
1699 r->dx = dx;
1700 r->dy = dy;
1701}
1702
1703maprect *
1704maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1705{
1706 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1707 buf.clear ();
1708
1709 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1710
1711 // add end marker
1712 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1713 r->m = 0;
1714
1715 return (maprect *)buf.linearise ();
1716}
1717

Diff Legend

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