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

Diff Legend

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