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.186 by root, Tue Apr 13 02:39:52 2010 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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"
30
31#include "path.h" 28#include "path.h"
32 29
33/* 30//+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 31
47/* 32sint8 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 33
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 37 * new values into newmap, nx, and ny. Any and all of those
137 * by the caller. 72 * by the caller.
138 */ 73 */
139int 74int
140blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
141{ 76{
142 object *tmp;
143 int mflags, blocked;
144
145 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
146 * have already checked this. 78 * have already checked this.
147 */ 79 */
148 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
149 { 81 {
150 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
151 return 1; 83 return 1;
152 } 84 }
153 85
154 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
155 * directly.
156 */
157 mflags = m->at (sx, sy).flags ();
158 87
159 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
160 90
161 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
162 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
163 * things we need to do for players. 93 * things we need to do for players.
164 */ 94 */
165 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166 return 0; 96 return 0;
167 97
168 /* if there isn't anytyhing alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
169 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
170 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
171 * or another. Likewise, only if something is blocking us do we 101 * or another. Likewise, only if something is blocking us do we
172 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
173 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
180 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
181 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
182 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
183 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
184 */ 114 */
185 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
186 { 116 {
187 117 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 { 118 {
191 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
192 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
193 * pass through this space. 121 return 1;
194 */ 122 else
195 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
196 { 126 {
197 if (check_inv_recursive (ob, tmp) == NULL) 127 bool have = check_inv_recursive (ob, tmp);
128
129 // last_sp set means we block if we don't have.
130 if (logical_xor (have, tmp->last_sp))
198 return 1; 131 return 1;
199 else 132 }
200 continue; 133 else if (tmp->type == T_MATCH)
134 {
135 // T_MATCH allows "entrance" iff the match is true
136 // == blocks if the match fails
137
138 // we could have used an INVOKE_OBJECT, but decided against it, as we
139 // assume that T_MATCH is relatively common.
140 if (!match (tmp->slaying, ob, tmp, ob))
141 return 1;
201 } 142 }
202 else 143 else
203 { 144 return 1; // unconditional block
204 /* In this case, the player must not have the object - 145
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 146 } else {
214 { 147 // space does not block the ob, directly, but
215 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
216 * this more readable. first check - if the space blocks 149 // 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 150
224 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
225 && tmp->head_ () != ob 152 && tmp->head_ () != ob
226 && tmp != ob 153 && tmp != ob
227 && tmp->type != DOOR 154 && tmp->type != DOOR)
228 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
229 return 1; 155 return 1;
230 } 156 }
231
232 } 157 }
158
233 return 0; 159 return 0;
234} 160}
235 161
236/* 162/*
237 * Returns true if the given object can't fit in the given spot. 163 * 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, 164 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 166 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
242 * 168 *
243 * While this doesn't call out of map, the get_map_flags does. 169 * While this doesn't call out of map, the get_map_flags does.
244 * 170 *
245 * This function has been used to deprecate arch_out_of_map - 171 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 172 * this function also does that check, and since in most cases,
257 * 183 *
258 * Note this used to be arch_blocked, but with new movement 184 * Note this used to be arch_blocked, but with new movement
259 * code, we need to have actual object to check its move_type 185 * code, we need to have actual object to check its move_type
260 * against the move_block values. 186 * against the move_block values.
261 */ 187 */
262int 188bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 189object::blocked (maptile *m, int x, int y) const
264{ 190{
265 archetype *tmp; 191 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 } 192 {
193 mapxy pos (m, x + tmp->x, y + tmp->y);
279 194
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 195 if (!pos.normalise ())
281 { 196 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 197
284 if (flag & P_OUT_OF_MAP) 198 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 199
286 if (flag & P_IS_ALIVE) 200 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 201 return 1;
288 202
289 mapspace &ms = m1->at (sx, sy); 203 /* However, often ob doesn't have any move type
290 204 * (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. 205 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 206 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 207 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 208 continue;
298 209
299 /* Note it is intentional that we check ob - the movement type of the 210 /* Note it is intentional that we check ob - the movement type of the
300 * head of the object should correspond for the entire object. 211 * head of the object should correspond for the entire object.
301 */ 212 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 213 if (ms.blocks (move_type))
303 return P_NO_PASS; 214 return 1;
304 } 215 }
305 216
306 return 0; 217 return 0;
307} 218}
308 219
309/* When the map is loaded, load_object does not actually insert objects 220//-GPL
310 * into inventory, but just links them. What this does is go through
311 * and insert them properly.
312 * The object 'container' is the object that contains the inventory.
313 * This is needed so that we can update the containers weight.
314 */
315void
316fix_container (object *container)
317{
318 object *tmp = container->inv, *next;
319
320 container->inv = 0;
321 while (tmp)
322 {
323 next = tmp->below;
324 if (tmp->inv)
325 fix_container (tmp);
326
327 insert_ob_in_ob (tmp, container);
328 tmp = next;
329 }
330
331 /* sum_weight will go through and calculate what all the containers are
332 * carrying.
333 */
334 sum_weight (container);
335}
336 221
337void 222void
338maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
339{ 224{
340 if (!spaces) 225 if (!spaces)
342 227
343 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 228 for (mapspace *ms = spaces + size (); ms-- > spaces; )
344 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 229 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
345 tmp->flag [flag] = value; 230 tmp->flag [flag] = value;
346} 231}
232
233void
234maptile::post_load_original ()
235{
236 if (!spaces)
237 return;
238
239 set_object_flag (FLAG_OBJ_ORIGINAL);
240
241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
243 INVOKE_OBJECT (RESET, tmp);
244}
245
246void
247maptile::post_load ()
248{
249#if 0
250 if (!spaces)
251 return;
252
253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
255 ; // nop
256#endif
257}
258
259//+GPL
347 260
348/* link_multipart_objects go through all the objects on the map looking 261/* 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 262 * 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 263 * info we have, they only have the head (as would be expected when
351 * they are saved). 264 * they are saved).
379 op = op->above; 292 op = op->above;
380 } 293 }
381 } 294 }
382} 295}
383 296
297//-GPL
298
384/* 299/*
385 * Loads (ands parses) the objects into a given map from the specified 300 * Loads (ands parses) the objects into a given map from the specified
386 * file pointer. 301 * file pointer.
387 */ 302 */
388bool 303bool
389maptile::_load_objects (object_thawer &f) 304maptile::_load_objects (object_thawer &f)
390{ 305{
391 for (;;) 306 for (;;)
392 { 307 {
393 coroapi::cede_to_tick_every (100); // cede once in a while 308 coroapi::cede_to_tick (); // cede once in a while
394 309
395 switch (f.kw) 310 switch (f.kw)
396 { 311 {
397 case KW_arch: 312 case KW_arch:
398 if (object *op = object::read (f, this)) 313 if (object *op = object::read (f, this))
399 { 314 {
315 // TODO: why?
400 if (op->inv) 316 if (op->inv)
401 sum_weight (op); 317 op->update_weight ();
402 318
403 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 319 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
320 {
321 // we insert manually because
322 // a) its way faster
323 // b) we remove manually, too, and there are good reasons for that
324 // c) it's correct
325 mapspace &ms = at (op->x, op->y);
326
327 op->flag [FLAG_REMOVED] = false;
328
329 op->above = 0;
330 op->below = ms.top;
331
332 *(ms.top ? &ms.top->above : &ms.bot) = op;
333
334 ms.top = op;
335 ms.flags_ = 0;
336 }
337 else
338 {
339 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
340 op->destroy ();
341 }
404 } 342 }
405 343
406 continue; 344 continue;
407 345
408 case KW_EOF: 346 case KW_EOF:
421} 359}
422 360
423void 361void
424maptile::activate () 362maptile::activate ()
425{ 363{
426 active = true;
427
428 if (spaces) 364 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 365 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 366 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 367 op->activate_recursive ();
432} 368}
433 369
434void 370void
435maptile::deactivate () 371maptile::deactivate ()
436{ 372{
437 active = false;
438
439 if (spaces) 373 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 374 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 375 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 376 op->deactivate_recursive ();
443} 377}
453 if (!spaces) 387 if (!spaces)
454 return false; 388 return false;
455 389
456 for (int i = 0; i < size (); ++i) 390 for (int i = 0; i < size (); ++i)
457 { 391 {
458 int unique = 0; 392 bool unique = 0;
393
459 for (object *op = spaces [i].bot; op; op = op->above) 394 for (object *op = spaces [i].bot; op; op = op->above)
460 { 395 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 396 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 397
464 if (!op->can_map_save ()) 398 if (expect_false (!op->can_map_save ()))
465 continue; 399 continue;
466 400
467 if (unique || op->flag [FLAG_UNIQUE]) 401 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 402 {
469 if (flags & IO_UNIQUES) 403 if (flags & IO_UNIQUES)
470 op->write (f); 404 op->write (f);
471 } 405 }
472 else if (flags & IO_OBJECTS) 406 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 407 op->write (f);
474 } 408 }
475 } 409 }
476 410
477 coroapi::cede_to_tick (); 411 coroapi::cede_to_tick ();
478 412
479 return true; 413 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} 414}
503 415
504bool 416bool
505maptile::_save_objects (const char *path, int flags) 417maptile::_save_objects (const char *path, int flags)
506{ 418{
520 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
521 */ 433 */
522 width = 16; 434 width = 16;
523 height = 16; 435 height = 16;
524 timeout = 300; 436 timeout = 300;
525 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
526 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
527} 439}
528 440
529maptile::maptile (int w, int h) 441maptile::maptile (int w, int h)
530{ 442{
551 if (spaces) 463 if (spaces)
552 return; 464 return;
553 465
554 spaces = salloc0<mapspace> (size ()); 466 spaces = salloc0<mapspace> (size ());
555} 467}
468
469//+GPL
556 470
557/* Takes a string from a map definition and outputs a pointer to the array of shopitems 471/* 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 472 * corresponding to that string. Memory is allocated for this, it must be freed
559 * at a later date. 473 * at a later date.
560 * Called by parse_map_headers below. 474 * Called by parse_map_headers below.
637 return items; 551 return items;
638} 552}
639 553
640/* opposite of parse string, this puts the string that was originally fed in to 554/* opposite of parse string, this puts the string that was originally fed in to
641 * the map (or something equivilent) into output_string. */ 555 * the map (or something equivilent) into output_string. */
642static void 556static const char *
643print_shop_string (maptile *m, char *output_string) 557print_shop_string (maptile *m)
644{ 558{
645 int i; 559 static dynbuf_text buf; buf.clear ();
646 char tmp[MAX_BUF];
647 560
648 strcpy (output_string, "");
649 for (i = 0; i < m->shopitems[0].index; i++) 561 for (int i = 0; i < m->shopitems[0].index; i++)
650 { 562 {
651 if (m->shopitems[i].typenum) 563 if (m->shopitems[i].typenum)
652 { 564 {
653 if (m->shopitems[i].strength) 565 if (m->shopitems[i].strength)
654 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 566 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
655 else 567 else
656 sprintf (tmp, "%s;", m->shopitems[i].name); 568 buf.printf ("%s;", m->shopitems[i].name);
657 } 569 }
658 else 570 else
659 { 571 {
660 if (m->shopitems[i].strength) 572 if (m->shopitems[i].strength)
661 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 573 buf.printf ("*:%d;", m->shopitems[i].strength);
662 else 574 else
663 sprintf (tmp, "*"); 575 buf.printf ("*");
664 } 576 }
665
666 strcat (output_string, tmp);
667 } 577 }
578
579 return buf;
668} 580}
581
582//-GPL
669 583
670/* This loads the header information of the map. The header 584/* This loads the header information of the map. The header
671 * contains things like difficulty, size, timeout, etc. 585 * contains things like difficulty, size, timeout, etc.
672 * this used to be stored in the map object, but with the 586 * this used to be stored in the map object, but with the
673 * addition of tiling, fields beyond that easily named in an 587 * addition of tiling, fields beyond that easily named in an
681bool 595bool
682maptile::_load_header (object_thawer &thawer) 596maptile::_load_header (object_thawer &thawer)
683{ 597{
684 for (;;) 598 for (;;)
685 { 599 {
686 thawer.next ();
687
688 switch (thawer.kw) 600 switch (thawer.kw)
689 { 601 {
690 case KW_msg: 602 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 603 thawer.get_ml (KW_endmsg, msg);
692 break; 604 break;
716 case KW_shopgreed: thawer.get (shopgreed); break; 628 case KW_shopgreed: thawer.get (shopgreed); break;
717 case KW_shopmin: thawer.get (shopmin); break; 629 case KW_shopmin: thawer.get (shopmin); break;
718 case KW_shopmax: thawer.get (shopmax); break; 630 case KW_shopmax: thawer.get (shopmax); break;
719 case KW_shoprace: thawer.get (shoprace); break; 631 case KW_shoprace: thawer.get (shoprace); break;
720 case KW_outdoor: thawer.get (outdoor); break; 632 case KW_outdoor: thawer.get (outdoor); break;
721 case KW_temp: thawer.get (temp); break;
722 case KW_pressure: thawer.get (pressure); break;
723 case KW_humid: thawer.get (humid); break;
724 case KW_windspeed: thawer.get (windspeed); break;
725 case KW_winddir: thawer.get (winddir); break;
726 case KW_sky: thawer.get (sky); break;
727 633
728 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
729 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break; 636 case KW_no_reset: thawer.get (no_reset); break;
637 case KW_no_drop: thawer.get (no_drop); break;
731 638
732 case KW_region: default_region = region::find (thawer.get_str ()); break; 639 case KW_region: default_region = region::find (thawer.get_str ()); break;
733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 640 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
734 641
735 // old names new names 642 // old names new names
746 case KW_tile_path_1: thawer.get (tile_path [0]); break; 653 case KW_tile_path_1: thawer.get (tile_path [0]); break;
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 654 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 655 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 656 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 657
658 case KW_ERROR:
659 set_key_text (thawer.kw_str, thawer.value);
660 break;
661
751 case KW_end: 662 case KW_end:
663 thawer.next ();
752 return true; 664 return true;
753 665
754 default: 666 default:
755 if (!thawer.parse_error ("map", 0)) 667 if (!thawer.parse_error ("map", 0))
756 return false; 668 return false;
757 break; 669 break;
758 } 670 }
671
672 thawer.next ();
759 } 673 }
760 674
761 abort (); 675 abort ();
762} 676}
763 677
764bool 678//+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 679
775/****************************************************************************** 680/******************************************************************************
776 * This is the start of unique map handling code 681 * This is the start of unique map handling code
777 *****************************************************************************/ 682 *****************************************************************************/
778 683
785 int unique = 0; 690 int unique = 0;
786 for (object *op = spaces [i].bot; op; ) 691 for (object *op = spaces [i].bot; op; )
787 { 692 {
788 object *above = op->above; 693 object *above = op->above;
789 694
790 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 695 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
791 unique = 1; 696 unique = 1;
792 697
793 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 698 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
794 {
795 op->destroy_inv (false);
796 op->destroy (); 699 op->destroy ();
797 }
798 700
799 op = above; 701 op = above;
800 } 702 }
801 } 703 }
802} 704}
803 705
706//-GPL
707
804bool 708bool
805maptile::_save_header (object_freezer &freezer) 709maptile::_save_header (object_freezer &freezer)
806{ 710{
807#define MAP_OUT(k) freezer.put (KW_ ## k, k) 711#define MAP_OUT(k) freezer.put (KW(k), k)
808#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 712#define MAP_OUT2(k,v) freezer.put (KW(k), v)
809 713
810 MAP_OUT2 (arch, "map"); 714 MAP_OUT2 (arch, CS(map));
811 715
812 if (name) MAP_OUT (name); 716 if (name) MAP_OUT (name);
813 MAP_OUT (swap_time); 717 MAP_OUT (swap_time);
814 MAP_OUT (reset_time); 718 MAP_OUT (reset_time);
815 MAP_OUT (reset_timeout); 719 MAP_OUT (reset_timeout);
816 MAP_OUT (fixed_resettime); 720 MAP_OUT (fixed_resettime);
817 MAP_OUT (no_reset); 721 MAP_OUT (no_reset);
722 MAP_OUT (no_drop);
818 MAP_OUT (difficulty); 723 MAP_OUT (difficulty);
819
820 if (default_region) MAP_OUT2 (region, default_region->name); 724 if (default_region) MAP_OUT2 (region, default_region->name);
821 725
822 if (shopitems) 726 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); 727 MAP_OUT (shopgreed);
830 MAP_OUT (shopmin); 728 MAP_OUT (shopmin);
831 MAP_OUT (shopmax); 729 MAP_OUT (shopmax);
832 if (shoprace) MAP_OUT (shoprace); 730 if (shoprace) MAP_OUT (shoprace);
833 MAP_OUT (darkness); 731
834 MAP_OUT (width); 732 MAP_OUT (width);
835 MAP_OUT (height); 733 MAP_OUT (height);
836 MAP_OUT (enter_x); 734 MAP_OUT (enter_x);
837 MAP_OUT (enter_y); 735 MAP_OUT (enter_y);
838 736 MAP_OUT (darkness);
839 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
840 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
841
842 MAP_OUT (outdoor); 737 MAP_OUT (outdoor);
843 MAP_OUT (temp); 738
844 MAP_OUT (pressure); 739 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
845 MAP_OUT (humid); 740 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
846 MAP_OUT (windspeed);
847 MAP_OUT (winddir);
848 MAP_OUT (sky);
849 741
850 MAP_OUT (per_player); 742 MAP_OUT (per_player);
851 MAP_OUT (per_party); 743 MAP_OUT (per_party);
852 744
853 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 745 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
854 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 746 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
855 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 747 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
856 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 748 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
857 749
858 freezer.put (this); 750 freezer.put (this);
859 freezer.put (KW_end); 751 freezer.put (KW(end));
860 752
861 return true; 753 return true;
862} 754}
863 755
864bool 756bool
870 return false; 762 return false;
871 763
872 return freezer.save (path); 764 return freezer.save (path);
873} 765}
874 766
767//+GPL
768
875/* 769/*
876 * Remove and free all objects in the given map. 770 * Remove and free all objects in the given map.
877 */ 771 */
878void 772void
879maptile::clear () 773maptile::clear ()
880{ 774{
881 sfree (regions, size ()), regions = 0;
882 free (regionmap), regionmap = 0;
883
884 if (spaces) 775 if (spaces)
885 { 776 {
886 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 777 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 while (object *op = ms->bot) 778 while (object *op = ms->bot)
888 { 779 {
780 // manually remove, as to not trigger anything
781 if (ms->bot = op->above)
782 ms->bot->below = 0;
783
784 op->flag [FLAG_REMOVED] = true;
785
889 op = op->head_ (); 786 object *head = op->head_ ();
890 op->destroy_inv (false); 787 if (op == head)
891 op->destroy (); 788 op->destroy ();
789 else if (head->map != op->map)
790 {
791 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
792 head->destroy ();
793 }
892 } 794 }
893 795
894 sfree (spaces, size ()), spaces = 0; 796 sfree0 (spaces, size ());
895 } 797 }
896 798
897 if (buttons) 799 if (buttons)
898 free_objectlinkpt (buttons), buttons = 0; 800 free_objectlinkpt (buttons), buttons = 0;
801
802 sfree0 (regions, size ());
803 delete [] regionmap; regionmap = 0;
899} 804}
900 805
901void 806void
902maptile::clear_header () 807maptile::clear_header ()
903{ 808{
936 841
937 clear (); 842 clear ();
938} 843}
939 844
940/* decay and destroy perishable items in a map */ 845/* decay and destroy perishable items in a map */
846// TODO: should be done regularly, not on map load?
941void 847void
942maptile::do_decay_objects () 848maptile::do_decay_objects ()
943{ 849{
944 if (!spaces) 850 if (!spaces)
945 return; 851 return;
947 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 853 for (mapspace *ms = spaces + size (); ms-- > spaces; )
948 for (object *above, *op = ms->bot; op; op = above) 854 for (object *above, *op = ms->bot; op; op = above)
949 { 855 {
950 above = op->above; 856 above = op->above;
951 857
858 // do not decay anything above unique floor tiles (yet :)
859 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
860 break;
861
952 bool destroy = 0; 862 bool destroy = 0;
953 863
954 // do not decay anything above unique floor tiles (yet :) 864 if (op->flag [FLAG_IS_FLOOR]
955 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 865 || op->flag [FLAG_OBJ_ORIGINAL]
956 break; 866 || op->flag [FLAG_UNIQUE]
957 867 || op->flag [FLAG_OVERLAY_FLOOR]
958 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 868 || op->flag [FLAG_UNPAID]
959 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
960 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
961 || QUERY_FLAG (op, FLAG_UNIQUE)
962 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
963 || QUERY_FLAG (op, FLAG_UNPAID)
964 || op->is_alive ()) 869 || op->is_alive ())
965 ; // do not decay 870 ; // do not decay
966 else if (op->is_weapon ()) 871 else if (op->is_weapon ())
967 { 872 {
968 op->stats.dam--; 873 op->stats.dam--;
993 || mat & M_LIQUID 898 || mat & M_LIQUID
994 || (mat & M_IRON && rndm (1, 5) == 1) 899 || (mat & M_IRON && rndm (1, 5) == 1)
995 || (mat & M_GLASS && rndm (1, 2) == 1) 900 || (mat & M_GLASS && rndm (1, 2) == 1)
996 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 901 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
997 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 902 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
998 || (mat & M_ICE && temp > 32)) 903 //|| (mat & M_ICE && temp > 32)
904 )
999 destroy = 1; 905 destroy = 1;
1000 } 906 }
1001 907
1002 /* adjust overall chance below */ 908 /* adjust overall chance below */
1003 if (destroy && rndm (0, 1)) 909 if (destroy && rndm (0, 1))
1004 op->destroy (); 910 op->destroy ();
1005 }
1006}
1007
1008/*
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 } 911 }
1030} 912}
1031 913
1032/* 914/*
1033 * This routine is supposed to find out the difficulty of the map. 915 * This routine is supposed to find out the difficulty of the map.
1034 * difficulty does not have a lot to do with character level, 916 * difficulty does not have a lot to do with character level,
1035 * but does have a lot to do with treasure on the map. 917 * but does have a lot to do with treasure on the map.
1036 * 918 *
1037 * Difficulty can now be set by the map creature. If the value stored 919 * 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 920 * in the map is zero, then use this routine. Maps should really
1039 * have a difficulty set than using this function - human calculation 921 * have a difficulty set rather than using this function - human calculation
1040 * is much better than this functions guesswork. 922 * is much better than this function's guesswork.
1041 */ 923 */
1042int 924int
1043maptile::estimate_difficulty () const 925maptile::estimate_difficulty () const
1044{ 926{
1045 long monster_cnt = 0; 927 long monster_cnt = 0;
1047 sint64 total_exp = 0; 929 sint64 total_exp = 0;
1048 930
1049 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 931 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1050 for (object *op = ms->bot; op; op = op->above) 932 for (object *op = ms->bot; op; op = op->above)
1051 { 933 {
1052 if (QUERY_FLAG (op, FLAG_MONSTER)) 934 if (op->flag [FLAG_MONSTER])
1053 { 935 {
1054 total_exp += op->stats.exp; 936 total_exp += op->stats.exp;
1055 monster_cnt++; 937 monster_cnt++;
1056 } 938 }
1057 939
1058 if (QUERY_FLAG (op, FLAG_GENERATOR)) 940 if (op->flag [FLAG_GENERATOR])
1059 { 941 {
1060 total_exp += op->stats.exp; 942 total_exp += op->stats.exp;
1061 943
1062 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 944 if (archetype *at = op->other_arch)
945 {
1063 total_exp += at->stats.exp * 8; 946 total_exp += at->stats.exp * 8;
1064
1065 monster_cnt++; 947 monster_cnt++;
948 }
949
950 for (object *inv = op->inv; inv; inv = inv->below)
951 {
952 total_exp += op->stats.exp * 8;
953 monster_cnt++;
954 }
1066 } 955 }
1067 } 956 }
1068 957
1069 avgexp = (double) total_exp / monster_cnt; 958 avgexp = (double) total_exp / monster_cnt;
1070 959
1083 * postive values make it darker, negative make it brighter 972 * postive values make it darker, negative make it brighter
1084 */ 973 */
1085int 974int
1086maptile::change_map_light (int change) 975maptile::change_map_light (int change)
1087{ 976{
1088 int new_level = darkness + change;
1089
1090 /* Nothing to do */ 977 /* Nothing to do */
1091 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 978 if (!change)
1092 return 0; 979 return 0;
1093 980
1094 /* inform all players on the map */ 981 /* inform all players on the map */
1095 if (change > 0) 982 if (change > 0)
1096 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 983 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1097 else 984 else
1098 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 985 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1099 986
1100 /* Do extra checking. since darkness is a unsigned value, 987 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 988
1112 /* All clients need to get re-updated for the change */ 989 /* All clients need to get re-updated for the change */
1113 update_all_map_los (this); 990 update_all_map_los (this);
991
1114 return 1; 992 return 1;
1115} 993}
1116 994
1117/* 995/*
1118 * This function updates various attributes about a specific space 996 * This function updates various attributes about a specific space
1121 * through, etc) 999 * through, etc)
1122 */ 1000 */
1123void 1001void
1124mapspace::update_ () 1002mapspace::update_ ()
1125{ 1003{
1126 object *tmp, *last = 0; 1004 object *last = 0;
1127 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1005 uint8 flags = P_UPTODATE;
1006 sint8 light = 0;
1128 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1007 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1008 uint64_t volume = 0;
1009 uint32_t items = 0;
1010 object *anywhere = 0;
1011 uint8_t middle_visibility = 0;
1129 1012
1130 //object *middle = 0; 1013 //object *middle = 0;
1131 //object *top = 0; 1014 //object *top = 0;
1132 //object *floor = 0; 1015 //object *floor = 0;
1133 // this seems to generate better code than using locals, above 1016 // this seems to generate better code than using locals, above
1134 object *&top = faces_obj[0] = 0; 1017 object *&top = faces_obj[0] = 0;
1135 object *&middle = faces_obj[1] = 0; 1018 object *&middle = faces_obj[1] = 0;
1136 object *&floor = faces_obj[2] = 0; 1019 object *&floor = faces_obj[2] = 0;
1137 1020
1021 object::flags_t allflags; // all flags of all objects or'ed together
1022
1138 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1139 { 1024 {
1140 /* This could be made additive I guess (two lights better than 1025 // 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; 1026 light += tmp->glow_radius;
1147 1027
1148 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1149 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1150 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1151 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
1152 * functions the move_player calls eventualy call this. 1032 * functions the move_player calls eventualy call this.
1153 * 1033 *
1154 * Always put the player down for drawing. 1034 * Always put the player down for drawing.
1155 */ 1035 */
1156 if (!tmp->invisible) 1036 if (expect_true (!tmp->invisible))
1157 { 1037 {
1158 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1038 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1159 top = tmp; 1039 top = tmp;
1160 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1040 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1161 { 1041 {
1162 /* If we got a floor, that means middle and top were below it, 1042 /* If we got a floor, that means middle and top were below it,
1163 * so should not be visible, so we clear them. 1043 * so should not be visible, so we clear them.
1164 */ 1044 */
1165 middle = 0; 1045 middle = 0;
1166 top = 0; 1046 top = 0;
1167 floor = tmp; 1047 floor = tmp;
1048 volume = 0;
1049 items = 0;
1168 } 1050 }
1169 /* Flag anywhere have high priority */ 1051 else
1170 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1171 { 1052 {
1053 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1054 {
1055 ++items;
1056 volume += tmp->volume ();
1057 }
1058
1059 /* Flag anywhere have high priority */
1060 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1061 anywhere = tmp;
1062
1063 /* Find the highest visible face around. If equal
1064 * visibilities, we still want the one nearer to the
1065 * top
1066 */
1067 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1068 {
1069 middle_visibility = ::faces [tmp->face].visibility;
1172 middle = tmp; 1070 middle = tmp;
1173 anywhere = 1; 1071 }
1174 } 1072 }
1175 /* Find the highest visible face around. If equal
1176 * visibilities, we still want the one nearer to the
1177 * top
1178 */
1179 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1180 middle = tmp;
1181 }
1182
1183 if (tmp == tmp->above)
1184 {
1185 LOG (llevError, "Error in structure of map\n");
1186 exit (-1);
1187 } 1073 }
1188 1074
1189 move_slow |= tmp->move_slow; 1075 move_slow |= tmp->move_slow;
1190 move_block |= tmp->move_block; 1076 move_block |= tmp->move_block;
1191 move_on |= tmp->move_on; 1077 move_on |= tmp->move_on;
1192 move_off |= tmp->move_off; 1078 move_off |= tmp->move_off;
1193 move_allow |= tmp->move_allow; 1079 move_allow |= tmp->move_allow;
1194 1080
1195 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1081 allflags |= tmp->flag;
1196 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1082
1197 if (tmp->type == PLAYER) flags |= P_PLAYER; 1083 if (tmp->type == PLAYER) flags |= P_PLAYER;
1198 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1084 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1199 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1200 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1201 } 1085 }
1202 1086
1203 this->light = light; 1087 // FLAG_SEE_ANYWHERE takes precedence
1088 if (anywhere)
1089 middle = anywhere;
1090
1091 // ORing all flags together and checking them here is much faster
1092 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1093 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1094 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1095 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1096
1097 this->light = min (light, MAX_LIGHT_RADIUS);
1204 this->flags_ = flags; 1098 this->flags_ = flags;
1205 this->move_block = move_block & ~move_allow; 1099 this->move_block = move_block & ~move_allow;
1206 this->move_on = move_on; 1100 this->move_on = move_on;
1207 this->move_off = move_off; 1101 this->move_off = move_off;
1208 this->move_slow = move_slow; 1102 this->move_slow = move_slow;
1103 this->volume_ = (volume + 1023) / 1024;
1104 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1209 1105
1210 /* At this point, we have a floor face (if there is a floor), 1106 /* At this point, we have a floor face (if there is a floor),
1211 * and the floor is set - we are not going to touch it at 1107 * and the floor is set - we are not going to touch it at
1212 * this point. 1108 * this point.
1213 * middle contains the highest visibility face. 1109 * middle contains the highest visibility face.
1228 * 1) top face is set, need middle to be set. 1124 * 1) top face is set, need middle to be set.
1229 * 2) middle is set, need to set top. 1125 * 2) middle is set, need to set top.
1230 * 3) neither middle or top is set - need to set both. 1126 * 3) neither middle or top is set - need to set both.
1231 */ 1127 */
1232 1128
1233 for (tmp = last; tmp; tmp = tmp->below) 1129 for (object *tmp = last; tmp; tmp = tmp->below)
1234 { 1130 {
1235 /* Once we get to a floor, stop, since we already have a floor object */ 1131 /* Once we get to a floor, stop, since we already have a floor object */
1236 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1132 if (tmp->flag [FLAG_IS_FLOOR])
1237 break; 1133 break;
1238 1134
1239 /* If two top faces are already set, quit processing */ 1135 /* If two top faces are already set, quit processing */
1240 if (top && middle) 1136 if (top && middle)
1241 break; 1137 break;
1279 faces_obj [1] = middle; 1175 faces_obj [1] = middle;
1280 faces_obj [2] = floor; 1176 faces_obj [2] = floor;
1281#endif 1177#endif
1282} 1178}
1283 1179
1284uint64 1180maptile *
1285mapspace::volume () const 1181maptile::tile_available (int dir, bool load)
1286{ 1182{
1287 uint64 vol = 0; 1183 if (tile_path[dir])
1288
1289 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1290 vol += op->volume ();
1291
1292 return vol;
1293}
1294
1295/* this updates the orig_map->tile_map[tile_num] value after finding
1296 * the map. It also takes care of linking back the freshly found
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{
1303 maptile *mp = orig_map->tile_map [tile_num];
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 } 1184 {
1185 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1186 return tile_map[dir];
1319 1187
1320 int dest_tile = (tile_num + 2) % 4; 1188 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1189 return tile_map[dir];
1190 }
1321 1191
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; 1192 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} 1193}
1337 1194
1338/* this returns TRUE if the coordinates (x,y) are out of 1195/* this returns TRUE if the coordinates (x,y) are out of
1339 * map m. This function also takes into account any 1196 * map m. This function also takes into account any
1340 * tiling considerations, loading adjacant maps as needed. 1197 * tiling considerations, loading adjacant maps as needed.
1353 if (!m) 1210 if (!m)
1354 return 0; 1211 return 0;
1355 1212
1356 if (x < 0) 1213 if (x < 0)
1357 { 1214 {
1358 if (!m->tile_path[3]) 1215 if (!m->tile_available (3))
1359 return 1; 1216 return 1;
1360 1217
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); 1218 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1365 } 1219 }
1366 1220
1367 if (x >= m->width) 1221 if (x >= m->width)
1368 { 1222 {
1369 if (!m->tile_path[1]) 1223 if (!m->tile_available (1))
1370 return 1; 1224 return 1;
1371 1225
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); 1226 return out_of_map (m->tile_map[1], x - m->width, y);
1376 } 1227 }
1377 1228
1378 if (y < 0) 1229 if (y < 0)
1379 { 1230 {
1380 if (!m->tile_path[0]) 1231 if (!m->tile_available (0))
1381 return 1; 1232 return 1;
1382 1233
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); 1234 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1387 } 1235 }
1388 1236
1389 if (y >= m->height) 1237 if (y >= m->height)
1390 { 1238 {
1391 if (!m->tile_path[2]) 1239 if (!m->tile_available (2))
1392 return 1; 1240 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 1241
1397 return out_of_map (m->tile_map[2], x, y - m->height); 1242 return out_of_map (m->tile_map[2], x, y - m->height);
1398 } 1243 }
1399 1244
1400 /* Simple case - coordinates are within this local 1245 /* Simple case - coordinates are within this local
1414maptile * 1259maptile *
1415maptile::xy_find (sint16 &x, sint16 &y) 1260maptile::xy_find (sint16 &x, sint16 &y)
1416{ 1261{
1417 if (x < 0) 1262 if (x < 0)
1418 { 1263 {
1419 if (!tile_path[3]) 1264 if (!tile_available (3))
1420 return 0; 1265 return 0;
1421 1266
1422 find_and_link (this, 3);
1423 x += tile_map[3]->width; 1267 x += tile_map[3]->width;
1424 return tile_map[3]->xy_find (x, y); 1268 return tile_map[3]->xy_find (x, y);
1425 } 1269 }
1426 1270
1427 if (x >= width) 1271 if (x >= width)
1428 { 1272 {
1429 if (!tile_path[1]) 1273 if (!tile_available (1))
1430 return 0; 1274 return 0;
1431 1275
1432 find_and_link (this, 1);
1433 x -= width; 1276 x -= width;
1434 return tile_map[1]->xy_find (x, y); 1277 return tile_map[1]->xy_find (x, y);
1435 } 1278 }
1436 1279
1437 if (y < 0) 1280 if (y < 0)
1438 { 1281 {
1439 if (!tile_path[0]) 1282 if (!tile_available (0))
1440 return 0; 1283 return 0;
1441 1284
1442 find_and_link (this, 0);
1443 y += tile_map[0]->height; 1285 y += tile_map[0]->height;
1444 return tile_map[0]->xy_find (x, y); 1286 return tile_map[0]->xy_find (x, y);
1445 } 1287 }
1446 1288
1447 if (y >= height) 1289 if (y >= height)
1448 { 1290 {
1449 if (!tile_path[2]) 1291 if (!tile_available (2))
1450 return 0; 1292 return 0;
1451 1293
1452 find_and_link (this, 2);
1453 y -= height; 1294 y -= height;
1454 return tile_map[2]->xy_find (x, y); 1295 return tile_map[2]->xy_find (x, y);
1455 } 1296 }
1456 1297
1457 /* Simple case - coordinates are within this local 1298 /* Simple case - coordinates are within this local
1468adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1309adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1469{ 1310{
1470 if (!map1 || !map2) 1311 if (!map1 || !map2)
1471 return 0; 1312 return 0;
1472 1313
1473 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1314 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1474 //fix: compare paths instead (this is likely faster, too!) 1315 //fix: compare paths instead (this is likely faster, too!)
1475 if (map1 == map2) 1316 if (map1 == map2)
1476 { 1317 {
1477 *dx = 0; 1318 *dx = 0;
1478 *dy = 0; 1319 *dy = 0;
1579 * 1420 *
1580 * currently, the only flag supported (0x1) is don't translate for 1421 * currently, the only flag supported (0x1) is don't translate for
1581 * closest body part of 'op1' 1422 * closest body part of 'op1'
1582 */ 1423 */
1583void 1424void
1584get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1425get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1585{ 1426{
1586 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1427 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1587 { 1428 {
1588 /* be conservative and fill in _some_ data */ 1429 /* be conservative and fill in _some_ data */
1589 retval->distance = 10000; 1430 retval->distance = 10000;
1592 retval->direction = 0; 1433 retval->direction = 0;
1593 retval->part = 0; 1434 retval->part = 0;
1594 } 1435 }
1595 else 1436 else
1596 { 1437 {
1597 object *best;
1598
1599 retval->distance_x += op2->x - op1->x; 1438 retval->distance_x += op2->x - op1->x;
1600 retval->distance_y += op2->y - op1->y; 1439 retval->distance_y += op2->y - op1->y;
1601 1440
1602 best = op1; 1441 object *best = op1;
1442
1603 /* If this is multipart, find the closest part now */ 1443 /* If this is multipart, find the closest part now */
1604 if (!(flags & 0x1) && op1->more) 1444 if (!(flags & 1) && op1->more)
1605 { 1445 {
1606 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1446 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1607 1447
1608 /* we just take the offset of the piece to head to figure 1448 /* we just take the offset of the piece to head to figure
1609 * distance instead of doing all that work above again 1449 * distance instead of doing all that work above again
1660 else 1500 else
1661 { 1501 {
1662 retval->distance_x += op2->x - x; 1502 retval->distance_x += op2->x - x;
1663 retval->distance_y += op2->y - y; 1503 retval->distance_y += op2->y - y;
1664 1504
1665 retval->part = NULL; 1505 retval->part = 0;
1666 retval->distance = idistance (retval->distance_x, retval->distance_y); 1506 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1667 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1507 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1668 } 1508 }
1669} 1509}
1670 1510
1671/* Returns true of op1 and op2 are effectively on the same map 1511/* Returns true of op1 and op2 are effectively on the same map
1682 int dx, dy; 1522 int dx, dy;
1683 1523
1684 return adjacent_map (op1->map, op2->map, &dx, &dy); 1524 return adjacent_map (op1->map, op2->map, &dx, &dy);
1685} 1525}
1686 1526
1527//-GPL
1528
1687object * 1529object *
1688maptile::insert (object *op, int x, int y, object *originator, int flags) 1530maptile::insert (object *op, int x, int y, object *originator, int flags)
1689{ 1531{
1690 if (!op->flag [FLAG_REMOVED])
1691 op->remove ();
1692
1693 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1532 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1694} 1533}
1695 1534
1696region * 1535region *
1697maptile::region (int x, int y) const 1536maptile::region (int x, int y) const
1706 return default_region; 1545 return default_region;
1707 1546
1708 return ::region::default_region (); 1547 return ::region::default_region ();
1709} 1548}
1710 1549
1550//+GPL
1551
1711/* picks a random object from a style map. 1552/* 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 */ 1553 */
1715object * 1554object *
1716maptile::pick_random_object () const 1555maptile::pick_random_object (rand_gen &gen) const
1717{ 1556{
1718 /* while returning a null object will result in a crash, that 1557 /* while returning a null object will result in a crash, that
1719 * is actually preferable to an infinite loop. That is because 1558 * is actually preferable to an infinite loop. That is because
1720 * most servers will automatically restart in case of crash. 1559 * most servers will automatically restart in case of crash.
1721 * Change the logic on getting the random space - shouldn't make 1560 * Change the logic on getting the random space - shouldn't make
1722 * any difference, but this seems clearer to me. 1561 * any difference, but this seems clearer to me.
1723 */ 1562 */
1724 for (int i = 1000; --i;) 1563 for (int i = 1000; --i;)
1725 { 1564 {
1726 object *pick = at (rndm (width), rndm (height)).bot; 1565 object *pick = at (gen (width), gen (height)).bot;
1727 1566
1728 // do not prefer big monsters just because they are big. 1567 // must be head: do not prefer big monsters just because they are big.
1729 if (pick && pick->head_ () == pick) 1568 if (pick && pick->is_head ())
1730 return pick->head_ (); 1569 return pick;
1731 } 1570 }
1732 1571
1733 // instead of crashing in the unlikely(?) case, try to return *something* 1572 // instead of crashing in the unlikely(?) case, try to return *something*
1734 return get_archetype ("blocked"); 1573 return archetype::find (shstr_bug);
1735} 1574}
1736 1575
1576//-GPL
1577
1578void
1579maptile::play_sound (faceidx sound, int x, int y) const
1580{
1581 if (!sound)
1582 return;
1583
1584 for_all_players_on_map (pl, this)
1585 if (client *ns = pl->ns)
1586 {
1587 int dx = x - pl->ob->x;
1588 int dy = y - pl->ob->y;
1589
1590 int distance = idistance (dx, dy);
1591
1592 if (distance <= MAX_SOUND_DISTANCE)
1593 ns->play_sound (sound, dx, dy);
1594 }
1595}
1596
1597void
1598maptile::say_msg (const char *msg, int x, int y) const
1599{
1600 for_all_players (pl)
1601 if (client *ns = pl->ns)
1602 {
1603 int dx = x - pl->ob->x;
1604 int dy = y - pl->ob->y;
1605
1606 int distance = idistance (dx, dy);
1607
1608 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1610 }
1611}
1612
1613dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1614
1615static void
1616split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1617{
1618 // clip to map to the left
1619 if (x0 < 0)
1620 {
1621 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1622 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1623
1624 if (x1 < 0) // entirely to the left
1625 return;
1626
1627 x0 = 0;
1628 }
1629
1630 // clip to map to the right
1631 if (x1 > m->width)
1632 {
1633 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1634 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1635
1636 if (x0 > m->width) // entirely to the right
1637 return;
1638
1639 x1 = m->width;
1640 }
1641
1642 // clip to map above
1643 if (y0 < 0)
1644 {
1645 if (maptile *tile = m->tile_available (TILE_UP, 1))
1646 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1647
1648 if (y1 < 0) // entirely above
1649 return;
1650
1651 y0 = 0;
1652 }
1653
1654 // clip to map below
1655 if (y1 > m->height)
1656 {
1657 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1658 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1659
1660 if (y0 > m->height) // entirely below
1661 return;
1662
1663 y1 = m->height;
1664 }
1665
1666 // if we get here, the rect is within the current map
1667 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1668
1669 r->m = m;
1670 r->x0 = x0;
1671 r->y0 = y0;
1672 r->x1 = x1;
1673 r->y1 = y1;
1674 r->dx = dx;
1675 r->dy = dy;
1676}
1677
1678maprect *
1679maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1680{
1681 buf.clear ();
1682
1683 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1684
1685 // add end marker
1686 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1687 r->m = 0;
1688
1689 return (maprect *)buf.linearise ();
1690}
1691

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines