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.81 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.161 by root, Mon Oct 12 21:27:55 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
30 26
27#include "global.h"
28#include "loader.h"
31#include "path.h" 29#include "path.h"
32 30
33/* 31sint8 maptile::outdoor_darkness;
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 strcpy (buf, create_pathname (name));
73 else
74 strcpy (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 32
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
137 * by the caller. 71 * by the caller.
138 */ 72 */
139int 73int
140blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
141{ 75{
142 object *tmp;
143 int mflags, blocked;
144
145 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
146 * have already checked this. 77 * have already checked this.
147 */ 78 */
148 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
149 { 80 {
… …
152 } 83 }
153 84
154 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
155 * directly. 86 * directly.
156 */ 87 */
157 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
158 89
159 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
160 92
161 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
162 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
163 * things we need to do for players. 95 * things we need to do for players.
164 */ 96 */
165 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
166 return 0; 98 return 0;
167 99
168 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* if there isn't anything alive on this space, and this space isn't
169 * otherwise blocked, we can return now. Only if there is a living 101 * otherwise blocked, we can return now. Only if there is a living
170 * creature do we need to investigate if it is part of this creature 102 * creature do we need to investigate if it is part of this creature
171 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
172 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
173 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
174 */ 106 */
175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 107 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176 return 0; 108 return 0;
177 109
178 if (ob->head != NULL)
179 ob = ob->head; 110 ob = ob->head_ ();
180 111
181 /* We basically go through the stack of objects, and if there is 112 /* 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 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
183 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
184 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
185 */ 116 */
186 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
187 { 118 {
188
189 /* This must be before the checks below. Code for inventory checkers. */ 119 /* This must be before the checks below. Code for inventory checkers. */
190 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 120 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
191 { 121 {
122 bool have = check_inv_recursive (ob, tmp);
123
192 /* If last_sp is set, the player/monster needs an object, 124 /* If last_sp is set, the player/monster needs an object,
193 * so we check for it. If they don't have it, they can't 125 * so we check for it. If they don't have it, they can't
194 * pass through this space. 126 * pass through this space.
195 */ 127 */
196 if (tmp->last_sp) 128 if (tmp->last_sp)
197 { 129 {
198 if (check_inv_recursive (ob, tmp) == NULL) 130 if (!have)
199 return 1; 131 return 1;
200 else
201 continue;
202 } 132 }
203 else 133 else
204 { 134 {
205 /* In this case, the player must not have the object - 135 /* In this case, the player must not have the object -
206 * if they do, they can't pass through. 136 * if they do, they can't pass through.
207 */ 137 */
208 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 138 if (have)
209 return 1; 139 return 1;
210 else
211 continue;
212 } 140 }
213 } /* if check_inv */ 141 }
214 else 142 else
215 { 143 {
216 /* Broke apart a big nasty if into several here to make 144 /* Broke apart a big nasty if into several here to make
217 * this more readable. first check - if the space blocks 145 * this more readable. first check - if the space blocks
218 * movement, can't move here. 146 * movement, can't move here.
219 * second - if a monster, can't move there, unles it is a 147 * second - if a monster, can't move there, unless it is a
220 * hidden dm 148 * dm.
221 */ 149 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 150 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 151 return 1;
224 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 152
225 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 153 if (tmp->flag [FLAG_ALIVE]
154 && tmp->head_ () != ob
155 && tmp != ob
156 && tmp->type != DOOR
157 && !tmp->flag [FLAG_WIZ])
226 return 1; 158 return 1;
227 } 159 }
228
229 } 160 }
161
230 return 0; 162 return 0;
231} 163}
232 164
233/* 165/*
234 * Returns true if the given object can't fit in the given spot. 166 * Returns qthe blocking object if the given object can't fit in the given
235 * This is meant for multi space objects - for single space objecs, 167 * spot. This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 168 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 169 * of object. This function goes through all the parts of the multipart
238 * multipart object and makes sure they can be inserted. 170 * object and makes sure they can be inserted.
239 * 171 *
240 * While this doesn't call out of map, the get_map_flags does. 172 * While this doesn't call out of map, the get_map_flags does.
241 * 173 *
242 * This function has been used to deprecate arch_out_of_map - 174 * This function has been used to deprecate arch_out_of_map -
243 * this function also does that check, and since in most cases, 175 * this function also does that check, and since in most cases,
… …
254 * 186 *
255 * Note this used to be arch_blocked, but with new movement 187 * Note this used to be arch_blocked, but with new movement
256 * code, we need to have actual object to check its move_type 188 * code, we need to have actual object to check its move_type
257 * against the move_block values. 189 * against the move_block values.
258 */ 190 */
259int 191bool
260ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 192object::blocked (maptile *m, int x, int y) const
261{ 193{
262 archetype *tmp; 194 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
263 int flag;
264 maptile *m1;
265 sint16 sx, sy;
266
267 if (!ob)
268 {
269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
270 if (flag & P_OUT_OF_MAP)
271 return P_OUT_OF_MAP;
272
273 /* don't have object, so don't know what types would block */
274 return m1->at (sx, sy).move_block;
275 } 195 {
196 mapxy pos (m, x + tmp->x, y + tmp->y);
276 197
277 for (tmp = ob->arch; tmp; tmp = tmp->more) 198 if (!pos.normalise ())
278 { 199 return 1;
279 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
280 200
281 if (flag & P_OUT_OF_MAP) 201 mapspace &ms = *pos;
282 return P_OUT_OF_MAP; 202
283 if (flag & P_IS_ALIVE) 203 if (ms.flags () & P_IS_ALIVE)
284 return P_IS_ALIVE; 204 return 1;
285 205
286 mapspace &ms = m1->at (sx, sy); 206 /* However, often ob doesn't have any move type
287 207 * (signifying non-moving objects)
288 /* find_first_free_spot() calls this function. However, often
289 * ob doesn't have any move type (when used to place exits)
290 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 208 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
291 */ 209 */
292
293 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 210 if (!move_type && ms.move_block != MOVE_ALL)
294 continue; 211 continue;
295 212
296 /* Note it is intentional that we check ob - the movement type of the 213 /* Note it is intentional that we check ob - the movement type of the
297 * head of the object should correspond for the entire object. 214 * head of the object should correspond for the entire object.
298 */ 215 */
299 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 216 if (ms.blocks (move_type))
300 return P_NO_PASS; 217 return 1;
301 } 218 }
302 219
303 return 0; 220 return 0;
304} 221}
305 222
… …
323 240
324 insert_ob_in_ob (tmp, container); 241 insert_ob_in_ob (tmp, container);
325 tmp = next; 242 tmp = next;
326 } 243 }
327 244
328 /* sum_weight will go through and calculate what all the containers are 245 // go through and calculate what all the containers are carrying.
329 * carrying. 246 //TODO: remove
330 */ 247 container->update_weight ();
331 sum_weight (container);
332} 248}
333 249
334void 250void
335maptile::set_object_flag (int flag, int value) 251maptile::set_object_flag (int flag, int value)
336{ 252{
… …
340 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 256 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 257 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value; 258 tmp->flag [flag] = value;
343} 259}
344 260
261void
262maptile::post_load_original ()
263{
264 if (!spaces)
265 return;
266
267 set_object_flag (FLAG_OBJ_ORIGINAL);
268
269 for (mapspace *ms = spaces + size (); ms-- > spaces; )
270 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
271 INVOKE_OBJECT (RESET, tmp);
272}
273
345/* link_multipart_objects go through all the objects on the map looking 274/* link_multipart_objects go through all the objects on the map looking
346 * for objects whose arch says they are multipart yet according to the 275 * for objects whose arch says they are multipart yet according to the
347 * info we have, they only have the head (as would be expected when 276 * info we have, they only have the head (as would be expected when
348 * they are saved). We do have to look for the old maps that did save 277 * they are saved).
349 * the more sections and not re-add sections for them.
350 */ 278 */
351void 279void
352maptile::link_multipart_objects () 280maptile::link_multipart_objects ()
353{ 281{
354 if (!spaces) 282 if (!spaces)
355 return; 283 return;
356 284
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 285 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 286 {
287 object *op = ms->bot;
288 while (op)
359 { 289 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 290 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 291 if (op->head_ () == op && !op->more && op->arch->more)
364 {
365 /* If there is nothing more to this object, this for loop
366 * won't do anything.
367 */
368 archetype *at;
369 object *last, *op;
370 for (at = tmp->arch->more, last = tmp;
371 at;
372 at = at->more, last = op)
373 { 292 {
374 op = arch_to_object (at); 293 op->remove ();
294 op->expand_tail ();
375 295
376 /* update x,y coordinates */ 296 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
377 op->x += tmp->x; 297 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
378 op->y += tmp->y; 298 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
379 op->head = tmp;
380 op->map = this;
381 last->more = op;
382 op->name = tmp->name;
383 op->title = tmp->title;
384
385 /* we could link all the parts onto tmp, and then just
386 * call insert_ob_in_map once, but the effect is the same,
387 * as insert_ob_in_map will call itself with each part, and
388 * the coding is simpler to just to it here with each part.
389 */
390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 299 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
300
301 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
302 // so we have to reset the iteration through the mapspace
391 } 303 }
304 else
305 op = op->above;
392 } 306 }
393
394 tmp = above;
395 } 307 }
396} 308}
397 309
398/* 310/*
399 * Loads (ands parses) the objects into a given map from the specified 311 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 312 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 313 */
403bool 314bool
404maptile::_load_objects (object_thawer &thawer) 315maptile::_load_objects (object_thawer &f)
405{ 316{
406 int unique; 317 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 318 {
414 /* if the archetype for the object is null, means that we 319 coroapi::cede_to_tick (); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 320
416 * or editor will not be able to do anything with it either. 321 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 322 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 323 case KW_arch:
324 if (object *op = object::read (f, this))
325 {
326 // TODO: why?
327 if (op->inv)
328 op->update_weight ();
329
330 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
331 {
332 // we insert manually because
333 // a) its way faster
334 // b) we remove manually, too, and there are good reasons for that
335 // c) it's correct
336 mapspace &ms = at (op->x, op->y);
337
338 op->flag [FLAG_REMOVED] = false;
339
340 op->above = 0;
341 op->below = ms.top;
342
343 *(ms.top ? &ms.top->above : &ms.bot) = op;
344
345 ms.top = op;
346 ms.flags_ = 0;
347 }
348 else
349 {
350 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
351 op->destroy ();
352 }
353 }
354
421 continue; 355 continue;
422 }
423 356
424 switch (i)
425 {
426 case LL_NORMAL:
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
428
429 if (op->inv)
430 sum_weight (op);
431
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 357 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 358 return true;
437 op->head = prev, last_more->more = op, last_more = op; 359
360 default:
361 if (!f.parse_error ("map file"))
362 return false;
438 break; 363 break;
439 } 364 }
440 365
441 op = object::create (); 366 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 367 }
462#endif
463 368
464 return true; 369 return true;
465} 370}
466 371
467void 372void
468maptile::activate () 373maptile::activate ()
469{ 374{
470 if (!spaces) 375 if (spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 376 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above) 377 for (object *op = ms->bot; op; op = op->above)
475 op->activate_recursive (); 378 op->activate_recursive ();
476} 379}
477 380
478void 381void
479maptile::deactivate () 382maptile::deactivate ()
480{ 383{
481 if (!spaces) 384 if (spaces)
482 return;
483
484 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 385 for (mapspace *ms = spaces + size (); ms-- > spaces; )
485 for (object *op = ms->bot; op; op = op->above) 386 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 387 op->deactivate_recursive ();
487} 388}
488 389
489bool 390bool
490maptile::_save_objects (object_freezer &freezer, int flags) 391maptile::_save_objects (object_freezer &f, int flags)
491{ 392{
492 static int cede_count = 0; 393 coroapi::cede_to_tick ();
493 394
494 if (flags & IO_HEADER) 395 if (flags & IO_HEADER)
495 _save_header (freezer); 396 _save_header (f);
496 397
497 if (!spaces) 398 if (!spaces)
498 return false; 399 return false;
499 400
500 for (int i = 0; i < size (); ++i) 401 for (int i = 0; i < size (); ++i)
501 { 402 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
510 int unique = 0; 403 bool unique = 0;
404
511 for (object *op = spaces [i].bot; op; op = op->above) 405 for (object *op = spaces [i].bot; op; op = op->above)
512 { 406 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 407 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
517 unique = 1;
518 408
519 if (!op->can_map_save ()) 409 if (expect_false (!op->can_map_save ()))
520 continue; 410 continue;
521 411
522 if (unique || op->flag [FLAG_UNIQUE]) 412 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
523 { 413 {
524 if (flags & IO_UNIQUES) 414 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 415 op->write (f);
526 } 416 }
527 else if (flags & IO_OBJECTS) 417 else if (expect_true (flags & IO_OBJECTS))
528 save_object (freezer, op, 1); 418 op->write (f);
529 } 419 }
530 } 420 }
531 421
422 coroapi::cede_to_tick ();
423
532 return true; 424 return true;
533}
534
535bool
536maptile::_load_objects (const char *path, bool skip_header)
537{
538 object_thawer thawer (path);
539
540 if (!thawer)
541 return false;
542
543 if (skip_header)
544 for (;;)
545 {
546 keyword kw = thawer.get_kv ();
547
548 if (kw == KW_end)
549 break;
550
551 thawer.skip_kv (kw);
552 }
553
554 return _load_objects (thawer);
555} 425}
556 426
557bool 427bool
558maptile::_save_objects (const char *path, int flags) 428maptile::_save_objects (const char *path, int flags)
559{ 429{
… …
568maptile::maptile () 438maptile::maptile ()
569{ 439{
570 in_memory = MAP_SWAPPED; 440 in_memory = MAP_SWAPPED;
571 441
572 /* The maps used to pick up default x and y values from the 442 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
574 */ 444 */
575 width = 16; 445 width = 16;
576 height = 16; 446 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 447 timeout = 300;
579 enter_x = 0; 448 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 449 max_volume = 2000000; // 2m³
581} 450}
582 451
583maptile::maptile (int w, int h) 452maptile::maptile (int w, int h)
584{ 453{
585 in_memory = MAP_SWAPPED; 454 in_memory = MAP_SWAPPED;
… …
735bool 604bool
736maptile::_load_header (object_thawer &thawer) 605maptile::_load_header (object_thawer &thawer)
737{ 606{
738 for (;;) 607 for (;;)
739 { 608 {
740 keyword kw = thawer.get_kv ();
741
742 switch (kw) 609 switch (thawer.kw)
743 { 610 {
744 case KW_EOF:
745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746 return false;
747
748 case KW_end:
749 return true;
750
751 default:
752 case KW_ERROR:
753 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
754 break;
755
756 case KW_msg: 611 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 612 thawer.get_ml (KW_endmsg, msg);
758 break; 613 break;
759 614
760 case KW_lore: // CF+ extension 615 case KW_lore: // CF+ extension
… …
791 case KW_winddir: thawer.get (winddir); break; 646 case KW_winddir: thawer.get (winddir); break;
792 case KW_sky: thawer.get (sky); break; 647 case KW_sky: thawer.get (sky); break;
793 648
794 case KW_per_player: thawer.get (per_player); break; 649 case KW_per_player: thawer.get (per_player); break;
795 case KW_per_party: thawer.get (per_party); break; 650 case KW_per_party: thawer.get (per_party); break;
651 case KW_no_reset: thawer.get (no_reset); break;
652 case KW_no_drop: thawer.get (no_drop); break;
796 653
797 case KW_region: default_region = region::find (thawer.get_str ()); break; 654 case KW_region: default_region = region::find (thawer.get_str ()); break;
798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 655 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799 656
800 // old names new names 657 // old names new names
… …
810 667
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 668 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 669 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 670 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 case KW_tile_path_4: thawer.get (tile_path [3]); break; 671 case KW_tile_path_4: thawer.get (tile_path [3]); break;
672
673 case KW_ERROR:
674 set_key_text (thawer.kw_str, thawer.value);
675 break;
676
677 case KW_end:
678 thawer.next ();
679 return true;
680
681 default:
682 if (!thawer.parse_error ("map", 0))
683 return false;
684 break;
815 } 685 }
686
687 thawer.next ();
816 } 688 }
817 689
818 abort (); 690 abort ();
819}
820
821bool
822maptile::_load_header (const char *path)
823{
824 object_thawer thawer (path);
825
826 if (!thawer)
827 return false;
828
829 return _load_header (thawer);
830} 691}
831 692
832/****************************************************************************** 693/******************************************************************************
833 * This is the start of unique map handling code 694 * This is the start of unique map handling code
834 *****************************************************************************/ 695 *****************************************************************************/
… …
845 object *above = op->above; 706 object *above = op->above;
846 707
847 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 708 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
848 unique = 1; 709 unique = 1;
849 710
850 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 711 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
851 {
852 op->destroy_inv (false);
853 op->destroy (); 712 op->destroy ();
854 }
855 713
856 op = above; 714 op = above;
857 } 715 }
858 } 716 }
859} 717}
… …
869 if (name) MAP_OUT (name); 727 if (name) MAP_OUT (name);
870 MAP_OUT (swap_time); 728 MAP_OUT (swap_time);
871 MAP_OUT (reset_time); 729 MAP_OUT (reset_time);
872 MAP_OUT (reset_timeout); 730 MAP_OUT (reset_timeout);
873 MAP_OUT (fixed_resettime); 731 MAP_OUT (fixed_resettime);
732 MAP_OUT (no_reset);
733 MAP_OUT (no_drop);
874 MAP_OUT (difficulty); 734 MAP_OUT (difficulty);
875 735
876 if (default_region) MAP_OUT2 (region, default_region->name); 736 if (default_region) MAP_OUT2 (region, default_region->name);
877 737
878 if (shopitems) 738 if (shopitems)
… …
932 * Remove and free all objects in the given map. 792 * Remove and free all objects in the given map.
933 */ 793 */
934void 794void
935maptile::clear () 795maptile::clear ()
936{ 796{
937 sfree (regions, size ()), regions = 0;
938 free (regionmap), regionmap = 0;
939
940 if (spaces) 797 if (spaces)
941 { 798 {
942 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 799 for (mapspace *ms = spaces + size (); ms-- > spaces; )
943 while (object *op = ms->bot) 800 while (object *op = ms->bot)
944 { 801 {
802 // manually remove, as to not trigger anything
803 if (ms->bot = op->above)
804 ms->bot->below = 0;
805
806 op->flag [FLAG_REMOVED] = true;
807
808 object *head = op->head_ ();
945 if (op->head) 809 if (op == head)
946 op = op->head;
947
948 op->destroy_inv (false);
949 op->destroy (); 810 op->destroy ();
811 else if (head->map != op->map)
812 {
813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
814 head->destroy ();
815 }
950 } 816 }
951 817
952 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
953 } 819 }
954 820
955 if (buttons) 821 if (buttons)
956 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
823
824 sfree0 (regions, size ());
825 delete [] regionmap; regionmap = 0;
957} 826}
958 827
959void 828void
960maptile::clear_header () 829maptile::clear_header ()
961{ 830{
… …
993 attachable::do_destroy (); 862 attachable::do_destroy ();
994 863
995 clear (); 864 clear ();
996} 865}
997 866
998/* 867/* decay and destroy perishable items in a map */
999 * Updates every button on the map (by calling update_button() for them).
1000 */
1001void 868void
1002maptile::update_buttons () 869maptile::do_decay_objects ()
1003{ 870{
1004 for (oblinkpt *obp = buttons; obp; obp = obp->next) 871 if (!spaces)
1005 for (objectlink *ol = obp->link; ol; ol = ol->next) 872 return;
873
874 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 for (object *above, *op = ms->bot; op; op = above)
1006 { 876 {
1007 if (!ol->ob) 877 above = op->above;
878
879 bool destroy = 0;
880
881 // do not decay anything above unique floor tiles (yet :)
882 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
883 break;
884
885 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
886 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
887 || QUERY_FLAG (op, FLAG_UNIQUE)
888 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
889 || QUERY_FLAG (op, FLAG_UNPAID)
890 || op->is_alive ())
891 ; // do not decay
892 else if (op->is_weapon ())
1008 { 893 {
1009 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 894 op->stats.dam--;
1010 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 895 if (op->stats.dam < 0)
1011 continue; 896 destroy = 1;
1012 } 897 }
1013 898 else if (op->is_armor ())
1014 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1015 { 899 {
1016 update_button (ol->ob); 900 op->stats.ac--;
1017 break; 901 if (op->stats.ac < 0)
902 destroy = 1;
1018 } 903 }
904 else if (op->type == FOOD)
905 {
906 op->stats.food -= rndm (5, 20);
907 if (op->stats.food < 0)
908 destroy = 1;
909 }
910 else
911 {
912 int mat = op->materials;
913
914 if (mat & M_PAPER
915 || mat & M_LEATHER
916 || mat & M_WOOD
917 || mat & M_ORGANIC
918 || mat & M_CLOTH
919 || mat & M_LIQUID
920 || (mat & M_IRON && rndm (1, 5) == 1)
921 || (mat & M_GLASS && rndm (1, 2) == 1)
922 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
923 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
924 || (mat & M_ICE && temp > 32))
925 destroy = 1;
926 }
927
928 /* adjust overall chance below */
929 if (destroy && rndm (0, 1))
930 op->destroy ();
1019 } 931 }
1020} 932}
1021 933
1022/* 934/*
1023 * This routine is supposed to find out the difficulty of the map. 935 * This routine is supposed to find out the difficulty of the map.
1024 * difficulty does not have a lot to do with character level, 936 * difficulty does not have a lot to do with character level,
1025 * but does have a lot to do with treasure on the map. 937 * but does have a lot to do with treasure on the map.
1026 * 938 *
1027 * Difficulty can now be set by the map creature. If the value stored 939 * Difficulty can now be set by the map creator. If the value stored
1028 * in the map is zero, then use this routine. Maps should really 940 * in the map is zero, then use this routine. Maps should really
1029 * have a difficulty set than using this function - human calculation 941 * have a difficulty set rather than using this function - human calculation
1030 * is much better than this functions guesswork. 942 * is much better than this function's guesswork.
1031 */ 943 */
1032int 944int
1033maptile::estimate_difficulty () const 945maptile::estimate_difficulty () const
1034{ 946{
1035 long monster_cnt = 0; 947 long monster_cnt = 0;
… …
1047 959
1048 if (QUERY_FLAG (op, FLAG_GENERATOR)) 960 if (QUERY_FLAG (op, FLAG_GENERATOR))
1049 { 961 {
1050 total_exp += op->stats.exp; 962 total_exp += op->stats.exp;
1051 963
1052 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 964 if (archetype *at = op->other_arch)
965 {
1053 total_exp += at->clone.stats.exp * 8; 966 total_exp += at->stats.exp * 8;
1054
1055 monster_cnt++; 967 monster_cnt++;
968 }
969
970 for (object *inv = op->inv; inv; inv = inv->below)
971 {
972 total_exp += op->stats.exp * 8;
973 monster_cnt++;
974 }
1056 } 975 }
1057 } 976 }
1058 977
1059 avgexp = (double) total_exp / monster_cnt; 978 avgexp = (double) total_exp / monster_cnt;
1060 979
… …
1073 * postive values make it darker, negative make it brighter 992 * postive values make it darker, negative make it brighter
1074 */ 993 */
1075int 994int
1076maptile::change_map_light (int change) 995maptile::change_map_light (int change)
1077{ 996{
1078 int new_level = darkness + change;
1079
1080 /* Nothing to do */ 997 /* Nothing to do */
1081 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 998 if (!change)
1082 return 0; 999 return 0;
1083 1000
1084 /* inform all players on the map */ 1001 /* inform all players on the map */
1085 if (change > 0) 1002 if (change > 0)
1086 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1003 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1087 else 1004 else
1088 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1005 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1089 1006
1090 /* Do extra checking. since darkness is a unsigned value, 1007 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1091 * we need to be extra careful about negative values.
1092 * In general, the checks below are only needed if change
1093 * is not +/-1
1094 */
1095 if (new_level < 0)
1096 darkness = 0;
1097 else if (new_level >= MAX_DARKNESS)
1098 darkness = MAX_DARKNESS;
1099 else
1100 darkness = new_level;
1101 1008
1102 /* All clients need to get re-updated for the change */ 1009 /* All clients need to get re-updated for the change */
1103 update_all_map_los (this); 1010 update_all_map_los (this);
1011
1104 return 1; 1012 return 1;
1105} 1013}
1106 1014
1107/* 1015/*
1108 * This function updates various attributes about a specific space 1016 * This function updates various attributes about a specific space
… …
1111 * through, etc) 1019 * through, etc)
1112 */ 1020 */
1113void 1021void
1114mapspace::update_ () 1022mapspace::update_ ()
1115{ 1023{
1116 object *tmp, *last = 0; 1024 object *last = 0;
1117 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1025 uint8 flags = P_UPTODATE, anywhere = 0;
1118 facetile *top, *floor, *middle; 1026 sint8 light = 0;
1119 object *top_obj, *floor_obj, *middle_obj;
1120 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1027 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1121 1028
1122 middle = blank_face; 1029 //object *middle = 0;
1123 top = blank_face; 1030 //object *top = 0;
1124 floor = blank_face; 1031 //object *floor = 0;
1032 // this seems to generate better code than using locals, above
1033 object *&top = faces_obj[0] = 0;
1034 object *&middle = faces_obj[1] = 0;
1035 object *&floor = faces_obj[2] = 0;
1125 1036
1126 middle_obj = 0;
1127 top_obj = 0;
1128 floor_obj = 0;
1129
1130 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1037 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1131 { 1038 {
1132 /* This could be made additive I guess (two lights better than 1039 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1133 * one). But if so, it shouldn't be a simple additive - 2
1134 * light bulbs do not illuminate twice as far as once since
1135 * it is a dissapation factor that is cubed.
1136 */
1137 if (tmp->glow_radius > light)
1138 light = tmp->glow_radius; 1040 light += tmp->glow_radius;
1139 1041
1140 /* This call is needed in order to update objects the player 1042 /* This call is needed in order to update objects the player
1141 * is standing in that have animations (ie, grass, fire, etc). 1043 * is standing in that have animations (ie, grass, fire, etc).
1142 * However, it also causes the look window to be re-drawn 1044 * However, it also causes the look window to be re-drawn
1143 * 3 times each time the player moves, because many of the 1045 * 3 times each time the player moves, because many of the
… …
1146 * Always put the player down for drawing. 1048 * Always put the player down for drawing.
1147 */ 1049 */
1148 if (!tmp->invisible) 1050 if (!tmp->invisible)
1149 { 1051 {
1150 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1052 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1151 {
1152 top = tmp->face;
1153 top_obj = tmp; 1053 top = tmp;
1154 }
1155 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1054 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1156 { 1055 {
1157 /* If we got a floor, that means middle and top were below it, 1056 /* If we got a floor, that means middle and top were below it,
1158 * so should not be visible, so we clear them. 1057 * so should not be visible, so we clear them.
1159 */ 1058 */
1160 middle = blank_face; 1059 middle = 0;
1161 top = blank_face; 1060 top = 0;
1162 floor = tmp->face;
1163 floor_obj = tmp; 1061 floor = tmp;
1164 } 1062 }
1165 /* Flag anywhere have high priority */ 1063 /* Flag anywhere have high priority */
1166 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1064 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1167 { 1065 {
1168 middle = tmp->face;
1169
1170 middle_obj = tmp; 1066 middle = tmp;
1171 anywhere = 1; 1067 anywhere = 1;
1172 } 1068 }
1069
1173 /* Find the highest visible face around. If equal 1070 /* Find the highest visible face around. If equal
1174 * visibilities, we still want the one nearer to the 1071 * visibilities, we still want the one nearer to the
1175 * top 1072 * top
1176 */ 1073 */
1177 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1074 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1178 {
1179 middle = tmp->face;
1180 middle_obj = tmp; 1075 middle = tmp;
1181 }
1182 } 1076 }
1183 1077
1184 if (tmp == tmp->above) 1078 if (tmp == tmp->above)
1185 { 1079 {
1186 LOG (llevError, "Error in structure of map\n"); 1080 LOG (llevError, "Error in structure of map\n");
… …
1199 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1093 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1200 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1094 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1201 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1095 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1202 } 1096 }
1203 1097
1204 this->light = light; 1098 this->light = min (light, MAX_LIGHT_RADIUS);
1205 this->flags_ = flags; 1099 this->flags_ = flags;
1206 this->move_block = move_block & ~move_allow; 1100 this->move_block = move_block & ~move_allow;
1207 this->move_on = move_on; 1101 this->move_on = move_on;
1208 this->move_off = move_off; 1102 this->move_off = move_off;
1209 this->move_slow = move_slow; 1103 this->move_slow = move_slow;
… …
1221 * middle face. This should not happen, as we already have the 1115 * middle face. This should not happen, as we already have the
1222 * else statement above so middle should not get set. OTOH, it 1116 * else statement above so middle should not get set. OTOH, it
1223 * may be possible for the faces to match but be different objects. 1117 * may be possible for the faces to match but be different objects.
1224 */ 1118 */
1225 if (top == middle) 1119 if (top == middle)
1226 middle = blank_face; 1120 middle = 0;
1227 1121
1228 /* There are three posibilities at this point: 1122 /* There are three posibilities at this point:
1229 * 1) top face is set, need middle to be set. 1123 * 1) top face is set, need middle to be set.
1230 * 2) middle is set, need to set top. 1124 * 2) middle is set, need to set top.
1231 * 3) neither middle or top is set - need to set both. 1125 * 3) neither middle or top is set - need to set both.
1232 */ 1126 */
1233 1127
1234 for (tmp = last; tmp; tmp = tmp->below) 1128 for (object *tmp = last; tmp; tmp = tmp->below)
1235 { 1129 {
1236 /* Once we get to a floor, stop, since we already have a floor object */ 1130 /* Once we get to a floor, stop, since we already have a floor object */
1237 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1131 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1238 break; 1132 break;
1239 1133
1240 /* If two top faces are already set, quit processing */ 1134 /* If two top faces are already set, quit processing */
1241 if ((top != blank_face) && (middle != blank_face)) 1135 if (top && middle)
1242 break; 1136 break;
1243 1137
1244 /* Only show visible faces */ 1138 /* Only show visible faces */
1245 if (!tmp->invisible) 1139 if (!tmp->invisible)
1246 { 1140 {
1247 /* Fill in top if needed */ 1141 /* Fill in top if needed */
1248 if (top == blank_face) 1142 if (!top)
1249 { 1143 {
1250 top = tmp->face;
1251 top_obj = tmp; 1144 top = tmp;
1252 if (top == middle) 1145 if (top == middle)
1253 middle = blank_face; 1146 middle = 0;
1254 } 1147 }
1255 else 1148 else
1256 { 1149 {
1257 /* top is already set - we should only get here if 1150 /* top is already set - we should only get here if
1258 * middle is not set 1151 * middle is not set
1259 * 1152 *
1260 * Set the middle face and break out, since there is nothing 1153 * Set the middle face and break out, since there is nothing
1261 * more to fill in. We don't check visiblity here, since 1154 * more to fill in. We don't check visiblity here, since
1262 * 1155 *
1263 */ 1156 */
1264 if (tmp->face != top) 1157 if (tmp != top)
1265 { 1158 {
1266 middle = tmp->face;
1267 middle_obj = tmp; 1159 middle = tmp;
1268 break; 1160 break;
1269 } 1161 }
1270 } 1162 }
1271 } 1163 }
1272 } 1164 }
1273 1165
1274 if (middle == floor) 1166 if (middle == floor)
1275 middle = blank_face; 1167 middle = 0;
1276 1168
1277 if (top == middle) 1169 if (top == middle)
1278 middle = blank_face; 1170 middle = 0;
1279 1171
1280 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1172#if 0
1281 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1173 faces_obj [0] = top;
1282 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1174 faces_obj [1] = middle;
1175 faces_obj [2] = floor;
1176#endif
1283} 1177}
1284 1178
1285/* this updates the orig_map->tile_map[tile_num] value after finding 1179uint64
1286 * the map. It also takes care of linking back the freshly found 1180mapspace::volume () const
1287 * maps tile_map values if it tiles back to this one. It returns
1288 * the value of orig_map->tile_map[tile_num].
1289 */
1290static inline maptile *
1291find_and_link (maptile *orig_map, int tile_num)
1292{ 1181{
1293 maptile *mp = orig_map->tile_map [tile_num]; 1182 uint64 vol = 0;
1294 1183
1295 if (!mp) 1184 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1296 { 1185 vol += op->volume ();
1297 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1298 1186
1299 if (!mp) 1187 return vol;
1300 { 1188}
1301 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1189
1302 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1190maptile *
1303 &orig_map->tile_path[tile_num], &orig_map->path); 1191maptile::tile_available (int dir, bool load)
1304 mp = new maptile (1, 1); 1192{
1305 mp->alloc (); 1193 if (tile_path[dir])
1306 mp->in_memory = MAP_IN_MEMORY;
1307 }
1308 } 1194 {
1195 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1196 return tile_map[dir];
1309 1197
1310 int dest_tile = (tile_num + 2) % 4; 1198 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1199 return tile_map[dir];
1200 }
1311 1201
1312 orig_map->tile_map [tile_num] = mp;
1313
1314 // optimisation: back-link map to origin map if euclidean
1315 //TODO: non-euclidean maps MUST GO
1316 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1317 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1318
1319 return mp; 1202 return 0;
1320}
1321
1322static inline void
1323load_and_link (maptile *orig_map, int tile_num)
1324{
1325 find_and_link (orig_map, tile_num)->load_sync ();
1326} 1203}
1327 1204
1328/* this returns TRUE if the coordinates (x,y) are out of 1205/* this returns TRUE if the coordinates (x,y) are out of
1329 * map m. This function also takes into account any 1206 * map m. This function also takes into account any
1330 * tiling considerations, loading adjacant maps as needed. 1207 * tiling considerations, loading adjacant maps as needed.
… …
1343 if (!m) 1220 if (!m)
1344 return 0; 1221 return 0;
1345 1222
1346 if (x < 0) 1223 if (x < 0)
1347 { 1224 {
1348 if (!m->tile_path[3]) 1225 if (!m->tile_available (3))
1349 return 1; 1226 return 1;
1350 1227
1351 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1352 find_and_link (m, 3);
1353
1354 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1228 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1355 } 1229 }
1356 1230
1357 if (x >= m->width) 1231 if (x >= m->width)
1358 { 1232 {
1359 if (!m->tile_path[1]) 1233 if (!m->tile_available (1))
1360 return 1; 1234 return 1;
1361 1235
1362 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1363 find_and_link (m, 1);
1364
1365 return out_of_map (m->tile_map[1], x - m->width, y); 1236 return out_of_map (m->tile_map[1], x - m->width, y);
1366 } 1237 }
1367 1238
1368 if (y < 0) 1239 if (y < 0)
1369 { 1240 {
1370 if (!m->tile_path[0]) 1241 if (!m->tile_available (0))
1371 return 1; 1242 return 1;
1372 1243
1373 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1374 find_and_link (m, 0);
1375
1376 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1244 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1377 } 1245 }
1378 1246
1379 if (y >= m->height) 1247 if (y >= m->height)
1380 { 1248 {
1381 if (!m->tile_path[2]) 1249 if (!m->tile_available (2))
1382 return 1; 1250 return 1;
1383
1384 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1385 find_and_link (m, 2);
1386 1251
1387 return out_of_map (m->tile_map[2], x, y - m->height); 1252 return out_of_map (m->tile_map[2], x, y - m->height);
1388 } 1253 }
1389 1254
1390 /* Simple case - coordinates are within this local 1255 /* Simple case - coordinates are within this local
… …
1404maptile * 1269maptile *
1405maptile::xy_find (sint16 &x, sint16 &y) 1270maptile::xy_find (sint16 &x, sint16 &y)
1406{ 1271{
1407 if (x < 0) 1272 if (x < 0)
1408 { 1273 {
1409 if (!tile_path[3]) 1274 if (!tile_available (3))
1410 return 0; 1275 return 0;
1411 1276
1412 find_and_link (this, 3);
1413 x += tile_map[3]->width; 1277 x += tile_map[3]->width;
1414 return tile_map[3]->xy_find (x, y); 1278 return tile_map[3]->xy_find (x, y);
1415 } 1279 }
1416 1280
1417 if (x >= width) 1281 if (x >= width)
1418 { 1282 {
1419 if (!tile_path[1]) 1283 if (!tile_available (1))
1420 return 0; 1284 return 0;
1421 1285
1422 find_and_link (this, 1);
1423 x -= width; 1286 x -= width;
1424 return tile_map[1]->xy_find (x, y); 1287 return tile_map[1]->xy_find (x, y);
1425 } 1288 }
1426 1289
1427 if (y < 0) 1290 if (y < 0)
1428 { 1291 {
1429 if (!tile_path[0]) 1292 if (!tile_available (0))
1430 return 0; 1293 return 0;
1431 1294
1432 find_and_link (this, 0);
1433 y += tile_map[0]->height; 1295 y += tile_map[0]->height;
1434 return tile_map[0]->xy_find (x, y); 1296 return tile_map[0]->xy_find (x, y);
1435 } 1297 }
1436 1298
1437 if (y >= height) 1299 if (y >= height)
1438 { 1300 {
1439 if (!tile_path[2]) 1301 if (!tile_available (2))
1440 return 0; 1302 return 0;
1441 1303
1442 find_and_link (this, 2);
1443 y -= height; 1304 y -= height;
1444 return tile_map[2]->xy_find (x, y); 1305 return tile_map[2]->xy_find (x, y);
1445 } 1306 }
1446 1307
1447 /* Simple case - coordinates are within this local 1308 /* Simple case - coordinates are within this local
… …
1452 1313
1453/** 1314/**
1454 * Return whether map2 is adjacent to map1. If so, store the distance from 1315 * Return whether map2 is adjacent to map1. If so, store the distance from
1455 * map1 to map2 in dx/dy. 1316 * map1 to map2 in dx/dy.
1456 */ 1317 */
1457static int 1318int
1458adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1319adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1459{ 1320{
1460 if (!map1 || !map2) 1321 if (!map1 || !map2)
1461 return 0; 1322 return 0;
1462 1323
1463 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1324 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1464 //fix: compare paths instead (this is likely faster, too!) 1325 //fix: compare paths instead (this is likely faster, too!)
1465 if (map1 == map2) 1326 if (map1 == map2)
1466 { 1327 {
1467 *dx = 0; 1328 *dx = 0;
1468 *dy = 0; 1329 *dy = 0;
… …
1574get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1435get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1575{ 1436{
1576 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1437 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577 { 1438 {
1578 /* be conservative and fill in _some_ data */ 1439 /* be conservative and fill in _some_ data */
1579 retval->distance = 100000; 1440 retval->distance = 10000;
1580 retval->distance_x = 32767; 1441 retval->distance_x = 10000;
1581 retval->distance_y = 32767; 1442 retval->distance_y = 10000;
1582 retval->direction = 0; 1443 retval->direction = 0;
1583 retval->part = 0; 1444 retval->part = 0;
1584 } 1445 }
1585 else 1446 else
1586 { 1447 {
… …
1591 1452
1592 best = op1; 1453 best = op1;
1593 /* If this is multipart, find the closest part now */ 1454 /* If this is multipart, find the closest part now */
1594 if (!(flags & 0x1) && op1->more) 1455 if (!(flags & 0x1) && op1->more)
1595 { 1456 {
1596 object *tmp;
1597 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1457 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598 1458
1599 /* we just take the offset of the piece to head to figure 1459 /* we just take the offset of the piece to head to figure
1600 * distance instead of doing all that work above again 1460 * distance instead of doing all that work above again
1601 * since the distance fields we set above are positive in the 1461 * since the distance fields we set above are positive in the
1602 * same axis as is used for multipart objects, the simply arithmetic 1462 * same axis as is used for multipart objects, the simply arithmetic
1603 * below works. 1463 * below works.
1604 */ 1464 */
1605 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1465 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606 { 1466 {
1607 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1467 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1608 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1468 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609 if (tmpi < best_distance) 1469 if (tmpi < best_distance)
1610 { 1470 {
… …
1619 retval->distance_y += op1->y - best->y; 1479 retval->distance_y += op1->y - best->y;
1620 } 1480 }
1621 } 1481 }
1622 1482
1623 retval->part = best; 1483 retval->part = best;
1624 retval->distance = idistance (retval->distance_x, retval->distance_y); 1484 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1485 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626 } 1486 }
1627} 1487}
1628 1488
1629/* this is basically the same as get_rangevector above, but instead of 1489/* this is basically the same as get_rangevector above, but instead of
… …
1634 * flags has no meaning for this function at this time - I kept it in to 1494 * flags has no meaning for this function at this time - I kept it in to
1635 * be more consistant with the above function and also in case they are needed 1495 * be more consistant with the above function and also in case they are needed
1636 * for something in the future. Also, since no object is pasted, the best 1496 * for something in the future. Also, since no object is pasted, the best
1637 * field of the rv_vector is set to NULL. 1497 * field of the rv_vector is set to NULL.
1638 */ 1498 */
1639
1640void 1499void
1641get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1500get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1642{ 1501{
1643 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1502 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1644 { 1503 {
1645 /* be conservative and fill in _some_ data */ 1504 /* be conservative and fill in _some_ data */
1646 retval->distance = 100000; 1505 retval->distance = 100000;
… …
1652 else 1511 else
1653 { 1512 {
1654 retval->distance_x += op2->x - x; 1513 retval->distance_x += op2->x - x;
1655 retval->distance_y += op2->y - y; 1514 retval->distance_y += op2->y - y;
1656 1515
1657 retval->part = NULL; 1516 retval->part = 0;
1658 retval->distance = idistance (retval->distance_x, retval->distance_y); 1517 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1659 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1518 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1660 } 1519 }
1661} 1520}
1662 1521
1663/* Returns true of op1 and op2 are effectively on the same map 1522/* Returns true of op1 and op2 are effectively on the same map
… …
1677} 1536}
1678 1537
1679object * 1538object *
1680maptile::insert (object *op, int x, int y, object *originator, int flags) 1539maptile::insert (object *op, int x, int y, object *originator, int flags)
1681{ 1540{
1682 if (!op->flag [FLAG_REMOVED])
1683 op->remove ();
1684
1685 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1541 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1686} 1542}
1687 1543
1688region * 1544region *
1689maptile::region (int x, int y) const 1545maptile::region (int x, int y) const
… …
1698 return default_region; 1554 return default_region;
1699 1555
1700 return ::region::default_region (); 1556 return ::region::default_region ();
1701} 1557}
1702 1558
1559/* picks a random object from a style map.
1560 */
1561object *
1562maptile::pick_random_object (rand_gen &gen) const
1563{
1564 /* while returning a null object will result in a crash, that
1565 * is actually preferable to an infinite loop. That is because
1566 * most servers will automatically restart in case of crash.
1567 * Change the logic on getting the random space - shouldn't make
1568 * any difference, but this seems clearer to me.
1569 */
1570 for (int i = 1000; --i;)
1571 {
1572 object *pick = at (gen (width), gen (height)).bot;
1573
1574 // do not prefer big monsters just because they are big.
1575 if (pick && pick->is_head ())
1576 return pick->head_ ();
1577 }
1578
1579 // instead of crashing in the unlikely(?) case, try to return *something*
1580 return archetype::find ("bug");
1581}
1582
1583void
1584maptile::play_sound (faceidx sound, int x, int y) const
1585{
1586 if (!sound)
1587 return;
1588
1589 for_all_players_on_map (pl, this)
1590 if (client *ns = pl->ns)
1591 {
1592 int dx = x - pl->ob->x;
1593 int dy = y - pl->ob->y;
1594
1595 int distance = idistance (dx, dy);
1596
1597 if (distance <= MAX_SOUND_DISTANCE)
1598 ns->play_sound (sound, dx, dy);
1599 }
1600}
1601
1602void
1603maptile::say_msg (const char *msg, int x, int y) const
1604{
1605 for_all_players (pl)
1606 if (client *ns = pl->ns)
1607 {
1608 int dx = x - pl->ob->x;
1609 int dy = y - pl->ob->y;
1610
1611 int distance = idistance (dx, dy);
1612
1613 if (distance <= MAX_SOUND_DISTANCE)
1614 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1615 }
1616}
1617
1618static void
1619split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1620{
1621 // clip to map to the left
1622 if (x0 < 0)
1623 {
1624 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1625 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1626
1627 if (x1 < 0) // entirely to the left
1628 return;
1629
1630 x0 = 0;
1631 }
1632
1633 // clip to map to the right
1634 if (x1 > m->width)
1635 {
1636 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1637 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1638
1639 if (x0 > m->width) // entirely to the right
1640 return;
1641
1642 x1 = m->width;
1643 }
1644
1645 // clip to map above
1646 if (y0 < 0)
1647 {
1648 if (maptile *tile = m->tile_available (TILE_UP, 1))
1649 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1650
1651 if (y1 < 0) // entirely above
1652 return;
1653
1654 y0 = 0;
1655 }
1656
1657 // clip to map below
1658 if (y1 > m->height)
1659 {
1660 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1661 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1662
1663 if (y0 > m->height) // entirely below
1664 return;
1665
1666 y1 = m->height;
1667 }
1668
1669 // if we get here, the rect is within the current map
1670 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1671
1672 r->m = m;
1673 r->x0 = x0;
1674 r->y0 = y0;
1675 r->x1 = x1;
1676 r->y1 = y1;
1677 r->dx = dx;
1678 r->dy = dy;
1679}
1680
1681maprect *
1682maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1683{
1684 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
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