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.109 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
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)) 156 && !tmp->flag [FLAG_WIZPASS])
230 return 1; 157 return 1;
231 } 158 }
232
233 } 159 }
160
234 return 0; 161 return 0;
235} 162}
236 163
237/* 164/*
238 * Returns true if the given object can't fit in the given spot. 165 * Returns qthe blocking object if the given object can't fit in the given
239 * This is meant for multi space objects - for single space objecs, 166 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 167 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 168 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 169 * object and makes sure they can be inserted.
243 * 170 *
244 * While this doesn't call out of map, the get_map_flags does. 171 * While this doesn't call out of map, the get_map_flags does.
245 * 172 *
246 * This function has been used to deprecate arch_out_of_map - 173 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 174 * this function also does that check, and since in most cases,
… …
258 * 185 *
259 * Note this used to be arch_blocked, but with new movement 186 * Note this used to be arch_blocked, but with new movement
260 * code, we need to have actual object to check its move_type 187 * code, we need to have actual object to check its move_type
261 * against the move_block values. 188 * against the move_block values.
262 */ 189 */
263int 190bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 191object::blocked (maptile *m, int x, int y) const
265{ 192{
266 archetype *tmp; 193 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 } 194 {
195 mapxy pos (m, x + tmp->x, y + tmp->y);
280 196
281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 197 if (!pos.normalise ())
282 { 198 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 199
285 if (flag & P_OUT_OF_MAP) 200 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 201
287 if (flag & P_IS_ALIVE) 202 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 203 return 1;
289 204
290 mapspace &ms = m1->at (sx, sy); 205 /* However, often ob doesn't have any move type
291 206 * (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. 207 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 208 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 209 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 210 continue;
299 211
300 /* Note it is intentional that we check ob - the movement type of the 212 /* Note it is intentional that we check ob - the movement type of the
301 * head of the object should correspond for the entire object. 213 * head of the object should correspond for the entire object.
302 */ 214 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 215 if (ms.blocks (move_type))
304 return P_NO_PASS; 216 return 1;
305 } 217 }
306 218
307 return 0; 219 return 0;
308} 220}
309 221
310/* When the map is loaded, load_object does not actually insert objects 222//-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 223
338void 224void
339maptile::set_object_flag (int flag, int value) 225maptile::set_object_flag (int flag, int value)
340{ 226{
341 if (!spaces) 227 if (!spaces)
… …
343 229
344 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 230 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 231 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value; 232 tmp->flag [flag] = value;
347} 233}
234
235void
236maptile::post_load_original ()
237{
238 if (!spaces)
239 return;
240
241 set_object_flag (FLAG_OBJ_ORIGINAL);
242
243 for (mapspace *ms = spaces + size (); ms-- > spaces; )
244 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
245 INVOKE_OBJECT (RESET, tmp);
246}
247
248void
249maptile::post_load ()
250{
251#if 0
252 if (!spaces)
253 return;
254
255 for (mapspace *ms = spaces + size (); ms-- > spaces; )
256 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
257 ; // nop
258#endif
259}
260
261//+GPL
348 262
349/* link_multipart_objects go through all the objects on the map looking 263/* 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 264 * 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 265 * info we have, they only have the head (as would be expected when
352 * they are saved). 266 * they are saved).
… …
356{ 270{
357 if (!spaces) 271 if (!spaces)
358 return; 272 return;
359 273
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 274 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 275 {
276 object *op = ms->bot;
277 while (op)
362 { 278 {
363 /* already multipart - don't do anything more */ 279 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 280 if (op->head_ () == op && !op->more && op->arch->more)
365 { 281 {
366 op->remove (); 282 op->remove ();
367 op->expand_tail (); 283 op->expand_tail ();
284
285 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
286 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
287 // 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); 288 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
289
290 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
291 // so we have to reset the iteration through the mapspace
369 } 292 }
293 else
294 op = op->above;
370 } 295 }
296 }
371} 297}
298
299//-GPL
372 300
373/* 301/*
374 * Loads (ands parses) the objects into a given map from the specified 302 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 303 * file pointer.
376 */ 304 */
377bool 305bool
378maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
379{ 307{
380 for (;;) 308 for (;;)
381 { 309 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
383 311
384 switch (f.kw) 312 switch (f.kw)
385 { 313 {
386 case KW_arch: 314 case KW_arch:
387 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
388 { 316 {
317 // TODO: why?
389 if (op->inv) 318 if (op->inv)
390 sum_weight (op); 319 op->update_weight ();
391 320
392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 {
323 // we insert manually because
324 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that
326 // c) it's correct
327 mapspace &ms = at (op->x, op->y);
328
329 op->flag [FLAG_REMOVED] = false;
330
331 op->above = 0;
332 op->below = ms.top;
333
334 *(ms.top ? &ms.top->above : &ms.bot) = op;
335
336 ms.top = op;
337 ms.flags_ = 0;
338 }
339 else
340 {
341 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
342 op->destroy ();
343 }
393 } 344 }
394 345
395 continue; 346 continue;
396 347
397 case KW_EOF: 348 case KW_EOF:
… …
410} 361}
411 362
412void 363void
413maptile::activate () 364maptile::activate ()
414{ 365{
415 active = true;
416
417 if (spaces) 366 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 367 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 368 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 369 op->activate_recursive ();
421} 370}
422 371
423void 372void
424maptile::deactivate () 373maptile::deactivate ()
425{ 374{
426 active = false;
427
428 if (spaces) 375 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 376 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 377 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 378 op->deactivate_recursive ();
432} 379}
… …
442 if (!spaces) 389 if (!spaces)
443 return false; 390 return false;
444 391
445 for (int i = 0; i < size (); ++i) 392 for (int i = 0; i < size (); ++i)
446 { 393 {
447 int unique = 0; 394 bool unique = 0;
395
448 for (object *op = spaces [i].bot; op; op = op->above) 396 for (object *op = spaces [i].bot; op; op = op->above)
449 { 397 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 398 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 399
453 if (!op->can_map_save ()) 400 if (expect_false (!op->can_map_save ()))
454 continue; 401 continue;
455 402
456 if (unique || op->flag [FLAG_UNIQUE]) 403 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 404 {
458 if (flags & IO_UNIQUES) 405 if (flags & IO_UNIQUES)
459 op->write (f); 406 op->write (f);
460 } 407 }
461 else if (flags & IO_OBJECTS) 408 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 409 op->write (f);
463 } 410 }
464 } 411 }
465 412
466 coroapi::cede_to_tick (); 413 coroapi::cede_to_tick ();
467 414
468 return true; 415 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} 416}
492 417
493bool 418bool
494maptile::_save_objects (const char *path, int flags) 419maptile::_save_objects (const char *path, int flags)
495{ 420{
… …
509 * map archetype. Mimic that behaviour. 434 * map archetype. Mimic that behaviour.
510 */ 435 */
511 width = 16; 436 width = 16;
512 height = 16; 437 height = 16;
513 timeout = 300; 438 timeout = 300;
514 max_nrof = 1000; // 1000 items of anything 439 max_items = MAX_ITEM_PER_ACTION;
515 max_volume = 2000000; // 2m³ 440 max_volume = 2000000; // 2m³
516} 441}
517 442
518maptile::maptile (int w, int h) 443maptile::maptile (int w, int h)
519{ 444{
… …
540 if (spaces) 465 if (spaces)
541 return; 466 return;
542 467
543 spaces = salloc0<mapspace> (size ()); 468 spaces = salloc0<mapspace> (size ());
544} 469}
470
471//+GPL
545 472
546/* Takes a string from a map definition and outputs a pointer to the array of shopitems 473/* 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 474 * corresponding to that string. Memory is allocated for this, it must be freed
548 * at a later date. 475 * at a later date.
549 * Called by parse_map_headers below. 476 * Called by parse_map_headers below.
… …
626 return items; 553 return items;
627} 554}
628 555
629/* opposite of parse string, this puts the string that was originally fed in to 556/* opposite of parse string, this puts the string that was originally fed in to
630 * the map (or something equivilent) into output_string. */ 557 * the map (or something equivilent) into output_string. */
631static void 558static const char *
632print_shop_string (maptile *m, char *output_string) 559print_shop_string (maptile *m)
633{ 560{
634 int i; 561 static dynbuf_text buf; buf.clear ();
635 char tmp[MAX_BUF];
636 562
637 strcpy (output_string, "");
638 for (i = 0; i < m->shopitems[0].index; i++) 563 for (int i = 0; i < m->shopitems[0].index; i++)
639 { 564 {
640 if (m->shopitems[i].typenum) 565 if (m->shopitems[i].typenum)
641 { 566 {
642 if (m->shopitems[i].strength) 567 if (m->shopitems[i].strength)
643 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 568 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
644 else 569 else
645 sprintf (tmp, "%s;", m->shopitems[i].name); 570 buf.printf ("%s;", m->shopitems[i].name);
646 } 571 }
647 else 572 else
648 { 573 {
649 if (m->shopitems[i].strength) 574 if (m->shopitems[i].strength)
650 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 575 buf.printf ("*:%d;", m->shopitems[i].strength);
651 else 576 else
652 sprintf (tmp, "*"); 577 buf.printf ("*");
653 } 578 }
654
655 strcat (output_string, tmp);
656 } 579 }
580
581 return buf;
657} 582}
583
584//-GPL
658 585
659/* This loads the header information of the map. The header 586/* This loads the header information of the map. The header
660 * contains things like difficulty, size, timeout, etc. 587 * contains things like difficulty, size, timeout, etc.
661 * this used to be stored in the map object, but with the 588 * this used to be stored in the map object, but with the
662 * addition of tiling, fields beyond that easily named in an 589 * addition of tiling, fields beyond that easily named in an
… …
670bool 597bool
671maptile::_load_header (object_thawer &thawer) 598maptile::_load_header (object_thawer &thawer)
672{ 599{
673 for (;;) 600 for (;;)
674 { 601 {
675 thawer.next ();
676
677 switch (thawer.kw) 602 switch (thawer.kw)
678 { 603 {
679 case KW_msg: 604 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 605 thawer.get_ml (KW_endmsg, msg);
681 break; 606 break;
… …
705 case KW_shopgreed: thawer.get (shopgreed); break; 630 case KW_shopgreed: thawer.get (shopgreed); break;
706 case KW_shopmin: thawer.get (shopmin); break; 631 case KW_shopmin: thawer.get (shopmin); break;
707 case KW_shopmax: thawer.get (shopmax); break; 632 case KW_shopmax: thawer.get (shopmax); break;
708 case KW_shoprace: thawer.get (shoprace); break; 633 case KW_shoprace: thawer.get (shoprace); break;
709 case KW_outdoor: thawer.get (outdoor); break; 634 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 635
717 case KW_per_player: thawer.get (per_player); break; 636 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 637 case KW_per_party: thawer.get (per_party); break;
719 case KW_no_reset: thawer.get (no_reset); break; 638 case KW_no_reset: thawer.get (no_reset); break;
639 case KW_no_drop: thawer.get (no_drop); break;
720 640
721 case KW_region: default_region = region::find (thawer.get_str ()); break; 641 case KW_region: default_region = region::find (thawer.get_str ()); break;
722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 642 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
723 643
724 // old names new names 644 // old names new names
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 655 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 656 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 657 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 658 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 659
660 case KW_ERROR:
661 set_key_text (thawer.kw_str, thawer.value);
662 break;
663
740 case KW_end: 664 case KW_end:
665 thawer.next ();
741 return true; 666 return true;
742 667
743 default: 668 default:
744 if (!thawer.parse_error ("map", 0)) 669 if (!thawer.parse_error ("map", 0))
745 return false; 670 return false;
746 break; 671 break;
747 } 672 }
673
674 thawer.next ();
748 } 675 }
749 676
750 abort (); 677 abort ();
751} 678}
752 679
753bool 680//+GPL
754maptile::_load_header (const char *path)
755{
756 object_thawer thawer (path);
757
758 if (!thawer)
759 return false;
760
761 return _load_header (thawer);
762}
763 681
764/****************************************************************************** 682/******************************************************************************
765 * This is the start of unique map handling code 683 * This is the start of unique map handling code
766 *****************************************************************************/ 684 *****************************************************************************/
767 685
… …
778 696
779 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 697 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
780 unique = 1; 698 unique = 1;
781 699
782 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 700 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
783 {
784 op->destroy_inv (false);
785 op->destroy (); 701 op->destroy ();
786 }
787 702
788 op = above; 703 op = above;
789 } 704 }
790 } 705 }
791} 706}
792 707
708//-GPL
709
793bool 710bool
794maptile::_save_header (object_freezer &freezer) 711maptile::_save_header (object_freezer &freezer)
795{ 712{
796#define MAP_OUT(k) freezer.put (KW_ ## k, k) 713#define MAP_OUT(k) freezer.put (KW(k), k)
797#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 714#define MAP_OUT2(k,v) freezer.put (KW(k), v)
798 715
799 MAP_OUT2 (arch, "map"); 716 MAP_OUT2 (arch, CS(map));
800 717
801 if (name) MAP_OUT (name); 718 if (name) MAP_OUT (name);
802 MAP_OUT (swap_time); 719 MAP_OUT (swap_time);
803 MAP_OUT (reset_time); 720 MAP_OUT (reset_time);
804 MAP_OUT (reset_timeout); 721 MAP_OUT (reset_timeout);
805 MAP_OUT (fixed_resettime); 722 MAP_OUT (fixed_resettime);
806 MAP_OUT (no_reset); 723 MAP_OUT (no_reset);
724 MAP_OUT (no_drop);
807 MAP_OUT (difficulty); 725 MAP_OUT (difficulty);
808
809 if (default_region) MAP_OUT2 (region, default_region->name); 726 if (default_region) MAP_OUT2 (region, default_region->name);
810 727
811 if (shopitems) 728 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
812 {
813 char shop[MAX_BUF];
814 print_shop_string (this, shop);
815 MAP_OUT2 (shopitems, shop);
816 }
817
818 MAP_OUT (shopgreed); 729 MAP_OUT (shopgreed);
819 MAP_OUT (shopmin); 730 MAP_OUT (shopmin);
820 MAP_OUT (shopmax); 731 MAP_OUT (shopmax);
821 if (shoprace) MAP_OUT (shoprace); 732 if (shoprace) MAP_OUT (shoprace);
822 MAP_OUT (darkness); 733
823 MAP_OUT (width); 734 MAP_OUT (width);
824 MAP_OUT (height); 735 MAP_OUT (height);
825 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
826 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
827 738 MAP_OUT (darkness);
828 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
829 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
830
831 MAP_OUT (outdoor); 739 MAP_OUT (outdoor);
832 MAP_OUT (temp); 740
833 MAP_OUT (pressure); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
834 MAP_OUT (humid); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
835 MAP_OUT (windspeed);
836 MAP_OUT (winddir);
837 MAP_OUT (sky);
838 743
839 MAP_OUT (per_player); 744 MAP_OUT (per_player);
840 MAP_OUT (per_party); 745 MAP_OUT (per_party);
841 746
842 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 747 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
843 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 748 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
844 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 749 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
845 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 750 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
846 751
847 freezer.put (this); 752 freezer.put (this);
848 freezer.put (KW_end); 753 freezer.put (KW(end));
849 754
850 return true; 755 return true;
851} 756}
852 757
853bool 758bool
… …
859 return false; 764 return false;
860 765
861 return freezer.save (path); 766 return freezer.save (path);
862} 767}
863 768
769//+GPL
770
864/* 771/*
865 * Remove and free all objects in the given map. 772 * Remove and free all objects in the given map.
866 */ 773 */
867void 774void
868maptile::clear () 775maptile::clear ()
869{ 776{
870 sfree (regions, size ()), regions = 0;
871 free (regionmap), regionmap = 0;
872
873 if (spaces) 777 if (spaces)
874 { 778 {
875 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 779 for (mapspace *ms = spaces + size (); ms-- > spaces; )
876 while (object *op = ms->bot) 780 while (object *op = ms->bot)
877 { 781 {
782 // manually remove, as to not trigger anything
783 if (ms->bot = op->above)
784 ms->bot->below = 0;
785
786 op->flag [FLAG_REMOVED] = true;
787
878 op = op->head_ (); 788 object *head = op->head_ ();
879 op->destroy_inv (false); 789 if (op == head)
880 op->destroy (); 790 op->destroy ();
791 else if (head->map != op->map)
792 {
793 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
794 head->destroy ();
795 }
881 } 796 }
882 797
883 sfree (spaces, size ()), spaces = 0; 798 sfree0 (spaces, size ());
884 } 799 }
885 800
886 if (buttons) 801 if (buttons)
887 free_objectlinkpt (buttons), buttons = 0; 802 free_objectlinkpt (buttons), buttons = 0;
803
804 sfree0 (regions, size ());
805 delete [] regionmap; regionmap = 0;
888} 806}
889 807
890void 808void
891maptile::clear_header () 809maptile::clear_header ()
892{ 810{
… …
925 843
926 clear (); 844 clear ();
927} 845}
928 846
929/* decay and destroy perishable items in a map */ 847/* decay and destroy perishable items in a map */
848// TODO: should be done regularly, not on map load?
930void 849void
931maptile::do_decay_objects () 850maptile::do_decay_objects ()
932{ 851{
933 if (!spaces) 852 if (!spaces)
934 return; 853 return;
… …
944 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 863 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
945 break; 864 break;
946 865
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 866 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 867 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE) 868 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 869 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID) 870 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ()) 871 || op->is_alive ())
954 ; // do not decay 872 ; // do not decay
… …
982 || mat & M_LIQUID 900 || mat & M_LIQUID
983 || (mat & M_IRON && rndm (1, 5) == 1) 901 || (mat & M_IRON && rndm (1, 5) == 1)
984 || (mat & M_GLASS && rndm (1, 2) == 1) 902 || (mat & M_GLASS && rndm (1, 2) == 1)
985 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 903 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
986 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 904 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
987 || (mat & M_ICE && temp > 32)) 905 //|| (mat & M_ICE && temp > 32)
906 )
988 destroy = 1; 907 destroy = 1;
989 } 908 }
990 909
991 /* adjust overall chance below */ 910 /* adjust overall chance below */
992 if (destroy && rndm (0, 1)) 911 if (destroy && rndm (0, 1))
993 op->destroy (); 912 op->destroy ();
994 }
995}
996
997/*
998 * Updates every button on the map (by calling update_button() for them).
999 */
1000void
1001maptile::update_buttons ()
1002{
1003 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1004 for (objectlink *ol = obp->link; ol; ol = ol->next)
1005 {
1006 if (!ol->ob)
1007 {
1008 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1009 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1010 continue;
1011 }
1012
1013 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1014 {
1015 update_button (ol->ob);
1016 break;
1017 }
1018 } 913 }
1019} 914}
1020 915
1021/* 916/*
1022 * This routine is supposed to find out the difficulty of the map. 917 * This routine is supposed to find out the difficulty of the map.
1023 * difficulty does not have a lot to do with character level, 918 * difficulty does not have a lot to do with character level,
1024 * but does have a lot to do with treasure on the map. 919 * but does have a lot to do with treasure on the map.
1025 * 920 *
1026 * Difficulty can now be set by the map creature. If the value stored 921 * Difficulty can now be set by the map creator. If the value stored
1027 * in the map is zero, then use this routine. Maps should really 922 * in the map is zero, then use this routine. Maps should really
1028 * have a difficulty set than using this function - human calculation 923 * have a difficulty set rather than using this function - human calculation
1029 * is much better than this functions guesswork. 924 * is much better than this function's guesswork.
1030 */ 925 */
1031int 926int
1032maptile::estimate_difficulty () const 927maptile::estimate_difficulty () const
1033{ 928{
1034 long monster_cnt = 0; 929 long monster_cnt = 0;
… …
1046 941
1047 if (QUERY_FLAG (op, FLAG_GENERATOR)) 942 if (QUERY_FLAG (op, FLAG_GENERATOR))
1048 { 943 {
1049 total_exp += op->stats.exp; 944 total_exp += op->stats.exp;
1050 945
1051 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 946 if (archetype *at = op->other_arch)
947 {
1052 total_exp += at->stats.exp * 8; 948 total_exp += at->stats.exp * 8;
1053
1054 monster_cnt++; 949 monster_cnt++;
950 }
951
952 for (object *inv = op->inv; inv; inv = inv->below)
953 {
954 total_exp += op->stats.exp * 8;
955 monster_cnt++;
956 }
1055 } 957 }
1056 } 958 }
1057 959
1058 avgexp = (double) total_exp / monster_cnt; 960 avgexp = (double) total_exp / monster_cnt;
1059 961
… …
1072 * postive values make it darker, negative make it brighter 974 * postive values make it darker, negative make it brighter
1073 */ 975 */
1074int 976int
1075maptile::change_map_light (int change) 977maptile::change_map_light (int change)
1076{ 978{
1077 int new_level = darkness + change;
1078
1079 /* Nothing to do */ 979 /* Nothing to do */
1080 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 980 if (!change)
1081 return 0; 981 return 0;
1082 982
1083 /* inform all players on the map */ 983 /* inform all players on the map */
1084 if (change > 0) 984 if (change > 0)
1085 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 985 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1086 else 986 else
1087 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 987 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1088 988
1089 /* Do extra checking. since darkness is a unsigned value, 989 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1090 * we need to be extra careful about negative values.
1091 * In general, the checks below are only needed if change
1092 * is not +/-1
1093 */
1094 if (new_level < 0)
1095 darkness = 0;
1096 else if (new_level >= MAX_DARKNESS)
1097 darkness = MAX_DARKNESS;
1098 else
1099 darkness = new_level;
1100 990
1101 /* All clients need to get re-updated for the change */ 991 /* All clients need to get re-updated for the change */
1102 update_all_map_los (this); 992 update_all_map_los (this);
993
1103 return 1; 994 return 1;
1104} 995}
1105 996
1106/* 997/*
1107 * This function updates various attributes about a specific space 998 * This function updates various attributes about a specific space
… …
1110 * through, etc) 1001 * through, etc)
1111 */ 1002 */
1112void 1003void
1113mapspace::update_ () 1004mapspace::update_ ()
1114{ 1005{
1115 object *tmp, *last = 0; 1006 object *last = 0;
1116 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1007 uint8 flags = P_UPTODATE;
1008 sint8 light = 0;
1117 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1009 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1010 uint64_t volume = 0;
1011 uint32_t items = 0;
1012 object *anywhere = 0;
1013 uint8_t middle_visibility = 0;
1118 1014
1119 //object *middle = 0; 1015 //object *middle = 0;
1120 //object *top = 0; 1016 //object *top = 0;
1121 //object *floor = 0; 1017 //object *floor = 0;
1122 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
1123 object *&top = faces_obj[0] = 0; 1019 object *&top = faces_obj[0] = 0;
1124 object *&middle = faces_obj[1] = 0; 1020 object *&middle = faces_obj[1] = 0;
1125 object *&floor = faces_obj[2] = 0; 1021 object *&floor = faces_obj[2] = 0;
1126 1022
1023 object::flags_t allflags; // all flags of all objects or'ed together
1024
1127 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1025 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1128 { 1026 {
1129 /* This could be made additive I guess (two lights better than 1027 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1130 * one). But if so, it shouldn't be a simple additive - 2
1131 * light bulbs do not illuminate twice as far as once since
1132 * it is a dissapation factor that is cubed.
1133 */
1134 if (tmp->glow_radius > light)
1135 light = tmp->glow_radius; 1028 light += tmp->glow_radius;
1136 1029
1137 /* This call is needed in order to update objects the player 1030 /* This call is needed in order to update objects the player
1138 * is standing in that have animations (ie, grass, fire, etc). 1031 * is standing in that have animations (ie, grass, fire, etc).
1139 * However, it also causes the look window to be re-drawn 1032 * However, it also causes the look window to be re-drawn
1140 * 3 times each time the player moves, because many of the 1033 * 3 times each time the player moves, because many of the
1141 * functions the move_player calls eventualy call this. 1034 * functions the move_player calls eventualy call this.
1142 * 1035 *
1143 * Always put the player down for drawing. 1036 * Always put the player down for drawing.
1144 */ 1037 */
1145 if (!tmp->invisible) 1038 if (expect_true (!tmp->invisible))
1146 { 1039 {
1147 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1040 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1148 top = tmp; 1041 top = tmp;
1149 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1042 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1150 { 1043 {
1151 /* If we got a floor, that means middle and top were below it, 1044 /* If we got a floor, that means middle and top were below it,
1152 * so should not be visible, so we clear them. 1045 * so should not be visible, so we clear them.
1153 */ 1046 */
1154 middle = 0; 1047 middle = 0;
1155 top = 0; 1048 top = 0;
1156 floor = tmp; 1049 floor = tmp;
1050 volume = 0;
1051 items = 0;
1157 } 1052 }
1158 /* Flag anywhere have high priority */ 1053 else
1159 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1160 { 1054 {
1055 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1056 {
1057 ++items;
1058 volume += tmp->volume ();
1059 }
1060
1061 /* Flag anywhere have high priority */
1062 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1063 anywhere = tmp;
1064
1065 /* Find the highest visible face around. If equal
1066 * visibilities, we still want the one nearer to the
1067 * top
1068 */
1069 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1070 {
1071 middle_visibility = ::faces [tmp->face].visibility;
1161 middle = tmp; 1072 middle = tmp;
1162 anywhere = 1; 1073 }
1163 } 1074 }
1164 /* Find the highest visible face around. If equal
1165 * visibilities, we still want the one nearer to the
1166 * top
1167 */
1168 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1169 middle = tmp;
1170 }
1171
1172 if (tmp == tmp->above)
1173 {
1174 LOG (llevError, "Error in structure of map\n");
1175 exit (-1);
1176 } 1075 }
1177 1076
1178 move_slow |= tmp->move_slow; 1077 move_slow |= tmp->move_slow;
1179 move_block |= tmp->move_block; 1078 move_block |= tmp->move_block;
1180 move_on |= tmp->move_on; 1079 move_on |= tmp->move_on;
1181 move_off |= tmp->move_off; 1080 move_off |= tmp->move_off;
1182 move_allow |= tmp->move_allow; 1081 move_allow |= tmp->move_allow;
1183 1082
1184 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1083 allflags |= tmp->flag;
1185 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1084
1186 if (tmp->type == PLAYER) flags |= P_PLAYER; 1085 if (tmp->type == PLAYER) flags |= P_PLAYER;
1187 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1086 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1188 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1189 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1190 } 1087 }
1191 1088
1192 this->light = light; 1089 // FLAG_SEE_ANYWHERE takes precedence
1090 if (anywhere)
1091 middle = anywhere;
1092
1093 // ORing all flags together and checking them here is much faster
1094 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1095 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1096 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1097 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1098
1099 this->light = min (light, MAX_LIGHT_RADIUS);
1193 this->flags_ = flags; 1100 this->flags_ = flags;
1194 this->move_block = move_block & ~move_allow; 1101 this->move_block = move_block & ~move_allow;
1195 this->move_on = move_on; 1102 this->move_on = move_on;
1196 this->move_off = move_off; 1103 this->move_off = move_off;
1197 this->move_slow = move_slow; 1104 this->move_slow = move_slow;
1105 this->volume_ = (volume + 1023) / 1024;
1106 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1198 1107
1199 /* At this point, we have a floor face (if there is a floor), 1108 /* At this point, we have a floor face (if there is a floor),
1200 * and the floor is set - we are not going to touch it at 1109 * and the floor is set - we are not going to touch it at
1201 * this point. 1110 * this point.
1202 * middle contains the highest visibility face. 1111 * middle contains the highest visibility face.
… …
1217 * 1) top face is set, need middle to be set. 1126 * 1) top face is set, need middle to be set.
1218 * 2) middle is set, need to set top. 1127 * 2) middle is set, need to set top.
1219 * 3) neither middle or top is set - need to set both. 1128 * 3) neither middle or top is set - need to set both.
1220 */ 1129 */
1221 1130
1222 for (tmp = last; tmp; tmp = tmp->below) 1131 for (object *tmp = last; tmp; tmp = tmp->below)
1223 { 1132 {
1224 /* Once we get to a floor, stop, since we already have a floor object */ 1133 /* Once we get to a floor, stop, since we already have a floor object */
1225 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1134 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1226 break; 1135 break;
1227 1136
… …
1268 faces_obj [1] = middle; 1177 faces_obj [1] = middle;
1269 faces_obj [2] = floor; 1178 faces_obj [2] = floor;
1270#endif 1179#endif
1271} 1180}
1272 1181
1273uint64 1182maptile *
1274mapspace::volume () const 1183maptile::tile_available (int dir, bool load)
1275{ 1184{
1276 uint64 vol = 0; 1185 if (tile_path[dir])
1277
1278 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1279 vol += op->volume ();
1280
1281 return vol;
1282}
1283
1284/* this updates the orig_map->tile_map[tile_num] value after finding
1285 * the map. It also takes care of linking back the freshly found
1286 * maps tile_map values if it tiles back to this one. It returns
1287 * the value of orig_map->tile_map[tile_num].
1288 */
1289static inline maptile *
1290find_and_link (maptile *orig_map, int tile_num)
1291{
1292 maptile *mp = orig_map->tile_map [tile_num];
1293
1294 if (!mp)
1295 {
1296 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1297
1298 if (!mp)
1299 {
1300 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1301 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1302 &orig_map->tile_path[tile_num], &orig_map->path);
1303 mp = new maptile (1, 1);
1304 mp->alloc ();
1305 mp->in_memory = MAP_IN_MEMORY;
1306 }
1307 } 1186 {
1187 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1188 return tile_map[dir];
1308 1189
1309 int dest_tile = (tile_num + 2) % 4; 1190 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1191 return tile_map[dir];
1192 }
1310 1193
1311 orig_map->tile_map [tile_num] = mp;
1312
1313 // optimisation: back-link map to origin map if euclidean
1314 //TODO: non-euclidean maps MUST GO
1315 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1316 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1317
1318 return mp; 1194 return 0;
1319}
1320
1321static inline void
1322load_and_link (maptile *orig_map, int tile_num)
1323{
1324 find_and_link (orig_map, tile_num)->load_sync ();
1325} 1195}
1326 1196
1327/* this returns TRUE if the coordinates (x,y) are out of 1197/* this returns TRUE if the coordinates (x,y) are out of
1328 * map m. This function also takes into account any 1198 * map m. This function also takes into account any
1329 * tiling considerations, loading adjacant maps as needed. 1199 * tiling considerations, loading adjacant maps as needed.
… …
1342 if (!m) 1212 if (!m)
1343 return 0; 1213 return 0;
1344 1214
1345 if (x < 0) 1215 if (x < 0)
1346 { 1216 {
1347 if (!m->tile_path[3]) 1217 if (!m->tile_available (3))
1348 return 1; 1218 return 1;
1349 1219
1350 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1351 find_and_link (m, 3);
1352
1353 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1220 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1354 } 1221 }
1355 1222
1356 if (x >= m->width) 1223 if (x >= m->width)
1357 { 1224 {
1358 if (!m->tile_path[1]) 1225 if (!m->tile_available (1))
1359 return 1; 1226 return 1;
1360 1227
1361 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 1);
1363
1364 return out_of_map (m->tile_map[1], x - m->width, y); 1228 return out_of_map (m->tile_map[1], x - m->width, y);
1365 } 1229 }
1366 1230
1367 if (y < 0) 1231 if (y < 0)
1368 { 1232 {
1369 if (!m->tile_path[0]) 1233 if (!m->tile_available (0))
1370 return 1; 1234 return 1;
1371 1235
1372 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1373 find_and_link (m, 0);
1374
1375 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1236 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1376 } 1237 }
1377 1238
1378 if (y >= m->height) 1239 if (y >= m->height)
1379 { 1240 {
1380 if (!m->tile_path[2]) 1241 if (!m->tile_available (2))
1381 return 1; 1242 return 1;
1382
1383 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1384 find_and_link (m, 2);
1385 1243
1386 return out_of_map (m->tile_map[2], x, y - m->height); 1244 return out_of_map (m->tile_map[2], x, y - m->height);
1387 } 1245 }
1388 1246
1389 /* Simple case - coordinates are within this local 1247 /* Simple case - coordinates are within this local
… …
1403maptile * 1261maptile *
1404maptile::xy_find (sint16 &x, sint16 &y) 1262maptile::xy_find (sint16 &x, sint16 &y)
1405{ 1263{
1406 if (x < 0) 1264 if (x < 0)
1407 { 1265 {
1408 if (!tile_path[3]) 1266 if (!tile_available (3))
1409 return 0; 1267 return 0;
1410 1268
1411 find_and_link (this, 3);
1412 x += tile_map[3]->width; 1269 x += tile_map[3]->width;
1413 return tile_map[3]->xy_find (x, y); 1270 return tile_map[3]->xy_find (x, y);
1414 } 1271 }
1415 1272
1416 if (x >= width) 1273 if (x >= width)
1417 { 1274 {
1418 if (!tile_path[1]) 1275 if (!tile_available (1))
1419 return 0; 1276 return 0;
1420 1277
1421 find_and_link (this, 1);
1422 x -= width; 1278 x -= width;
1423 return tile_map[1]->xy_find (x, y); 1279 return tile_map[1]->xy_find (x, y);
1424 } 1280 }
1425 1281
1426 if (y < 0) 1282 if (y < 0)
1427 { 1283 {
1428 if (!tile_path[0]) 1284 if (!tile_available (0))
1429 return 0; 1285 return 0;
1430 1286
1431 find_and_link (this, 0);
1432 y += tile_map[0]->height; 1287 y += tile_map[0]->height;
1433 return tile_map[0]->xy_find (x, y); 1288 return tile_map[0]->xy_find (x, y);
1434 } 1289 }
1435 1290
1436 if (y >= height) 1291 if (y >= height)
1437 { 1292 {
1438 if (!tile_path[2]) 1293 if (!tile_available (2))
1439 return 0; 1294 return 0;
1440 1295
1441 find_and_link (this, 2);
1442 y -= height; 1296 y -= height;
1443 return tile_map[2]->xy_find (x, y); 1297 return tile_map[2]->xy_find (x, y);
1444 } 1298 }
1445 1299
1446 /* Simple case - coordinates are within this local 1300 /* Simple case - coordinates are within this local
… …
1457adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1311adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1458{ 1312{
1459 if (!map1 || !map2) 1313 if (!map1 || !map2)
1460 return 0; 1314 return 0;
1461 1315
1462 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1316 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1463 //fix: compare paths instead (this is likely faster, too!) 1317 //fix: compare paths instead (this is likely faster, too!)
1464 if (map1 == map2) 1318 if (map1 == map2)
1465 { 1319 {
1466 *dx = 0; 1320 *dx = 0;
1467 *dy = 0; 1321 *dy = 0;
… …
1649 else 1503 else
1650 { 1504 {
1651 retval->distance_x += op2->x - x; 1505 retval->distance_x += op2->x - x;
1652 retval->distance_y += op2->y - y; 1506 retval->distance_y += op2->y - y;
1653 1507
1654 retval->part = NULL; 1508 retval->part = 0;
1655 retval->distance = idistance (retval->distance_x, retval->distance_y); 1509 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1656 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1510 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1657 } 1511 }
1658} 1512}
1659 1513
1660/* Returns true of op1 and op2 are effectively on the same map 1514/* Returns true of op1 and op2 are effectively on the same map
… …
1671 int dx, dy; 1525 int dx, dy;
1672 1526
1673 return adjacent_map (op1->map, op2->map, &dx, &dy); 1527 return adjacent_map (op1->map, op2->map, &dx, &dy);
1674} 1528}
1675 1529
1530//-GPL
1531
1676object * 1532object *
1677maptile::insert (object *op, int x, int y, object *originator, int flags) 1533maptile::insert (object *op, int x, int y, object *originator, int flags)
1678{ 1534{
1679 if (!op->flag [FLAG_REMOVED])
1680 op->remove ();
1681
1682 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1535 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1683} 1536}
1684 1537
1685region * 1538region *
1686maptile::region (int x, int y) const 1539maptile::region (int x, int y) const
… …
1695 return default_region; 1548 return default_region;
1696 1549
1697 return ::region::default_region (); 1550 return ::region::default_region ();
1698} 1551}
1699 1552
1553//+GPL
1554
1700/* picks a random object from a style map. 1555/* picks a random object from a style map.
1701 * Redone by MSW so it should be faster and not use static
1702 * variables to generate tables.
1703 */ 1556 */
1704object * 1557object *
1705maptile::pick_random_object () const 1558maptile::pick_random_object (rand_gen &gen) const
1706{ 1559{
1707 /* while returning a null object will result in a crash, that 1560 /* while returning a null object will result in a crash, that
1708 * is actually preferable to an infinite loop. That is because 1561 * is actually preferable to an infinite loop. That is because
1709 * most servers will automatically restart in case of crash. 1562 * most servers will automatically restart in case of crash.
1710 * Change the logic on getting the random space - shouldn't make 1563 * Change the logic on getting the random space - shouldn't make
1711 * any difference, but this seems clearer to me. 1564 * any difference, but this seems clearer to me.
1712 */ 1565 */
1713 for (int i = 1000; --i;) 1566 for (int i = 1000; --i;)
1714 { 1567 {
1715 object *pick = at (rndm (width), rndm (height)).bot; 1568 object *pick = at (gen (width), gen (height)).bot;
1716 1569
1717 // do not prefer big monsters just because they are big. 1570 // do not prefer big monsters just because they are big.
1718 if (pick && pick->head_ () == pick) 1571 if (pick && pick->is_head ())
1719 return pick->head_ (); 1572 return pick->head_ ();
1720 } 1573 }
1721 1574
1722 // instead of crashing in the unlikely(?) case, try to return *something* 1575 // instead of crashing in the unlikely(?) case, try to return *something*
1723 return get_archetype ("blocked"); 1576 return archetype::find (shstr_bug);
1724} 1577}
1725 1578
1579//-GPL
1580
1581void
1582maptile::play_sound (faceidx sound, int x, int y) const
1583{
1584 if (!sound)
1585 return;
1586
1587 for_all_players_on_map (pl, this)
1588 if (client *ns = pl->ns)
1589 {
1590 int dx = x - pl->ob->x;
1591 int dy = y - pl->ob->y;
1592
1593 int distance = idistance (dx, dy);
1594
1595 if (distance <= MAX_SOUND_DISTANCE)
1596 ns->play_sound (sound, dx, dy);
1597 }
1598}
1599
1600void
1601maptile::say_msg (const char *msg, int x, int y) const
1602{
1603 for_all_players (pl)
1604 if (client *ns = pl->ns)
1605 {
1606 int dx = x - pl->ob->x;
1607 int dy = y - pl->ob->y;
1608
1609 int distance = idistance (dx, dy);
1610
1611 if (distance <= MAX_SOUND_DISTANCE)
1612 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1613 }
1614}
1615
1616static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{
1619 // clip to map to the left
1620 if (x0 < 0)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624
1625 if (x1 < 0) // entirely to the left
1626 return;
1627
1628 x0 = 0;
1629 }
1630
1631 // clip to map to the right
1632 if (x1 > m->width)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636
1637 if (x0 > m->width) // entirely to the right
1638 return;
1639
1640 x1 = m->width;
1641 }
1642
1643 // clip to map above
1644 if (y0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648
1649 if (y1 < 0) // entirely above
1650 return;
1651
1652 y0 = 0;
1653 }
1654
1655 // clip to map below
1656 if (y1 > m->height)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660
1661 if (y0 > m->height) // entirely below
1662 return;
1663
1664 y1 = m->height;
1665 }
1666
1667 // if we get here, the rect is within the current map
1668 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1669
1670 r->m = m;
1671 r->x0 = x0;
1672 r->y0 = y0;
1673 r->x1 = x1;
1674 r->y1 = y1;
1675 r->dx = dx;
1676 r->dy = dy;
1677}
1678
1679maprect *
1680maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1681{
1682 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683 buf.clear ();
1684
1685 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686
1687 // add end marker
1688 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1689 r->m = 0;
1690
1691 return (maprect *)buf.linearise ();
1692}
1693

Diff Legend

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