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

Diff Legend

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