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

Diff Legend

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