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.104 by root, Fri May 18 00:09:16 2007 UTC vs.
Revision 1.180 by root, Thu Jan 14 23:46:14 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h" 28#include "loader.h"
31
32#include "path.h" 29#include "path.h"
33 30
34/* 31//+GPL
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47 32
48/* 33sint8 maptile::outdoor_darkness;
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 34
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
103 * 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
138 * by the caller. 73 * by the caller.
139 */ 74 */
140int 75int
141blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
142{ 77{
143 object *tmp;
144 int mflags, blocked;
145
146 /* 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
147 * have already checked this. 79 * have already checked this.
148 */ 80 */
149 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
150 { 82 {
151 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");
152 return 1; 84 return 1;
153 } 85 }
154 86
155 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
156 * directly.
157 */
158 mflags = m->at (sx, sy).flags ();
159 88
160 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
161 91
162 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
163 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
164 * things we need to do for players. 94 * things we need to do for players.
165 */ 95 */
166 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
167 return 0; 97 return 0;
168 98
169 /* 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
170 * 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
171 * 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
172 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
173 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
174 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
181 /* 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
182 * 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
183 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
185 */ 115 */
186 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187 { 117 {
188 118 if (OB_MOVE_BLOCK (ob, tmp))
189 /* This must be before the checks below. Code for inventory checkers. */
190 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191 { 119 {
192 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
193 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
194 * pass through this space. 122 return 1;
195 */ 123 else
196 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
197 { 127 {
198 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))
199 return 1; 132 return 1;
200 else 133 }
201 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;
202 } 143 }
203 else 144 else
204 { 145 return 1; // unconditional block
205 /* In this case, the player must not have the object - 146
206 * if they do, they can't pass through.
207 */
208 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
209 return 1;
210 else
211 continue;
212 }
213 } /* if check_inv */
214 else 147 } else {
215 { 148 // space does not block the ob, directly, but
216 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
217 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
218 * movement, can't move here.
219 * second - if a monster, can't move there, unless it is a
220 * hidden dm
221 */
222 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1;
224 151
225 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 153 && tmp->head_ () != ob
227 && tmp != ob 154 && tmp != ob
228 && tmp->type != DOOR 155 && tmp->type != DOOR)
229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
230 return 1; 156 return 1;
231 } 157 }
232
233 } 158 }
159
234 return 0; 160 return 0;
235} 161}
236 162
237/* 163/*
238 * Returns true if the given object can't fit in the given spot. 164 * Returns qthe blocking object if the given object can't fit in the given
239 * This is meant for multi space objects - for single space objecs, 165 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 166 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 167 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 168 * object and makes sure they can be inserted.
243 * 169 *
244 * While this doesn't call out of map, the get_map_flags does. 170 * While this doesn't call out of map, the get_map_flags does.
245 * 171 *
246 * This function has been used to deprecate arch_out_of_map - 172 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 173 * this function also does that check, and since in most cases,
258 * 184 *
259 * Note this used to be arch_blocked, but with new movement 185 * Note this used to be arch_blocked, but with new movement
260 * code, we need to have actual object to check its move_type 186 * code, we need to have actual object to check its move_type
261 * against the move_block values. 187 * against the move_block values.
262 */ 188 */
263int 189bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 190object::blocked (maptile *m, int x, int y) const
265{ 191{
266 archetype *tmp; 192 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 193 {
194 mapxy pos (m, x + tmp->x, y + tmp->y);
280 195
281 for (tmp = ob->arch; tmp; tmp = tmp->more) 196 if (!pos.normalise ())
282 { 197 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
284 198
285 if (flag & P_OUT_OF_MAP) 199 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 200
287 if (flag & P_IS_ALIVE) 201 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 202 return 1;
289 203
290 mapspace &ms = m1->at (sx, sy); 204 /* However, often ob doesn't have any move type
291 205 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 206 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 207 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 208 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 209 continue;
299 210
300 /* Note it is intentional that we check ob - the movement type of the 211 /* Note it is intentional that we check ob - the movement type of the
301 * head of the object should correspond for the entire object. 212 * head of the object should correspond for the entire object.
302 */ 213 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 214 if (ms.blocks (move_type))
304 return P_NO_PASS; 215 return 1;
305 } 216 }
306 217
307 return 0; 218 return 0;
308} 219}
309 220
310/* When the map is loaded, load_object does not actually insert objects 221//-GPL
311 * into inventory, but just links them. What this does is go through
312 * and insert them properly.
313 * The object 'container' is the object that contains the inventory.
314 * This is needed so that we can update the containers weight.
315 */
316void
317fix_container (object *container)
318{
319 object *tmp = container->inv, *next;
320
321 container->inv = 0;
322 while (tmp)
323 {
324 next = tmp->below;
325 if (tmp->inv)
326 fix_container (tmp);
327
328 insert_ob_in_ob (tmp, container);
329 tmp = next;
330 }
331
332 /* sum_weight will go through and calculate what all the containers are
333 * carrying.
334 */
335 sum_weight (container);
336}
337 222
338void 223void
339maptile::set_object_flag (int flag, int value) 224maptile::set_object_flag (int flag, int value)
340{ 225{
341 if (!spaces) 226 if (!spaces)
343 228
344 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 229 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 230 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value; 231 tmp->flag [flag] = value;
347} 232}
233
234void
235maptile::post_load_original ()
236{
237 if (!spaces)
238 return;
239
240 set_object_flag (FLAG_OBJ_ORIGINAL);
241
242 for (mapspace *ms = spaces + size (); ms-- > spaces; )
243 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
244 INVOKE_OBJECT (RESET, tmp);
245}
246
247void
248maptile::post_load ()
249{
250#if 0
251 if (!spaces)
252 return;
253
254 for (mapspace *ms = spaces + size (); ms-- > spaces; )
255 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
256 ; // nop
257#endif
258}
259
260//+GPL
348 261
349/* link_multipart_objects go through all the objects on the map looking 262/* link_multipart_objects go through all the objects on the map looking
350 * for objects whose arch says they are multipart yet according to the 263 * for objects whose arch says they are multipart yet according to the
351 * info we have, they only have the head (as would be expected when 264 * info we have, they only have the head (as would be expected when
352 * they are saved). 265 * they are saved).
356{ 269{
357 if (!spaces) 270 if (!spaces)
358 return; 271 return;
359 272
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 273 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 274 {
275 object *op = ms->bot;
276 while (op)
362 { 277 {
363 /* already multipart - don't do anything more */ 278 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 279 if (op->head_ () == op && !op->more && op->arch->more)
365 { 280 {
366 op->remove (); 281 op->remove ();
367 op->expand_tail (); 282 op->expand_tail ();
283
284 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
285 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
286 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 287 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
288
289 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
290 // so we have to reset the iteration through the mapspace
369 } 291 }
292 else
293 op = op->above;
370 } 294 }
295 }
371} 296}
297
298//-GPL
372 299
373/* 300/*
374 * Loads (ands parses) the objects into a given map from the specified 301 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 302 * file pointer.
376 */ 303 */
377bool 304bool
378maptile::_load_objects (object_thawer &f) 305maptile::_load_objects (object_thawer &f)
379{ 306{
380 for (;;) 307 for (;;)
381 { 308 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 309 coroapi::cede_to_tick (); // cede once in a while
383 310
384 switch (f.kw) 311 switch (f.kw)
385 { 312 {
386 case KW_arch: 313 case KW_arch:
387 if (object *op = object::read (f, this)) 314 if (object *op = object::read (f, this))
388 { 315 {
316 // TODO: why?
389 if (op->inv) 317 if (op->inv)
390 sum_weight (op); 318 op->update_weight ();
391 319
392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 320 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
321 {
322 // we insert manually because
323 // a) its way faster
324 // b) we remove manually, too, and there are good reasons for that
325 // c) it's correct
326 mapspace &ms = at (op->x, op->y);
327
328 op->flag [FLAG_REMOVED] = false;
329
330 op->above = 0;
331 op->below = ms.top;
332
333 *(ms.top ? &ms.top->above : &ms.bot) = op;
334
335 ms.top = op;
336 ms.flags_ = 0;
337 }
338 else
339 {
340 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
341 op->destroy ();
342 }
393 } 343 }
394 344
395 continue; 345 continue;
396 346
397 case KW_EOF: 347 case KW_EOF:
410} 360}
411 361
412void 362void
413maptile::activate () 363maptile::activate ()
414{ 364{
415 active = true;
416
417 if (spaces) 365 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 366 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 367 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 368 op->activate_recursive ();
421} 369}
422 370
423void 371void
424maptile::deactivate () 372maptile::deactivate ()
425{ 373{
426 active = false;
427
428 if (spaces) 374 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 375 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 376 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 377 op->deactivate_recursive ();
432} 378}
442 if (!spaces) 388 if (!spaces)
443 return false; 389 return false;
444 390
445 for (int i = 0; i < size (); ++i) 391 for (int i = 0; i < size (); ++i)
446 { 392 {
447 int unique = 0; 393 bool unique = 0;
394
448 for (object *op = spaces [i].bot; op; op = op->above) 395 for (object *op = spaces [i].bot; op; op = op->above)
449 { 396 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 397 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 398
453 if (!op->can_map_save ()) 399 if (expect_false (!op->can_map_save ()))
454 continue; 400 continue;
455 401
456 if (unique || op->flag [FLAG_UNIQUE]) 402 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 403 {
458 if (flags & IO_UNIQUES) 404 if (flags & IO_UNIQUES)
459 op->write (f); 405 op->write (f);
460 } 406 }
461 else if (flags & IO_OBJECTS) 407 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 408 op->write (f);
463 } 409 }
464 } 410 }
465 411
466 coroapi::cede_to_tick (); 412 coroapi::cede_to_tick ();
467 413
468 return true; 414 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 415}
492 416
493bool 417bool
494maptile::_save_objects (const char *path, int flags) 418maptile::_save_objects (const char *path, int flags)
495{ 419{
509 * map archetype. Mimic that behaviour. 433 * map archetype. Mimic that behaviour.
510 */ 434 */
511 width = 16; 435 width = 16;
512 height = 16; 436 height = 16;
513 timeout = 300; 437 timeout = 300;
514 max_nrof = 1000; // 1000 items of anything 438 max_items = MAX_ITEM_PER_ACTION;
515 max_volume = 2000000; // 2m³ 439 max_volume = 2000000; // 2m³
516} 440}
517 441
518maptile::maptile (int w, int h) 442maptile::maptile (int w, int h)
519{ 443{
540 if (spaces) 464 if (spaces)
541 return; 465 return;
542 466
543 spaces = salloc0<mapspace> (size ()); 467 spaces = salloc0<mapspace> (size ());
544} 468}
469
470//+GPL
545 471
546/* Takes a string from a map definition and outputs a pointer to the array of shopitems 472/* Takes a string from a map definition and outputs a pointer to the array of shopitems
547 * corresponding to that string. Memory is allocated for this, it must be freed 473 * corresponding to that string. Memory is allocated for this, it must be freed
548 * at a later date. 474 * at a later date.
549 * Called by parse_map_headers below. 475 * Called by parse_map_headers below.
626 return items; 552 return items;
627} 553}
628 554
629/* opposite of parse string, this puts the string that was originally fed in to 555/* opposite of parse string, this puts the string that was originally fed in to
630 * the map (or something equivilent) into output_string. */ 556 * the map (or something equivilent) into output_string. */
631static void 557static const char *
632print_shop_string (maptile *m, char *output_string) 558print_shop_string (maptile *m)
633{ 559{
634 int i; 560 static dynbuf_text buf; buf.clear ();
635 char tmp[MAX_BUF];
636 561
637 strcpy (output_string, "");
638 for (i = 0; i < m->shopitems[0].index; i++) 562 for (int i = 0; i < m->shopitems[0].index; i++)
639 { 563 {
640 if (m->shopitems[i].typenum) 564 if (m->shopitems[i].typenum)
641 { 565 {
642 if (m->shopitems[i].strength) 566 if (m->shopitems[i].strength)
643 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 567 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
644 else 568 else
645 sprintf (tmp, "%s;", m->shopitems[i].name); 569 buf.printf ("%s;", m->shopitems[i].name);
646 } 570 }
647 else 571 else
648 { 572 {
649 if (m->shopitems[i].strength) 573 if (m->shopitems[i].strength)
650 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 574 buf.printf ("*:%d;", m->shopitems[i].strength);
651 else 575 else
652 sprintf (tmp, "*"); 576 buf.printf ("*");
653 } 577 }
654
655 strcat (output_string, tmp);
656 } 578 }
579
580 return buf;
657} 581}
582
583//-GPL
658 584
659/* This loads the header information of the map. The header 585/* This loads the header information of the map. The header
660 * contains things like difficulty, size, timeout, etc. 586 * contains things like difficulty, size, timeout, etc.
661 * this used to be stored in the map object, but with the 587 * this used to be stored in the map object, but with the
662 * addition of tiling, fields beyond that easily named in an 588 * addition of tiling, fields beyond that easily named in an
670bool 596bool
671maptile::_load_header (object_thawer &thawer) 597maptile::_load_header (object_thawer &thawer)
672{ 598{
673 for (;;) 599 for (;;)
674 { 600 {
675 keyword kw = thawer.get_kv ();
676
677 switch (kw) 601 switch (thawer.kw)
678 { 602 {
679 case KW_msg: 603 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 604 thawer.get_ml (KW_endmsg, msg);
681 break; 605 break;
682 606
705 case KW_shopgreed: thawer.get (shopgreed); break; 629 case KW_shopgreed: thawer.get (shopgreed); break;
706 case KW_shopmin: thawer.get (shopmin); break; 630 case KW_shopmin: thawer.get (shopmin); break;
707 case KW_shopmax: thawer.get (shopmax); break; 631 case KW_shopmax: thawer.get (shopmax); break;
708 case KW_shoprace: thawer.get (shoprace); break; 632 case KW_shoprace: thawer.get (shoprace); break;
709 case KW_outdoor: thawer.get (outdoor); break; 633 case KW_outdoor: thawer.get (outdoor); break;
710 case KW_temp: thawer.get (temp); break;
711 case KW_pressure: thawer.get (pressure); break;
712 case KW_humid: thawer.get (humid); break;
713 case KW_windspeed: thawer.get (windspeed); break;
714 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break;
716 634
717 case KW_per_player: thawer.get (per_player); break; 635 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 636 case KW_per_party: thawer.get (per_party); break;
637 case KW_no_reset: thawer.get (no_reset); break;
638 case KW_no_drop: thawer.get (no_drop); break;
719 639
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 640 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 641 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 642
723 // old names new names 643 // old names new names
734 case KW_tile_path_1: thawer.get (tile_path [0]); break; 654 case KW_tile_path_1: thawer.get (tile_path [0]); break;
735 case KW_tile_path_2: thawer.get (tile_path [1]); break; 655 case KW_tile_path_2: thawer.get (tile_path [1]); break;
736 case KW_tile_path_3: thawer.get (tile_path [2]); break; 656 case KW_tile_path_3: thawer.get (tile_path [2]); break;
737 case KW_tile_path_4: thawer.get (tile_path [3]); break; 657 case KW_tile_path_4: thawer.get (tile_path [3]); break;
738 658
659 case KW_ERROR:
660 set_key_text (thawer.kw_str, thawer.value);
661 break;
662
739 case KW_end: 663 case KW_end:
664 thawer.next ();
740 return true; 665 return true;
741 666
742 default: 667 default:
743 if (!thawer.parse_error ("map", 0)) 668 if (!thawer.parse_error ("map", 0))
744 return false; 669 return false;
745 break; 670 break;
746 } 671 }
672
673 thawer.next ();
747 } 674 }
748 675
749 abort (); 676 abort ();
750} 677}
751 678
752bool 679//+GPL
753maptile::_load_header (const char *path)
754{
755 object_thawer thawer (path);
756
757 if (!thawer)
758 return false;
759
760 return _load_header (thawer);
761}
762 680
763/****************************************************************************** 681/******************************************************************************
764 * This is the start of unique map handling code 682 * This is the start of unique map handling code
765 *****************************************************************************/ 683 *****************************************************************************/
766 684
777 695
778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 696 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
779 unique = 1; 697 unique = 1;
780 698
781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 699 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
782 {
783 op->destroy_inv (false);
784 op->destroy (); 700 op->destroy ();
785 }
786 701
787 op = above; 702 op = above;
788 } 703 }
789 } 704 }
790} 705}
791 706
707//-GPL
708
792bool 709bool
793maptile::_save_header (object_freezer &freezer) 710maptile::_save_header (object_freezer &freezer)
794{ 711{
795#define MAP_OUT(k) freezer.put (KW_ ## k, k) 712#define MAP_OUT(k) freezer.put (KW(k), k)
796#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 713#define MAP_OUT2(k,v) freezer.put (KW(k), v)
797 714
798 MAP_OUT2 (arch, "map"); 715 MAP_OUT2 (arch, CS(map));
799 716
800 if (name) MAP_OUT (name); 717 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 718 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 719 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 720 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 721 MAP_OUT (fixed_resettime);
722 MAP_OUT (no_reset);
723 MAP_OUT (no_drop);
805 MAP_OUT (difficulty); 724 MAP_OUT (difficulty);
806
807 if (default_region) MAP_OUT2 (region, default_region->name); 725 if (default_region) MAP_OUT2 (region, default_region->name);
808 726
809 if (shopitems) 727 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
810 {
811 char shop[MAX_BUF];
812 print_shop_string (this, shop);
813 MAP_OUT2 (shopitems, shop);
814 }
815
816 MAP_OUT (shopgreed); 728 MAP_OUT (shopgreed);
817 MAP_OUT (shopmin); 729 MAP_OUT (shopmin);
818 MAP_OUT (shopmax); 730 MAP_OUT (shopmax);
819 if (shoprace) MAP_OUT (shoprace); 731 if (shoprace) MAP_OUT (shoprace);
820 MAP_OUT (darkness); 732
821 MAP_OUT (width); 733 MAP_OUT (width);
822 MAP_OUT (height); 734 MAP_OUT (height);
823 MAP_OUT (enter_x); 735 MAP_OUT (enter_x);
824 MAP_OUT (enter_y); 736 MAP_OUT (enter_y);
825 737 MAP_OUT (darkness);
826 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
827 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
828
829 MAP_OUT (outdoor); 738 MAP_OUT (outdoor);
830 MAP_OUT (temp); 739
831 MAP_OUT (pressure); 740 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
832 MAP_OUT (humid); 741 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
833 MAP_OUT (windspeed);
834 MAP_OUT (winddir);
835 MAP_OUT (sky);
836 742
837 MAP_OUT (per_player); 743 MAP_OUT (per_player);
838 MAP_OUT (per_party); 744 MAP_OUT (per_party);
839 745
840 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 746 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
841 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 747 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
842 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 748 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
843 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 749 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
844 750
845 freezer.put (this); 751 freezer.put (this);
846 freezer.put (KW_end); 752 freezer.put (KW(end));
847 753
848 return true; 754 return true;
849} 755}
850 756
851bool 757bool
857 return false; 763 return false;
858 764
859 return freezer.save (path); 765 return freezer.save (path);
860} 766}
861 767
768//+GPL
769
862/* 770/*
863 * Remove and free all objects in the given map. 771 * Remove and free all objects in the given map.
864 */ 772 */
865void 773void
866maptile::clear () 774maptile::clear ()
867{ 775{
868 sfree (regions, size ()), regions = 0;
869 free (regionmap), regionmap = 0;
870
871 if (spaces) 776 if (spaces)
872 { 777 {
873 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 778 for (mapspace *ms = spaces + size (); ms-- > spaces; )
874 while (object *op = ms->bot) 779 while (object *op = ms->bot)
875 { 780 {
781 // manually remove, as to not trigger anything
782 if (ms->bot = op->above)
783 ms->bot->below = 0;
784
785 op->flag [FLAG_REMOVED] = true;
786
876 op = op->head_ (); 787 object *head = op->head_ ();
877 op->destroy_inv (false); 788 if (op == head)
878 op->destroy (); 789 op->destroy ();
790 else if (head->map != op->map)
791 {
792 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
793 head->destroy ();
794 }
879 } 795 }
880 796
881 sfree (spaces, size ()), spaces = 0; 797 sfree0 (spaces, size ());
882 } 798 }
883 799
884 if (buttons) 800 if (buttons)
885 free_objectlinkpt (buttons), buttons = 0; 801 free_objectlinkpt (buttons), buttons = 0;
802
803 sfree0 (regions, size ());
804 delete [] regionmap; regionmap = 0;
886} 805}
887 806
888void 807void
889maptile::clear_header () 808maptile::clear_header ()
890{ 809{
922 attachable::do_destroy (); 841 attachable::do_destroy ();
923 842
924 clear (); 843 clear ();
925} 844}
926 845
927/* 846/* decay and destroy perishable items in a map */
928 * Updates every button on the map (by calling update_button() for them). 847// TODO: should be done regularly, not on map load?
929 */
930void 848void
931maptile::update_buttons () 849maptile::do_decay_objects ()
932{ 850{
933 for (oblinkpt *obp = buttons; obp; obp = obp->next) 851 if (!spaces)
934 for (objectlink *ol = obp->link; ol; ol = ol->next) 852 return;
853
854 for (mapspace *ms = spaces + size (); ms-- > spaces; )
855 for (object *above, *op = ms->bot; op; op = above)
935 { 856 {
936 if (!ol->ob) 857 above = op->above;
858
859 // do not decay anything above unique floor tiles (yet :)
860 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
861 break;
862
863 bool destroy = 0;
864
865 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
866 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
867 || QUERY_FLAG (op, FLAG_UNIQUE)
868 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
869 || QUERY_FLAG (op, FLAG_UNPAID)
870 || op->is_alive ())
871 ; // do not decay
872 else if (op->is_weapon ())
937 { 873 {
938 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 874 op->stats.dam--;
939 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 875 if (op->stats.dam < 0)
940 continue; 876 destroy = 1;
941 } 877 }
942 878 else if (op->is_armor ())
943 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
944 { 879 {
945 update_button (ol->ob); 880 op->stats.ac--;
946 break; 881 if (op->stats.ac < 0)
882 destroy = 1;
947 } 883 }
884 else if (op->type == FOOD)
885 {
886 op->stats.food -= rndm (5, 20);
887 if (op->stats.food < 0)
888 destroy = 1;
889 }
890 else
891 {
892 int mat = op->materials;
893
894 if (mat & M_PAPER
895 || mat & M_LEATHER
896 || mat & M_WOOD
897 || mat & M_ORGANIC
898 || mat & M_CLOTH
899 || mat & M_LIQUID
900 || (mat & M_IRON && rndm (1, 5) == 1)
901 || (mat & M_GLASS && rndm (1, 2) == 1)
902 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
903 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
904 //|| (mat & M_ICE && temp > 32)
905 )
906 destroy = 1;
907 }
908
909 /* adjust overall chance below */
910 if (destroy && rndm (0, 1))
911 op->destroy ();
948 } 912 }
949} 913}
950 914
951/* 915/*
952 * This routine is supposed to find out the difficulty of the map. 916 * This routine is supposed to find out the difficulty of the map.
953 * difficulty does not have a lot to do with character level, 917 * difficulty does not have a lot to do with character level,
954 * but does have a lot to do with treasure on the map. 918 * but does have a lot to do with treasure on the map.
955 * 919 *
956 * Difficulty can now be set by the map creature. If the value stored 920 * Difficulty can now be set by the map creator. If the value stored
957 * in the map is zero, then use this routine. Maps should really 921 * in the map is zero, then use this routine. Maps should really
958 * have a difficulty set than using this function - human calculation 922 * have a difficulty set rather than using this function - human calculation
959 * is much better than this functions guesswork. 923 * is much better than this function's guesswork.
960 */ 924 */
961int 925int
962maptile::estimate_difficulty () const 926maptile::estimate_difficulty () const
963{ 927{
964 long monster_cnt = 0; 928 long monster_cnt = 0;
976 940
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 941 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 942 {
979 total_exp += op->stats.exp; 943 total_exp += op->stats.exp;
980 944
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 945 if (archetype *at = op->other_arch)
946 {
982 total_exp += at->clone.stats.exp * 8; 947 total_exp += at->stats.exp * 8;
983
984 monster_cnt++; 948 monster_cnt++;
949 }
950
951 for (object *inv = op->inv; inv; inv = inv->below)
952 {
953 total_exp += op->stats.exp * 8;
954 monster_cnt++;
955 }
985 } 956 }
986 } 957 }
987 958
988 avgexp = (double) total_exp / monster_cnt; 959 avgexp = (double) total_exp / monster_cnt;
989 960
1002 * postive values make it darker, negative make it brighter 973 * postive values make it darker, negative make it brighter
1003 */ 974 */
1004int 975int
1005maptile::change_map_light (int change) 976maptile::change_map_light (int change)
1006{ 977{
1007 int new_level = darkness + change;
1008
1009 /* Nothing to do */ 978 /* Nothing to do */
1010 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 979 if (!change)
1011 return 0; 980 return 0;
1012 981
1013 /* inform all players on the map */ 982 /* inform all players on the map */
1014 if (change > 0) 983 if (change > 0)
1015 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 984 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1016 else 985 else
1017 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 986 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1018 987
1019 /* Do extra checking. since darkness is a unsigned value, 988 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1020 * we need to be extra careful about negative values.
1021 * In general, the checks below are only needed if change
1022 * is not +/-1
1023 */
1024 if (new_level < 0)
1025 darkness = 0;
1026 else if (new_level >= MAX_DARKNESS)
1027 darkness = MAX_DARKNESS;
1028 else
1029 darkness = new_level;
1030 989
1031 /* All clients need to get re-updated for the change */ 990 /* All clients need to get re-updated for the change */
1032 update_all_map_los (this); 991 update_all_map_los (this);
992
1033 return 1; 993 return 1;
1034} 994}
1035 995
1036/* 996/*
1037 * This function updates various attributes about a specific space 997 * This function updates various attributes about a specific space
1040 * through, etc) 1000 * through, etc)
1041 */ 1001 */
1042void 1002void
1043mapspace::update_ () 1003mapspace::update_ ()
1044{ 1004{
1045 object *tmp, *last = 0; 1005 object *last = 0;
1046 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1006 uint8 flags = P_UPTODATE;
1007 sint8 light = 0;
1047 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1008 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1009 uint64_t volume = 0;
1010 uint32_t items = 0;
1011 object *anywhere = 0;
1012 uint8_t middle_visibility = 0;
1048 1013
1049 //object *middle = 0; 1014 //object *middle = 0;
1050 //object *top = 0; 1015 //object *top = 0;
1051 //object *floor = 0; 1016 //object *floor = 0;
1052 // this seems to generate better code than using locals, above 1017 // this seems to generate better code than using locals, above
1053 object *&top = faces_obj[0] = 0; 1018 object *&top = faces_obj[0] = 0;
1054 object *&middle = faces_obj[1] = 0; 1019 object *&middle = faces_obj[1] = 0;
1055 object *&floor = faces_obj[2] = 0; 1020 object *&floor = faces_obj[2] = 0;
1056 1021
1022 object::flags_t allflags; // all flags of all objects or'ed together
1023
1057 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1024 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1058 { 1025 {
1059 /* This could be made additive I guess (two lights better than 1026 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1060 * one). But if so, it shouldn't be a simple additive - 2
1061 * light bulbs do not illuminate twice as far as once since
1062 * it is a dissapation factor that is cubed.
1063 */
1064 if (tmp->glow_radius > light)
1065 light = tmp->glow_radius; 1027 light += tmp->glow_radius;
1066 1028
1067 /* This call is needed in order to update objects the player 1029 /* This call is needed in order to update objects the player
1068 * is standing in that have animations (ie, grass, fire, etc). 1030 * is standing in that have animations (ie, grass, fire, etc).
1069 * However, it also causes the look window to be re-drawn 1031 * However, it also causes the look window to be re-drawn
1070 * 3 times each time the player moves, because many of the 1032 * 3 times each time the player moves, because many of the
1071 * functions the move_player calls eventualy call this. 1033 * functions the move_player calls eventualy call this.
1072 * 1034 *
1073 * Always put the player down for drawing. 1035 * Always put the player down for drawing.
1074 */ 1036 */
1075 if (!tmp->invisible) 1037 if (expect_true (!tmp->invisible))
1076 { 1038 {
1077 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1039 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1078 top = tmp; 1040 top = tmp;
1079 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1041 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1080 { 1042 {
1081 /* If we got a floor, that means middle and top were below it, 1043 /* If we got a floor, that means middle and top were below it,
1082 * so should not be visible, so we clear them. 1044 * so should not be visible, so we clear them.
1083 */ 1045 */
1084 middle = 0; 1046 middle = 0;
1085 top = 0; 1047 top = 0;
1086 floor = tmp; 1048 floor = tmp;
1049 volume = 0;
1050 items = 0;
1087 } 1051 }
1088 /* Flag anywhere have high priority */ 1052 else
1089 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1090 { 1053 {
1054 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1055 {
1056 ++items;
1057 volume += tmp->volume ();
1058 }
1059
1060 /* Flag anywhere have high priority */
1061 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1062 anywhere = tmp;
1063
1064 /* Find the highest visible face around. If equal
1065 * visibilities, we still want the one nearer to the
1066 * top
1067 */
1068 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1069 {
1070 middle_visibility = ::faces [tmp->face].visibility;
1091 middle = tmp; 1071 middle = tmp;
1092 anywhere = 1; 1072 }
1093 } 1073 }
1094 /* Find the highest visible face around. If equal
1095 * visibilities, we still want the one nearer to the
1096 * top
1097 */
1098 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1099 middle = tmp;
1100 }
1101
1102 if (tmp == tmp->above)
1103 {
1104 LOG (llevError, "Error in structure of map\n");
1105 exit (-1);
1106 } 1074 }
1107 1075
1108 move_slow |= tmp->move_slow; 1076 move_slow |= tmp->move_slow;
1109 move_block |= tmp->move_block; 1077 move_block |= tmp->move_block;
1110 move_on |= tmp->move_on; 1078 move_on |= tmp->move_on;
1111 move_off |= tmp->move_off; 1079 move_off |= tmp->move_off;
1112 move_allow |= tmp->move_allow; 1080 move_allow |= tmp->move_allow;
1113 1081
1114 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1082 allflags |= tmp->flag;
1115 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1083
1116 if (tmp->type == PLAYER) flags |= P_PLAYER; 1084 if (tmp->type == PLAYER) flags |= P_PLAYER;
1117 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1085 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1118 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1119 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1120 } 1086 }
1121 1087
1122 this->light = light; 1088 // FLAG_SEE_ANYWHERE takes precedence
1089 if (anywhere)
1090 middle = anywhere;
1091
1092 // ORing all flags together and checking them here is much faster
1093 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1094 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1095 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1096 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1097
1098 this->light = min (light, MAX_LIGHT_RADIUS);
1123 this->flags_ = flags; 1099 this->flags_ = flags;
1124 this->move_block = move_block & ~move_allow; 1100 this->move_block = move_block & ~move_allow;
1125 this->move_on = move_on; 1101 this->move_on = move_on;
1126 this->move_off = move_off; 1102 this->move_off = move_off;
1127 this->move_slow = move_slow; 1103 this->move_slow = move_slow;
1104 this->volume_ = (volume + 1023) / 1024;
1105 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1128 1106
1129 /* At this point, we have a floor face (if there is a floor), 1107 /* At this point, we have a floor face (if there is a floor),
1130 * and the floor is set - we are not going to touch it at 1108 * and the floor is set - we are not going to touch it at
1131 * this point. 1109 * this point.
1132 * middle contains the highest visibility face. 1110 * middle contains the highest visibility face.
1147 * 1) top face is set, need middle to be set. 1125 * 1) top face is set, need middle to be set.
1148 * 2) middle is set, need to set top. 1126 * 2) middle is set, need to set top.
1149 * 3) neither middle or top is set - need to set both. 1127 * 3) neither middle or top is set - need to set both.
1150 */ 1128 */
1151 1129
1152 for (tmp = last; tmp; tmp = tmp->below) 1130 for (object *tmp = last; tmp; tmp = tmp->below)
1153 { 1131 {
1154 /* Once we get to a floor, stop, since we already have a floor object */ 1132 /* Once we get to a floor, stop, since we already have a floor object */
1155 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1133 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 break; 1134 break;
1157 1135
1198 faces_obj [1] = middle; 1176 faces_obj [1] = middle;
1199 faces_obj [2] = floor; 1177 faces_obj [2] = floor;
1200#endif 1178#endif
1201} 1179}
1202 1180
1203uint64 1181maptile *
1204mapspace::volume () const 1182maptile::tile_available (int dir, bool load)
1205{ 1183{
1206 uint64 vol = 0; 1184 if (tile_path[dir])
1207
1208 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1209 vol += op->volume ();
1210
1211 return vol;
1212}
1213
1214/* this updates the orig_map->tile_map[tile_num] value after finding
1215 * the map. It also takes care of linking back the freshly found
1216 * maps tile_map values if it tiles back to this one. It returns
1217 * the value of orig_map->tile_map[tile_num].
1218 */
1219static inline maptile *
1220find_and_link (maptile *orig_map, int tile_num)
1221{
1222 maptile *mp = orig_map->tile_map [tile_num];
1223
1224 if (!mp)
1225 {
1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1227
1228 if (!mp)
1229 {
1230 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1231 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1232 &orig_map->tile_path[tile_num], &orig_map->path);
1233 mp = new maptile (1, 1);
1234 mp->alloc ();
1235 mp->in_memory = MAP_IN_MEMORY;
1236 }
1237 } 1185 {
1186 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1187 return tile_map[dir];
1238 1188
1239 int dest_tile = (tile_num + 2) % 4; 1189 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1190 return tile_map[dir];
1191 }
1240 1192
1241 orig_map->tile_map [tile_num] = mp;
1242
1243 // optimisation: back-link map to origin map if euclidean
1244 //TODO: non-euclidean maps MUST GO
1245 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1246 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1247
1248 return mp; 1193 return 0;
1249}
1250
1251static inline void
1252load_and_link (maptile *orig_map, int tile_num)
1253{
1254 find_and_link (orig_map, tile_num)->load_sync ();
1255} 1194}
1256 1195
1257/* this returns TRUE if the coordinates (x,y) are out of 1196/* this returns TRUE if the coordinates (x,y) are out of
1258 * map m. This function also takes into account any 1197 * map m. This function also takes into account any
1259 * tiling considerations, loading adjacant maps as needed. 1198 * tiling considerations, loading adjacant maps as needed.
1272 if (!m) 1211 if (!m)
1273 return 0; 1212 return 0;
1274 1213
1275 if (x < 0) 1214 if (x < 0)
1276 { 1215 {
1277 if (!m->tile_path[3]) 1216 if (!m->tile_available (3))
1278 return 1; 1217 return 1;
1279 1218
1280 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1281 find_and_link (m, 3);
1282
1283 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1219 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1284 } 1220 }
1285 1221
1286 if (x >= m->width) 1222 if (x >= m->width)
1287 { 1223 {
1288 if (!m->tile_path[1]) 1224 if (!m->tile_available (1))
1289 return 1; 1225 return 1;
1290 1226
1291 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1292 find_and_link (m, 1);
1293
1294 return out_of_map (m->tile_map[1], x - m->width, y); 1227 return out_of_map (m->tile_map[1], x - m->width, y);
1295 } 1228 }
1296 1229
1297 if (y < 0) 1230 if (y < 0)
1298 { 1231 {
1299 if (!m->tile_path[0]) 1232 if (!m->tile_available (0))
1300 return 1; 1233 return 1;
1301 1234
1302 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1303 find_and_link (m, 0);
1304
1305 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1235 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1306 } 1236 }
1307 1237
1308 if (y >= m->height) 1238 if (y >= m->height)
1309 { 1239 {
1310 if (!m->tile_path[2]) 1240 if (!m->tile_available (2))
1311 return 1; 1241 return 1;
1312
1313 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1314 find_and_link (m, 2);
1315 1242
1316 return out_of_map (m->tile_map[2], x, y - m->height); 1243 return out_of_map (m->tile_map[2], x, y - m->height);
1317 } 1244 }
1318 1245
1319 /* Simple case - coordinates are within this local 1246 /* Simple case - coordinates are within this local
1333maptile * 1260maptile *
1334maptile::xy_find (sint16 &x, sint16 &y) 1261maptile::xy_find (sint16 &x, sint16 &y)
1335{ 1262{
1336 if (x < 0) 1263 if (x < 0)
1337 { 1264 {
1338 if (!tile_path[3]) 1265 if (!tile_available (3))
1339 return 0; 1266 return 0;
1340 1267
1341 find_and_link (this, 3);
1342 x += tile_map[3]->width; 1268 x += tile_map[3]->width;
1343 return tile_map[3]->xy_find (x, y); 1269 return tile_map[3]->xy_find (x, y);
1344 } 1270 }
1345 1271
1346 if (x >= width) 1272 if (x >= width)
1347 { 1273 {
1348 if (!tile_path[1]) 1274 if (!tile_available (1))
1349 return 0; 1275 return 0;
1350 1276
1351 find_and_link (this, 1);
1352 x -= width; 1277 x -= width;
1353 return tile_map[1]->xy_find (x, y); 1278 return tile_map[1]->xy_find (x, y);
1354 } 1279 }
1355 1280
1356 if (y < 0) 1281 if (y < 0)
1357 { 1282 {
1358 if (!tile_path[0]) 1283 if (!tile_available (0))
1359 return 0; 1284 return 0;
1360 1285
1361 find_and_link (this, 0);
1362 y += tile_map[0]->height; 1286 y += tile_map[0]->height;
1363 return tile_map[0]->xy_find (x, y); 1287 return tile_map[0]->xy_find (x, y);
1364 } 1288 }
1365 1289
1366 if (y >= height) 1290 if (y >= height)
1367 { 1291 {
1368 if (!tile_path[2]) 1292 if (!tile_available (2))
1369 return 0; 1293 return 0;
1370 1294
1371 find_and_link (this, 2);
1372 y -= height; 1295 y -= height;
1373 return tile_map[2]->xy_find (x, y); 1296 return tile_map[2]->xy_find (x, y);
1374 } 1297 }
1375 1298
1376 /* Simple case - coordinates are within this local 1299 /* Simple case - coordinates are within this local
1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1310adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1388{ 1311{
1389 if (!map1 || !map2) 1312 if (!map1 || !map2)
1390 return 0; 1313 return 0;
1391 1314
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1315 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!) 1316 //fix: compare paths instead (this is likely faster, too!)
1394 if (map1 == map2) 1317 if (map1 == map2)
1395 { 1318 {
1396 *dx = 0; 1319 *dx = 0;
1397 *dy = 0; 1320 *dy = 0;
1579 else 1502 else
1580 { 1503 {
1581 retval->distance_x += op2->x - x; 1504 retval->distance_x += op2->x - x;
1582 retval->distance_y += op2->y - y; 1505 retval->distance_y += op2->y - y;
1583 1506
1584 retval->part = NULL; 1507 retval->part = 0;
1585 retval->distance = idistance (retval->distance_x, retval->distance_y); 1508 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1586 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1509 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1587 } 1510 }
1588} 1511}
1589 1512
1590/* Returns true of op1 and op2 are effectively on the same map 1513/* Returns true of op1 and op2 are effectively on the same map
1601 int dx, dy; 1524 int dx, dy;
1602 1525
1603 return adjacent_map (op1->map, op2->map, &dx, &dy); 1526 return adjacent_map (op1->map, op2->map, &dx, &dy);
1604} 1527}
1605 1528
1529//-GPL
1530
1606object * 1531object *
1607maptile::insert (object *op, int x, int y, object *originator, int flags) 1532maptile::insert (object *op, int x, int y, object *originator, int flags)
1608{ 1533{
1609 if (!op->flag [FLAG_REMOVED])
1610 op->remove ();
1611
1612 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1534 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1613} 1535}
1614 1536
1615region * 1537region *
1616maptile::region (int x, int y) const 1538maptile::region (int x, int y) const
1625 return default_region; 1547 return default_region;
1626 1548
1627 return ::region::default_region (); 1549 return ::region::default_region ();
1628} 1550}
1629 1551
1552//+GPL
1553
1630/* picks a random object from a style map. 1554/* picks a random object from a style map.
1631 * Redone by MSW so it should be faster and not use static
1632 * variables to generate tables.
1633 */ 1555 */
1634object * 1556object *
1635maptile::pick_random_object () const 1557maptile::pick_random_object (rand_gen &gen) const
1636{ 1558{
1637 /* while returning a null object will result in a crash, that 1559 /* while returning a null object will result in a crash, that
1638 * is actually preferable to an infinite loop. That is because 1560 * is actually preferable to an infinite loop. That is because
1639 * most servers will automatically restart in case of crash. 1561 * most servers will automatically restart in case of crash.
1640 * Change the logic on getting the random space - shouldn't make 1562 * Change the logic on getting the random space - shouldn't make
1641 * any difference, but this seems clearer to me. 1563 * any difference, but this seems clearer to me.
1642 */ 1564 */
1643 for (int i = 1000; --i;) 1565 for (int i = 1000; --i;)
1644 { 1566 {
1645 object *pick = at (rndm (width), rndm (height)).bot; 1567 object *pick = at (gen (width), gen (height)).bot;
1646 1568
1647 // do not prefer big monsters just because they are big. 1569 // do not prefer big monsters just because they are big.
1648 if (pick && pick->head_ () == pick) 1570 if (pick && pick->is_head ())
1649 return pick->head_ (); 1571 return pick->head_ ();
1650 } 1572 }
1651 1573
1652 // instead of crashing in the unlikely(?) case, try to return *something* 1574 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked"); 1575 return archetype::find (shstr_bug);
1654} 1576}
1655 1577
1578//-GPL
1579
1580void
1581maptile::play_sound (faceidx sound, int x, int y) const
1582{
1583 if (!sound)
1584 return;
1585
1586 for_all_players_on_map (pl, this)
1587 if (client *ns = pl->ns)
1588 {
1589 int dx = x - pl->ob->x;
1590 int dy = y - pl->ob->y;
1591
1592 int distance = idistance (dx, dy);
1593
1594 if (distance <= MAX_SOUND_DISTANCE)
1595 ns->play_sound (sound, dx, dy);
1596 }
1597}
1598
1599void
1600maptile::say_msg (const char *msg, int x, int y) const
1601{
1602 for_all_players (pl)
1603 if (client *ns = pl->ns)
1604 {
1605 int dx = x - pl->ob->x;
1606 int dy = y - pl->ob->y;
1607
1608 int distance = idistance (dx, dy);
1609
1610 if (distance <= MAX_SOUND_DISTANCE)
1611 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1612 }
1613}
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 (int x0, int y0, int x1, int y1)
1680{
1681 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1682 buf.clear ();
1683
1684 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1685
1686 // add end marker
1687 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1688 r->m = 0;
1689
1690 return (maprect *)buf.linearise ();
1691}
1692

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines