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.98 by root, Sat Mar 17 22:11:22 2007 UTC vs.
Revision 1.172 by root, Sun Nov 8 20:55:39 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
308 * into inventory, but just links them. What this does is go through 223 * into inventory, but just links them. What this does is go through
309 * and insert them properly. 224 * and insert them properly.
310 * The object 'container' is the object that contains the inventory. 225 * The object 'container' is the object that contains the inventory.
311 * This is needed so that we can update the containers weight. 226 * This is needed so that we can update the containers weight.
312 */ 227 */
313void 228static void
314fix_container (object *container) 229fix_container (object *container)
315{ 230{
316 object *tmp = container->inv, *next; 231 object *tmp = container->inv, *next;
317 232
318 container->inv = 0; 233 container->inv = 0;
324 239
325 insert_ob_in_ob (tmp, container); 240 insert_ob_in_ob (tmp, container);
326 tmp = next; 241 tmp = next;
327 } 242 }
328 243
329 /* sum_weight will go through and calculate what all the containers are 244 // go through and calculate what all the containers are carrying.
330 * carrying. 245 //TODO: remove
331 */ 246 container->update_weight ();
332 sum_weight (container);
333} 247}
248
249//-GPL
334 250
335void 251void
336maptile::set_object_flag (int flag, int value) 252maptile::set_object_flag (int flag, int value)
337{ 253{
338 if (!spaces) 254 if (!spaces)
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 257 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 258 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 259 tmp->flag [flag] = value;
344} 260}
345 261
262void
263maptile::post_load_original ()
264{
265 if (!spaces)
266 return;
267
268 set_object_flag (FLAG_OBJ_ORIGINAL);
269
270 for (mapspace *ms = spaces + size (); ms-- > spaces; )
271 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272 INVOKE_OBJECT (RESET, tmp);
273}
274
275//+GPL
276
346/* link_multipart_objects go through all the objects on the map looking 277/* 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 278 * 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 279 * 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 280 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 281 */
352void 282void
353maptile::link_multipart_objects () 283maptile::link_multipart_objects ()
354{ 284{
355 if (!spaces) 285 if (!spaces)
356 return; 286 return;
357 287
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 288 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 289 {
290 object *op = ms->bot;
291 while (op)
360 { 292 {
361 /* already multipart - don't do anything more */ 293 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 294 if (op->head_ () == op && !op->more && op->arch->more)
363 {
364 /* If there is nothing more to this object, this for loop
365 * won't do anything.
366 */
367 archetype *at;
368 object *last, *op;
369 for (at = tmp->arch->more, last = tmp;
370 at;
371 at = at->more, last = op)
372 { 295 {
373 op = arch_to_object (at); 296 op->remove ();
297 op->expand_tail ();
374 298
375 /* update x,y coordinates */ 299 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 300 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 301 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
378 op->head = tmp;
379 op->map = this;
380 last->more = op;
381 op->name = tmp->name;
382 op->title = tmp->title;
383
384 /* we could link all the parts onto tmp, and then just
385 * call insert_ob_in_map once, but the effect is the same,
386 * as insert_ob_in_map will call itself with each part, and
387 * the coding is simpler to just to it here with each part.
388 */
389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 302 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
303
304 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
305 // so we have to reset the iteration through the mapspace
390 } 306 }
307 else
308 op = op->above;
391 } 309 }
392 } 310 }
393} 311}
312
313//-GPL
394 314
395/* 315/*
396 * Loads (ands parses) the objects into a given map from the specified 316 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 317 * file pointer.
398 */ 318 */
399bool 319bool
400maptile::_load_objects (object_thawer &f) 320maptile::_load_objects (object_thawer &f)
401{ 321{
402 for (;;) 322 for (;;)
403 { 323 {
404 coroapi::cede_every (1000); // cede once in a while 324 coroapi::cede_to_tick (); // cede once in a while
405 325
406 switch (f.kw) 326 switch (f.kw)
407 { 327 {
408 case KW_arch: 328 case KW_arch:
409 if (object *op = object::read (f, this)) 329 if (object *op = object::read (f, this))
410 { 330 {
331 // TODO: why?
411 if (op->inv) 332 if (op->inv)
412 sum_weight (op); 333 op->update_weight ();
413 334
414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336 {
337 // we insert manually because
338 // a) its way faster
339 // b) we remove manually, too, and there are good reasons for that
340 // c) it's correct
341 mapspace &ms = at (op->x, op->y);
342
343 op->flag [FLAG_REMOVED] = false;
344
345 op->above = 0;
346 op->below = ms.top;
347
348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
415 } 358 }
416 359
417 continue; 360 continue;
418 361
419 case KW_EOF: 362 case KW_EOF:
432} 375}
433 376
434void 377void
435maptile::activate () 378maptile::activate ()
436{ 379{
437 if (!spaces) 380 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 383 op->activate_recursive ();
443} 384}
444 385
445void 386void
446maptile::deactivate () 387maptile::deactivate ()
447{ 388{
448 if (!spaces) 389 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 392 op->deactivate_recursive ();
454} 393}
455 394
456bool 395bool
457maptile::_save_objects (object_freezer &f, int flags) 396maptile::_save_objects (object_freezer &f, int flags)
458{ 397{
459 coroapi::cede (); 398 coroapi::cede_to_tick ();
460 399
461 if (flags & IO_HEADER) 400 if (flags & IO_HEADER)
462 _save_header (f); 401 _save_header (f);
463 402
464 if (!spaces) 403 if (!spaces)
465 return false; 404 return false;
466 405
467 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
468 { 407 {
469#if 0 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
472 if (cede_count >= 500)
473 {
474 cede_count = 0;
475 coroapi::cede ();
476 }
477#endif
478
479 int unique = 0; 408 bool unique = 0;
409
480 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
481 { 411 {
482#if 0
483 // count per-object, but cede only when modification-safe
484 cede_count++;
485#endif
486
487 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
488 unique = 1;
489 413
490 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
491 continue; 415 continue;
492 416
493 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
494 { 418 {
495 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
496 op->write (f); 420 op->write (f);
497 } 421 }
498 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
499 op->write (f); 423 op->write (f);
500 } 424 }
501 } 425 }
502 426
503 coroapi::cede (); 427 coroapi::cede_to_tick ();
504 428
505 return true; 429 return true;
506}
507
508bool
509maptile::_load_objects (const char *path, bool skip_header)
510{
511 object_thawer f (path);
512
513 if (!f)
514 return false;
515
516 f.next ();
517
518 if (skip_header)
519 for (;;)
520 {
521 keyword kw = f.kw;
522 f.skip ();
523 if (kw == KW_end)
524 break;
525 }
526
527 return _load_objects (f);
528} 430}
529 431
530bool 432bool
531maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
532{ 434{
547 */ 449 */
548 width = 16; 450 width = 16;
549 height = 16; 451 height = 16;
550 timeout = 300; 452 timeout = 300;
551 max_nrof = 1000; // 1000 items of anything 453 max_nrof = 1000; // 1000 items of anything
454 max_items = MAX_ITEM_PER_ACTION;
552 max_volume = 2000000; // 2m³ 455 max_volume = 2000000; // 2m³
553} 456}
554 457
555maptile::maptile (int w, int h) 458maptile::maptile (int w, int h)
556{ 459{
577 if (spaces) 480 if (spaces)
578 return; 481 return;
579 482
580 spaces = salloc0<mapspace> (size ()); 483 spaces = salloc0<mapspace> (size ());
581} 484}
485
486//+GPL
582 487
583/* Takes a string from a map definition and outputs a pointer to the array of shopitems 488/* Takes a string from a map definition and outputs a pointer to the array of shopitems
584 * corresponding to that string. Memory is allocated for this, it must be freed 489 * corresponding to that string. Memory is allocated for this, it must be freed
585 * at a later date. 490 * at a later date.
586 * Called by parse_map_headers below. 491 * Called by parse_map_headers below.
663 return items; 568 return items;
664} 569}
665 570
666/* opposite of parse string, this puts the string that was originally fed in to 571/* opposite of parse string, this puts the string that was originally fed in to
667 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
668static void 573static const char *
669print_shop_string (maptile *m, char *output_string) 574print_shop_string (maptile *m)
670{ 575{
671 int i; 576 static dynbuf_text buf; buf.clear ();
672 char tmp[MAX_BUF];
673 577
674 strcpy (output_string, "");
675 for (i = 0; i < m->shopitems[0].index; i++) 578 for (int i = 0; i < m->shopitems[0].index; i++)
676 { 579 {
677 if (m->shopitems[i].typenum) 580 if (m->shopitems[i].typenum)
678 { 581 {
679 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
680 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 583 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
681 else 584 else
682 sprintf (tmp, "%s;", m->shopitems[i].name); 585 buf.printf ("%s;", m->shopitems[i].name);
683 } 586 }
684 else 587 else
685 { 588 {
686 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
687 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 590 buf.printf ("*:%d;", m->shopitems[i].strength);
688 else 591 else
689 sprintf (tmp, "*"); 592 buf.printf ("*");
690 } 593 }
691
692 strcat (output_string, tmp);
693 } 594 }
595
596 return buf;
694} 597}
598
599//-GPL
695 600
696/* This loads the header information of the map. The header 601/* This loads the header information of the map. The header
697 * contains things like difficulty, size, timeout, etc. 602 * contains things like difficulty, size, timeout, etc.
698 * this used to be stored in the map object, but with the 603 * this used to be stored in the map object, but with the
699 * addition of tiling, fields beyond that easily named in an 604 * addition of tiling, fields beyond that easily named in an
707bool 612bool
708maptile::_load_header (object_thawer &thawer) 613maptile::_load_header (object_thawer &thawer)
709{ 614{
710 for (;;) 615 for (;;)
711 { 616 {
712 keyword kw = thawer.get_kv ();
713
714 switch (kw) 617 switch (thawer.kw)
715 { 618 {
716 case KW_msg: 619 case KW_msg:
717 thawer.get_ml (KW_endmsg, msg); 620 thawer.get_ml (KW_endmsg, msg);
718 break; 621 break;
719 622
751 case KW_winddir: thawer.get (winddir); break; 654 case KW_winddir: thawer.get (winddir); break;
752 case KW_sky: thawer.get (sky); break; 655 case KW_sky: thawer.get (sky); break;
753 656
754 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
755 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
659 case KW_no_reset: thawer.get (no_reset); break;
660 case KW_no_drop: thawer.get (no_drop); break;
756 661
757 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: default_region = region::find (thawer.get_str ()); break;
758 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
759 664
760 // old names new names 665 // old names new names
771 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [0]); break;
772 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [1]); break;
773 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [2]); break;
774 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [3]); break;
775 680
681 case KW_ERROR:
682 set_key_text (thawer.kw_str, thawer.value);
683 break;
684
776 case KW_end: 685 case KW_end:
686 thawer.next ();
777 return true; 687 return true;
778 688
779 default: 689 default:
780 if (!thawer.parse_error ("map", 0)) 690 if (!thawer.parse_error ("map", 0))
781 return false; 691 return false;
782 break; 692 break;
783 } 693 }
694
695 thawer.next ();
784 } 696 }
785 697
786 abort (); 698 abort ();
787} 699}
788 700
789bool 701//+GPL
790maptile::_load_header (const char *path)
791{
792 object_thawer thawer (path);
793
794 if (!thawer)
795 return false;
796
797 return _load_header (thawer);
798}
799 702
800/****************************************************************************** 703/******************************************************************************
801 * This is the start of unique map handling code 704 * This is the start of unique map handling code
802 *****************************************************************************/ 705 *****************************************************************************/
803 706
813 object *above = op->above; 716 object *above = op->above;
814 717
815 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 718 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
816 unique = 1; 719 unique = 1;
817 720
818 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 721 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
819 {
820 op->destroy_inv (false);
821 op->destroy (); 722 op->destroy ();
822 }
823 723
824 op = above; 724 op = above;
825 } 725 }
826 } 726 }
827} 727}
728
729//-GPL
828 730
829bool 731bool
830maptile::_save_header (object_freezer &freezer) 732maptile::_save_header (object_freezer &freezer)
831{ 733{
832#define MAP_OUT(k) freezer.put (KW_ ## k, k) 734#define MAP_OUT(k) freezer.put (KW_ ## k, k)
837 if (name) MAP_OUT (name); 739 if (name) MAP_OUT (name);
838 MAP_OUT (swap_time); 740 MAP_OUT (swap_time);
839 MAP_OUT (reset_time); 741 MAP_OUT (reset_time);
840 MAP_OUT (reset_timeout); 742 MAP_OUT (reset_timeout);
841 MAP_OUT (fixed_resettime); 743 MAP_OUT (fixed_resettime);
744 MAP_OUT (no_reset);
745 MAP_OUT (no_drop);
842 MAP_OUT (difficulty); 746 MAP_OUT (difficulty);
843
844 if (default_region) MAP_OUT2 (region, default_region->name); 747 if (default_region) MAP_OUT2 (region, default_region->name);
845 748
846 if (shopitems) 749 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
847 {
848 char shop[MAX_BUF];
849 print_shop_string (this, shop);
850 MAP_OUT2 (shopitems, shop);
851 }
852
853 MAP_OUT (shopgreed); 750 MAP_OUT (shopgreed);
854 MAP_OUT (shopmin); 751 MAP_OUT (shopmin);
855 MAP_OUT (shopmax); 752 MAP_OUT (shopmax);
856 if (shoprace) MAP_OUT (shoprace); 753 if (shoprace) MAP_OUT (shoprace);
754
857 MAP_OUT (darkness); 755 MAP_OUT (darkness);
858 MAP_OUT (width); 756 MAP_OUT (width);
859 MAP_OUT (height); 757 MAP_OUT (height);
860 MAP_OUT (enter_x); 758 MAP_OUT (enter_x);
861 MAP_OUT (enter_y); 759 MAP_OUT (enter_y);
894 return false; 792 return false;
895 793
896 return freezer.save (path); 794 return freezer.save (path);
897} 795}
898 796
797//+GPL
798
899/* 799/*
900 * Remove and free all objects in the given map. 800 * Remove and free all objects in the given map.
901 */ 801 */
902void 802void
903maptile::clear () 803maptile::clear ()
904{ 804{
905 sfree (regions, size ()), regions = 0;
906 free (regionmap), regionmap = 0;
907
908 if (spaces) 805 if (spaces)
909 { 806 {
910 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 807 for (mapspace *ms = spaces + size (); ms-- > spaces; )
911 while (object *op = ms->bot) 808 while (object *op = ms->bot)
912 { 809 {
810 // manually remove, as to not trigger anything
811 if (ms->bot = op->above)
812 ms->bot->below = 0;
813
814 op->flag [FLAG_REMOVED] = true;
815
816 object *head = op->head_ ();
913 if (op->head) 817 if (op == head)
914 op = op->head;
915
916 op->destroy_inv (false);
917 op->destroy (); 818 op->destroy ();
819 else if (head->map != op->map)
820 {
821 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
822 head->destroy ();
823 }
918 } 824 }
919 825
920 sfree (spaces, size ()), spaces = 0; 826 sfree0 (spaces, size ());
921 } 827 }
922 828
923 if (buttons) 829 if (buttons)
924 free_objectlinkpt (buttons), buttons = 0; 830 free_objectlinkpt (buttons), buttons = 0;
831
832 sfree0 (regions, size ());
833 delete [] regionmap; regionmap = 0;
925} 834}
926 835
927void 836void
928maptile::clear_header () 837maptile::clear_header ()
929{ 838{
961 attachable::do_destroy (); 870 attachable::do_destroy ();
962 871
963 clear (); 872 clear ();
964} 873}
965 874
966/* 875/* decay and destroy perishable items in a map */
967 * Updates every button on the map (by calling update_button() for them).
968 */
969void 876void
970maptile::update_buttons () 877maptile::do_decay_objects ()
971{ 878{
972 for (oblinkpt *obp = buttons; obp; obp = obp->next) 879 if (!spaces)
973 for (objectlink *ol = obp->link; ol; ol = ol->next) 880 return;
881
882 for (mapspace *ms = spaces + size (); ms-- > spaces; )
883 for (object *above, *op = ms->bot; op; op = above)
974 { 884 {
975 if (!ol->ob) 885 above = op->above;
886
887 bool destroy = 0;
888
889 // do not decay anything above unique floor tiles (yet :)
890 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
891 break;
892
893 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
894 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
895 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ())
899 ; // do not decay
900 else if (op->is_weapon ())
976 { 901 {
977 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 902 op->stats.dam--;
978 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 903 if (op->stats.dam < 0)
979 continue; 904 destroy = 1;
980 } 905 }
981 906 else if (op->is_armor ())
982 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
983 { 907 {
984 update_button (ol->ob); 908 op->stats.ac--;
985 break; 909 if (op->stats.ac < 0)
910 destroy = 1;
986 } 911 }
912 else if (op->type == FOOD)
913 {
914 op->stats.food -= rndm (5, 20);
915 if (op->stats.food < 0)
916 destroy = 1;
917 }
918 else
919 {
920 int mat = op->materials;
921
922 if (mat & M_PAPER
923 || mat & M_LEATHER
924 || mat & M_WOOD
925 || mat & M_ORGANIC
926 || mat & M_CLOTH
927 || mat & M_LIQUID
928 || (mat & M_IRON && rndm (1, 5) == 1)
929 || (mat & M_GLASS && rndm (1, 2) == 1)
930 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
931 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
932 || (mat & M_ICE && temp > 32))
933 destroy = 1;
934 }
935
936 /* adjust overall chance below */
937 if (destroy && rndm (0, 1))
938 op->destroy ();
987 } 939 }
988} 940}
989 941
990/* 942/*
991 * This routine is supposed to find out the difficulty of the map. 943 * This routine is supposed to find out the difficulty of the map.
992 * difficulty does not have a lot to do with character level, 944 * difficulty does not have a lot to do with character level,
993 * but does have a lot to do with treasure on the map. 945 * but does have a lot to do with treasure on the map.
994 * 946 *
995 * Difficulty can now be set by the map creature. If the value stored 947 * Difficulty can now be set by the map creator. If the value stored
996 * in the map is zero, then use this routine. Maps should really 948 * in the map is zero, then use this routine. Maps should really
997 * have a difficulty set than using this function - human calculation 949 * have a difficulty set rather than using this function - human calculation
998 * is much better than this functions guesswork. 950 * is much better than this function's guesswork.
999 */ 951 */
1000int 952int
1001maptile::estimate_difficulty () const 953maptile::estimate_difficulty () const
1002{ 954{
1003 long monster_cnt = 0; 955 long monster_cnt = 0;
1015 967
1016 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (QUERY_FLAG (op, FLAG_GENERATOR))
1017 { 969 {
1018 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
1019 971
1020 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 972 if (archetype *at = op->other_arch)
973 {
1021 total_exp += at->clone.stats.exp * 8; 974 total_exp += at->stats.exp * 8;
1022
1023 monster_cnt++; 975 monster_cnt++;
976 }
977
978 for (object *inv = op->inv; inv; inv = inv->below)
979 {
980 total_exp += op->stats.exp * 8;
981 monster_cnt++;
982 }
1024 } 983 }
1025 } 984 }
1026 985
1027 avgexp = (double) total_exp / monster_cnt; 986 avgexp = (double) total_exp / monster_cnt;
1028 987
1041 * postive values make it darker, negative make it brighter 1000 * postive values make it darker, negative make it brighter
1042 */ 1001 */
1043int 1002int
1044maptile::change_map_light (int change) 1003maptile::change_map_light (int change)
1045{ 1004{
1046 int new_level = darkness + change;
1047
1048 /* Nothing to do */ 1005 /* Nothing to do */
1049 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1006 if (!change)
1050 return 0; 1007 return 0;
1051 1008
1052 /* inform all players on the map */ 1009 /* inform all players on the map */
1053 if (change > 0) 1010 if (change > 0)
1054 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1055 else 1012 else
1056 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1013 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1057 1014
1058 /* Do extra checking. since darkness is a unsigned value, 1015 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1059 * we need to be extra careful about negative values.
1060 * In general, the checks below are only needed if change
1061 * is not +/-1
1062 */
1063 if (new_level < 0)
1064 darkness = 0;
1065 else if (new_level >= MAX_DARKNESS)
1066 darkness = MAX_DARKNESS;
1067 else
1068 darkness = new_level;
1069 1016
1070 /* All clients need to get re-updated for the change */ 1017 /* All clients need to get re-updated for the change */
1071 update_all_map_los (this); 1018 update_all_map_los (this);
1019
1072 return 1; 1020 return 1;
1073} 1021}
1074 1022
1075/* 1023/*
1076 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
1079 * through, etc) 1027 * through, etc)
1080 */ 1028 */
1081void 1029void
1082mapspace::update_ () 1030mapspace::update_ ()
1083{ 1031{
1084 object *tmp, *last = 0; 1032 object *last = 0;
1085 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1034 sint8 light = 0;
1086 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0;
1037 uint32_t items = 0;
1038 object *anywhere = 0;
1087 1039
1088 //object *middle = 0; 1040 //object *middle = 0;
1089 //object *top = 0; 1041 //object *top = 0;
1090 //object *floor = 0; 1042 //object *floor = 0;
1091 // this seems to generate better code than using locals, above 1043 // this seems to generate better code than using locals, above
1092 object *&top = faces_obj[0] = 0; 1044 object *&top = faces_obj[0] = 0;
1093 object *&middle = faces_obj[1] = 0; 1045 object *&middle = faces_obj[1] = 0;
1094 object *&floor = faces_obj[2] = 0; 1046 object *&floor = faces_obj[2] = 0;
1095 1047
1048 object::flags_t allflags; // all flags of all objects or'ed together
1049
1096 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1050 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1097 { 1051 {
1098 /* This could be made additive I guess (two lights better than 1052 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1099 * one). But if so, it shouldn't be a simple additive - 2
1100 * light bulbs do not illuminate twice as far as once since
1101 * it is a dissapation factor that is cubed.
1102 */
1103 if (tmp->glow_radius > light)
1104 light = tmp->glow_radius; 1053 light += tmp->glow_radius;
1105 1054
1106 /* This call is needed in order to update objects the player 1055 /* This call is needed in order to update objects the player
1107 * is standing in that have animations (ie, grass, fire, etc). 1056 * is standing in that have animations (ie, grass, fire, etc).
1108 * However, it also causes the look window to be re-drawn 1057 * However, it also causes the look window to be re-drawn
1109 * 3 times each time the player moves, because many of the 1058 * 3 times each time the player moves, because many of the
1110 * functions the move_player calls eventualy call this. 1059 * functions the move_player calls eventualy call this.
1111 * 1060 *
1112 * Always put the player down for drawing. 1061 * Always put the player down for drawing.
1113 */ 1062 */
1114 if (!tmp->invisible) 1063 if (expect_true (!tmp->invisible))
1115 { 1064 {
1116 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1065 if (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER])
1117 top = tmp; 1066 top = tmp;
1118 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1067 else
1119 { 1068 {
1069 if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1070 {
1120 /* If we got a floor, that means middle and top were below it, 1071 /* If we got a floor, that means middle and top were below it,
1121 * so should not be visible, so we clear them. 1072 * so should not be visible, so we clear them.
1122 */ 1073 */
1123 middle = 0; 1074 middle = 0;
1124 top = 0; 1075 top = 0;
1125 floor = tmp; 1076 floor = tmp;
1077 volume = 0;
1078 items = 0;
1079 }
1080 else
1081 {
1082 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1083 {
1084 ++items;
1085 volume += tmp->volume ();
1086 }
1087
1088 /* Flag anywhere have high priority */
1089 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1090 anywhere = tmp;
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility))
1096 middle = tmp;
1097 }
1126 } 1098 }
1127 /* Flag anywhere have high priority */
1128 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1129 {
1130 middle = tmp;
1131 anywhere = 1;
1132 }
1133 /* Find the highest visible face around. If equal
1134 * visibilities, we still want the one nearer to the
1135 * top
1136 */
1137 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1138 middle = tmp;
1139 }
1140
1141 if (tmp == tmp->above)
1142 {
1143 LOG (llevError, "Error in structure of map\n");
1144 exit (-1);
1145 } 1099 }
1146 1100
1147 move_slow |= tmp->move_slow; 1101 move_slow |= tmp->move_slow;
1148 move_block |= tmp->move_block; 1102 move_block |= tmp->move_block;
1149 move_on |= tmp->move_on; 1103 move_on |= tmp->move_on;
1150 move_off |= tmp->move_off; 1104 move_off |= tmp->move_off;
1151 move_allow |= tmp->move_allow; 1105 move_allow |= tmp->move_allow;
1152 1106
1153 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1107 allflags |= tmp->flag;
1154 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1108
1155 if (tmp->type == PLAYER) flags |= P_PLAYER; 1109 if (tmp->type == PLAYER) flags |= P_PLAYER;
1156 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1110 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1157 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1158 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1159 } 1111 }
1160 1112
1161 this->light = light; 1113 // FLAG_SEE_ANYWHERE takes precedence
1114 if (anywhere)
1115 middle = anywhere;
1116
1117 // ORing all flags together and checking them here is much faster
1118 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1119 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1120 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1121 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1122
1123 this->light = min (light, MAX_LIGHT_RADIUS);
1162 this->flags_ = flags; 1124 this->flags_ = flags;
1163 this->move_block = move_block & ~move_allow; 1125 this->move_block = move_block & ~move_allow;
1164 this->move_on = move_on; 1126 this->move_on = move_on;
1165 this->move_off = move_off; 1127 this->move_off = move_off;
1166 this->move_slow = move_slow; 1128 this->move_slow = move_slow;
1129 this->volume_ = (volume + 1023) / 1024;
1130 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1167 1131
1168 /* At this point, we have a floor face (if there is a floor), 1132 /* At this point, we have a floor face (if there is a floor),
1169 * and the floor is set - we are not going to touch it at 1133 * and the floor is set - we are not going to touch it at
1170 * this point. 1134 * this point.
1171 * middle contains the highest visibility face. 1135 * middle contains the highest visibility face.
1186 * 1) top face is set, need middle to be set. 1150 * 1) top face is set, need middle to be set.
1187 * 2) middle is set, need to set top. 1151 * 2) middle is set, need to set top.
1188 * 3) neither middle or top is set - need to set both. 1152 * 3) neither middle or top is set - need to set both.
1189 */ 1153 */
1190 1154
1191 for (tmp = last; tmp; tmp = tmp->below) 1155 for (object *tmp = last; tmp; tmp = tmp->below)
1192 { 1156 {
1193 /* Once we get to a floor, stop, since we already have a floor object */ 1157 /* Once we get to a floor, stop, since we already have a floor object */
1194 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1158 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1195 break; 1159 break;
1196 1160
1237 faces_obj [1] = middle; 1201 faces_obj [1] = middle;
1238 faces_obj [2] = floor; 1202 faces_obj [2] = floor;
1239#endif 1203#endif
1240} 1204}
1241 1205
1242uint64 1206maptile *
1243mapspace::volume () const 1207maptile::tile_available (int dir, bool load)
1244{ 1208{
1245 uint64 vol = 0; 1209 if (tile_path[dir])
1246
1247 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1248 vol += op->volume ();
1249
1250 return vol;
1251}
1252
1253/* this updates the orig_map->tile_map[tile_num] value after finding
1254 * the map. It also takes care of linking back the freshly found
1255 * maps tile_map values if it tiles back to this one. It returns
1256 * the value of orig_map->tile_map[tile_num].
1257 */
1258static inline maptile *
1259find_and_link (maptile *orig_map, int tile_num)
1260{
1261 maptile *mp = orig_map->tile_map [tile_num];
1262
1263 if (!mp)
1264 {
1265 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1266
1267 if (!mp)
1268 {
1269 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1270 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1271 &orig_map->tile_path[tile_num], &orig_map->path);
1272 mp = new maptile (1, 1);
1273 mp->alloc ();
1274 mp->in_memory = MAP_IN_MEMORY;
1275 }
1276 } 1210 {
1211 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1212 return tile_map[dir];
1277 1213
1278 int dest_tile = (tile_num + 2) % 4; 1214 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1215 return tile_map[dir];
1216 }
1279 1217
1280 orig_map->tile_map [tile_num] = mp;
1281
1282 // optimisation: back-link map to origin map if euclidean
1283 //TODO: non-euclidean maps MUST GO
1284 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1285 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1286
1287 return mp; 1218 return 0;
1288}
1289
1290static inline void
1291load_and_link (maptile *orig_map, int tile_num)
1292{
1293 find_and_link (orig_map, tile_num)->load_sync ();
1294} 1219}
1295 1220
1296/* this returns TRUE if the coordinates (x,y) are out of 1221/* this returns TRUE if the coordinates (x,y) are out of
1297 * map m. This function also takes into account any 1222 * map m. This function also takes into account any
1298 * tiling considerations, loading adjacant maps as needed. 1223 * tiling considerations, loading adjacant maps as needed.
1311 if (!m) 1236 if (!m)
1312 return 0; 1237 return 0;
1313 1238
1314 if (x < 0) 1239 if (x < 0)
1315 { 1240 {
1316 if (!m->tile_path[3]) 1241 if (!m->tile_available (3))
1317 return 1; 1242 return 1;
1318 1243
1319 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1320 find_and_link (m, 3);
1321
1322 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1244 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1323 } 1245 }
1324 1246
1325 if (x >= m->width) 1247 if (x >= m->width)
1326 { 1248 {
1327 if (!m->tile_path[1]) 1249 if (!m->tile_available (1))
1328 return 1; 1250 return 1;
1329 1251
1330 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1331 find_and_link (m, 1);
1332
1333 return out_of_map (m->tile_map[1], x - m->width, y); 1252 return out_of_map (m->tile_map[1], x - m->width, y);
1334 } 1253 }
1335 1254
1336 if (y < 0) 1255 if (y < 0)
1337 { 1256 {
1338 if (!m->tile_path[0]) 1257 if (!m->tile_available (0))
1339 return 1; 1258 return 1;
1340 1259
1341 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1342 find_and_link (m, 0);
1343
1344 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1260 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1345 } 1261 }
1346 1262
1347 if (y >= m->height) 1263 if (y >= m->height)
1348 { 1264 {
1349 if (!m->tile_path[2]) 1265 if (!m->tile_available (2))
1350 return 1; 1266 return 1;
1351
1352 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1353 find_and_link (m, 2);
1354 1267
1355 return out_of_map (m->tile_map[2], x, y - m->height); 1268 return out_of_map (m->tile_map[2], x, y - m->height);
1356 } 1269 }
1357 1270
1358 /* Simple case - coordinates are within this local 1271 /* Simple case - coordinates are within this local
1372maptile * 1285maptile *
1373maptile::xy_find (sint16 &x, sint16 &y) 1286maptile::xy_find (sint16 &x, sint16 &y)
1374{ 1287{
1375 if (x < 0) 1288 if (x < 0)
1376 { 1289 {
1377 if (!tile_path[3]) 1290 if (!tile_available (3))
1378 return 0; 1291 return 0;
1379 1292
1380 find_and_link (this, 3);
1381 x += tile_map[3]->width; 1293 x += tile_map[3]->width;
1382 return tile_map[3]->xy_find (x, y); 1294 return tile_map[3]->xy_find (x, y);
1383 } 1295 }
1384 1296
1385 if (x >= width) 1297 if (x >= width)
1386 { 1298 {
1387 if (!tile_path[1]) 1299 if (!tile_available (1))
1388 return 0; 1300 return 0;
1389 1301
1390 find_and_link (this, 1);
1391 x -= width; 1302 x -= width;
1392 return tile_map[1]->xy_find (x, y); 1303 return tile_map[1]->xy_find (x, y);
1393 } 1304 }
1394 1305
1395 if (y < 0) 1306 if (y < 0)
1396 { 1307 {
1397 if (!tile_path[0]) 1308 if (!tile_available (0))
1398 return 0; 1309 return 0;
1399 1310
1400 find_and_link (this, 0);
1401 y += tile_map[0]->height; 1311 y += tile_map[0]->height;
1402 return tile_map[0]->xy_find (x, y); 1312 return tile_map[0]->xy_find (x, y);
1403 } 1313 }
1404 1314
1405 if (y >= height) 1315 if (y >= height)
1406 { 1316 {
1407 if (!tile_path[2]) 1317 if (!tile_available (2))
1408 return 0; 1318 return 0;
1409 1319
1410 find_and_link (this, 2);
1411 y -= height; 1320 y -= height;
1412 return tile_map[2]->xy_find (x, y); 1321 return tile_map[2]->xy_find (x, y);
1413 } 1322 }
1414 1323
1415 /* Simple case - coordinates are within this local 1324 /* Simple case - coordinates are within this local
1426adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1335adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1427{ 1336{
1428 if (!map1 || !map2) 1337 if (!map1 || !map2)
1429 return 0; 1338 return 0;
1430 1339
1431 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1340 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1432 //fix: compare paths instead (this is likely faster, too!) 1341 //fix: compare paths instead (this is likely faster, too!)
1433 if (map1 == map2) 1342 if (map1 == map2)
1434 { 1343 {
1435 *dx = 0; 1344 *dx = 0;
1436 *dy = 0; 1345 *dy = 0;
1618 else 1527 else
1619 { 1528 {
1620 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1621 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1622 1531
1623 retval->part = NULL; 1532 retval->part = 0;
1624 retval->distance = idistance (retval->distance_x, retval->distance_y); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626 } 1535 }
1627} 1536}
1628 1537
1629/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
1640 int dx, dy; 1549 int dx, dy;
1641 1550
1642 return adjacent_map (op1->map, op2->map, &dx, &dy); 1551 return adjacent_map (op1->map, op2->map, &dx, &dy);
1643} 1552}
1644 1553
1554//-GPL
1555
1645object * 1556object *
1646maptile::insert (object *op, int x, int y, object *originator, int flags) 1557maptile::insert (object *op, int x, int y, object *originator, int flags)
1647{ 1558{
1648 if (!op->flag [FLAG_REMOVED])
1649 op->remove ();
1650
1651 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1559 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1652} 1560}
1653 1561
1654region * 1562region *
1655maptile::region (int x, int y) const 1563maptile::region (int x, int y) const
1664 return default_region; 1572 return default_region;
1665 1573
1666 return ::region::default_region (); 1574 return ::region::default_region ();
1667} 1575}
1668 1576
1577//+GPL
1578
1669/* picks a random object from a style map. 1579/* picks a random object from a style map.
1670 * Redone by MSW so it should be faster and not use static
1671 * variables to generate tables.
1672 */ 1580 */
1673object * 1581object *
1674maptile::pick_random_object () const 1582maptile::pick_random_object (rand_gen &gen) const
1675{ 1583{
1676 /* while returning a null object will result in a crash, that 1584 /* while returning a null object will result in a crash, that
1677 * is actually preferable to an infinite loop. That is because 1585 * is actually preferable to an infinite loop. That is because
1678 * most servers will automatically restart in case of crash. 1586 * most servers will automatically restart in case of crash.
1679 * Change the logic on getting the random space - shouldn't make 1587 * Change the logic on getting the random space - shouldn't make
1680 * any difference, but this seems clearer to me. 1588 * any difference, but this seems clearer to me.
1681 */ 1589 */
1682 for (int i = 1000; --i;) 1590 for (int i = 1000; --i;)
1683 { 1591 {
1684 object *pick = at (rndm (width), rndm (height)).bot; 1592 object *pick = at (gen (width), gen (height)).bot;
1685 1593
1686 // do not prefer big monsters just because they are big. 1594 // do not prefer big monsters just because they are big.
1687 if (pick && pick->head_ () == pick) 1595 if (pick && pick->is_head ())
1688 return pick->head_ (); 1596 return pick->head_ ();
1689 } 1597 }
1690 1598
1691 // instead of crashing in the unlikely(?) case, try to return *something* 1599 // instead of crashing in the unlikely(?) case, try to return *something*
1692 return get_archetype ("blocked"); 1600 return archetype::find (shstr_bug);
1693} 1601}
1694 1602
1603//-GPL
1604
1605void
1606maptile::play_sound (faceidx sound, int x, int y) const
1607{
1608 if (!sound)
1609 return;
1610
1611 for_all_players_on_map (pl, this)
1612 if (client *ns = pl->ns)
1613 {
1614 int dx = x - pl->ob->x;
1615 int dy = y - pl->ob->y;
1616
1617 int distance = idistance (dx, dy);
1618
1619 if (distance <= MAX_SOUND_DISTANCE)
1620 ns->play_sound (sound, dx, dy);
1621 }
1622}
1623
1624void
1625maptile::say_msg (const char *msg, int x, int y) const
1626{
1627 for_all_players (pl)
1628 if (client *ns = pl->ns)
1629 {
1630 int dx = x - pl->ob->x;
1631 int dy = y - pl->ob->y;
1632
1633 int distance = idistance (dx, dy);
1634
1635 if (distance <= MAX_SOUND_DISTANCE)
1636 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1637 }
1638}
1639
1640static void
1641split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1642{
1643 // clip to map to the left
1644 if (x0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1647 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1648
1649 if (x1 < 0) // entirely to the left
1650 return;
1651
1652 x0 = 0;
1653 }
1654
1655 // clip to map to the right
1656 if (x1 > m->width)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1659 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1660
1661 if (x0 > m->width) // entirely to the right
1662 return;
1663
1664 x1 = m->width;
1665 }
1666
1667 // clip to map above
1668 if (y0 < 0)
1669 {
1670 if (maptile *tile = m->tile_available (TILE_UP, 1))
1671 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1672
1673 if (y1 < 0) // entirely above
1674 return;
1675
1676 y0 = 0;
1677 }
1678
1679 // clip to map below
1680 if (y1 > m->height)
1681 {
1682 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1683 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1684
1685 if (y0 > m->height) // entirely below
1686 return;
1687
1688 y1 = m->height;
1689 }
1690
1691 // if we get here, the rect is within the current map
1692 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1693
1694 r->m = m;
1695 r->x0 = x0;
1696 r->y0 = y0;
1697 r->x1 = x1;
1698 r->y1 = y1;
1699 r->dx = dx;
1700 r->dy = dy;
1701}
1702
1703maprect *
1704maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1705{
1706 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1707 buf.clear ();
1708
1709 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1710
1711 // add end marker
1712 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1713 r->m = 0;
1714
1715 return (maprect *)buf.linearise ();
1716}
1717

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines